diff --git a/Manifest.files.gz b/Manifest.files.gz
index 7b2d194ea7e9..b0a8add554a2 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index e76474cef8a3..29e464b5d9b5 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/sys-auth/pam_passwdqc/Manifest b/acct-group/freenet/Manifest
similarity index 100%
rename from sys-auth/pam_passwdqc/Manifest
rename to acct-group/freenet/Manifest
diff --git a/acct-group/freenet/freenet-0.ebuild b/acct-group/freenet/freenet-0.ebuild
new file mode 100644
index 000000000000..3c1540f857da
--- /dev/null
+++ b/acct-group/freenet/freenet-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-p2p/freenet"
+
+KEYWORDS="~amd64 ~x86"
+
+ACCT_GROUP_ID=105
diff --git a/acct-group/freenet/metadata.xml b/acct-group/freenet/metadata.xml
new file mode 100644
index 000000000000..3800f75787af
--- /dev/null
+++ b/acct-group/freenet/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tommy@gentoo.org</email>
+		<name>Thomas Sachau (Tommy[D])</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/ipsec/Manifest b/acct-group/ipsec/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/ipsec/ipsec-0.ebuild b/acct-group/ipsec/ipsec-0.ebuild
new file mode 100644
index 000000000000..d0716459d75e
--- /dev/null
+++ b/acct-group/ipsec/ipsec-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="ipsec (strongswan) program group"
+
+ACCT_GROUP_ID=199
diff --git a/acct-group/ipsec/metadata.xml b/acct-group/ipsec/metadata.xml
new file mode 100644
index 000000000000..8c5a5301197b
--- /dev/null
+++ b/acct-group/ipsec/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 86d063cee153..a6e49a483202 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/freenet/Manifest b/acct-user/freenet/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/freenet/freenet-0.ebuild b/acct-user/freenet/freenet-0.ebuild
new file mode 100644
index 000000000000..f069c9f11430
--- /dev/null
+++ b/acct-user/freenet/freenet-0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-p2p/freenet"
+
+KEYWORDS="~amd64 ~x86"
+
+ACCT_USER_ID=105
+ACCT_USER_GROUPS=( ${PN} )
+ACCT_USER_HOME=/var/freenet
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
diff --git a/acct-user/freenet/metadata.xml b/acct-user/freenet/metadata.xml
new file mode 100644
index 000000000000..3800f75787af
--- /dev/null
+++ b/acct-user/freenet/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tommy@gentoo.org</email>
+		<name>Thomas Sachau (Tommy[D])</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/ipsec/Manifest b/acct-user/ipsec/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/ipsec/ipsec-0.ebuild b/acct-user/ipsec/ipsec-0.ebuild
new file mode 100644
index 000000000000..738b68f43199
--- /dev/null
+++ b/acct-user/ipsec/ipsec-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="ipsec (strongswan) program user"
+
+ACCT_USER_ID=199
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/ipsec/metadata.xml b/acct-user/ipsec/metadata.xml
new file mode 100644
index 000000000000..8c5a5301197b
--- /dev/null
+++ b/acct-user/ipsec/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 4307d90a9f67..8f1deff15f3a 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.36.0.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.36.0.ebuild
index f55feb98580a..71a1700a1965 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.36.0.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.36.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 LICENSE="LGPL-2.1+"
 SLOT="2"
 IUSE="X gtk-doc +introspection"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 RDEPEND="
 	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
diff --git a/app-accessibility/edbrowse/edbrowse-3.7.5.1.ebuild b/app-accessibility/edbrowse/edbrowse-3.7.5.1-r1.ebuild
similarity index 97%
rename from app-accessibility/edbrowse/edbrowse-3.7.5.1.ebuild
rename to app-accessibility/edbrowse/edbrowse-3.7.5.1-r1.ebuild
index f2a61e23958c..1f0f66a9bb15 100644
--- a/app-accessibility/edbrowse/edbrowse-3.7.5.1.ebuild
+++ b/app-accessibility/edbrowse/edbrowse-3.7.5.1-r1.ebuild
@@ -18,7 +18,7 @@ RDEPEND="
 	>=net-misc/curl-7.36.0
 	>=dev-libs/libpcre-7.8
 	>=sys-libs/readline-6.0
-	dev-lang/duktape
+	dev-lang/duktape:=
 	odbc? ( dev-db/unixODBC )"
 DEPEND="${RDEPEND}"
 BDEPEND="${RDEPEND}
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 4e68f33244c8..e41dbe00e453 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/aerospike-amc-community/files/amc.init b/app-admin/aerospike-amc-community/files/amc.init
deleted file mode 100644
index 06c14001f5d6..000000000000
--- a/app-admin/aerospike-amc-community/files/amc.init
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-config_file=${config_file:-/etc/amc/config/gunicorn_config.py}
-run_dir=${run_dir:-/run}
-
-command="/usr/bin/gunicorn"
-command_args="--daemon --config ${config_file} flaskapp:app"
-command_background="true"
-pidfile=${run_dir}/${SVCNAME}.pid
-user=${user:-root}
-group=${group:-root}
-start_stop_daemon_args="--user ${user} --group ${group}"
-required_files="${config_file}"
-
-depend() {
-	use net
-}
-
-start_post() {
-	ewaitfile 60 "${pidfile}"
-}
diff --git a/app-admin/cgmanager/cgmanager-0.41.ebuild b/app-admin/cgmanager/cgmanager-0.41.ebuild
index f50a2b4463c1..f54b2d44c503 100644
--- a/app-admin/cgmanager/cgmanager-0.41.ebuild
+++ b/app-admin/cgmanager/cgmanager-0.41.ebuild
@@ -35,7 +35,8 @@ src_configure() {
 	econf \
 		--with-distro=gentoo \
 		--with-pamdir="$(usex pam $(getpam_mod_dir) none)" \
-		--with-init-script=systemd
+		--with-init-script=systemd \
+		--disable-static
 }
 
 src_install() {
@@ -46,4 +47,6 @@ src_install() {
 
 	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
 	newinitd "${FILESDIR}"/cgproxy.initd-r1 cgproxy
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-admin/cgmanager/cgmanager-0.42.ebuild b/app-admin/cgmanager/cgmanager-0.42.ebuild
index af8480ae28ea..da4663f6c806 100644
--- a/app-admin/cgmanager/cgmanager-0.42.ebuild
+++ b/app-admin/cgmanager/cgmanager-0.42.ebuild
@@ -35,7 +35,8 @@ src_configure() {
 	econf \
 		--with-distro=gentoo \
 		--with-pamdir="$(usex pam $(getpam_mod_dir) none)" \
-		--with-init-script=systemd
+		--with-init-script=systemd \
+		--disable-static
 }
 
 src_install() {
@@ -46,4 +47,6 @@ src_install() {
 
 	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
 	newinitd "${FILESDIR}"/cgproxy.initd-r1 cgproxy
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-admin/cpulimit/files/cpulimit.8 b/app-admin/cpulimit/files/cpulimit.8
deleted file mode 100644
index 8e6dcf9bbf42..000000000000
--- a/app-admin/cpulimit/files/cpulimit.8
+++ /dev/null
@@ -1,49 +0,0 @@
-.TH CPULIMIT "8" "July 2006" "cpulimit" "System Management"
-.SH NAME
-cpulimit -- limits the CPU usage of a process
-.SH SYNOPSIS
-.B cpulimit
-\fITARGET \fR[\fIOPTIONS\fR...]
-.SH DESCRIPTION
-.P
-\fITARGET \fRmust be exactly one of these:
-.TP
-\fB\-p\fR, \fB\-\-pid\fR=\fIN\fR
-pid of the process
-.TP
-\fB\-e\fR, \fB\-\-exe\fR=\fIFILE\fR
-name of the executable program file
-.TP
-\fB\-P\fR, \fB\-\-path\fR=\fIPATH\fR
-absolute path name of the executable program file
-.P
-\fIOPTIONS\fR
-.TP
-\fB\-l\fR, \fB\-\-limit\fR=\fIN\fR
-percentage of CPU allowed from 0 to 100 (mandatory)
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-show control statistics
-.TP
-\fB\-z\fR, \fB\-\-lazy\fR
-exit if there is no suitable target process, or if it dies
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-display this help and exit
-.SH EXAMPLES
-Assuming you have started \fB`foo \-\-bar`\fR and you find out with \fItop\fR(1) or
-\fIps\fR(1) that this process uses all your CPU time you can either
-.TP
-\[sh] \fBcpulimit \-e foo \-l 50\fR
-limits the CPU usage of the process by acting on the executable program file
-(note: the argument "\-\-bar" is omitted)
-.TP
-\[sh] \fBcpulimit \-p 1234 \-l 50\fR
-limits the CPU usage of the process by acting on its PID, as shown by
-\fIps\fR(1)
-.TP
-\[sh] \fBcpulimit \-P /usr/bin/foo \-l 50\fR
-same as \fI\-e\fR but uses the absolute path name 
-.SH AUTHOR
-This manpage was written for the Debian project by gregor herrmann
-<gregor+debian@comodo.priv.at> but may be used by others.
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index 2a3ff5a2c981..b954a39758c7 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -29,13 +29,11 @@ DIST code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a
 DIST code.cloudfoundry.org%2Frfc5424%2F@v%2Fv0.0.0-20180905210152-236a6d29298a.mod 37 BLAKE2B 7f1d6b0d3a4466e42d7eef1cc7fb543f9e3614c482fc33462f006a193bbac8f629b55ff4f6046091dd19cc3414517bff8817e43836c9caa68284b580edcc0d78 SHA512 f05b5cedfdb7a281ab89b8150387ddcd695b84617c0355bad4bad1abb7609cec47d3e16bdd3fda172f067ad58e68a120b9abd18a240e5181e94d2912f4b6308d
 DIST code.cloudfoundry.org%2Frfc5424%2F@v%2Fv0.0.0-20180905210152-236a6d29298a.zip 12973 BLAKE2B 761863ec1f123172069a000a43a5aa2e60a07bae4b8ece617450608603121ac81b12b771f9ae3ab0f3eb9cf14c2d2c23319a31e4f8cd49e93d5e19f5a6dc2c12 SHA512 d39f126bbd0bc0ce86098d3eb4e14ff02d0b6b053cb2e63ba202d5fed007d673ef39d2653d29751ee0b7107e96ad32d48c66944d55815dab4f7b9c778c531c55
 DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
-DIST filebeat-6.8.12.tar.gz 35567860 BLAKE2B d9650806ec4889bbcf511f1433a6b85678852c79aaba0a1f3493ff1451d012a1e3c6d2ca613a627a0c2c43c5ad43467c23fbb6993003bb9e836ac49ab8ab6539 SHA512 7d322506949e365046411beefbf87c45da4b9e2fa4b5a8b8820f97be73d48a9ae75fc85fe209602752eb18e21784f6b8f3bc7f83881efa91ad4995f07a773bd2
-DIST filebeat-7.3.2.tar.gz 49977990 BLAKE2B 6219a382b415572fdea2ff4b0aa3f02b3c1e500d77ed5200b6d5b4334a08b8e91d389ea41b3afe98355f8b20e7f8ecaccf5996f0bb7aad5f10e0f0d69400a0d6 SHA512 75943b251343d28f478f2f19665e4ba31f5bc6e4b26f6e6da8aa062322da4ab8e134c87a9557a97677ba3b22484c44ebaeaeeb87866e0f12e67f1647fe34131a
-DIST filebeat-7.6.1.tar.gz 77795975 BLAKE2B 2ca420b339b96baefff5042dba456fe1086dfdc5ccc1503609ff1989d79952709347662be60b18591e2b1a9f6557bfb942429b9aa6412dc02072331c8918c95c SHA512 c4f8daff002fe393b95f00b47df1ecb5566a69a9345bbbe1caceffecd8d413e3e9886f30cd4f2914579526db3de92c036c78fb37d703d447567fe921275b5fac
-DIST filebeat-7.7.0.tar.gz 90104462 BLAKE2B d044ec00bcae08745d012e49fc3cf9369b201da68ee2bfca2ce7f91ecd74c78e7c48d2045e539b6752c164e4c3f6cba38a00f1ee7a82493e008f6be49581b5d5 SHA512 1e0c7cc77b90cb3764d62db23a5a66ac3214c97a2f305c46f568ccc91a21f247c9e42c91a0771c9fc7500f6d0769e3d224b81a2c76399fd2bc6edd5afa1cb367
+DIST filebeat-6.8.13.tar.gz 35569151 BLAKE2B 2ede230e537055065b70a79578e775b0ae9da104ab21ed895e4fd2f8d2070d07ab60e33f24c2850cae908a42f0d537a8e24a6256b7a6a5fca9b6897e43f95439 SHA512 39f1ba06e1930ea498c13dda11cd835096adbcd075585672004fdc9e19d96971936e47f9c631ee02f59984c10858cfd914de136ddc356e8c39fe833401b42304
+DIST filebeat-7.10.0.tar.gz 87244908 BLAKE2B e6ef888011c053287a4b6c6d49420f6d0cd68866be208ed4a3ec630cc627e13df21a73f1db5e4f9cd959690eccaa78d15c78bf72c65023c4263d3d6826ad7aa9 SHA512 5a26a0c6638e01fb1b9c621a5ad20b2f65d255da82eb31a45110c96d8ab966a3e5e3c212bae5d27a618226d1a4ef0649102fdaeffa8069141fbb1dcb109f868b
 DIST filebeat-7.8.1.tar.gz 95430122 BLAKE2B ca79479ae8bec318a69b49fa8ba08c460755b356348ac5aa067ae90ffdd1d4e0c38b05938a80920a2d6886dc08fc0ccda0153c8a3299aafc5d2c2dab4c4fbdec SHA512 ccbf8fbbd2c094400b24e5cf8a40a910c69f4ae1bc858c496118519f5424b03b192f4852620ad1b9b8dc14f627c0d0548127406b015cc2a3d7b624801196ea60
-DIST filebeat-7.9.1.tar.gz 82853636 BLAKE2B c995e4cfe8a51b0597116d9e218360c574b4eee3f0b2174bddaacca5da7a286005bb9fb9b0b4f6de4202be95e390f32924755461b3b2cc03c4b88331e8a2329f SHA512 ae113efca9ff997dc77b44b6d1962653ef2b752a2d1b77e3131b94d7139db5672e29d02d02c8c7447f3a53a13126beb7dbfaaf228261053b6520acfaaf13ab23
 DIST filebeat-7.9.2.tar.gz 82861097 BLAKE2B 902f124215d4017c65dbb5fca033a7597cca0fede573f6b564bff656e540030eec7536075cd24f28dce31de28bac2508fb492c42eea90fa25f06b2120716b73a SHA512 8e6eba2d201997af21bb268e4708cd9c4fb22a862152dcf45e2720ccb3bf7c1e40907f468ecd4492a0a4c1f2c426bd6077a0739951f7dc42c9b0b12ecc28e90e
+DIST filebeat-7.9.3.tar.gz 82872010 BLAKE2B e437905a13e556e1bec9b59a8837eb4649f063e4ddb9815a3e18efdc291758e39b5abc0465295f8526f042aecdfc2b8e49ebb6980aeb8b3b13be9d4431863401 SHA512 35c2c8038f0f540e467feef341f3248eadda5e5b1a80c247bcd54c073153a7839f797be327b65c4eee255f4d656e36c57d112b7ff0e637342ccc13f4f59366d7
 DIST github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.mod 372 BLAKE2B 80a7e0aac984acb79239b3309290cd8ef1eeca8d9f53b3c91628cbe6dd112706d2313c47e33ac52ea9e8a6417289dacae8e2e72a03e679836d3ed89cb86c0aee SHA512 6db1a52bbab1332ab7e761532cb110394afa1dd69cc5f7443c3fb733c7d95fa712cf6bf8a78fc3f51d89b2d368a248e532bab06bc93e2e663b8f836c91aef0de
 DIST github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.zip 29788 BLAKE2B c1e493471bca24ac64c8119e624ea077a74678a492b036deb907ede12b5e93c3ef699820cb2ec9468a98d00e83d84c6bb45cf274b4812a0f319a0248610a4d2c SHA512 a412fbe597ab0c47223d733303ed2277656fe35866f52e4ed1f25cc03b691f15f5592cb07b3c5fb39d4cb98c6d73dbc8e1e7869cea17241a33dfc29db0a1d121
 DIST github.com%2F!azure%2Fazure-event-hubs-go%2Fv3%2F@v%2Fv3.1.2.mod 916 BLAKE2B eda68c483b29b920a2a3efafcf5b36b7d4f1c01bc5f55fefafc3ff9805cbf62a9a83a9d8f870319776a53f55d21efd52de8174ecb45c1c648e65d5e187be21fa SHA512 6fd1c6d13559028e1fac3c9cd3de1a914e5cd0607519de8b71e622b187168c377dc8bcc3de87c4905f0a7ed846b123885fc2dd9b8a4a6d9a49f7781a61ef53bb
@@ -57,7 +55,6 @@ DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv12.2.0+incompatible.mod 36 BLAKE2
 DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv12.2.0+incompatible.zip 21424 BLAKE2B c22d29ed317c6490a0856a177c7624ca87b3015f6512f4ab330aed250a3742276f2e6fce0e6e20d3cb1660e384c429949321a7fdd949b325f0bbbd2433652d47 SHA512 cd43fd5be17c3e334f8bc4810cd92ddeea02b0ccf550a73e38212536fac21aedf6684b42244edf8dd2dba58eda2aabf0d6c499b2a5de83c05af1ff636f833f76
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod 315 BLAKE2B 08bd66cb04b1bd32588ef1eb6059f3a2cd208a20a9ba12816e50fa39f6258d1e50ced24d78da3df80f9ebbf19db7a6c42d04fa1934eb66637ec612da86704c6e SHA512 72bb5cdb3b87c148cf4b613f3976076ffa0f8406d0d85b92b8f0311ca260e643c7855a939292dd82c66a71d4c5a1419a90b13f886bd65c7138062c34eaeae0b8
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod 315 BLAKE2B 2f508451778b22bf72bb0e6b4479991dd1dda0b474ed3f09d4bebdfdde1628c780d70c9c0edc38fb91c6b7568eeb0db63e7c8500a908adf967370fe16682e24c SHA512 72629745cdd14c9c66a696700baecb37589b565862873cbdb9711545df08c7af659aeb4dc4725c7ef9c19af9889b9007935487530a87ff97267f98811b701924
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.zip 104877 BLAKE2B d266dc408ad799bb289293df8dfb2ccd6008b01dbbf0436e5b49ffe48da4cca98fff7759010750e63c9cd3c7ce8bbd89b1b1642e1a08c0b81d801ceb1d168ffe SHA512 a9622ef347ea7bb305a20121552e185c3854c901f3495a5eb48da7eb9cbe58fc1f63bed48f659cbfcff87fdae961dd4c214e9191cd89ec0303f502a26ef4fb1d
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.4.mod 315 BLAKE2B 2f508451778b22bf72bb0e6b4479991dd1dda0b474ed3f09d4bebdfdde1628c780d70c9c0edc38fb91c6b7568eeb0db63e7c8500a908adf967370fe16682e24c SHA512 72629745cdd14c9c66a696700baecb37589b565862873cbdb9711545df08c7af659aeb4dc4725c7ef9c19af9889b9007935487530a87ff97267f98811b701924
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.4.zip 104907 BLAKE2B 553d09eecc922a448b2b321f0ea9f03237aa34d202b295a2e2e7367548f65b7189692ba84241d7a2d232622229e568b646a9a9a899f435a452b82a75f3255900 SHA512 c474d9e5f9d3f471a707a1c6f565f1f1ee87349eb3162722db1e6ce3f8fd51382fd4e1101aa485ddde258df492c7ee4b9c3b9f534e7389034d01391f15e8d4ff
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod 325 BLAKE2B 1ff6851c8e73b2a566cfafdc2ebd259478b39258f785040407cd853433312ef10e492da8dc0dc9cbd4a2d2470e2715ef5ba4c05100c35f5b0664c9b23879e721 SHA512 61c06f593c1759bb078042d461319db2f91afcbddf50186d09195021eab865159ca5c017eb078d354d7db590365846e401ec3f91a2cbbf753bc32d7111683bd2
@@ -86,6 +83,8 @@ DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip 6278 BLAKE2B
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
 DIST github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d
+DIST github.com%2F!data!dog%2Fzstd%2F@v%2Fv1.4.1.mod 31 BLAKE2B 3f699ae120e91b47e91e35449ae06e146a77a3b8c6834a6494ee4809e3f524bcfbb7b0d9a53b6c64b6ba9f3b1814a7cefa525030871557e52e54be629bae3aee SHA512 5d47517c29477f39a7f12d63ee80c1c64cbbe8065ede96732c133a0159e541b95bb17f10fea0ed5acde361deb84cbb66e79a38cf4be0dc7b28d8b8e342d45a88
+DIST github.com%2F!data!dog%2Fzstd%2F@v%2Fv1.4.1.zip 565502 BLAKE2B cdcd85a821838a709b28b3d7e8dae6af9d562f7394ae155624f9975900cad193d91ed80e6183aff82d95a367a8ce0af28c575cefd5f8cd16b7bc16596f6eb22c SHA512 e4551cb3fb58cc60e1e141c2c11952c524c07280e530309ffee13ade0e9cadc873def7b279d024b3efb3d6aada5817c2d248aaf140323507172fca2d2d5a1855
 DIST github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.mod 37 BLAKE2B 60b2ec6aeaaece8fbe3ca154b432f677dbb46672fdbc95b503f613190df535c7254900c9cfaa3319ab2d7562513640c7cc9fe650d75d97dc09fe84a17e359a86 SHA512 4f01cd11b3ae6f26266154ee37e7a4084e61e865fa9427187a24a02631415f2367a4afad83b4e1cf772b263aaf8f180b4b177e30ae884cdcab239919c9e08bbc
 DIST github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.zip 20216 BLAKE2B cf3a8d5190067f8e58d632df761abcf3b122f7ff384137607a90b1afb23a42deb63a348dc1c1003d043a607adb7da997511c136d728f2c5fd553b2bced3fe62f SHA512 4c6cbe7e391a6c667c74b2cbd5f71be014d3f4cd5f384978fd4c6e2847b6e66ee6d5aa80cdeadef1e1edd6188a92d9032321a5365872ee18970175070b33c182
 DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.mod 177 BLAKE2B f2d2eb41aaa0f3f47a75ab260a461e6df690c34e7e817ec61afc7854ae26bec641cddf4f4481b5b3b27394e303d1fb1c4a9864f4de2d6c01f33e3fa0521b05bc SHA512 584c9a707b6115caac28ff373974faa59d12531962997f9640a4172b020f72c5d527355f035449a767d65ce426fc9705c143a7bd8afb5058c9ece241c9ad5d1f
@@ -93,6 +92,8 @@ DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a
 DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.mod 1988 BLAKE2B e89ecdb4644e50e2cd545eb43452729d909745705f5254a59547420baf3da357e77bf5d73b220da6899fe08a4eb034b0d1815702dceda20ada57e277b83b9954 SHA512 67df97dbec1c4a0c0f84551ea80df88a827c9ff4467614ef61544a611e19de6d063af40cf33673621f2e52e198595b61c8d6e5d732fe87f00eb7c5bd653e0399
 DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.zip 552856 BLAKE2B ec7ad9c6e4c49c04f8aaca1c42e198027e5db5abd79ed84f1bc8dcef2e26d3e386e02554285b666eaed6dae5ac9bec5f0e9c01cb703585921f2834cd8f49b65e SHA512 5d4575dc4e98137cfacd463cabbaefe2df0e49b81af900e9c43d2f98fe2aa4a02323e395b390bdf4c05bdb1d470f8fd2f2766123d27360541f249cde5e91c738
 DIST github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod 38 BLAKE2B 3f0ac051b31c84f5e98663c1e6245a4e2bde2be5c0be61ec80764d753bef5479251bbad3cedf6fb998d1a4a4e66a80beeafa6f3291ed45f46d643f7be109004a SHA512 aa1f503fe0c19002da21ae30df5393c15f2b2243ff415493420204d11032a562d5d40047705b1644d031523881dbbf284d3c56ce8106a2a969d2610504426762
+DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
+DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.zip 17606 BLAKE2B ee5acf57c658d87b97b533d695cb72c9d83e281f9e533271f03d85d52f92c3c90e240f3b6d2a01bebbea6befb147ab66d7f75c403fb8bb3e58a2bc0bb1269f6e SHA512 89912d8630bed5c71dcf391b57e4537b93f01c4f1cf320a8c11d5d34d47fa4e3ea4abbfb3bc3aa76ad3cf08350da67e190cd80322597d0de3123fbaccbcea9e4
 DIST github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod 37 BLAKE2B 9aad8d876b88c7c8976667747135ea2496c21542d029e879d80490e9d979923ac3060f65ddc443044db8eff2f92e2eed6b18682822f6b5706c5605d8de92ecbb SHA512 8382734877c9dc6a9c8a59b12d9735b6f971ea72ddeeb9985ea0cd0573820991a4b936baa1a643d38b694f1df7395d7b0d119f4f52be8d947f00adba96773989
 DIST github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod 37 BLAKE2B 28c9393f5171487d23b732afcbb1d3d835d13d1a63b7e852fd3205925742fcf5a686c39b0600359e9052770360e9396f6bfe52a0000ecb51e3ed0a23611a2853 SHA512 a2b3211e3520fdef3d5c1991b5ad4b3745f4bb1b49be3afc5b1936c82b2a3058231b6cc17c63c85402cae0b80f037a70051d42738e89a708865e43dabf7b7b8a
 DIST github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod 36 BLAKE2B af7b84d9f1cd163555b32bcf960b28b64a5689a1c9694f430af310f5041cd967fcf0d6c1a6c4020478544d347e4ba5b2fd16a6ef54258d33314ee0ad9239752c SHA512 917ada7ac198a013d2b090dfc59a45bd2619dcb7227df1521ca38a0d822fab12ea8c158c526257fef4ef506af29d9fa678e8dc2a73fc13c8dfeb57b398801744
@@ -123,8 +124,11 @@ DIST github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.m
 DIST github.com%2Fantihax%2Foptional%2F@v%2Fv0.0.0-20180407024304-ca021399b1a6.mod 35 BLAKE2B 42febcb2e06c46797f14a850943d1df3c0e15630f376b8f1c860cf4e26ae4e2acbb38947f1348f501665f719943510aa2c0ad091f336e635430408794e61feed SHA512 c3d0bc6de3cac8395d0a231f041437b4caf00a4678270ae447b2e76bba3a588a6913cc1df6ba438bf6dd361b48860c365e9d32af55575208bd0f4b705b0504f6
 DIST github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200326173327-a4c66dc863bb.mod 31 BLAKE2B 8ba7e45848280b2365b9c8fafcffd70ac32c1c22bca0d2bccb965b98f1aba961faba0824e33941ba06e7330a7e89d6804860ce16e0c0d6dcff77ad4d9f8e68b6 SHA512 f82c53780113048de082df94ef28072fbd86dadd4531270567ee8cbf31295b2590973c83992c2271df2cc1abe0cad808e4d8c5f7857e3dfc94768db69327d2c4
 DIST github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200326173327-a4c66dc863bb.zip 5551171 BLAKE2B 3a6ad27fe06908c831aabe57acc34e25cf2fb85750011d93ea2c77e78c6968c99aa5abc51e373a11ddfd27aae31073463f6c1ca576dc7e39c24bccdd4c06d32c SHA512 92662212b13315cb47d541e2f522c159829a31cf1a81070c9aa7c1a27b238a9cd2481306275267260b19a81a664ec7ce62ed79c21d24455abaf8da1d164b8037
+DIST github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200820155224-be881fa6b91d.mod 31 BLAKE2B 8ba7e45848280b2365b9c8fafcffd70ac32c1c22bca0d2bccb965b98f1aba961faba0824e33941ba06e7330a7e89d6804860ce16e0c0d6dcff77ad4d9f8e68b6 SHA512 f82c53780113048de082df94ef28072fbd86dadd4531270567ee8cbf31295b2590973c83992c2271df2cc1abe0cad808e4d8c5f7857e3dfc94768db69327d2c4
+DIST github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200820155224-be881fa6b91d.zip 5776997 BLAKE2B 688499f0a621a3aea26af0620a182677bd4e44250585d3898f2f984a4dfd7890a6817aec77c274eaf8f2ef6bdf7a5120a4e0ff8b90a42c9b7e2d82a2dbce014e SHA512 9a6e92ac17b114f65484e29dcb5f4b69a374898dbe9fc5596d82f9862f343542744255d2401765304cd950250e63247646669ec102c25d89fcbc076d4814ebcb
 DIST github.com%2Fapoydence%2Feachers%2F@v%2Fv0.0.0-20181020210610-23942921fe77.mod 36 BLAKE2B 95acd323deda998f2943316c4e98a85606fb8cc21ab5bfb33e3560b8c68fdfb9656ea82fa6991d4a916bee00fea24e367b169475945b73cf28898964e2187a4f SHA512 869523d36b81db8518bea028adf347fcfa88359fb6249fbb98ba378f31ca2becf9f5332e429e1de403ebe272c273a1c8b1be68dddbdb040917f9135f0ef2c1b7
 DIST github.com%2Fapoydence%2Feachers%2F@v%2Fv0.0.0-20181020210610-23942921fe77.zip 9890 BLAKE2B 67b178726ad129d97976c14743e294db88c466ff5cdea9f03f171254d331c8b9b97b55ad88f36b1804394acfbba843d5169b4bacd4dd516ebe94784318329bbb SHA512 206b9cb993351d2cc2377f1d4f2be544f939e1f7c8fe19404db9688e8c8879851aad71c4df7aac2b7582f95fd53900bb805df2a0cbb4fa6b88225e94670509d9
+DIST github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod 35 BLAKE2B e9ca430f98cfcfdc5bc1e50ef421253011f21fe2a9a06b15b4b818f336c64a544ede9a8d1552740e85358fcb16a588345124b06fb2788951c24c9dd92c3b1cda SHA512 a0c76da94f068f583607520b728036f45ea071b727d3aee601eee712bd952b5f6c8cd5df1e1484195b07bb4c3b224771dda1fc7848dcd086a6dc93ada3ff2ce8
 DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
 DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip 7144 BLAKE2B d223f96d7bdb87d77573fde857a61d518336b60ab04e2a3cafbbfde23ecd65511553d9bd6360b1a9c17b394f77c7cd37e3c74df827a65b0e79580e1695723652 SHA512 c3d4056c34241f73d9f79801ea6a6d03697f2a6f151ceb5239458cf50c715dab693ccc0b5593f51cde8e2fff5f4959c72ab4e95197be3f65cae8185b6cbda06d
 DIST github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.mod 34 BLAKE2B 2ee2c993fac070e463df0896b1eb4c2160acf22c1f404b58a17024f8b5f2630d2cd1ad6526c611de0b651cd0c7f0f687398fabea864e7e7b0cebeeb7676579e9 SHA512 75898dfee327b793e7f253f5555409433214a7fb0336f3c33122ae5b2ef66e22ac44970202f67ed5d94f2dc02701b8a0f62cd1d80f543d93d347d83ec26da8c8
@@ -140,6 +144,10 @@ DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 3
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce42c81a7dcb03d21a99d6240ce12f8455297722513497b1a75f2c848b5fb7ef70b577c2406638442f16beedd68806de890a5c299cf1c008c439df23df2f5bb1 SHA512 ec4424da8e1e3849408da7bfe83d37e21ac75edb889de8ef63be897d59678679b018f4606be78500952e7eee73a6252ee6e477b1a1612e2d036dbf72c17b9c9b
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod 40 BLAKE2B 6cc86f2bceda8617678a251604b6c049cfdc80f9afcae0cead6b2cd04f90fe1b5d5d56d0c29f98fddd7f4ff6fb4a0f97c052193b153dbfc772cf6597d664c09d SHA512 d0c78b8f08d177e05148ce845f8d720fe79a193a420c12ce15504af8fa3dffc4d2fcebea8030f5cca90aff5775013e2252e0c289d4ed5094e07657ea97a79570
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip 14678 BLAKE2B 6647c66a45f2dc67b83a1e493bc73d4439de7962f7f1472dc267be9a9408b5ddda66b8ee2fdadf18b2973648035fb3907fe539a8b7ccb768b8c99c4cae573eab SHA512 f973efba5ce7c651d9c3e4e467a1423b00b102034a054874d09977957b7b55557e05da06fb4c158e693db7bac01bf601f950cae0d411dc92afd0686d7e1de4cf
+DIST github.com%2Fbi-zone%2Fgo-winio%2F@v%2Fv0.4.15.mod 177 BLAKE2B f2d2eb41aaa0f3f47a75ab260a461e6df690c34e7e817ec61afc7854ae26bec641cddf4f4481b5b3b27394e303d1fb1c4a9864f4de2d6c01f33e3fa0521b05bc SHA512 584c9a707b6115caac28ff373974faa59d12531962997f9640a4172b020f72c5d527355f035449a767d65ce426fc9705c143a7bd8afb5058c9ece241c9ad5d1f
+DIST github.com%2Fbi-zone%2Fgo-winio%2F@v%2Fv0.4.15.zip 156507 BLAKE2B 82bee93825d78ba4066eabccffec19edd242e974300ba21adbeb2058147504f908d2ccdef0c182a5c2a06c52eaa129b3f148171704780a44041a6561a3e20c37 SHA512 76cb6ab0e66805530b43a77bf2de23dc0dd0d49f0347cd77dd4cec6e7464864559f5abcd59b1d4eb8b3afa8813605116ee7182b8347ba63ac120825eebfccc33
+DIST github.com%2Fblakerouse%2Fservice%2F@v%2Fv1.1.1-0.20200924160513-057808572ffa.mod 106 BLAKE2B 7f9ab0c53ac72de9df064e33ea99b5fc1f8d24b44aac63e36bae6fcb617b8d1503a9b145d6feb3e55ebadca0eea0a3ca17621099c19fb771b8cc7ff918d3972c SHA512 03864cc7246e33f3e39c496cdf962cd3c461a85f3f21e54894c408ba3d06e33ae9cff37e4ce9bba452477d0fa10b7e76c6343e55d2e90c95691eae8cf1bbc246
+DIST github.com%2Fblakerouse%2Fservice%2F@v%2Fv1.1.1-0.20200924160513-057808572ffa.zip 47075 BLAKE2B 2e1e1620bd5e27f10b4b15221a7351d8a47b28991a0bae80a25f54b9ef42faa2166750abdb24df67c8e466c846c3ee8d7e6eeb4fa83542df276aa42862dc13f5 SHA512 5178a9aac46cdb38ab045ab0a86f91c316327dff572fd10115dd7798a7056f89f722f1e4a338798fe547c2de926e466c0cbe671a9a67a11ba46f393878a8daad
 DIST github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20150311145944-8bd4349a67f2.mod 32 BLAKE2B 8ee548cb83775c93076fbc084a29ca01d08006ff664daf6b27bfbc5afacdcf5f9629f01d6d7e7b55a8040c1b9d571e0588f69aae6a716c4d8a89fae1437fb91d SHA512 d010a67773f9276989547ca4231752d7875e8d55ee833e980c577c606a983bfaaf957ebfbe01039de24670bd9e6e120de33f21bd0d4dd187d6f6faf61e83d8c4
 DIST github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20150311145944-8bd4349a67f2.zip 10520 BLAKE2B c31da41d94e16b0a12100959bad891d1c481c1e6721561bd77fc404abad2d717bf458d138f78c403aaac5a44bca2ee4d0fccef8715f0471568061abeb186022d SHA512 db43f3c4560876fdfbae0e44696e7cb67630787227ea67dd93e63c55614d605254f8e8674c9f83d579124319e9d90be40012f74a8f59f9f8b1536010d4090e69
 DIST github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.mod 31 BLAKE2B 15785a01a9f07d2cfe324a1ece5c8188395300b11821621fe13427b702cb9f452ebe125566c3c2648d2d83139add9ad6224d00536aaea7b16306eb62f67f8184 SHA512 5f7f52012aa82bdc43bd89d1491fbe00091299554bd85dbfc07f0cc757fcf44f4499df97a4f19c234ce70fbb7af0f4c54c13ffd547ef0a733365ea9c68dd0297
@@ -152,6 +160,8 @@ DIST github.com%2Fcavaliercoder%2Fbadio%2F@v%2Fv0.0.0-20160213150051-ce5280129e9
 DIST github.com%2Fcavaliercoder%2Fgo-rpm%2F@v%2Fv0.0.0-20190131055624-7a9c54e3d83e.mod 39 BLAKE2B 9baf15b0244b970775a5ec6f0eb0546ce6d5c8da261cf1fba3b964ede5f9bec43034a453e87c90ff242b7ee66e635ccdc8576fa96fdd6b37aeb05b1d9eed9afe SHA512 397b38c689516b6bf553ef0574e38eba57e77b2dbfae3700d792762d0ac30a966886fa2f10ef9de33a75e8481340674a148c2d0206530741c207358bd3de6735
 DIST github.com%2Fcavaliercoder%2Fgo-rpm%2F@v%2Fv0.0.0-20190131055624-7a9c54e3d83e.zip 334166 BLAKE2B f9a31a8ca288584364f66a95fa44f82482d9e25b15910107336061a8dae48f3a2d3fa6280bb4756c4dd658116d50224452a0228d5696df94666e1bc65b0eb246 SHA512 f11473eaf494e290c41d351b76b69f3152a2afd61ff748cdbb1bae23d4f507e2efb7b634c33e012023c9a1b775ab620f19b3c02b315d50f06c9dfca60cc178df
 DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
+DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9
+DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip 12221 BLAKE2B ea2f826b4582ec60f51c65783408df0e065d2a752d1cba17aaf277e0c2b48779a3bf3579982dcc26e5566c899c3f933e4c711d2f1e01c98c13e73d46fa08baad SHA512 09432cff34f69e9b0cc6f0d5bb9af376efccb85ab4396c14a4e0c072272f3172a93c240c5ae0aa89eab91799d1bed1a0e7e00ba83682843f46344c9e2fc2d4b6
 DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod 45 BLAKE2B 350e937e3f7b254b5c590445a9a7f7cc908daa2a5f208e293ac414d50b46bd29671bb483e55daeedca41d70a42fdcc62ce17fffd9992a932e29153ab6ca1168e SHA512 c1b9f572957bc4ed1ad0c61d22b7b5d6a4c863df2aaeb4cf914e304af21d949c9cfc53dc8eb67aacdf3dd56f339ee6f4a1f5fa464121d9db79b7b3febfb3251b
 DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip 12031 BLAKE2B 47bd92ee66282b671cdfea60969710e371540e79b3c1e2f510380e3dbbfe40ff76be23ab48f44855b1cbbbed7cdbfc4f1ea21bc4bd7a37716de7c27a7ef81329 SHA512 dc5efd476875fe3cfb3c5f5ce9314920bb2175be85fd1a4667faddee1b5360113b66bdc2f17e4fe889a7d104d684558744bdc6c56c8ac3afc585d7aad0114486
 DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod 31 BLAKE2B 683f04ea11a77fcee27cfc84f41a1974ca6d61ee854dc77f072493358099ec03e94f01b5cd5cbb5ef69c856dc36790b660a3e90d7d520fd553e572f1b01a2304 SHA512 0e40cd7ff22a86cd23b49b509f5b5653f67e31ca67a07ab82743f56e5504f126cb2c11d88da644afbaf024dffa657560a420ec6d82f6b463452ad8a8bdb576d2
@@ -183,12 +193,16 @@ DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.m
 DIST github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod 37 BLAKE2B 109f32f2dc537cfeff1699937e93eed980f34a37faa111ad3831be6dbbb1df965c56ef266deba48aa1390fd94bdedfda9ba3a51f4f6d9519ae24db6b99dfe1d4 SHA512 6485196f4703578401e82673647b49d58fe60d7f90c311294096504d3e11477c75fa50684f00c7b378b2566e6e8683cf18d99f2ac78043b077318a643fb11720
 DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.1-coreos.6.0.20180318001526-af9db2027c98.mod 31 BLAKE2B 7bbb809c199d39bac173751c3dc21b23ee8b020f20b4447c33681469b5083c64e74f699fa8d3dd55446b76ed44fc0949337303a776efeed90a764af1d751c8a4 SHA512 12f6b0e7090b257656ee9068083207fdd1b6d9f0b27546cb5b3a5a520e5944f3eccb8f6dd644a17e1089bbf787fd26b3e83eb0f0353071c8c4ef23ca99bc6251
 DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.1-coreos.6.0.20180318001526-af9db2027c98.zip 111763 BLAKE2B 79366ccbda1a9a4346e5fc82cf44a7f37389603306ab9302ac71cec0613a0747c97b035ba5e26631f5818044435e39d3382184b4b8d48afd7e6af4cfe01f6206 SHA512 d770b2590f13c4bd880cd489a25913226983cdc1f07d48cbb76ff72dd472996b62419a35f4011cf0366ac98ef6c78b9c85bdabeb4c9c36cc6070108d107b6e9f
+DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
+DIST github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod 33 BLAKE2B 1ce5b6fdaf9b07e47e53896873b9ee4e96fa51c66a7a5afb3f48f34bf1b28addc5a5faa14832c24232a048b5d2b5ec0fd9af57997f0360105479550670b7272e SHA512 4fddb273aae34ba148c277266e98d174e04f5e888a1f59d44a86f7ec80168fbee85f245cea2e2fca44b29cf83f7a417e43b885438d7e3231c89604bb9f0a30c6
+DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
 DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
 DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip 109838 BLAKE2B 82e02c44f4fa60aa7257b79e385af47e23508e260415f0f768e4f7aac6a5962c713488458a50f1bc98308446ee3f45de973d5240811dc5a113e5b9577f33bab3 SHA512 7acd6ca00d067e6a81fbb12697ae9d46fa9880834934065549bb23671153012a8596d4c7875705578ca58a259ff81b1165e45aa65c93406d2c324c61954ea4df
 DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod 91 BLAKE2B fad30507d91fca15291c8f13100206c9d9eae4f73ca4034e37de10d1494b42b03535540ce704582cd7a4be4ffa2685f778ac9cd3aa647d6c48d8e6fe33a345cb SHA512 54e3700ced7222d086eac5a73a5973147473e9d063a7a8dd719bff2dbe3d61d9e4cd7427f30c926a2289ef53948f158bc09e189d9714f0437d446f7c30d0cc6e
 DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.zip 114418 BLAKE2B 43e288a393932b03a27d91cd456cbef42c2611751d40e8a8e6c14d2b80f65990711a5be7d75e1f62b1eaef3d9eb8c9bcf3f51eb14a2436ca1dcb15b3b3a2ef16 SHA512 9df60d53633425f32d5bf594dd579ce61bee549c2672da2f7da39437031a8b0d27b7d3448adc6f9b20b230f48c355242ce8b01b0c5be25612165c53c73e10735
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.zip 57784 BLAKE2B 1f6e54681c062413577ca873cbbc251c2bb9df4de6339e1154d6b34aa146136ff9464629e419bea7f75afd9feb8b50bddee965160560b25dc5b4041e9d30072e SHA512 4e0f838a7752838dcdac70a96235bae7aee51242022ec2c27be99f4af7657ff5afda5b710be81e25539d2712e5644211689b556e9d8971897ab9f8bf1d3845dc
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod 94 BLAKE2B 94e391c9c787f7b0b9d238f1fc61ac5e90d4d6658f7d60a4c143bbeae999ea0ca23d28f2ca204523e44b61807afa23e8690af850d14203e5755717b0a1f5981d SHA512 b54a3715ce2745ef68bf269b09d458d3712d8ec7a876eff53f5c171d23d992a5391552651c56f7adf5b90a356bcefab552a7ef8dd3a0d562fd396434970963ab
 DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod 29 BLAKE2B 6d29d882c7c8c863cc1cfa01de2e2347b09e8cf4470c0bae2737f7436ce6d6ab34eb6714eba9f869974c1c8d7a332bfb90ac842b9fb7a07bd1a4c8b0e460eefe SHA512 a41a722efe7f634eebd689a9793f9ee3a89924e6c7917008c6661761c8829d6a897dc71c496f761068c36c590a800f06bbefa4ac59f7761cc0ee2cc68ac5c14c
 DIST github.com%2Fcucumber%2Fgodog%2F@v%2Fv0.8.1.mod 42 BLAKE2B 09381800dfdb8d9ee9032e2eb53d51bdef9c0bc48fbed60431654485afc510f1af8282d675101a49fca885004998003d73545269a4d12ab14fe1338d49a976c6 SHA512 4118f2e16a9e96f4d68e003b92189b9b17f58fc57700a98fe0feaeb893f406100c5574aca23d40a579d95a67b59e2cd6dfdb4883fde356a868e6bca640961376
 DIST github.com%2Fcucumber%2Fgodog%2F@v%2Fv0.8.1.zip 624543 BLAKE2B b0d72f4b9e0eec70803fb534f2fa5e1044f89a5d97cea40ac6aa9398b74992cad76bce4c8153a1d0226fcc8fb6fd85fe7d8e098e611073daf3e7ac27e4b5a60e SHA512 149aa16651deba1db2399a721d726ac46160715ed3b940599e36ce7e6950a794b83127c05e20f1247714bcf9ead573b3813bcab06e5cb77a417bfca6930fae2e
@@ -200,17 +214,21 @@ DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
 DIST github.com%2Fdavecgh%2Fgo-xdr%2F@v%2Fv0.0.0-20161123171359-e6a2ba005892.mod 33 BLAKE2B d62553e4d76118ac802948696cd6a72992a097743d2a8e64045324bafea74d816d7195867e64710988ba8173597dfd851a9a261560e3f3238312cae434bf34be SHA512 c5a014d3183b67275c9df990c95ea812d0c6c9f2af2759bbaf9cc864884862b64d4a4a06e3965130404ac0d3abf84ad9f3358134b097cd6f12ad16b6fa9cb74c
 DIST github.com%2Fdavecgh%2Fgo-xdr%2F@v%2Fv0.0.0-20161123171359-e6a2ba005892.zip 70819 BLAKE2B fd5ae4da731b41134f50866b12577544634694ad45abbbc92c23d59eacfce23b0dc64fbe1284218fe15013e1fb7d4adbc8b30ebe325ddb01f40209e63e1d7f41 SHA512 2db3f8cb2b13ba66a1ffec69ec6d5c774eeae09bf562f3e4eb7264ddd7ea5e37cfbd3521a911a4efe6a6defc0db58c0802b375b091b9f9dcbba27ff9c4c87558
-DIST github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20181014144952-4e0d7dc8888f.mod 40 BLAKE2B c010929388412995c2f94b2d5ccaa676a243b890bf41ef59250366dd3d7eca00b03ef6525ecd25a6a402da7acfef0c6b5875e4558a68a08066bb4e1cb65f3646 SHA512 b8dd88219c0e6b606247d416c25ac01e3592a162322610ae4a93423f2d83854c108d78a810e546232cbaea6be0f48618ca2f55d890b6a79aada85d9c9df92322
-DIST github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20181014144952-4e0d7dc8888f.zip 528684 BLAKE2B d611ba9fab72a4c04b49f464ccd43a4622d79b746d5da3a15d44c545c4f7b25d217c7fab09812de87d1efcc43be50faeef2db7e89d60aef517d90c1ff844f1b4 SHA512 646dd4628e8d3c6ab3e716d160b611c3d82d508330792b994d28d5909d2449f537ba45c5ce728c1a94335593d47581f8fedf6fbeafe3f4f20b7a802da1d2f798
 DIST github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200206145737-bbfc9a55622e.mod 182 BLAKE2B 27d2e8f155923769d6df395281d9d2967f2bee262faff767c586e851c1595d8c74db1f890809bce63cd9544c4dfcdbda89e518a25e1a8925ff78607940e2a374 SHA512 14925087284b332c5458fa81d0e92f2a33b4a59e98b93dc6c99e0943f03c13165e8dbe1a27fe5a4d78b62b3b3bdc84d634bc31f346a70301cdf7da7463c85f92
 DIST github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200206145737-bbfc9a55622e.zip 570947 BLAKE2B 77503e5f0f669cc6b53ea75a0c227c125022c30af4cfd86389f4381a9cfbc3b15cca21ebf633218e4261ba0d8ad8c26735afcbb5eb57cc8380aebf7d4b0ec69a SHA512 f7c4bc9355f36826d1b0c384e20238c9c461933b4eae6455b1828687eb62137d98969998d181046e36bd348690e7df22633413a294aea73af0420bd242c0f93e
 DIST github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.1.mod 40 BLAKE2B 3090a8e1737078a28e24c1a01f78a18ca2ab94c0cd297a9ab04f970ffe05a6db291561b893c345c1d4f023a0743adf0a769f58365251ec94e3925da9187aaf62 SHA512 de55ba427379e57d671a31a72b9295e8e7fbe3bc0b80d05e63ccd31c1fd7030e74fd39fb0347d87f10f19bed208df6317714b0d1028057fa40e633820d49a03a
 DIST github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.2-0.20190607222403-0c15cf42f9a2.mod 40 BLAKE2B 3090a8e1737078a28e24c1a01f78a18ca2ab94c0cd297a9ab04f970ffe05a6db291561b893c345c1d4f023a0743adf0a769f58365251ec94e3925da9187aaf62 SHA512 de55ba427379e57d671a31a72b9295e8e7fbe3bc0b80d05e63ccd31c1fd7030e74fd39fb0347d87f10f19bed208df6317714b0d1028057fa40e633820d49a03a
 DIST github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.2-0.20190607222403-0c15cf42f9a2.zip 6710 BLAKE2B 25a6519442463637a3592d4d45b9c7f691e51c4217662ae3c2789933dbf98a5a957b2d59b77e59b99f82cf494e753ce2b521ded79f17abfe061ef74bf64038ea SHA512 544cb0f6502ce883beb548f412c6b79394a84961a4d0faeb563438e32c3c4121fe623ae24b81109714eb58fb2f29fce90c20d227a03bb67396dc05fe927cf5d5
+DIST github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.2007.3-0.20201012072640-f5a7e0a1c83b.mod 723 BLAKE2B e3bd923966c67e9aade1ae14c37a585103d35f9e0644f3cf8fb0d8306b24bbf591e24626ef68954a930d4ac9898f0f63115ded9790eaf6323366abd9a186c9fe SHA512 959ed0ccede88ca2ace12a0014491e310d120c9aa10bc1097f7d3846e1118db6becabbdd15b887ca07e783a41e1811b2589c31ac104d628422f38d5f545fae6a
+DIST github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.2007.3-0.20201012072640-f5a7e0a1c83b.zip 429582 BLAKE2B 9022c5ad4658392f0cf3f06bc46402a0b80c30f1745766aa5be6440bb4db2a234b0e4df1813cb6fab3277f904b79791202f37fa983d9d440fac57ef37fb2c5a4 SHA512 b957061b14fe7abad566071213dac12f9abdf0f655b47a5e2c7c998c0e9aa9aca3e49283a1c2250e1abe4fd8d9ad9e185d969c2a0a2fdd3e295fe9eb54002630
+DIST github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.3-0.20200630154024-f66de99634de.mod 193 BLAKE2B 0938da2ee0a3bc0acc3416db8387be68292b8848b72cf3b44c28e11d6d456037f7ed998fe08fd142f42ccb447bd0f0a7cb75ff72e72d73a5649a85f7def42070 SHA512 7752f28d6ae3da6cd4f2b5d23ff373a4bd8b8b24879d9bde17bd22b1689aa5b87ccd1c206f4f70aaf5acfd89f4e1f11a04ed822266a576abc0a1f979cdce2911
+DIST github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.3-0.20200630154024-f66de99634de.zip 276868 BLAKE2B ec236ded34552ba8b1959e75fc58f6b36ab82f9c99e3f23dcf241196441bb4e8c626826175d8f0726c3ac1f8856dcf5e4cad81d70369a54e597f66b8389968a7 SHA512 4940f6aacf5e1a640e30cce9cf8f3797d7811b80b9ff96696ff2eb1c4ff10f25e8090c396ded4bacdc3393289810db3d0e4ed1d6373fb4654336112ef854034f
 DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv0.0.0-20160705203006-01aeca54ebda.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
 DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
 DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
 DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.zip 60258 BLAKE2B 833495fd32059bcc757746d77670009145512b327557e48abbb1be3f33d7f540fdf3d221b5cde015d0802a85823d9302e5afd0b10c730d7e7841814dd03336f0 SHA512 bd4fa1d2be064ce6e7a0e8ac3138e7324fa0567f5312806f92a7c9b1ab58aeec5546db054f8f0616ad011fa0022d43dcf9607e53b6b06ae6e30bdce8c5a87231
+DIST github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.mod 34 BLAKE2B 7db9f433942253e04513e9a7e88b2a76cecb28837e808c9fd2fa444f19bb75f1567358ccdb5537dc6caf0aebffa08898127dc93f8f464c838da838f7ed70615d SHA512 ee0f8fff193e70c23c830494ebc2bbd182c1882ba443baeb4a8ce03166f399765ab8e4ac85047306b27c03e84fd0980f93b5b5e29f94129569ec8021e8d127fa
+DIST github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.zip 31667 BLAKE2B 7114afb863d419c80d539e287e76ee6471163aa5fee433de95276174d1c1e9030097543afe97a6131356979bc88a14108679a98bca3cb8b38e833468e80d321d SHA512 f04577670a6649bfe5d40fb743df38fdb9499b3f584e38197eed2d958d4f3e77635e82c057aa643ab3268bb99e7478aaeccfc687be36b9723ccfea3551b45366
 DIST github.com%2Fdigitalocean%2Fgo-libvirt%2F@v%2Fv0.0.0-20180301200012-6075ea3c39a1.mod 42 BLAKE2B c5cdcb203f51fc889bbf9214e6a59ee8c2650b79f19d0d44b3f24a82f08269595ed0810c5585a6c27f14505ed783821cf9656b8fa204a07f33ecf80c6357ca25 SHA512 11ff837ee4b6353e9b75961eb158281c328f36a7f99ceedecd791da0f351106440248e99b6aa5d8085b898f279e3c7181a13afd81a6e75a20ee6d29ab1c9c126
 DIST github.com%2Fdigitalocean%2Fgo-libvirt%2F@v%2Fv0.0.0-20180301200012-6075ea3c39a1.zip 122148 BLAKE2B 7afe3f03d5f50c3a1c8a6079f7c814dd5c00292e9f1cda855e94ded85e61710eb1f4edea8e07471f9086254a32fde91da521a3d0d60a4d5967c703db2d423cd3 SHA512 bbd2b9eb9965288eb15758d2539c80877d841bc8e28bafdd202ab7ec1807addffd2bbe6b5cf63076d64c0a61273c5564aed1ade83997e969d12bcb051515d231
 DIST github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod 35 BLAKE2B 4e9e86f0f7f18e47c80b9f4a0abff3f07d47814a9c54b297a2419265fd91b16c2780e170ded80589dac290cc3262aad162911b789510703d973f3f891d5e0849 SHA512 6a786a38aae43d8a7532621bac8c4c053624f39573a37bd66fef9048a7eff36ea55778ac8a4bf3d18cc1e6faf352dc2365e6f819053359df9ac98129e16f422f
@@ -233,8 +251,8 @@ DIST github.com%2Fdop251%2Fgoja_nodejs%2F@v%2Fv0.0.0-20171011081505-adff31b136e6
 DIST github.com%2Fdop251%2Fgoja_nodejs%2F@v%2Fv0.0.0-20171011081505-adff31b136e6.zip 9815 BLAKE2B d263cd677b17ac795fb6be116c662d36c44474029c96a2efdb17b2107c292f7f2240b2565f45ce1a92d1dfbf14bbf9ee5686ae1634b4b1839ce22ad2617e69e1 SHA512 651db3bc9d472dbe6814b7a94d564440ee43f6eb3cf72f94bcf7df266d998bebe334eeb3ec84ebb429825ade32f41f670da144e070fa4b2f9d265c4299f9c8d4
 DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
 DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.zip 26646 BLAKE2B 408dfc541d7bd0692010d6071f96db972dbf84b0e9dfe552db221cdcc4011f023dcfc12e7c9657696c9ad204c6587404f793b4785beb78d53462764a2da96c5b SHA512 fb53c8511a1538397edace6101699904f19e63b82143b56754ef2a62d457fd34f6bfa907d379964c427ad8b7d38fa9ad186bc66d4a103c7f118b8734324593ce
-DIST github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod 40 BLAKE2B 9300f3006801602e05416487e6021123ff345e36835b5f4841158bc87556afa086470218c3f2178d125baae065c1af3cb27e210a50173a5bc9a469c592758eb6 SHA512 fb616884898669f21d53576f0fb70c8babc38bb98da066a2cb77fa85ceab6bcc8775feea3d3bcec19ea3b25544c776b8d55ad82f8876da5d0ed5176768da735f
-DIST github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.zip 17986 BLAKE2B dd2bcaa3f080dc5ed1b1da8d1f2ab7573577e5dce76e23d323310419bb0e3128003715bb023c4c4533e8e3297b795b30a95801cc68129f19844f433026ff8433 SHA512 64d611c7646011f9ad2f9ac423a9ba8154d9e6713611dff5481cf585c18c0a2bde3f32b26ce8647134f2e8338c08fe32b0dce4f3ff591a8a2b2601e29ea1f00d
+DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
+DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip 26356 BLAKE2B 665fb778605fc05dc686b59a3ad82a6df9020017243cc84498e4113c7b18343507a0084cd67febc329fa6b44e675696f99f632cd282ead5bb06f93ff3bd50bea SHA512 88e19d0139de7de602272e14586a99eda26b2867ea60ef56b517d13b37c0d28b1ab62c05b2f9cf1a9b8dcc8e5afa9c915baf7a30b0f17c4fbd47d5c71d0a3965
 DIST github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.2.0.mod 40 BLAKE2B 9300f3006801602e05416487e6021123ff345e36835b5f4841158bc87556afa086470218c3f2178d125baae065c1af3cb27e210a50173a5bc9a469c592758eb6 SHA512 fb616884898669f21d53576f0fb70c8babc38bb98da066a2cb77fa85ceab6bcc8775feea3d3bcec19ea3b25544c776b8d55ad82f8876da5d0ed5176768da735f
 DIST github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.2.0.zip 18643 BLAKE2B 193af083e7191c5003e7668f0f35ce83b40e04642f02337ff5194a60b654d0e9f0776355ced676f8c6482a2b006026380a989e9724b2c7d8a965c863daae8798 SHA512 a5093016b6559c7297cbbca1abd3b7e50ff34a9f57ddbc383a0141a04943a5e4784a54e44d0e722fe2ac011cb9d8bd4aa954b758ff1951fc99a8b7c5ad2a36a0
 DIST github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod 43 BLAKE2B 500b3a85f43db1d61f037f437b3290888204aef8b80aabf42d70c37607fdac86e8b1f7f4e41ad3709ad7015a78b934ed7d6d254522eb3e2baba4ae24619ea4d2 SHA512 da87f8eea5497796badaa6bdd1c67ae04e75deb7595f10739f30f20364f22e588a449aacf603f2c8d738b365ac14211c7cfe8e1bfb91f220f5c9d547007ad453
@@ -247,16 +265,22 @@ DIST github.com%2Felastic%2Fdhcp%2F@v%2Fv0.0.0-20200227161230-57ec251c7eb3.mod 3
 DIST github.com%2Felastic%2Fdhcp%2F@v%2Fv0.0.0-20200227161230-57ec251c7eb3.zip 134387 BLAKE2B 962a6a9bb3566ec9256379606fe9884a8ab52bf1122e0f6af74fc2a215c994faeb3e0b43c25e470ec3fba3c9ee9aec22d3d3fbf033bb0b78cce4e025cddb74d0 SHA512 f8af1e8159ab8081e86e876c9459fffdd9f21f6c95f5e3355b970ee42a3944a19054c88acf0fbf328e401f9c8d8e4db7bde49eb66096d82602eb808e220cfb4a
 DIST github.com%2Felastic%2Fecs%2F@v%2Fv1.5.0.mod 30 BLAKE2B 7c00577d618e4a93d80b3b221afdbe6b203f4b0ce389003669b2c276f8d652aa359fcb56876d67b8a6773be6c3161868f94267d64e82f75784e3bafc571dc33d SHA512 df2aba4b600100ebab1d00a73ccf181ded8a9e5acc8b96c466c26f7ba80596fcb9b71bfd94c229704bb078251dae6ffbf95f0ec71acc1baddff94deac845190e
 DIST github.com%2Felastic%2Fecs%2F@v%2Fv1.5.0.zip 334278 BLAKE2B 4eba81c0717adc3abd330d62991630fe7a4a72a9d58ecfca897d308f3b498f7276430195e5422397b5e0d75b9c04be305891a4ae13e45da05847b9e88a0d10ae SHA512 6d48986705fe6ef8741ab789f5cfc74da940fe670eda5d2680b9ea329460be39dcc90a4b7a693a07313a3b1a160dce50935c18c24e37a35c613b861c22141a2a
+DIST github.com%2Felastic%2Fecs%2F@v%2Fv1.6.0.mod 30 BLAKE2B 7c00577d618e4a93d80b3b221afdbe6b203f4b0ce389003669b2c276f8d652aa359fcb56876d67b8a6773be6c3161868f94267d64e82f75784e3bafc571dc33d SHA512 df2aba4b600100ebab1d00a73ccf181ded8a9e5acc8b96c466c26f7ba80596fcb9b71bfd94c229704bb078251dae6ffbf95f0ec71acc1baddff94deac845190e
+DIST github.com%2Felastic%2Fecs%2F@v%2Fv1.6.0.zip 624725 BLAKE2B 016354515fcf0305d369209aaba086b45c7066169aacd8f9d8bf1ce6cd0f1a78d15f3a1a6c0571318956e2e85d173c84be39a6093dc93673720da64dc082c40e SHA512 2e15a76bc85f93bfbc99e6cd5c705a47ad16d30e5736c372eca420e68450ebbe18e14f1940e5da9a294c2e6fdcd343725a99f38086c467eafb08df9d22ee19aa
 DIST github.com%2Felastic%2Felastic-agent-client%2Fv7%2F@v%2Fv7.0.0-20200709172729-d43b7ad5833a.mod 330 BLAKE2B d6e6237249764a791a9971235b9373a3e4896a588be5fd512a6c9d31fa132a0420483ba8446c78f3d9823dc2ccce8e5b13db711241472811f2078c4cb4b6a9df SHA512 73fa5a4b3c6d845c535e247e8fc9bb679a2e7bc2b6996c718b3050c86f553fdf0e6d8d7ecee4aa3e4a9b4a9b095b61af0c3cc4ca31c0c8bb70c9c569c3d1ebd8
 DIST github.com%2Felastic%2Felastic-agent-client%2Fv7%2F@v%2Fv7.0.0-20200709172729-d43b7ad5833a.zip 34605 BLAKE2B af8cecd1ee6b64bf493f2d2ef70aadec9f2f0c327ace6e34af58c0ab76a13f801e0a6bcb2d1678d863be11b1a6a87fd44b8deea7c1135783b0b292f75e446e31 SHA512 01807e806fa6767d3cc3a4b224fb811c4034491f35aed4566f6da852c675bd9313a18823042437135a340a09950ee831cfabb72966b7468781fc1a9c3d67c3af
 DIST github.com%2Felastic%2Ffsevents%2F@v%2Fv0.0.0-20181029231046-e1d381a4d270.mod 35 BLAKE2B 1b0f99cb90c8988881f05a89516baa2ec76693a4cd324df4b64c1ece1687b22637bf6b14798cb27607949cd5034208530660f5812633dd1c814ec70d71c9cf14 SHA512 82fb5372af513fe5b90722d52d09f8eaf54483935a2b75bceab47415688fc1366b2b5fa6fd1299e791122dbe10b3fc8a1188b6ff6c8341ba386d03bb9ed9ffa5
 DIST github.com%2Felastic%2Ffsevents%2F@v%2Fv0.0.0-20181029231046-e1d381a4d270.zip 19393 BLAKE2B e28db25647c95c3c1d4b99f3c2938729a6bbd3d1030892389efc7d7278ea4fd3c18dfa22177e15bc2813872d799550910659a4299b495fc546424cf76d75ed49 SHA512 d301be6d49d508d89c1e640de88695493ad22db05a3b679b5689ea7140a52ec2d25638635745a0a06888c818043c3f5b40f59fa9e89eddf8362c4f813be53761
 DIST github.com%2Felastic%2Fgo-concert%2F@v%2Fv0.0.3.mod 360 BLAKE2B f5688af3801d4924feb662c514095d90a03f81be10886651593526275ea2852544253018a9760855c9c5c5e3b7c0442b25a15dd2a750d8da007b04e50ed4894e SHA512 67c5d76c8b70386e01762d0842ed5638887a40a80575d21b1e1b10dd4df24525c1f6ea77d5c6096c9842f22817c9a49fcd14514bd5a238ed1ec3fbef79803838
 DIST github.com%2Felastic%2Fgo-concert%2F@v%2Fv0.0.3.zip 56280 BLAKE2B a7bcfd957d321d54a6bbc5a3cdb19c4901bb01be0a043b28f1f82b80f56e325748a618b81ab477b20ad323d4f2b0f0b3d310ae694bb5687050c8cc5711b022b4 SHA512 312024d9ae4e62b3d4513c6463c42d2bf41e2d4b1d301ed13e8aa7fb677ea303393ee94ea6d90066608a39f6f2dbc1ac16228c68d7ea55a3e496039f5cc7fe3e
+DIST github.com%2Felastic%2Fgo-concert%2F@v%2Fv0.0.4.mod 360 BLAKE2B f5688af3801d4924feb662c514095d90a03f81be10886651593526275ea2852544253018a9760855c9c5c5e3b7c0442b25a15dd2a750d8da007b04e50ed4894e SHA512 67c5d76c8b70386e01762d0842ed5638887a40a80575d21b1e1b10dd4df24525c1f6ea77d5c6096c9842f22817c9a49fcd14514bd5a238ed1ec3fbef79803838
+DIST github.com%2Felastic%2Fgo-concert%2F@v%2Fv0.0.4.zip 60182 BLAKE2B 67424bded241534aca60800f7724607df17450117f6050ca851e19b6ecc7d1d11beee8458c2d5773b06c882aefa509e889ec971b192f16ec81f00bda082e21c5 SHA512 2e4c699448e5c3899798debcb2ea759d62ed460a4a007d89abb9ce7ed363787c9526413b14dfb291394f31003ed0c49e9d5947c8990d403570a13384790f3ea2
 DIST github.com%2Felastic%2Fgo-libaudit%2F@v%2Fv0.4.0.mod 38 BLAKE2B d5bbebe1e345d5dcbb2b261d2b7fe76847a525f5a3001881782fb1a1cd2f803315b2af52a221a0d5aa75725c79c67d45287443a8ced59b156980abf0b4eaf965 SHA512 8de7f9e54f95a8628b77f91f991d661877c4d52fc8e8f74f606194d2dbe7003c92e3d9b960f99ecce3da9bcda42e49712a543f8232d67c8b387986bbd8fb13be
 DIST github.com%2Felastic%2Fgo-libaudit%2F@v%2Fv0.4.0.zip 198635 BLAKE2B 83f075fb88907c6287c82fba2e70297e2636db297ce4892b524c157705b3f301cf720c1661e8fce657a4ca921de8d761ca700a1c57ef51aecef8d641b8703b01 SHA512 ac95bf7f015348118d60347f8e8ea17ba234ed74db063f0b1d75477fc373d94aaf185847ffd730da89d53de512a7b551a8af136eccf95215b495b64fd67add96
 DIST github.com%2Felastic%2Fgo-libaudit%2Fv2%2F@v%2Fv2.0.0-20200515221334-92371bef3fb8.mod 441 BLAKE2B 2e98c14f0b7966a38fbd830304fc931794972fb8a541807d803e6dadf83bbd3cc9a1f88624c259b39da6690cc54a393869f73c345bda3902cc63edfc47fdcfc5 SHA512 f9a55e11e92a6a70189c1cdebd4a4aafea8716ff4efa7d9b3c1c63ce8f6b1f2ee44d6278a79f1bfd5cfb6f746d818450a5ca65304fe3bedb0f1f138cca85247d
 DIST github.com%2Felastic%2Fgo-libaudit%2Fv2%2F@v%2Fv2.0.0-20200515221334-92371bef3fb8.zip 231939 BLAKE2B f7e0b397504d5f15f91e2495b70c4e0fff2e960a86a5cbfd8c1bf06b288910a62d7de001476996c152d332e896ebaee0b72b07f24e55235bfb5ac4c5f507903b SHA512 5cc8234bb5a8561feeb08c0f14c734798d7aae18d36f4b5ac7908026532007ba44e9efca021b212bda58d76f21c3e60603d29cb900245af38dc16fdd5559fc30
+DIST github.com%2Felastic%2Fgo-libaudit%2Fv2%2F@v%2Fv2.0.2.mod 364 BLAKE2B 3f8e5c96b96a659a18b7b47ecbacc8c688a9cb5216f8de10f233c84ad3474786f04e3a38f6f76d8bafef6c16ce279cdbf30d2b377a71b00d74aa6dfa6f3b1943 SHA512 57aaf368161836e49f07a5ed802d5ed0436ec9a6aa7847d06d51c5e501d7a9ad35ae7fe29df5117dad71f51efc1312c08f066f2ee563272c746f12a9b06fc880
+DIST github.com%2Felastic%2Fgo-libaudit%2Fv2%2F@v%2Fv2.0.2.zip 227123 BLAKE2B 81229f03825306f9374d19d8be2561223c0c1f1273d975f571e95a958bbc904f3bb63348879dda5677305adaf1e93fb56e7359183fb397f4aa0284870697adcc SHA512 282b063e127439a754e9cf356c6a24a86a1f99602e4c02046fb88c5cadc0cd1cdb080af9707c647231ff0daf527ea810e0d0f826c5368d9738c61c8642e40546
 DIST github.com%2Felastic%2Fgo-licenser%2F@v%2Fv0.2.1.mod 38 BLAKE2B 14a649bd9211c297419381656d05902bbd17e1cf2071fe7dc8643f7088680b8646da17ee760f01a3be0de91fa1bf10d986828bda0ac3fbb352f23e18544da963 SHA512 91f146dc460096d38ab213404c92b1cf8540a6e45d22c49a7d1ca903627c63a22d3e70e17cfb75d59b22f47530b8c8fc31d25386c4c4db03319f9b20740ebeed
 DIST github.com%2Felastic%2Fgo-licenser%2F@v%2Fv0.2.1.zip 40569 BLAKE2B c5011769af42cb3d2c1d60fefc7a7f27a436a18ef828c6c79a2d06661f7ea5d80ef90961f12d123b609f3d475d7d523a18904b50629a077ce0673a5c052715aa SHA512 fae11d9a5007de0c3e41533d31fe95b5ffec248e3890389e13d0235117b7393a1c255ca449432e92520ac292d46f27b2853168bfc9d93e67fc96d7491a4a2e7c
 DIST github.com%2Felastic%2Fgo-licenser%2F@v%2Fv0.3.1.mod 38 BLAKE2B 14a649bd9211c297419381656d05902bbd17e1cf2071fe7dc8643f7088680b8646da17ee760f01a3be0de91fa1bf10d986828bda0ac3fbb352f23e18544da963 SHA512 91f146dc460096d38ab213404c92b1cf8540a6e45d22c49a7d1ca903627c63a22d3e70e17cfb75d59b22f47530b8c8fc31d25386c4c4db03319f9b20740ebeed
@@ -281,7 +305,6 @@ DIST github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.3.0.zip 118316 BLAKE2B ec39114e
 DIST github.com%2Felastic%2Fgo-txfile%2F@v%2Fv0.0.7.mod 594 BLAKE2B 95c97799b1cb834b083daba37e0a06f3ff042e1be89b42e91d425b399615dec702b431b7b27253237c9934600991bb698f4554b61914dbd734480d83c09d7717 SHA512 2f7c2f22f8ed0282a9abaf27212cbe9175059dc2950b329b607ad4ca804f460abe211f5df2a8fe2766b9e44ac4d35d6dd95376c667c6dcb10deb571542c8a62c
 DIST github.com%2Felastic%2Fgo-txfile%2F@v%2Fv0.0.7.zip 192468 BLAKE2B f7503c158e40d3edd73996f9d3697a36c862d898f4468b070396c8a0a6f9065e78efdf12bf10f91bee7f780b0827ae5f03078a8fc2291d9b7f7100943dc883f4 SHA512 548cb0d77b8db42f42a996d4411b1b5bc6235ef1ed6ea114805679730938a3d396df7f7877ea95421103fb15c35d1278cc5568a40d61123727a75c1e03531dfc
 DIST github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.7.0.mod 34 BLAKE2B 50f8f3861aafb929932efbc0512810d203335399c6892df7ce8d11763c1d8ffabcf55332c338cc1105144a6d157add8b1fd5e91e63a93da31cf5391a7df3e906 SHA512 1fb3c5218cff09ffd4086cb739bd5c4273591b7389f0d56bde786876b0303c73db51ea83e69c5b4a54ba942e50697b9080d82794654e5e225ab2eef0b2fb57c5
-DIST github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.7.0.zip 116302 BLAKE2B 213d79a9121e87f2c15c9b94aa5560f7769103dff465fb101b698e0d2ed2ded6c889f16d3415fad8c82028f3d5f6f4e454f684411a4ecb2984654d112f989343 SHA512 6c003fc980913f10f301037126550cf69d3d86a22f82f6049aa106bd09800510d78fccca5f6cd642f9f936473fd3b2aa9ce617feeafcff34334324df505b42f4
 DIST github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.8.3.mod 34 BLAKE2B 50f8f3861aafb929932efbc0512810d203335399c6892df7ce8d11763c1d8ffabcf55332c338cc1105144a6d157add8b1fd5e91e63a93da31cf5391a7df3e906 SHA512 1fb3c5218cff09ffd4086cb739bd5c4273591b7389f0d56bde786876b0303c73db51ea83e69c5b4a54ba942e50697b9080d82794654e5e225ab2eef0b2fb57c5
 DIST github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.8.3.zip 127483 BLAKE2B 7dc0995f7f98aa3d8f7f5c72e0fef19bb7512a595160dd7192196e68ea19fa83bc7bc841c8fc081191cd6a97c6e676c4668980f0824e9b15a846019a110ecf4f SHA512 cb63caaf24e1de41693c64864287b1e438c4d40e9696a0a9c1371fd46e446465af85ea71c3732fcd7d0077202c5aff613676b7540f30754f7965ff49096a6aae
 DIST github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.0.mod 116 BLAKE2B 2d92651d2383c73f3bec3975e5234c1346dc707f31dc29f5bcfda4cb623aa037a0df5a2dce4bf2b5fbacc0dec8a6594dc1f5ecb8806dae8d46c3cd2b4ad45e90 SHA512 158fa7771a24db80b5aeebf68528b829654d71e56ef80b5cfdd8a01b43ca25dc76bb27d7bb56a44bd6e3fb39d43695ef8edcf95e0990a970b61b8dfe80e85c65
@@ -291,8 +314,6 @@ DIST github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.5.mod 34 BLAKE2B 1e42e1bc3a6b6e
 DIST github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.5.zip 107227 BLAKE2B 5e29f9ff6b523ac999a74aa4fe0952495a3a63edeb5894783b08056b16bbedcd122ff36f8658d5277711cc45dfb35481b8d3566d7fe4a864c9bc698e7e60c4f4 SHA512 65ebdd1324286abe1dd0dea6e8ca594b7a4ae3114e1847821dc0af545848c3de7c7d2140ff1f62cdaa40a3cb367297e7467b53faf319af58a9773c1600bfb8ed
 DIST github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.6-0.20200715000138-f115143bb233.mod 34 BLAKE2B 1e42e1bc3a6b6e07f1f79dfb4d4cce05f157733c04b0afd052abfd8ab4740c3dd13a79ce604d4e3c39e83a9bb030843916ab65ce1073dd4909c7152dbe7201f3 SHA512 4e38f6bf1be9c62070d87a9485670cf73dce37af642eb560ddda6724663da17d852465cef3e0c8f0664ca9d479ce30012393d8a375bcb3a593f47cb745ed59f1
 DIST github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.6-0.20200715000138-f115143bb233.zip 111274 BLAKE2B f7d8f3c732b9349dc7c324b107764ef1aaa6fbad9668dc1d5b85edf914bfcd76795b7860436761a8a5aa9dc2d6df3a3ceb2653f33b643a02577e736e5afcac27 SHA512 cbe1480fd09a7c14eb5c977ca85f3268da634861075847ffe86bdd1338d1d3b87c3441e9ed00b02400179f2651016cc3b6d9d3396c1c980a47137752dbfa7543
-DIST github.com%2Felastic%2Fsarama%2F@v%2Fv0.0.0-20191122160421-355d120d0970.mod 1188 BLAKE2B bd52cd2d49c856181228f7d2500d6457befd145e5f5e69d1ee4e939c07cd436d4e94b1d6d7ec2cf7f371683daa69f89e06afd70f3a7d8205141cc934b61a695d SHA512 7afc6074fc64dd861b1fed922c2a89b7b75fd35a3b6af51c073152aa4097782f47f6b2c986b9e92e55c30e7bbff68ac176d478a6b1743df6e54b68c3715e7c7b
-DIST github.com%2Felastic%2Fsarama%2F@v%2Fv0.0.0-20191122160421-355d120d0970.zip 368799 BLAKE2B c5b3fe0346ad2c2978f13c5db9de073a91e70c7ea66e6c848946b6a9642e23668ce1d3de7f816de4d4f81d436ef7dfa2f84fae05d3258d727fbe678f8b779fe3 SHA512 f59e798714e5e5f02e50d44f6728b3bf464ff77704c5b67f8b704f11318d29ea5c883c78f5909e65a907ab23d036e2d64a63e6369d5dbaed565f27d8fae04517
 DIST github.com%2Felastic%2Fsarama%2F@v%2Fv1.19.1-0.20200629123429-0e7b69039eec.mod 1375 BLAKE2B 2078c8e8bb7e18fc469ef77acbfefbd44e6d76c492bd18a8008adf28c5d1fae9cc60d4fc8503a7d66b16a74299e56f673ed6701b34d7a9840afa2fa61be0d2c6 SHA512 31a41e1f8a619aa9dd438be4dcc185d75984a1dd6d7efc5bfd37bf74f63be6a6fb2ca3b4d584bb66f343ca1693b59a2156745689fee29588395ab369fbe32391
 DIST github.com%2Felastic%2Fsarama%2F@v%2Fv1.19.1-0.20200629123429-0e7b69039eec.zip 393905 BLAKE2B 91e13d3eaa5fbae1d48d5e02a64fcf2c12237eedb2f5a171795ddee5c1830b2e3006576d37f58468bcbae3fe65ee7a37b1ee8a4c1f78869d5d0b1f9c877e3fc5 SHA512 599747a3a5deac56741c09bd0655c7dea2a3e6e25c1c2d5a851472a6b5cec4bc599d9ed873d6f71fc27a1956ebbf9c30c84ab0d11954d3e02de7352839d2d2eb
 DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod 34 BLAKE2B f28e4e0816416341c47f1050c45c142e5f54ea8461f335b1303def3516a3642a4cf29341cb16aa3fe7a8f78439732058a3712b3831dc35b2db3bbfdc8289ba2d SHA512 df974cf26d8392df0aa30b39a28ad4b6fa2c128cc6e4be98e91aad8f997e76f98d16a5c19cb3aaa510f659ed8c02b05e7d93888648f30c701fa02e63707075be
@@ -313,8 +334,6 @@ DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.5.0.zip 11358 BLAKE2B 665fb79fe378c76e
 DIST github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod 33 BLAKE2B 2c279a40bce4e61e5aad9d25a1c374b6c154586c296cfdfd56f52435c7739c8d9a8958e19d6da8026c2a03b728e0cb9bb512d5c094aa6111f9b10af24ab894ee SHA512 2bb0f125a91c8f92dc1cb5ec16441b27027585606a3862c216434b76324f3069941055c4bdc98372547543b095a4014155446de1be98264842504450121c941c
 DIST github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.mod 36 BLAKE2B 0b3e2e38c2a6c708af475f5550f4e6b366b9218fb9e29b9ace6fd61775be5635b5dfb237170e5c4a84c82a4f62e3901ce8854cc5f9a81aeb1e2da6f788470e1a SHA512 88ca10cb6af255e2e0ff960df075cbaf39e8baeb3b65e35b9a8f48843520a4cefe410765d0890781dc0429aebaa183aeda2290fc0643b852b9ef269c009ecbd1
 DIST github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.zip 6665 BLAKE2B f9bdacdd7f4cb7149fbf6297d3ab38c3a9527e0af158b933fbc673b96c5ffb684d6511b1679e03a142e4db5dafffc7b1e2edf24ac2d0f4e8faad32041e3e1165 SHA512 77f320b3a94a6da76051d6c15a7c31bfe9dd50b463ad9a354b0ccd4e24df3ea14ce026a1f509d2125f9603ff95db4ee001f9910fd6db05c9bca7b1b15ec304f2
-DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.1.mod 112 BLAKE2B d5d3a6674d915a64981d16e50519ddcb083e77a5bc0e2474fb1e2d718512edd48534c11e13c4acc7d403da5778cb6f04c275c8f208d14d54880cdceadbfff872 SHA512 b2b728fab00b8cfb86dcfb042631a37025bd981364c068990abca3ed57b3f47837ae71e568bb2a60a2c941aa2a35ff1bb24a336e786d20ff0bebb63384fee5a4
-DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.1.zip 36823 BLAKE2B 748629d0224bc4598ca2573286d49e8623ca17a9438cb525a8d080d14cf37549943418d170dc5b107e2a39271be21e1ffe2f9224b469b3eb82574a0c64218851 SHA512 1d451dc97018060ba5fee2dc1696807fb98aee809bc8cd2994bb83a35550edae819fb46cf17ecaf89fa8a22b277ae20b35c32c779640a47679e5ec965bca007c
 DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.mod 121 BLAKE2B 023fc722091ade6051165a9058ff74674f43aeea249b530be92b7f05534f0b0e738a7dade302f6733e29315fcfd34bd0d8c7554795b524e596a408e248051d12 SHA512 151f687b4d5c2b5a8fa26134332222105f40422530e49930b4533831fd5a0133ea7a8038f2d851196dd615b658729a10ec42d0a6efb15bc3abf55903bf42bd49
 DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.zip 43121 BLAKE2B ae8c0baab3324c9d60363b216e00ccd5e27b746ddd8a3b1b231f9f018dce8f3bacf5c2f9a8f1a3db97fce8db290d05f7c397141d278d585e0e44f0bea099549d SHA512 8f4610eba24604d46bcf1f9c4c7da0723a99f37224c298022823160d14469b85a911a6d18b8f084aa2730dd100721e52a8cd6bbe0215d72843daefe0f79fb141
 DIST github.com%2Fgaryburd%2Fredigo%2F@v%2Fv1.0.1-0.20160525165706-b8dc90050f24.mod 34 BLAKE2B aacafc6177e1e87c8f4a17f295900d749608f722755d31a1939d1b601e4719984c0d1299fc4de9fe74c1109852009daf4641cb5c81629788a639eeb9314867c5 SHA512 c4b5fc4230e8e9c7631f577ee15414f7a72bfe27af524fd6bfad8c38a81426411dce35a191d840a9c69eeedfeacacd3f2a108c5eec35a3e30b0a7b262b15340a
@@ -371,7 +390,6 @@ DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip 2698974 BLAKE2B 5fcb1c66d3fa
 DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
 DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip 22449 BLAKE2B 8d2eaf41ab75e870a445d50b62c02877ae8049e282f066d9aedc0dfb54d04af55d921ebc84d1e4131cc66a3f9efdf8270a0e423e563d3f8fc5a6bdd403bcdb39 SHA512 a3c086e660f2285d9fb7d56d1eba74994e8f0052363413337413cb50009ba46d3a432e2b4c67a73bfb753e7c60646d96bdad308d8e634e53f0bb0bb97ea17bda
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
-DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.zip 38604 BLAKE2B a7d16e6b3e1820db97600f17bef2076ec815b81d36c22c8ee927012e8df74bcfc6a3384b2abcffd974a1635068ffa5de9443b204c587df10c9593f830e1c3df8 SHA512 af7492e0d36fa2a876c6204a651d250193900badb819dc7db8c62141d7ee7253eab9d87393a131059587160a0a5f7d373017b2ea2170b4ca6d91e9a58175d88f
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.zip 39683 BLAKE2B cebd7b69e8f18547e77e07d49ca26fabd513b6bf95317553c5bcabac3b513dc1d7becc259118eadbad18ee4d45a1dffc3ec96864b80d87c0dc6885983bdbb3d4 SHA512 e7a8277f9b7d2e35d1e8586c580d03457ac1e755e1051fcda20ff9f819a6fb9c3cd1892be3a50d4cbf141b35d1c7b85b27bdc402eb45b700a37ce994be4e5b5e
@@ -403,7 +421,6 @@ DIST github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.7.2-0.20170925184458-7a6b2bf521
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb97e0d557200e8722f2d373e149127307efa285cdfedb36dd57355168554d1a1bada62144e6a6a00c4d3246aa9afc7d0ffae0f087459c552 SHA512 7229d917bb0c788b07297e1b09b8f7952f951998a56f17ea1f69ff7c2f565a5686b212f42f45c6b8351905d6740a2ec5a235e493daa531ae00cb709faf67ae45
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.zip 99651 BLAKE2B 14632f8da685fecc046b2cc9e61eecca02e7bd4720ebb1d3cd01a299e59d47cc604abc57d5518e18dea69785e3d5d539d87da211279e238a78dd23e3d7f8c7bd SHA512 4b47aa3677a464af17f3e320f41f59e775b45f04cabf2cf749e00ba1aa97e27ee78a07daad347bac4b5c41e2c430634fba57c6edbcd7ad405b5a084142871362
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip 105396 BLAKE2B 8b45b030824cf6ad208a00e36c7098b59e89c2725702926092baa11e82bd395d52b5daf26af57cd5edb01bee6ac2b8c4e3379e357e3a6cef69550d9403090c53 SHA512 bd13e72e46a82b149661a61dfc36dc6e0471dd4161f2291f301e871811e5b2a7976a49cf2af10eee1b7b2f6ad68583c240cba007ec163cea157f24bbe51d3b3a
 DIST github.com%2Fgoogle%2Fgo-github%2Fv28%2F@v%2Fv28.1.1.mod 428 BLAKE2B e78c1cfae3615c6b7062d74c18a8695fa0f35af0b2dd545bf6f5f5d4ce5a3f334b7abf2a0526061b174b4ac0b458d59dbed25c00d4a63b71e25d4a98821ae524 SHA512 7d2a20a54c885207facafd3e6ab18698e102c9ec564daa2864e39ed887f88df20c6b37488185fc829685198ab628de978a7a99a0a07611d4ef6256f1a5ebc7c2
@@ -471,8 +488,6 @@ DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod 96 BLAKE2B ada026b
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip 17595 BLAKE2B 06dae93e8077ab6235d59b57646a162ff31e044624bab3b6ec86c7aaadf49c36b262b957704151db889c515c425630299d396d0b76919403eabf4a3e71098ef6 SHA512 aa4b145476a80d7be7959bf7d0a9a278765496dbf915d083fbc40c5b216a52126af9ba12cf09f9cc178ce53987822ed61c92e2a0295fa977f8a460262e857c30
 DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod 147 BLAKE2B a87a317948074210158c83c25aa1e287c613665f0008c6337a41cde6fb7e1a0758c38762d8467fa508e0178fee74781f1db49a05a388d46f8871700fa3c85c92 SHA512 7ff5a339ab0da7023d7548056aa96eaf1fa9a0a36f9deb098f99910a9a77fbab43137b6e305b35cfbc4ab9d50adabda10b53c279bc701ffdf97e928fd19c7888
 DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.zip 22283 BLAKE2B c4c50530c98e584d408da87abf3d41470211b02dd1fdbedc7f06671fd8bdb9176a286414c0530975b44651f2a263230d7c450e35ffd435aeca100795e895f0f5 SHA512 d3cc4de24a8fc43b1efffb2e18fa5879bf57f2220f4a890fa3e357a3c05111ac55a36aea22fcddec115d50b19d04a9d452d28d6c05a60c39be301b11d8391558
-DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
-DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip 7804 BLAKE2B 118a166e041d64c446114e195ab870455fb75db45554e02f0ca1b0a2ee76938022120848bcd5d3668a9711c32345db5911cc627977a602bfdcaa875be791199e SHA512 3a3e4b23b82bea9b094f407662f5c63659ae427bd0e922c37f0dcafa1e3cbb16f4117f265cacf2a0219f5240d378aad7aa4cd2f9960e07b7cc7200859b0d6699
 DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
 DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip 8042 BLAKE2B 9ea2dd58a5d47047a84965e956e0d228e0c7f836c6b0111fca63ca2313c1721341ba31e7e741febc8f5b1053298116d69d6dc96f1497b59b343da59b57f7c3f9 SHA512 1afcd111ce5ec191a932e6f51f0aa9b05ffd3320793c022cc66766bf01431ee4b9cdd3e7a0544b6b1616fabeea262f54270660fb723de8ecebc8f919e7a94e34
 DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
@@ -481,6 +496,7 @@ DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f9343
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.2-0.20190520140433-59383c442f7d.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.2-0.20190520140433-59383c442f7d.zip 20402 BLAKE2B 26f21b533637539b48f4a7980f328b2b20e93beaf214d62e12615e1052e62bdaa81272e386ff3bd49c91d7767b843ce097651510f1c7c507ce27cb535e81b5a3 SHA512 721456556cc322e49c192d9060fdc63684a4992c8193e52c32cfd69dd9303f314bd2805a1048ab8483101ae96f58fe1760508c15a5180a5b2e03bb21cbef9423
+DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331e2648bdef36882414dbf8416884b8fd385b7e926c9b837d317322a433e7312e14c27eb095cbed26a74eec9822f0f063a2d14e753031f632 SHA512 045ed40015294ebd8f7a6df06b418415da8f091d09fb4d34fd70718bbf5ce9f49dca7399dc5649336de3fc83bbbd93e740ad6f62d41ea540fae3b17f349cd66b
 DIST github.com%2Fhaya14busa%2Fgo-actions-toolkit%2F@v%2Fv0.0.0-20200105081403-ca0307860f01.mod 103 BLAKE2B d57be1a4f6587f5834ee2d8f54afb7cae984e822f2ebd5f6a56bbc350059943157cb7ed6af5880b873012a6eebaee9466c113137fecc389efd350d94b160ae43 SHA512 abf4fff66be8027ed27b0133cddb7db63f332dfa6c530461ac09efac75bd63549a2ca43a945c118ffc0b406ece99cf98aa22a40d989d8e71a7f15134dcef3868
 DIST github.com%2Fhaya14busa%2Fgo-actions-toolkit%2F@v%2Fv0.0.0-20200105081403-ca0307860f01.zip 10647 BLAKE2B ba852c139ca23a6403f4545232aeb66f5c690889fe76ee0a6e822e67cd293ab9439937984129a744dd9dd641fedb26cc354837187ee196bc63c57f56cd1ee962 SHA512 5051501159bb22ab7cf1fca61fe6f513be712b687498695f5d3d82feefc7d3d6338adbc71affd8a9712b8dbfc51b48f84a3aadbd9d232acb1d9632829e4797c0
 DIST github.com%2Fhaya14busa%2Fgo-checkstyle%2F@v%2Fv0.0.0-20170303121022-5e9d09f51fa1.mod 43 BLAKE2B 2406c2d4f74ca49b59020819fcf3696ccbe70dce37d0d9167b9d13677c017efea2b94a95ba3855fe6be05c31f9fd3f4f08eb26d6876aafd4f315ea6ec070e902 SHA512 89a2cc13793ce063e5e087a0d50dd58ec0af29589b00db777ea9337713d57fc656a6e425edc2a85c7200e1cb92a240fe3b030eb2a3b5299ccdf86f80040c6e61
@@ -496,7 +512,6 @@ DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip 25340 BLAKE2B 3d0fcc2379f609
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip 3712 BLAKE2B f4f79741bb83862583f51f2ac5e80181eb0e9c2a4578df32f7e24eb98f4f548b99333e0e6a377e03ef701057b01e852e6b710ab885b65170c861bef556863da4 SHA512 e16bd414c1df566a12944e4a99ebd84d2103f0cb3bf8ec312e3de400f20b3eae27845db50672801c10474dbf1dc61d0c2e16e5dcd3c4447681c0b77f9114a411
 DIST github.com%2Fjbenet%2Fgo-context%2F@v%2Fv0.0.0-20150711004518-d14ea06fba99.mod 36 BLAKE2B 3face566779516d32818939bfc87f0c24ef4b03ec89330763cb2de2ab371a6a391eb5fbf24d9619a07719f160c4f6c403dd4fbe1c650764c5e0ff43a43051aa0 SHA512 fc1cd659d6210d91ef66189a759c3850b242b76267035f38959be2b2f35283b54a61334f4416b619ff017d39646433c5a13c6b181e53bdfb28fbc3f9c35f3dbd
-DIST github.com%2Fjcmturner%2Fgofork%2F@v%2Fv0.0.0-20190328161633-dc7c13fece03.mod 35 BLAKE2B 152ed61bf84dd1666421e11827c23eeee0c7c50edd35851a50ce21f4fefa13660a7a6cead25a0f9d8f1b748c2c4277d21639eb781c484359aef00e77921139e0 SHA512 5e94601c72f24a3d8a115759a8fd6fd3420b662995ce94d7dbcfe4f86437bdf81a42c77c82accf7fdb926b75a5898bb34706fff864e00b38d891cdd076fc89ec
 DIST github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.mod 35 BLAKE2B 152ed61bf84dd1666421e11827c23eeee0c7c50edd35851a50ce21f4fefa13660a7a6cead25a0f9d8f1b748c2c4277d21639eb781c484359aef00e77921139e0 SHA512 5e94601c72f24a3d8a115759a8fd6fd3420b662995ce94d7dbcfe4f86437bdf81a42c77c82accf7fdb926b75a5898bb34706fff864e00b38d891cdd076fc89ec
 DIST github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.zip 31175 BLAKE2B 17e0ba33bedb9809d12ffefe034baf727e7c2a66aa19adeb87de3e3659c085f176fa48951f1afff4e5fe132c73d4520ac7061deb0e24d86520936e6ed6b63845 SHA512 d1717086c3d429838c88ad276d3bebda858fb4afafff46a204cf252685d9c7f1e2b15916f3cf7f8c03fd54e68d2d1c3ecb64e9d73975ebe9ae188039f0aa4570
 DIST github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod 36 BLAKE2B 67fdbc6d14995318979fb3e5575136262165afd7a1582f078d2c84c5d7fcc893f52707f01d798bd2a43e1cef8fdab6613f34fd9e4f5f1f6a61d91bf09a55ffa7 SHA512 5db9838fe6a00be9849cb79ad148813a573b652d6f6cf220c55b68bd23636016e6bddd6733f6b29d63e5f02d2750a86c2dcea6b964ceb87d4048d5c5f3cc989b
@@ -521,7 +536,6 @@ DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.zip 131514 BLAKE2B 477f1ba843
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.zip 133348 BLAKE2B 1b5294c65a6864de4df7000935d365cffe1112d6f27848703cef467ae7f962a3c5c5ad22e5f67f25810a2ffcef5d4ea19b2445cbd67cf0f0372db0b1c6c162f1 SHA512 cdc9e1759d68c8c9a64cf6d1566a7d30bb90151d3a7ce3ddc9689627b53056be3915196cba74823d5f7d8c50fe05a9c6a96f8e7c26d2ed17bf7f1b64962fe050
 DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c
-DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.zip 42656 BLAKE2B bc6a0b9ce81d8202304d3097e5193b5491a3626416fedf55af46770b8a2b9bdaae3e7854ab32ccaabcdcc0f362e1eb1d161eb141c3b7075f33dd0b668855b6c8 SHA512 b1e79df59686266c13a7f84457ab59900509c6dd5bdd2a343307ab2b19e10107f06c654803c698f1194da92a0c621c484ab2100cf8f3b9db6ec68b0022ac7262
 DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod 51 BLAKE2B 4cf5f813ed021b04c810da33b332dbf44f45594e3657779687cd24391d2a93770f2a0e8999fa5a8b6564da5e08ed9fea1e52394907d518ea14a9568adf263e67 SHA512 c5761bc45d554ee6639c4ca23fefa5fc5c8a7c818f8f18d0b43aaab26c8114615543a1be207f5aedaef53c2dda623edeb7d3ae1c5ce6b72ea42605a1d5c31667
 DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip 42083 BLAKE2B 5f9cc715c99fa4058551abcdabb96e2294cd50c79f49e8acd42b0e37cc990599a1eab827121b259b47d7af6fc62f1b75791c4916feafe6be08e2df3932e49fba SHA512 9f5d126347316b497910b30fa2905e6b6c119fa975adc6bd4f17f5a346cbe110c10f33a7df6ecc63e086c082f61ce493e4ca5efefbf2eb8d024f2a07cd80e093
 DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
@@ -534,9 +548,6 @@ DIST github.com%2Fkevinburke%2Fssh_config%2F@v%2Fv0.0.0-20190725054713-01f96b0aa
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod 143 BLAKE2B 128f8934f81d0e497e1258ec65129fe5d8831b66058669a5aef3fdb2fbe5f6d8ab30bfe97a1de7befadd34aafd55d6d15bb787e8948fb7718761392817203874 SHA512 c5e546822036a7114a29454e28290f8e1082392a47a101fb1d370e0969fc2c83186b4487473f903dd638abb8a763ce3180dc87993906895a2df33db7d8bc4790
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod 98 BLAKE2B b9d3c55999054ed927f666a43066ccc6758a6c5f550651f43ad5d85b5403c882ee76ac2b2553803d71789da33c60ea41857ed545003072ab6c666dbb77118e00 SHA512 3529b37d770af511a716a612b7fd7fb6a4805d13166e3a6f9378950443f6eceb2f3d95db5a46027437ce55b36e571c75bba72a03769d21ecdc97888019d80a68
 DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
-DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.8.2.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
-DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.3-0.20191122130757-c099ac9f21dd.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
-DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.3-0.20191122130757-c099ac9f21dd.zip 15268424 BLAKE2B 948489d5e2c6235370c1bdaa1e105047dcc470e316734f148e1dce6b6baca421f215495e6dfd29105f478390599d4334e8078cc2b2933a67d3871ad5ad9acdb9 SHA512 4b5265db6d4383f085a67be3422bf3f18b1703a123e0d4329e44230d73a5fdbf8f46c606cefcaab880263f95bf07b6c3830d8b82cd906516b5c0d29a7d430bad
 DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.8.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
 DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.8.zip 16194359 BLAKE2B da3b081970f666c910de17fb8f959d1c52e7d92b64973b98954b816aef77629014d00eac2a064cbd32b4d4f40581cad8ffd37861c33fa8df31348cd21b320807 SHA512 2157dbd3094aaf49f560c066c6a84314141964ca72425187ff0647f03a033b33234530027879df08055dbff9d58ae365f467f5c1572d33cf0bce1edbe3910e16
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
@@ -561,8 +572,8 @@ DIST github.com%2Fmagefile%2Fmage%2F@v%2Fv1.10.0.mod 41 BLAKE2B 6269fdf51dccf032
 DIST github.com%2Fmagefile%2Fmage%2F@v%2Fv1.10.0.zip 8889874 BLAKE2B be8ffdaeeb4384ac5d68a1e8e009327e63a3a5fea4b22f4f0421916c0eda23ddcbfa5b550f4d8f3d37d75f5254dd9d00b95f0f57172903f0bd8e2f63fd75cf77 SHA512 24e0c406b185f7ef2cb5175f9c77dff18746ddd1ba96a441eb2b94d5cb62426c7a024c92d8c34a26f393726b545de26bc1f1ae7629e98ff3570f7632fe2c667f
 DIST github.com%2Fmagefile%2Fmage%2F@v%2Fv1.9.0.mod 41 BLAKE2B 6269fdf51dccf032b87cf8e7ea710c01933f0be0fea993963af14eb9274fa1a8bb078ad75f90279b4ba1b83d70035725c2f19f0241db615828231a2fa32c2cff SHA512 00bd89d63559cd13e21f6e60155e7c1c200848129dfbe4819a964efd14eb36141ee3dd9fd0c43fe28c7ff9f9255e8954e9d2145eb409f3e30b3474054737811c
 DIST github.com%2Fmagefile%2Fmage%2F@v%2Fv1.9.0.zip 8877180 BLAKE2B 47c23f5590437974a0c03fa730ff9b3217014d40cab7076e6eaff142941f95328652134b4ffceda1bac0e30f968733afef66d6f94132158c86eb069b99d8638e SHA512 7dc6a0e8a2f5d907136a894ae27aa5e9f96f0adce3a904632e635312b7b564e861f25765db18279d996ba0107d87c8277e279176888f0129f2bc2ab4c499be82
+DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
 DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
-DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.zip 91527 BLAKE2B 2515669359657f17a9e13026cfcfc5ca02efaf37223ba09166744c17cce8c1947fd6ae932c838d32840bd01f8201f9f3000cbe9ce59ba42b2efb89c093a24926 SHA512 57e01fc947548602c2d14559faadddab35e7f90c622ec8692143054d1f72a323e8401f671e7d075614223b8681461649db19f110517d6f2c5de35914100bee6d
 DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.1.mod 43 BLAKE2B 52ec55a10810ebe4083ca01c7a10daec67e5e9e370d24ae3a0140ab40801bd9b18fd09cee4f306c891b60c83049497bfc69ebc12420663fb5f6b39426002d759 SHA512 0b54c4dc34e54f09c3d9d4b63a4d6a22736250aa3caf1526220c11473f4bfb5b589fc1fe4cfd9d59d1a7c2f8cb60b3407353d41f9b31389200a96939cb95d925
 DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.1.zip 71751 BLAKE2B 828d4e00e138f755724170e8e13c8cc95b31d1701fee5903d54f54af0b6553427e5ea0b0ee39f2a078f6827bac43ba7245d6f6be13ef785df82807f854928fed SHA512 c8e29e95279ff183f5a3a4df25494349cac032ba191398809bf41aff746cb5a1f661e20659a257ae85bb58366b355287fbcb58798ceba0afa8991f6a729deb1a
 DIST github.com%2Fmarkbates%2Fpkger%2F@v%2Fv0.17.0.mod 126 BLAKE2B 54684aab4787776885bac06e7d05060fcefefa23e739a6c3c46588f1153808d45f2afe5843640ee083a59c134e10e212b90fa2910ba4949689cb38caba5e615e SHA512 38adb18d796530ea1384762053fe1668473fd00909a9eabf8cfb7384b9ff4cf9b843bb30f53b156047f1c39854d64a84163d507c96b35c1d8d950c781a7511fc
@@ -638,21 +649,29 @@ DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.zip 388333 BLAKE2B f6c
 DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv0.1.2-0.20190507144316-5b71a03e2700.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
 DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
 DIST github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod 47 BLAKE2B 0eda9805fe0e1acdcc1e7b2693e72e39ea416cf57a108b1847491e1f15f8a7965c8aaa77baad1ae6148f39d36b1fc5fcf159b54111bee0d20bf2fe8edfdf85e2 SHA512 4e53e67b276ea3fe8a3977bbe72758bb2f844e22cdc3e23994176821cea51b10f5e802ca3db848a8b3d00a146c133a89271ee76158c478683b393682806400de
+DIST github.com%2Fotiai10%2Fcopy%2F@v%2Fv1.2.0.mod 80 BLAKE2B 04718a62a0874dff2d0a305cd3cc4160048fc38b45316e9453279d2437e817884bdd666fd1af6031f7e3b9e782a00248e6e98d0f0eb28c7b5c436ca6bdd1134b SHA512 9528e3b28299cc17b8e93c9314f457c1f0350313db0919ea57ed3124e80ddc5f1348eede9e8f199758d2cc256905d43e38a476d4d4f7fb7a03fbd85282abf57c
+DIST github.com%2Fotiai10%2Fcopy%2F@v%2Fv1.2.0.zip 12137 BLAKE2B 35afe4c4d0eef8be2a40d763193438985c0abfd5e761a92ae866290e2ea3638ccb52cf5011adff014d509cecc5427be907ffe6fb2db5a12f940494e83fbf045d SHA512 df7b692ba9227e42e9f8bdf2511833aeb8127409fcc320bdb8ba81bf5e9e5d317e8fd46a634be0cf7bdfdda91044c554b27949f4186891621aa10333b9c6ad89
+DIST github.com%2Fotiai10%2Fcurr%2F@v%2Fv0.0.0-20150429015615-9b4961190c95.mod 31 BLAKE2B 2672a50a0d2433b86cac9329ec96a520f2d426b5e04356056bd1173a3e297696c4bb6d2ba30efe34b557afa6c7c973af7267ea8d1a9d939860fb8c438863b6a7 SHA512 851f7cc28e17fbb5889fb46b71283312b4e66755e6bb6093b2170348352a68ed0c7855fdeb576160ed659563f79bf9d5af843a8c47c07c8239d4edb75e07f498
+DIST github.com%2Fotiai10%2Fcurr%2F@v%2Fv1.0.0.mod 80 BLAKE2B fb379c2984a53bfcc4c14a0a86655a7ea6a12d148aa2ce239c8c3497f6098b2f05af27cd1f8fdd8d5a04283b3b8a4234415c1472ae48ab6e65b5277fba9adcb2 SHA512 a8fb3d74f219262401918603b1944ce1d64a51f7e9cf89f4ea4aa58f9a2758637fe007741a1ca057ceecd59ebf2ad147082d00596fa35c8e4bb65f52906c0101
+DIST github.com%2Fotiai10%2Fcurr%2F@v%2Fv1.0.0.zip 3702 BLAKE2B 27380c5d62b0eae66290ef73076c73c1561c27950e48923a6156fa29119a7c2c28edd695ce1cef10de8dfaeb64f4409b3655fd7b5e404885f09d3abe9b228bda SHA512 09b0df5e622e14a79b579da7e9b1dafe05e02002b6021dfda8f6b928ebb03addd7755443ef2b2cdf42cf207d819d56e6aabed551a17e48f245b6a0f2d70a422f
+DIST github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.0.mod 108 BLAKE2B 474e77997e73380c030b4809c8f282b643cb0da9bcd1e0b0a231aac20e8f3ec463df76824372300b199a1453ee90995e3d682ae1ac12bad05f1dbba4fc2ef517 SHA512 13789a725161311e33af6ced4e07d7b548ddaa069e34791d8c6b4f1bf29ca1653ea723f5da79953f2e2314a3d81239985882dfeb1700c3bab4a3579cf972eb4e
+DIST github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.1.mod 80 BLAKE2B 7dde564f562e2e049893762d2ddc6653434fb32cee6c9aeb6f298e90d534bde43b79814d95a9a38070c6291184e590c144433b39f4c1f27a11e3211e3e7b81a6 SHA512 0291055b9568f02df1eaa6c5d3a4cf31447e864a89a25e741471a9c2aa34cc686535bc1987e3e827934f412f2892997f9336159f13bb8c3c915b940fee8c2e6c
+DIST github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.1.zip 9837 BLAKE2B 8a6545a58eea36974c18a22430b408a81b52b038b950ab15eafd1dbea3ab6c1a96c809e551e0992177b0196b9a022f87aa3398b07d93abad8a527aef8008cb13 SHA512 ed11e504b8ed5b55396a1b05384d471f713fe5a845bc0d74d8690d6bebe94996014043802d0a78976f4e9e0bb5c0cdc6d9582dd168d5fb233c95b55fe5724aac
 DIST github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.mod 34 BLAKE2B 24e5a5c0bd31053b54c98d3a593c6c82cc8a0136234a90981004ca7f40e1eeca392b56d80ede7407a49f8c666cfffa4407d0ba0d7c09a42dbe8a9773f1613d0c SHA512 a0744e73669284e544d60a9b3c9449ce074cae579583410ff0879571e0cc57a7784e30938a8dc56c08b8f5b87fb0c0df3ad477b0c3543f3bd221b6f3a2f282b9
 DIST github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.zip 10165 BLAKE2B 7208b851d5b38607aaf215d3076130dda5208b8c54a7ae8ceb8232011b2c802e8d3034ace2d91c2e5f1e085068ad8dcbe53eb653674255d3a727dca92cd14dd8 SHA512 0fe3bcb22a1a3485e64df4bb6fcfe619a8544bd1e245ca755a0a4b1db2fbaa39411f4fc2e5d3373538b66eec805a3df208103ef813ebd94494dabde52d5683da
 DIST github.com%2Fpelletier%2Fgo-buffruneio%2F@v%2Fv0.2.0.mod 42 BLAKE2B 26e88451ad5d521cc8f48a08c91f2fd3fe6dc2e2ea084cb0012f25d8399f0e43329de5e96fd741255d910cf5a2146d3568718249980876c816a67f79e8b3290e SHA512 9f82f0d4d467420830ab8fb80ff97215e5fb47653b48d88304a6effdecabfc735f55dba9959319014ba943b2cbd27394ce86ebfba8a6d068c9c3d368f6b0cdfe
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
 DIST github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod 37 BLAKE2B a52c6a0304ea7026657d40ff685f37799d37cf3b05a87b15336eb05eb8a12d8749cd73d8cc3228ba2a80ce1e489a3029617ecf301dbd51c7f5dc7630dc114801 SHA512 df531789f1495979faa830433a34e38996cd919757f0191b31b862a9e9dd48be68179e291416876cb31083dec78337abf6bee92c68cff38630aaa456cd3cf052
-DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.2.6+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
-DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.2.6+incompatible.zip 20567035 BLAKE2B fc4282618ff1d2d426080e969b1645fd4c8ca72464438fdd2a63feac6743ca15b0522ac6e2e069ebf5c0cbda2b43618253ecf17f271daafc61f03b2aee9f51df SHA512 7c218059eaeb85ef6313c5ea25c9c0118daae8d2795094a3046a020029aa53ce0a55b688fbc9b70999c8c1d93e1d6e11f4977b871e7b3f5cfd2b3aecbac4f97b
 DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.4.1+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
 DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.4.1+incompatible.zip 20573196 BLAKE2B e04cea4ab317118a9a854ea34a7e907f5be268ece8ce552507b18151aef74a30d2a087a48ab1657eae38f79f015542fcc3cd9cac1237d4d2b1411fe2bfa97788 SHA512 5e9b1485713572250b69adf2b826eb40ff65851914452511df818dc1785063b2816d19397bea3d4d581c966d1c0c1aad27750e0ddb4fb0affb1b43f21c76ce47
 DIST github.com%2Fpierrre%2Fgotestcover%2F@v%2Fv0.0.0-20160113212533-7b94f124d338.mod 38 BLAKE2B b26ee235ee877e67b605670a1a041cad6e320058c454816089083ae602be967006955b4f38f23927a495b09d2f71f3e3796a5269ab46587e3047d8150a6f3a57 SHA512 b32caefeba4ead78cb310946d4f8bda2d76eda17913aaf8cdffaa9db41300b5741a759be069f60def0e4ab1bfb1d6505bf3ca9375e80b77897e4419a933ccb11
 DIST github.com%2Fpierrre%2Fgotestcover%2F@v%2Fv0.0.0-20160113212533-7b94f124d338.zip 5506 BLAKE2B 955d71140c6a3780dff928c4f1f27ad1f016ae2e467b773b77891350212c1b2f449d8872ccb7b2503a4c02cc020f78510ad612f02c99310db0f0c36223d423c9 SHA512 2d60ab410169bccd8196b5b352240232479ebef3fad2b1565208c33873eb6633cefabc7c091816d2b228caee64cca7900a26ef9409162913e0723dbaebd44aff
+DIST github.com%2Fpierrre%2Fgotestcover%2F@v%2Fv0.0.0-20160517101806-924dca7d15f0.mod 38 BLAKE2B b26ee235ee877e67b605670a1a041cad6e320058c454816089083ae602be967006955b4f38f23927a495b09d2f71f3e3796a5269ab46587e3047d8150a6f3a57 SHA512 b32caefeba4ead78cb310946d4f8bda2d76eda17913aaf8cdffaa9db41300b5741a759be069f60def0e4ab1bfb1d6505bf3ca9375e80b77897e4419a933ccb11
+DIST github.com%2Fpierrre%2Fgotestcover%2F@v%2Fv0.0.0-20160517101806-924dca7d15f0.zip 5750 BLAKE2B 06d678503e37d07155e3538f3b54a0a94011b27e25ceb60a7e8d2ab2de8ef089ea51a75fd09a8c927ef9e999f1abee04b931c5f7579d0a8f92978c0526ad909e SHA512 69c3192f5ab649c31f174b4caf9b72786e64779e6d1b746c80c73a95cee40df7bc08a3738b12c32e36694391b03bb46396edb630f08ec5a823b090695c12a3d5
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20170505043639-c605e284fe17.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20171018195549-f15c970de5b7.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
-DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip 14339 BLAKE2B 9332d9cac7dd3aa2f4d756f0d92c911cd0fb8e00232db3bb013a0ef12addae0aea2388ce3adf79407a81e13cfe9cd4b45aeb2bc9f8b84b4e3c5dfa63b59d46a1 SHA512 f97471d54c5e73b3f59326847cdd4dbbb142a9ae790df83493f11a851d716fb407e01a857152812caf731b8f3e0f37ae151ee83300feaa73152173f6cb5b8515
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip 17866 BLAKE2B bb8d50b9e736f5f1e129482bd50f720b7dbe80935fcb6cfbec6d5a5f5ba5d5434476d66a362f12bedc304e89c9886d4868d310710aa100c357900a742d4ee341 SHA512 82b0ed1ceadd44a2871b56e733a118003b1bae9e38fe95251e0aa06a0a4c9b4940c485336fa11335974e0df536dcd0491ec1b2e545ecdddc7f9ce59771f86321
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
@@ -680,13 +699,9 @@ DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.11.zip 227473 BLAKE2B bdeb96bf
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod 136 BLAKE2B 49b2b47ca2cb64a1522a3719c1b46dc6f44d3122d3a05ea475dab88e89336aae3f396082f4de0f89400a0e8db85208446582a226238a701fb92c155a2e85fef8 SHA512 fbbbd57eff765585e67074e5c278d7d3077289c3d13c306147d6c3efb98232ff317ad92464ba768fc3d921b4a09cb3f3ff5c5480c89a01ec821bc86e5dca82f1
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod 136 BLAKE2B 49b2b47ca2cb64a1522a3719c1b46dc6f44d3122d3a05ea475dab88e89336aae3f396082f4de0f89400a0e8db85208446582a226238a701fb92c155a2e85fef8 SHA512 fbbbd57eff765585e67074e5c278d7d3077289c3d13c306147d6c3efb98232ff317ad92464ba768fc3d921b4a09cb3f3ff5c5480c89a01ec821bc86e5dca82f1
-DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.9-0.20191208103036-42f6e295b56f.mod 145 BLAKE2B 8c6ed8a28b2f2fa7e97cfcb545ff7604eeb5802bf301ecfd574c1bd5bbd59172479a55c9f42f42a13a85daeb77e730dcf5cdb78aa9b7c499f3ded0584163d75b SHA512 0d285b677b209f7973ddf036b2f2463aacd060e58db9a0721e85d40d513f8befe3605677dca1040fe9dce006e3d5d3246d876224f05c45757505696122a3153c
-DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.9-0.20191208103036-42f6e295b56f.zip 218463 BLAKE2B 17a2a5d3116ab3240482ea280aa6eb7e374d72a519a918cb792a350376743213cdefc48d88989775ea97933bda903b0df89719ec0d0f4da18814f284e72002ad SHA512 0a7ee9a2ddc97eaa739e0b64b4b287e636484ba98dc285685448d1bb54a536e31acb69b25318f4ca8c767fbddef493d435685808799098be87c9c1169e6dca47
 DIST github.com%2Fprometheus%2Fprometheus%2F@v%2Fv2.5.0+incompatible.mod 40 BLAKE2B 5927978be658cc322b87551a59f5462bcd7456070251d124d784ed592b145f39f95bd064cd031b5dfcd3992b8d65f75c06a941264fb70b55c74915da6af974de SHA512 c638601e225b1ef5a33abb3b252b9ad96db42d04cdbe92db8605ab5b616cd2eea41bac0bddd1ccc77ba43c9a6137b0ba22115bde85fa156a8204389b7dbb7444
 DIST github.com%2Fprometheus%2Fprometheus%2F@v%2Fv2.5.0+incompatible.zip 1301042 BLAKE2B 1b9ddf847de05022e07b68a60e26449a278e51479ae000bf1d08282cbedde23a36d1ce95fe33dbaacba2bc467c1fb02d48c4843576deb5ef543065f5af78ec29 SHA512 1d2941eb7156171079280bbcbfdd7752d21d5ca97648981d5b4ff0535b88b5b2533cddd5f624afc5e18dfad86df7e6922079806860de6eed0187e4ae9f95b017
 DIST github.com%2Frakyll%2Fstatik%2F@v%2Fv0.1.6.mod 32 BLAKE2B fa3ddb522edba85e62f1f7913ef7230f7f4907bc350a0ee1cc570c73954774baa539b6110941697019d13198bc8cc01a7cb833a6235c8588f86351d4c5643943 SHA512 b9df57a2659d47107fd678dc36e262bc4c796c7ddf38cc6887423a645e4feef2f9d7cbf4070e8635114b754df57c3157c6b8734dc1631af02f848e599326f194
-DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod 38 BLAKE2B 091e64943724001796bfb662a26443a681d4db705219a1d7601c350b94105caa1584c62a4befd1aa0c634268867c84bacc79e235d5a8b416f6a8aa8e12192261 SHA512 f22213d29e8a0914fc947e08d8c85dbcab835cd7587e45cf5458a1cff074359fcb187ab47bdfd933c8937e393975a29e872b744ad61295fb1dee3783877e81df
-DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.zip 57982 BLAKE2B 07c3ac2d98a119485695f6b96c4aae0bca36a305cd38e90f40afeae5746fcf0f78c0f389930b28184ab9ed6750746bea8939ffb8d569b0ef3552a3c3c0eada35 SHA512 0502f433987c5a02ae81f156f4b2916b6de0ac2f3e55a2117ccad7ecf94dc25a8bf952fd70bb7d37b82cc8302280c92f70b94606c8c2d125e505669a72e2e7b6
 DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20190826022208-cac0b30c2563.mod 38 BLAKE2B 091e64943724001796bfb662a26443a681d4db705219a1d7601c350b94105caa1584c62a4befd1aa0c634268867c84bacc79e235d5a8b416f6a8aa8e12192261 SHA512 f22213d29e8a0914fc947e08d8c85dbcab835cd7587e45cf5458a1cff074359fcb187ab47bdfd933c8937e393975a29e872b744ad61295fb1dee3783877e81df
 DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20190826022208-cac0b30c2563.zip 58836 BLAKE2B bd86e85253270f67c6e52406532482d6ff8a702fb2f8bb4ccceaa41b3e3854f65c829e225b954275dc176e632112b4ef6ae7c326bf1c40c5ea16f829b2b9c770 SHA512 25f0432ea5260dfb79909b2f522de492b726f1a7d450d5ba90f56d3abd0202b712cbede6acc628eed08d23dd5eb1741724e3920c02b3299a7378eb3df8dccbfc
 DIST github.com%2Freviewdog%2Ferrorformat%2F@v%2Fv0.0.0-20200109134752-8983be9bc7dd.mod 129 BLAKE2B 89da2797324d72bea586d45da407611d9997c997dbd892f18b5cdeaf1cf2d32caa2d566e71a963284feaf1958daa9f0ee7b6598f9d2286a554dd9c3237423f1f SHA512 7dfa7e8953f8e9cda777fcdf81323f5425fc50aa33dc627e63336ea91fcccb1678a28f58507394a49ec1ac2e6b68e94bd72172a8e237a98c6a2217505dc88078
@@ -695,6 +710,7 @@ DIST github.com%2Freviewdog%2Freviewdog%2F@v%2Fv0.9.17.mod 832 BLAKE2B e1e259107
 DIST github.com%2Freviewdog%2Freviewdog%2F@v%2Fv0.9.17.zip 182772 BLAKE2B 691f9d3460a63e047eaa7c1f294205f48dfd3a0ac5cdc3ea66f8b27676ba19c22a886e18f84cb456c637d0edd9896096b069aefc235aaa4d6cba05bd204321f1 SHA512 e5befbc265d7fe9368e5a16a956c293a9a669758e04d06185176f810d65479b6a7981afe9449d505b3abe8153268d02ac9ff4cad72bfebd9cf18e43ded1d09b7
 DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod 45 BLAKE2B 6fe371f17a31bcd132ac67cb50052f6f3874c9f62e2d67f48d52d241026fd21e58ca9abdc15fd53cb949f79e7d40dd0c289af3849da3d4d9ff75b491e8235c10 SHA512 ea2e9a81d7720b4e11129fbdd4772be224b6e1267157c29b9d33813b6f4ae905e43c3840cf1ade6ff5f73bd22c103430a0bc882355c16715e124b442652cd4da
 DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
+DIST github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod 39 BLAKE2B 6d577028361a97eeb7070517fb59bc801499e5b93cb97da563e41b91ab1443583510a259283bd01777ebd435934f27212c15ed32cb5422d6d711697a7c714579 SHA512 d9e6796c9e0a1b870a32c313e22555a090e85919007d50ed4dcbcd3ccbfb90a3ab98e9f3e2d41bd32196e3d5fd57c62e6d47aa65e79efd3d05b7d73ae9bfda7a
 DIST github.com%2Fsamuel%2Fgo-parser%2F@v%2Fv0.0.0-20130731160455-ca8abbf65d0e.mod 35 BLAKE2B 33e37d84ef40609b75cf482bf1621f7a86960123cf4d164761c1a6d72695ea585ace3c1ae6671814275b0d525a09a7ac6aec67cde27331c50a02e21f2e874662 SHA512 b2567672a30edeacd02d0eaa3c81cb11925d81f08f460ca2de87d0a61a2e2b0d2918cebd650968892a6e0d6577bc4eabeb5d8ed57851d2eb41c67eebd24c6226
 DIST github.com%2Fsamuel%2Fgo-parser%2F@v%2Fv0.0.0-20130731160455-ca8abbf65d0e.zip 4339 BLAKE2B 01b0df404ab09d605fb61712123cf6f4d43373b1b19803a51c2ccc8ae3a054d065dad0649ee83dfe21473c46cf9fe99e39c1e35f0b5cbba13cb0549a37dce566 SHA512 264276b6431635d91b04413198b370ccaa5576b779d610b64d3250e6ea9b19b06ce4f5eb08c80fa312fe446334f103cbd8c35984d3efe1d5b17707df089b3df8
 DIST github.com%2Fsamuel%2Fgo-thrift%2F@v%2Fv0.0.0-20140522043831-2187045faa54.mod 35 BLAKE2B 3e8d8faa5b53ea2b126cd13bb5ab290fe59fee52c40f9ca1c57009129e49fbcb7f0a782d25f1237bf5c926fee61b641e9e49fa2b2f980515e9f07cee74c4e2a3 SHA512 20aba56ccf35eaabe5212a3e60120466dfc8b7d97062c4a4da170a18b1243797b8d295b22467008563671946891b26bb638a96a16c151e4221385ac6656aed81
@@ -724,10 +740,18 @@ DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0c
 DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip 81760 BLAKE2B a5767557b0e96fa3bbbace46e08d6a2167be2c203a44ffaadcf14079a23e906ee9197c8028fb29bdfc596d4f39e7bdd29993a1a520c36c8b08c5c5b6bd6bd2cc SHA512 e204307d5a06550292a4fb6e44912260aa5a7f9fcce0883d8abb324a53673512218982b1893e7d563eb7d6313ac98a8638072aaf7b5d66d359e82832f2a8bb2f
 DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
 DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.zip 1529663 BLAKE2B f5bac351e33600e56b635602a487b592e9d54623bffdccdf9c6d9ca8eff7f358c8a1de307c2ed6dcdad5c94b9d569ed7efc3eda22044a2ef8aedfba985d7578a SHA512 e3504b80d856f46158f6997bce909f8fd6345d5177b556ca63b63be5d74a7b108e1dd621483478f20ff03932551132a1a80578f3561819072952fafe81c23993
+DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
+DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
+DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip 9830 BLAKE2B c5d27e8b447082c0a1756354c0a414079fc3b03d0649cee8353490827ff50882a9321b89fdae4e341da1a4718f6db4c4a4c27e937c9bf31111085a449f56f282 SHA512 aff4d1c9bab0fd619496fd6948f05bc88e4147af2fb171c4ce4e44d81c114257abd55f92fee27c4b6d96fde21c6756735c32257de7b00bdb0356509cb4b97374
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod 30 BLAKE2B 9bf213acd16f9456f4a010a7c300a1fb7bf1ab248d1ac9eed7883deae7f9a6f6d0c761127b7b2c84e8dc46e7b0da2eecac9b334fd5a94d2995d56858d345edb9 SHA512 3166c898d741be502c0b733653cdca0e8ac4999fa6a5d67460b3962799287c9176b7f0243f0c0da394a4b7737ed1d1a6a2ee4f84a8917cf7076c774ba9a2a648
 DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod 64 BLAKE2B 51fb4de1e12106663228a747aa9e5fc135104573154f2a33f2a6cd2a927873efeb19bbb6d7a0a74fa1c7050683ba40d176d7c9e2c32b31e71aa43f9284b868b6 SHA512 e091de41de8e320e4eb47a082cc419a6d102791c888646a0482bf4d2b91a9f357455fe59ef0657e043dcd021441d6d78fe89440db3f11d4d516995903e0aa3b1
+DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod 175 BLAKE2B 9077c3a2c65f4025500a3215c440b1b3856e09f1543cad7ca6a37fe5b42d51af01c2032b905c72cce445807bb311ed461c4a5fd4fe680a81ac7a1c0d94759c67 SHA512 7a0a21f6a7564b3261bccc8b1e1cd39d5d1a95bd0dd3debea914b1d37b687fbacdaee5f1dd5f1f74e4da11664c12f7ee63b484d690cd79389423cb79ff38dee9
 DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod 30 BLAKE2B cb72701c052ce4059500f4c6b3d0c4fb336d118865bf1f7f45ce0b0279e1d01b6e58d49f82182c2523681a97bcaa7a70216d63ceeca0ea1d09c1921226f6bc4e SHA512 ea13ed8e166d16a7bcd14a7cde90af1cacc0b05995d1c5ec245fa536208e0cbfffd689dd460d66c0a1ad315f2b0ae9f4b803ed72bcdfd89c4a98a7ed934289c7
 DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod 30 BLAKE2B cb72701c052ce4059500f4c6b3d0c4fb336d118865bf1f7f45ce0b0279e1d01b6e58d49f82182c2523681a97bcaa7a70216d63ceeca0ea1d09c1921226f6bc4e SHA512 ea13ed8e166d16a7bcd14a7cde90af1cacc0b05995d1c5ec245fa536208e0cbfffd689dd460d66c0a1ad315f2b0ae9f4b803ed72bcdfd89c4a98a7ed934289c7
 DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.zip 139997 BLAKE2B c20d7292a69fd548bf0dbd62751dc08a41c66f120bd8b5142e96f498aafd208328ed4888d7ac59404b64dace96bcad210f64734e432f15ae63ce6d39dd308cf4 SHA512 1476716a98d5aa26c34af6d85eb93886cae211beac7cdc8f886d2030bf7f83802409aa56510ba09cbdb609dcd2faf87d3490c4e5392922e0e034edcd3d9fb1bf
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod 310 BLAKE2B 851f2542f28849f4f5c33155e5d9562aa9aa2645f1fb57e6300e2c6e98c39e0728e01a5e26d4a514435245662fccc55b8eca4eb2633a21057a6c4a5d80d24fd4 SHA512 dfde1474aedc5f36508bed07a01fdfd433967d2a6c0acadc6d985ce862da5e1cbec7ced13d55073512afbc2d925e6ad3e3cdee9511ad17b14ea8a159d8adf8e0
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.zip 151788 BLAKE2B 423089b53512bb0c6d09fa259a266d879e2fcc1db85939481475f71df2dd91db5794e4492ebdf61cc6f694501d94cfe8e761f986f857f62e328e596413403304 SHA512 cf0a047c617e014bfcd50dbdf466431efba7d32186027dcd714e0a63a483d4abbbba00716265309f10477f7739406fd3710fa137a4dd6fad4a9d3c4ff84c991e
+DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod 42 BLAKE2B 1f0af0f4518708edd09c0f02aec6103960b023a6bc178181276c54cd86b653e8bd1ddd60c5d49fa75a85f1fa0d18f670a9c2ead381da7c4f2d5e611b24f51ca9 SHA512 748b5648bf8bec4d1efe13f4dc37608e7378acc2a7d954e9d3b649a4b170a1e2d1c61338f6bee8d9007ad75a5bde87487612b47a692d6f966bca56490dcb834d
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
@@ -735,11 +759,10 @@ DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf8009
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip 74638 BLAKE2B 0e9d2a40aa6e68cae69ae24f76385e840e0b53b2a4afcf89ac5ea61ee144462c113dde938c5de728c8e54e7e46dc099786ce85020bdd60859e1ac04393556246 SHA512 c33aa1ac5cf2a8441bc849a49b65a614de6c9e0c5d37a77f0b6972bdd8f25a651752743b1172e0a83fdbb384aa7e8b0685af5c5dad1bc128310c60e13cc9b56d
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod 39 BLAKE2B c9d700f96874e0a3977c2ffc7fd321acfffd8081aaa70ca50421ca55253fbe0636d48eca8f7093df202861f0a5f908fa00303533232c83c78bdba84e2973bba7 SHA512 8071c316d33aff1d8ffcabaeb42e8f9320465d83600cb57ac5ef071569f948d5cfd69e1bd2e92855c061395c1b814e84d1705f42e37f00d5bc713b6e724f29f5
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip 88931 BLAKE2B 7adcdaa60d4a3fd99b0f3e7e6888178b0a8d141ebcc0166b12df4bd4566500929bc792c391d33201b1ce215b6ca8ebb578cfcabb027ba453a54986270f5e37a1 SHA512 9a81f0635ca8ac059c48a15cbf625a7c91513f95a9b402ba166d48ab72d5d38cbd941d5309446f5637bd7c23eef35b60fef2f06e8b557f415dd8409a6ddf43e9
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod 986 BLAKE2B 4f2c5d920b08d5802df635316a6ca72ab3346dcd2b0ec76bc9657c265eebc68ef7c8036c1993595bcdb416ea9ef0e7ea338162a7c6854c98db3a16b035c310ca SHA512 2195ba8e28e21deb5d4f78a9319e568ea5e81fb7a257292ec12d0aeaba84d1898e8d0cb51355f87d7093c3c0501cfa1f93f2e520e40edc4995260d7977fe306f
 DIST github.com%2Fsrc-d%2Fgcfg%2F@v%2Fv1.4.0.mod 29 BLAKE2B b5d4003e44ee3e61a72146f100f7d669aac7047b096fdaf549194cde409e0ca927af590140e4344f57e77e2db5aa16e92055e3ef2edcb73c8616ddb0edf6c62c SHA512 59c1f5827727d54b89814acef7026a976343019b58d7c673b853382e661b72231e04e251c60377f8bfbaab0bd6768cb8144dc18f1fb207b6fbfd3d5534dea160
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
-DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.2-0.20180702103455-b8b73a35e983.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
-DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.2-0.20180702103455-b8b73a35e983.zip 43759 BLAKE2B e8e94e38cabf87136a09e900563fbf3bc35563788df16aaf34092ff94fa6f9e046a7f19dbf1d224970239ae7293c824b480569b6629446e0bccd5edc7a53639e SHA512 3f3aefa8b21ac5403b6fe6e142253383c4657bee4b57c98ec2b7a6bdf922244450a97ef0353ac60cad9ada75b612c3e135d76c3235246eaa87f30359a225c878
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod 137 BLAKE2B 47195334e42f0997d96b50b8364764426301d31cc7fbc289b89b173b877d54cc67133b07d4a21e6ecdfa2e4404a9cff32f06b53cfa9493e075ee2ff2cc46e605 SHA512 02d0b2b1df84750ad3d15f4b86b3f7989a22007e27b28e7b3a4d34b26ec7ccbaa5d48ac0032ad692bf7db150e101cabdc050b0aa1697cfb20f922c88b9f086b8
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip 42547 BLAKE2B af3f81b3947f0802a6542c60db0248aebac9521d75d0d991f76b5783f4eeb42f7902250cd22da1b8fcfc2f150342ffff53260276b7a6903c092febbe66f40ace SHA512 b21cdcb8683760280e515ae487e17b65b324b51dbdb36c6380ec0b272699297d388a34b1a6aac281b1aa149d85ca81640850e1fa0d84bf63f3dc67b794baa249
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
@@ -747,7 +770,6 @@ DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.1.5-0.20170601210322-f6abca593680
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip 90474 BLAKE2B 2f79f0cac2c15acaeae764aeb640534f58ec2ae86fe88a82533498e718cf37d67c563606090ad39b38e22ffca1e63a25cd881d6a472b862ddaf150c7d329b16a SHA512 a047ba8d5f529d459fb6ae8dd39367e6f6cd2e785e90f54a5f8759ff76e4cfff990f1b8c1e0cf49c67b97ca8de36ecf8fdeb3b8f16e579aeae2d563d38da69db
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.zip 92066 BLAKE2B bc321a8dde64189df65fef0a931a54a1c8dce62de17b011149c1f78a3db2c6bc50e0694c4dac2bb77291dda45fdaaca68901f5a6a584cf8b78117231c2a417ae SHA512 f40c1d8fc0c0edd78abec113f71601ccbc6a320e7eceb9ded2e6a047a05c9ad54bfdd7aea3f476fb10983b92e5d0fdf3cc716b93ad5a93793f40dc3d830c8d28
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
@@ -761,6 +783,11 @@ DIST github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20190320122513-dd3d0e41124a.mod 3
 DIST github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20190320122513-dd3d0e41124a.zip 665575 BLAKE2B dbc70781128df28ae9ac6b49f9994a0835a645df593233f7dc4e6cb8be23fe055cd7f1e1466c3a2568d311ffb851ccdac63f81b6e68db8f9a9462cbd2c67a99e SHA512 8f4fea74a9b399a1eb923ed7e724381e47b529ca1c6c041143a8f3f22936ff6f80bd7e15b29c85013da37c5add084ad3af687454e92bf492047c3f4e7dcd1660
 DIST github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20200626092518-2ab8e397a786.mod 31 BLAKE2B f0a3620501ae28c986a7b1bb5ac6726a807f9b4173129036b72f1a44290fa6e5d59fc66d61d9fa554a4227a91c4d001733d341a7b2165b03a67e528c3b4af822 SHA512 ff7217008312f36684c8c655ea39e67d4efbaf44edbd73d15551649a3647a543fe4f493312c32f0e8f8a3ae9e23b3c9c0820767fa518e3a9dc2aa0cdd5930bbc
 DIST github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20200626092518-2ab8e397a786.zip 665575 BLAKE2B 179c2f83888ca4f78103c151e527ff612fb0eb2ca0f5228db2cf0e93ba22374957f4bbad118f6917e2f1523de91c0f88429bd564c2112382d7a21ac1ec1b4afb SHA512 bae9fe03f2daf5b2ac1739967c4c298b5b638b23b9659b4acaa7c26673e091b780e9556f692c248a04f9a58befbb84343813f9d7544acb592cc8373427676961
+DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.8.mod 80 BLAKE2B 239ac891c92ef39240c17f3dbbfcaa7ae9683bdff05e8d67dde1e30597a131267a3d0589f7d2b52085f3947a59ae52a5252f3ee4305235f8d2665ee330cd7171 SHA512 84479e92ffb75572e88de028a7b8d990f0ba3de43c4aba03040a2518b35466684ddd60ecf5175835a113078c9640663b77e131ae9dbded5aec78f7799176d823
+DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.8.zip 8143 BLAKE2B bf74a5fd269af42fc3dacea4c999861993e22d5aeeccea442c1c142a6faa8f94492a60ce083e946d49308842c3797276dcb651ed0697fc582261ceb5cdd6a9ca SHA512 0590a985cf7f3b69fa213452d2bfc982c28918789efb58fb984af732edddfa3cb992222a5164ae88cc48d0f64648f41ae7a55afaf488d979c1cff238ee3b851a
+DIST github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod 35 BLAKE2B 159fcdee33f554db7f7bfc834a6478865e93a6258876dbb3ae755eb474786149f109ad8823484f1d72a8fe4012f24041c994e4d19ce7e684a84f85025803ffc1 SHA512 633ff61cb8fc7260fc5bd11d9bf59e9a758a3db457a9780701686b9b942b6aaabf102c7342f97d2beeeed247507f383253bc396b26581f7726538149ea4203c0
+DIST github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv1.1.8.mod 80 BLAKE2B 7beba8e666585a6dad81f461e24298b8087087429a2112be586d51d774f8f21e7d965394869383a93ed510316f83f83db6547937a9095db8c73f2c0020e22590 SHA512 541cc5adf1c71c2d92b505199fd94d13a7ee4fa4c2158bf562ab7e5249c1c1073444682d71a25f13c19a3835b970a8a525218d53623eb950c2389efa7e69c8e1
+DIST github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv1.1.8.zip 314745 BLAKE2B 9e411504eff25262762069d8e2547e848d11c8daffc19a76cd1b92136cc6b8ca4f2d4ceedcabdb968c779005e83f6d89d5f40a075e22b8fd113c098e19757ba0 SHA512 24121e64d81cb3b5a265df493a6abc157bfd75410c46d6adbfc320b929d9f6ac545568db7aff32247bf7dfc39661c984abf7cd23ad64badc4e7ff9c6b141ca3f
 DIST github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.mod 29 BLAKE2B 4f20ac8fb7beef2b678cff290a28c8125d368504aebfcde33e746d3ca7b9606804bd94c59c50fe328da4c1c592b8768b1aad89bc1d22ddf76cbc88d0f0f76b74 SHA512 5edcf2aac39658fc7e60d5086b066470c6d6213b66a2432bc35c6f67b8cb37a66a67fd97cdd4b8fa1b8b1bddfd544e4aa9838cec06806b89f8e1447e3c61bd2a
 DIST github.com%2Furso%2Fdiag%2F@v%2Fv0.0.0-20200125202105-ffdc32ff5518.mod 78 BLAKE2B c50261cc483c6bd82c7a8641696349b4d490c01ef2481aa0c3b5788f9b1c64ecb0c6d75af90ed99dd6e0f2f7946866c81a35731d73224218d5a8057e75864c52 SHA512 66523469a357b8bb9d8b0cda3eedfd0701cf20936974f0a4078fccf2c1eae97eebc77f591a71a2c808ddc5b265500ea77927debb1f74ffe5966eb67c98efee8d
 DIST github.com%2Furso%2Fdiag%2F@v%2Fv0.0.0-20200210123136-21b3cc8eb797.mod 78 BLAKE2B c50261cc483c6bd82c7a8641696349b4d490c01ef2481aa0c3b5788f9b1c64ecb0c6d75af90ed99dd6e0f2f7946866c81a35731d73224218d5a8057e75864c52 SHA512 66523469a357b8bb9d8b0cda3eedfd0701cf20936974f0a4078fccf2c1eae97eebc77f591a71a2c808ddc5b265500ea77927debb1f74ffe5966eb67c98efee8d
@@ -773,8 +800,6 @@ DIST github.com%2Furso%2Fgo-bin%2F@v%2Fv0.0.0-20180220135811-781c575c9f0e.mod 30
 DIST github.com%2Furso%2Fgo-bin%2F@v%2Fv0.0.0-20180220135811-781c575c9f0e.zip 11941 BLAKE2B f64e153f3c62f9220f422f1b2e72b4eb77a3dcc009a99a93a2e985bdb8f134d298db36377b05e263ba8e059bbe0aaa9ee6e0ee0a54914f578d2a5ee76ddfeb3d SHA512 b6301d0eb0b0ec015068c9dbf2106109fb258c22010ef71db09bcbc84467fbec83363c3bfa369801f730da74a7779978a86834361d89e4fcee67db7853abfa97
 DIST github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20190919040553-290c89e0c230.mod 33 BLAKE2B aae9bb38eb370b22426bafe483e842d67975bc186f2f040df14d7b8778d0e0d972d8bc084a25e70826cfc4604eec043e26f4add6273db90c6d7ca8b956f9b71b SHA512 8ea785e6ca06a6751f2598f434303a54fb9219f66a824bba4552e67ffcef12e94ad0527c24f762169a33dd627a55110a087e1e54adfef512c1e5909cde28aceb
 DIST github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20190919040553-290c89e0c230.zip 12709 BLAKE2B 871db29f8e8319f5f06ee2846b0c3a3c052e727d4a023f9c094e276f7ddb3b75f9bf0c350008e12211e94fb5e230afa0f0faaa84c2e513fbb26ae2e6254fa92e SHA512 8ebbfa53cbc43de5dcf799e74e7ba57c8bf1d832ce9b085ddb051b12977c54c3f4ecf5acd894189e069d8fb920ba89e6acab4883f0a248cd51be8cba549545b9
-DIST github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20200106130147-61080ed7b22b.mod 33 BLAKE2B aae9bb38eb370b22426bafe483e842d67975bc186f2f040df14d7b8778d0e0d972d8bc084a25e70826cfc4604eec043e26f4add6273db90c6d7ca8b956f9b71b SHA512 8ea785e6ca06a6751f2598f434303a54fb9219f66a824bba4552e67ffcef12e94ad0527c24f762169a33dd627a55110a087e1e54adfef512c1e5909cde28aceb
-DIST github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20200106130147-61080ed7b22b.zip 16854 BLAKE2B c6c1ed2cc68e8ffb484b4b456b899e4f2135c8307396cb631cf5adadf0dfc8edfbcf90f8cd396e7e7087b7c82ef101afb23f67dcb2d15c6b2977d579add95459 SHA512 b9abcec3ed8b8fd669dda8b3382d18ef37f576b665d8fe1dc4b43922518223d3246c7affda5b28474b6a6577dcf1083211de50b049a7eab7d61e2b2d21005fab
 DIST github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20200125210132-c2e338f92f3a.mod 42 BLAKE2B 6c481463839f4b6f1e2d162413609f23091c4adb531bfba5eeed80b1c604fa3cc514c097abb72e7ea36a7a07f94fe22909f03fd1420ebe0197d7af7d6f9ee87f SHA512 4ef4c98060e06cde13e9efcd7aeeb47b03960850075f68f2e7d6f9d251f35ac783303a0ece1b8639e254d8c17a6d17a5652c5d5ae4d549be02c32d0eb884473c
 DIST github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20200125210132-c2e338f92f3a.zip 17736 BLAKE2B 2c358e3baa5bca3ea87e8db6574f4b8a907dde49d46e8fdb2860c834a165ba96f41e714b0b7bd430ba6dfe0502b0213029cd5c38b0b8b374c6fd2f0c2821966a SHA512 7511306054669300a1206af2cc6772d9c0258cd098274e540da274251c99f40225ab7c38b0d4d959e60bde6adc29608603f01f93e9edf71a21d891eac8c0fbe7
 DIST github.com%2Furso%2Fqcgen%2F@v%2Fv0.0.0-20180131103024-0b059e7db4f4.mod 29 BLAKE2B 3edbe2c6139af3cab6c0ac32b935764c9442e84ce2c6861d4908741c2c060bc95292c7d24ef0c439397cc23ccc4817214dd802366aafd6941d9e8c9bb6470aae SHA512 406ab8978f9f53c5c35aedb7416a9dda857aec33d3e7ddad167528efba35034c7eedc235a18b533649a2544fd0d5410a6feb03223cd2be32c8bf3ba84c808708
@@ -799,59 +824,57 @@ DIST github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7b
 DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.mod 39 BLAKE2B 4a9a7321d9c10929abaf038e336248709fcfcde17c0ec9ec8e96407a9e12910b84e7008a7a847f533bd8695b56a8e35313d5771931d2fb1dfddd74ff59b58d5b SHA512 8ee8fb19b40e1366446a91a48a495fa96e4626f594903b7d4a53355069043c5a2958612dd0bf0f8b0a01a4fadf9dd92d0b9dfafbd10ab9c8ee6e3bcaa01853d2
 DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20181112162635-ac52e6811b56.mod 39 BLAKE2B 4a9a7321d9c10929abaf038e336248709fcfcde17c0ec9ec8e96407a9e12910b84e7008a7a847f533bd8695b56a8e35313d5771931d2fb1dfddd74ff59b58d5b SHA512 8ee8fb19b40e1366446a91a48a495fa96e4626f594903b7d4a53355069043c5a2958612dd0bf0f8b0a01a4fadf9dd92d0b9dfafbd10ab9c8ee6e3bcaa01853d2
 DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20181112162635-ac52e6811b56.zip 139320 BLAKE2B 0f152a17ee3790bc11d4e4344d16406c494cf9fa563ca4a38a5d5ed6e9b6d0ce0cb95ecf5b13b5acbecae8604d6578265ec276b4d430aa7d25c0b0de496f979d SHA512 53b6fef3e9fc66824a6a6a4a1e66b803052a80b8c1127abcda8d27ba264cf8477035ffbf8b84d0433c697a3f683ae7c1fac64c5326d978de78395822714bdb47
+DIST github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod 40 BLAKE2B 844d63d9c10c55eb74504d88d5e6e85641f2c4bdbbc9b4f6728cd6b1e750d1eb333e91b6eadac635a80abf328c9423fa106b18337e89dc592876cd3f04a803e2 SHA512 daffe8f4148becee3a32c90ad21454cd48255409f3edff8681ea2074623c8aa02cbb4620b7ba52aabe4ac3c24a5f256b56fd71de1da45dcd7e4e8376699a422a
 DIST github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20170403160031-b402f3114ec7.mod 34 BLAKE2B 58672703644ac6739cc829047dc75265ef7c6c4ab2783595819e7f1c4edee8a4ca4b6820f5734dc387882b780dab7f786e03291af2edce3e1bf839dad060c22f SHA512 a93071d377a3b10b4220e71d7ad8bbcae0c55746f11f44f59deec7bc4216e19e4ceb375ee2c0d3ec8ae7f9e78be1a4b93eae6ecb6668936783c778ade75d6cc7
 DIST github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20170403160031-b402f3114ec7.zip 182857 BLAKE2B 1f21c2074fb23a68e95cb4f4f6ed29760fceaf5b6333309ed83fc75ee29728fb388ebce43766c2ed4ad1b7cab83473f2369387b6963b0afbc1fccfe9a8d5479c SHA512 bb421f5858d73f3ac01df87418004575bfc64ee643a935ca44699ee1fd3b9a51f199896ef1a2c5afff52384385f9c0abc2b3d8f8a0f8ca591d255f5e10f03a4a
 DIST go.elastic.co%2Fapm%2F@v%2Fv1.7.2.mod 478 BLAKE2B 5f009a9e870f64c57c52e4e4ac40ca7ee95382fab969e6316f84c5de6bc48629edda4e588727b928399020028a687563fb4f69f6ac6222c20b97e60d34280e56 SHA512 fde518d1bc6c7f675decdf4f2421bb41e3d285269c611a774596e3c222666b0e7f4b2f7f1af39045c1665dfa0b9f4ec90a5e41b609ec8b69e2d7cead874aaa32
 DIST go.elastic.co%2Fapm%2F@v%2Fv1.7.2.zip 332338 BLAKE2B bcf39cd63231e14048fcb16ff54c1b1d8253982010a52b4112e3cbfbf9365dc16af5147c841462fa99eb58f93c4599d327c5f79442668342590e8d67d26911ab SHA512 ccf598af44dd7704f741b04d704ecb48ee0689ef4de8552eb6ae3060cc75fa65a42de6e054c3726e4e52b5b960dc4da374d4810146b3a6190e3c25c9ec828145
+DIST go.elastic.co%2Fapm%2F@v%2Fv1.8.1-0.20200909061013-2aef45b9cf4b.mod 478 BLAKE2B a1a8481977b8a647fc0f0e62e5deeda3e952c1f6a9e04ab42f39f5c299e79c11fce774518f92889c18987d3c6a671017f45a56201255f8fc842dc49705a8db93 SHA512 c192935ae0adebfbf29a0fd9c525ba4fc99cc02c93f2bbe5b67744529f1ac61f881eada89a8b246d65d180e22adf14c9e8546108df0868662f6857d0ba7d6ae9
+DIST go.elastic.co%2Fapm%2F@v%2Fv1.8.1-0.20200909061013-2aef45b9cf4b.zip 356468 BLAKE2B cd94e8f9fe74b5cbb2a56e703447b3a146a2ac8ca78155a207a12fb1d550dec41746e1a5de298b9bfa5fc5710cc6f3d5d36367c63eafde1c9bf1e65ca9d44620 SHA512 177976d554a2586502393d6e375974f1f9f15d6688a10351800e36817145936cbd6ed9427ceee5ca246f12a500d03e7327927c8bc39f972fc5c2851452e94fc1
 DIST go.elastic.co%2Fapm%2Fmodule%2Fapmelasticsearch%2F@v%2Fv1.7.2.mod 319 BLAKE2B 8bdfeba2da6858dcedd306fcd21c68a68589d44da930b6f0a85a4de39c913838e5e24115a8778e9851361299ed1afe0f61fba9c3f21b7bd2430c131f4c4a72c5 SHA512 f03ce02f3e178d30f5e890c62e647bbe0788e1e42d09489664d5321513c3ea28f09fe99d2f51a1557c06b9aa446fc120eaa8fa3779309be6d4216b6be0cf39df
 DIST go.elastic.co%2Fapm%2Fmodule%2Fapmelasticsearch%2F@v%2Fv1.7.2.zip 16390 BLAKE2B eb63085475105fb3c2749a1e90ed84f8bea36b8859cb7f0155b1d267867d950bbca7d45043ed11610d43b733f895203ed26393bce34d935184741ee4fe3e8164 SHA512 d72b3b404ad475b8e7c0ee59397bb631bf10e7d41262158dc19a33806b84d914fd4763c55e49d251d7341ee73d6332fc912359b9608f4114fde54c804f020f11
 DIST go.elastic.co%2Fapm%2Fmodule%2Fapmhttp%2F@v%2Fv1.7.2.mod 281 BLAKE2B 69b39708dbc3ba646836e44bdc85ef6d867663c97efb3e4a965678dc746fdc84d5bec5bb9fc809a28e340034a9d5a7bc34ca41c47ef7e37c2c061bc6ed0f9c3a SHA512 b23e7e60140bd80d6c46c744120a27d35189fc6ba97365a0d2bf827386390bdeba3e82b16e5d94fa824ddf0a21c329bbc2a113587ac253c27dcd26a816b6c24d
 DIST go.elastic.co%2Fapm%2Fmodule%2Fapmhttp%2F@v%2Fv1.7.2.zip 38649 BLAKE2B b6c9200c6f4dd65324bc7441b82212c8ea182ed0a7d36aa748cbbc790e7d755d4a286026c65e33a994d1a52f2e64556bc51a8f14f3963d6575429aa9f3a4dca1 SHA512 ad10ec85cc845d3b09ae7ebcebf6156ef302c9470371444f9311c53db0c93a08050a2da2374672853c109b2dbf7922412a349d2869aaa9cb309b7f60a0560bed
 DIST go.elastic.co%2Fecszap%2F@v%2Fv0.1.1-0.20200424093508-cdd95a104193.mod 174 BLAKE2B 738d91b9cf4b7a927f67f24a52b5dd181e483fd8e71bd04add082e776a6ea3b4929925c30c865cdb4d553eb4e50d796f4e2a9581ed2959a5eec5982df5f101de SHA512 4ee49236e3bb1354ff8a09235d9bf75bcfdc53a4b1bd95fc4cb17ef327aab083815920ad84b2c03cd563ef24449f3433e9d8c0ca5abd53e66a90951c27be26f2
 DIST go.elastic.co%2Fecszap%2F@v%2Fv0.1.1-0.20200424093508-cdd95a104193.zip 32631 BLAKE2B 55921402d674a684117290a4fea2921a10d8f7624bd0c6c451921139411ee2d0e57b920e39955868457a0d3f46dc94e289d0feaaa598d0a34665380dbebe1720 SHA512 9ca1324dfa639d6d58f772468edbc338d9a8d193240b89abb43e5891cd6ba226d0a74cca2bdd5f81cc9e47d4c0fa8dd6cc8d67f6dcd3c21b5dfd1c6b26fb7454
+DIST go.elastic.co%2Fecszap%2F@v%2Fv0.3.0.mod 174 BLAKE2B 738d91b9cf4b7a927f67f24a52b5dd181e483fd8e71bd04add082e776a6ea3b4929925c30c865cdb4d553eb4e50d796f4e2a9581ed2959a5eec5982df5f101de SHA512 4ee49236e3bb1354ff8a09235d9bf75bcfdc53a4b1bd95fc4cb17ef327aab083815920ad84b2c03cd563ef24449f3433e9d8c0ca5abd53e66a90951c27be26f2
+DIST go.elastic.co%2Fecszap%2F@v%2Fv0.3.0.zip 31250 BLAKE2B 8d5e7acf1d11d5a55ffbe5979f54858fe8a764cddead05f1e9e70cfa89619ba5bb6e957f37edc3254be608b5da61a16693f00026daf113adf9bfcfc397949f0b SHA512 d4726e1dd32104d07748fa9075bc65e388d9de08e88a7376601303d8cab86051388fca13f7c9aa9af0fccec0421b176b6bf58e7bd66b466458a9dd13e6dc97ca
 DIST go.elastic.co%2Ffastjson%2F@v%2Fv1.0.0.mod 68 BLAKE2B 38761b0b1593550d253ccb0876a8a5d2be2e71ac0ee33a9e4183d95044f57cd4404ee1cbb3f9aa995ff37d949c6ba8e8ce8708b398a79514ad3256da64e3ab2e SHA512 c15374592dc4ec4f13699ce4fcbbdd96ad6dc40d2c6be32d7dc244d04848d2db8305db96ef5fb0be6f2708778ab4da4557cb973720d9010dd8a276372fa8c981
 DIST go.elastic.co%2Ffastjson%2F@v%2Fv1.0.0.zip 13266 BLAKE2B 74f1d3b40705a460d08738d5bff9400540d637a05131e5864b4b0bc2f6bf377258dc8c412d2bd831465c55545fee2fd471ed85c2938cb80ae18b4e9958307765 SHA512 c549aab7779c5637002b7108983e9a63eccea277617f6186edeb3b3de9f4eebe3f32092d7ae008bf8897fa905348ff739e81854b73423595b06229f2a9dd16f1
+DIST go.elastic.co%2Ffastjson%2F@v%2Fv1.1.0.mod 137 BLAKE2B 7122047ee2ef3e3c3f06a710d24fdaea1ef3adf1e59c32d8b428ad69aeeef75d0dc0415d0762e3a245f046256a2bf8aa25e81160e9949d07214302b059c9a800 SHA512 6801ac1f4481482ad93f7ebd56a2fa094991323bbdfb7141d28a7c7027aaf4109c083b17b4b7fdda48d826f76d479cc5b4b75774d75d19ee6082681a725baf77
+DIST go.elastic.co%2Ffastjson%2F@v%2Fv1.1.0.zip 14077 BLAKE2B 33aa59e99ab1943bb688616033ffa928cd8e85cb35900d44c83b6c3c8547dc4daa1988511dddf41665a895bb101a7fe51f2236afae82afb153058c0c551aa512 SHA512 dd77f9cff3e5abc5139be6593702be71dafd8b45ba530e2d2696abc5faadbd5b105d1eb067b181d2bdde7668eab87e1997bcd44e3ad48fac61142a55da7a47d1
 DIST go.elastic.co%2Fgo-licence-detector%2F@v%2Fv0.4.0.mod 457 BLAKE2B 2d5cba129a8cf0ee454057069e5891cbe0c1db871758676632826c3e39684598427ae76ab503489fdecc4faa92d852adf251e7469bd8da5a7699fe10e1a283ae SHA512 32c9420c08c1e1759d84f2971631cf2748eef9c197522b47f88479dc5c6c72182a3697b71a4d78d701967e62a11d60f89c41fde9ff9b308418b5e99968553d88
 DIST go.elastic.co%2Fgo-licence-detector%2F@v%2Fv0.4.0.zip 11074271 BLAKE2B 895285abcbf08541a52e7b22faff6202402e7f4bb2ca0b31fcc824319a1029cf5ab72a2a07f2f6410de66f1254fc2f6da49d055a253ae4e084a4933628379b25 SHA512 199c9aa32be6a9c383317fb0384453619d16ab97c31bfb4192676911a1c7994f1477e3604801599b6457b82ffab8ea4a73a8f0c806d15d60e4f5db0be4d72406
 DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.4.mod 94 BLAKE2B 5014c2a8459f1f01661c7cac0a7d2ad7de372b3e2916d56d721fd454e459fc75d5b4f6249a73dc54b46b91df00b1ef5c3d47d099fa28429a6967427ec7bfb36a SHA512 d3cfb7a75e321d2a6fc145b727dea76002189ae2caa8dd3162e5e6903a1acbe5bd55be81d7f112c71b47e61351534ff991be30993632be9c9d7443111600fe39
 DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.4.zip 114084 BLAKE2B c47607a89d8fa027633c72c3d1527eb1ef4941436a4f809188a927185f4cd549ea3c7a1eebd277a8074e0f90da4103523f6bbb6cf2a8ebeb976212d664cadb41 SHA512 089d2ec9a7ef9342e654b97571cac4605c13c828c1e023565191cf3bcd09e830d756419aefdfa7aba61ef8dce3768ddd594b8c50845a732e389d5cd3276e12ab
 DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d739412c3396e0df8627a6adbe810ac560998e4cf2eda12e449b6e336dd6b433eaf57c885b4a927359d0bc1bd6eba9432bb0793c35d SHA512 448e90223b8d67e4d5e4b150055ac83eacf9ef48aa34036c2e59559f21443f796e721df3c0395a829bf5d10d229cdc7beb956c8f90273e50f0989e45a82aace8
 DIST go.opencensus.io%2F@v%2Fv0.22.0.mod 408 BLAKE2B c96dc637d392594cdf710b9542b90504fb090392662ab45208d45abe2cbaac5b64e55f2f62d1afe5542d2747abef1eedfcff97cfc48d6e0649c23b9b8293f7e5 SHA512 823e1ca3a9adedb1a98f5ac900e190bd51480686872bd901cc20a394cf03be6c8fd69cfe7343e42cb6f9d3500282a8097b6c32376aeb3e92bf0b1ce3e75872d1
-DIST go.opencensus.io%2F@v%2Fv0.22.0.zip 291484 BLAKE2B ca3bfc9c9864a2218ec373d78792ba0a40f4e2522bf3e0acd01b153eee43083cf8b124ae19b5fb0eaf7eef7cd59b2733b6c3ad847761518eeff2b183780c79cf SHA512 4fe718c3dd4c7bc0914b32844ae86ce281721f98b05797fb0a0fb51245129dfe1a74d2d04b419f4e0b7a31409b874e0e9d7939c8426af1efd92fdd5f12a52a98
 DIST go.opencensus.io%2F@v%2Fv0.22.2.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
 DIST go.opencensus.io%2F@v%2Fv0.22.2.zip 296264 BLAKE2B 0b0e20eb2f10b81748d55b843f8489ffb8147a8b17c063cb21fe505fcdb46feb9cc0830f3b3a91ea7034b1e7ba78df27b0b235b8500b8c1ade19f6837366aaa1 SHA512 c98a43e1bfc9f4bd1e54847dfd6b07e9af14efdbcd8d61b70c9f9701541ee2405f800b1e33cf115615a43030accb735a1235e2b7d81f54efd127e2fe5c992326
-DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.1.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
-DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.1.zip 14706 BLAKE2B d310973614a50f94f92344ea10e1bd50e29be5ef90f78a0b03fde6c962df670de8ad56968fca2aab816004906cfb8cc2aa73fa8dac508c8233e5f2c78ea1e701 SHA512 21f4182cd0872e15396ed08dcd7bd3307c2da40c6ac51be0a5e73571776487edf3b611be20ed6a1f745b7197f73a5d0517f34ede098f42f6db24cba8aac322e0
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod 252 BLAKE2B d5019d6264ec35aa5c7c85d6c42130027213590c6dca568099f9c3b7c02fea9abdc969dccdc2d8d3f8abd0ce4c95727ec3f6f8dfbd2d4c1c75d4462e356181ac SHA512 15aae0e0950c9812700ba4bab0a19050c30398511df8e29fcfe496927fae3aa228761a796f150dd766377e5768beed842f06ece285e8b0e094a59288e1b86e23
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.5.0.zip 18762 BLAKE2B a472638d7d9fa9cf5fa1ad2bf968c1eef4b2b3e8bb6fb53066a85a7139fc8621954ff21ae09aae6887803621dabfbf00069deccb9c208e39776052d13a9f0a6c SHA512 73bff83189e7a98b144cc407d4cb267277e68f00827f86d24d9b5586fff66691b6566ad2fce11525b11a5bc3b8f0ade753ea996c7468ea5bfbae682aabb2db95
 DIST go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.mod 312 BLAKE2B 16bf4900b2afadc331814e16a34fa8cae0cfdc78c7ea9704312f121e166c93b7811db3604f6c167fc526faefdd1eb0ffca1dd09581094bfea4847fe0f62ecd91 SHA512 8814a6b8138027c366f3ebeea9033a71019990faf1cb613d75a25498a3a74d61fa2ba662302254150370a49a2a6f56da5c54889d4465117cf8afed4ec6cd9f63
 DIST go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.zip 24023 BLAKE2B 4e847da3c0de521f65e74beb03b24f9f3707abf1ccc6740b18e9109a28dd0300effc7ec181546b5cae7a8fdd5e5358b753d69e0a17ce5f18151e6e2c6c930ff9 SHA512 d8bb8553e96f2c7e4feb404db453a35c1ad42590f36a6e294f238282c8c02bbae2e8f524767341ac20ca6d864b58c46572c3e2236c24cb8d10c710528f18161e
-DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.1-0.20170829224307-fb7d312c2c04.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
-DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.1-0.20170829224307-fb7d312c2c04.zip 15327 BLAKE2B 539eb4089f20b1764b62d01e4162eae8c70b05b3072b6bc95c888152f1d7f2fd7d5539856cffa9f00b27b2e2e992ff44b23d01fa03174968e1c94108f17d9137 SHA512 e9a0808e740203e81eaddf9345b42267b8a61d995efac06739b5919a14338919a2b784f9ae45e1cfde84b3b0fe1467630f8dd4439ef60445f15a6a5e4d0467d3
 DIST go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod 324 BLAKE2B 48b4bfac55f83ef9b78680d5354431cb8fa66139bb3e2f81dfb2861c8c2bd0731572372178c8499f8de7f3e7bd8d34f23f5b51935214eb008d52cda1e80953ce SHA512 9060d8bf8fd7a14d2a32656b1e086de1b3ec5658041ea0127fb2f68570c01059854137ce213d5ed648673c6f1843ae467facf647a4c7cd6ff44165eab575d30d
 DIST go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.zip 19365 BLAKE2B 7d71e90b68a4d6dd2412108b9484f782209f0c0a9531d1158fee4a9e9c377769ac1734a1254f762e055cbbe342ea9c053bd038826a11e327ed7e13a53de18da5 SHA512 6260dbe2a98d9c74cea2648187ce28280acbbb361a93ba75a8c53755c6521cb929ec05ae93046b3515a194133894111fb0717e9d04e00b1711c2520a62d8759d
 DIST go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod 25 BLAKE2B 233f108e33b587684ea189f873a869f028f02d9fee0eea04183b8d5baa445c5f76bbe2b497f5cae24dbe1745d8b26d35f302b23d8b11b95bb7c62f54416548ad SHA512 0ee649ad9b6a2d478469ece9e6ad9b51fa00f002f7a4966068892cdae278680403637897d83a0a423effcb8bddce1d2f9316774cb5890609f6085b906394909f
 DIST go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.zip 27032 BLAKE2B 58b337663e7a5625521925deadcd0d686ccbaa7d04925852bee0ff1cf3ada22c078e9715930dd20858b16bf51632a4e4d7e76986b0092107bc07ad46d132840c SHA512 b0f1b10667e0e600a4ebca7b4cd9983a27c3ec5f2c54cd46eb055cc0a07504642bea7ccfd0e0f6e3d007422633506efe863817b7c7bc9d18eec3642c84b28f8c
 DIST go.uber.org%2Fzap%2F@v%2Fv1.14.0.mod 221 BLAKE2B 586c82887d6cf6582837fb495a46030e1c582b58305fc70c7b88a29e570610e693a298fa7d4eac80bc86231c7fe6f6e27d3fdb5afe084363eb918692a1ccbc59 SHA512 2a7413f6f83e66456c340536502d855772e6de433ca4be1a9cd1572caf5fba7cafc7d377ef529324b5bd8af97830c9eae75768f7c45d4676b455e3959acc82c1
 DIST go.uber.org%2Fzap%2F@v%2Fv1.14.0.zip 223137 BLAKE2B 55b880703f2b061605954bca3ae21959663c88a8e88deb62373f38228da090a81511bbd0bdf24346e76feba4164b48ec892fc587bbb41de7807c52205db1642b SHA512 3021ddb93de155c5834da694c9528f4c8532c951acfd86b6431302461baf1e097210a7d9cdef8fdeb2a1745842bdeceba4e8d8feaa81dfb8884ba629718feb74
-DIST go.uber.org%2Fzap%2F@v%2Fv1.7.1.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
-DIST go.uber.org%2Fzap%2F@v%2Fv1.7.1.zip 201415 BLAKE2B 67ce98a69444d6b8050fc2e3b9d89cdaeda809fccc973f854ad4aa9bb26cdebef3e02c8884b2e066bae6eaf572c0af050e122733c2ab14463aecdf7cc0131db9 SHA512 bae6a0e1e42eb79ed1ebf14ac527970cca6820379174b12e71a7772dbe31e500d37e1a1e7c98b9cac05b1d0158cac3420f091e657e2017a0c48ef7510eb09e51
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20171113213409-9f005a07e0d3.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181025213731-e84da0312774.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190219172222-a4c6cb3142f2.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190404164418-38d8ce5564a5.mod 88 BLAKE2B 22568b660b7e13eed0dd423bfb6b033adf659a2c2b59c6ab12d707aca9f6f7317b7b438640caf6233dea4d9840aec4eb997eff5fcccbcdb193ba81db52d814d7 SHA512 fcfc8d63d333065f1193e9c27efe32a1fab270e450fbe1db533156e00427a13c75691163cd1bc7e9aa26b84d4142625c9fbd755535c575f83d63d82d7a276066
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.zip 1859923 BLAKE2B 289c9b56814fd50a40a350f1e325381ab0789ec38e161eb7c64a988e6fa46dca70892de0b1fa21636d10ff7f8870160714d30d294781024c45782c5e6ff165e8 SHA512 f54cb2da01ee50f7e04fa3caecd06a794c70e9b58c6ac05fee6d09d7a8cf4f0d8ed129f981d457b8ae1ffc79316744b3e6d0ef8534e61fdc4127d41da8cf2700
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200204104054-c9f3fb736b72.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200204104054-c9f3fb736b72.zip 1863059 BLAKE2B ffa21e8af27abc68c144798d86da766b0c246f68c8a35dc94b29b31234e5b7c611651a1b1f79ea70d0fdf3fd54190df608a23f3a0931271e962ea28bd18fb0bc SHA512 0256e72c4734509cd52a04f4cb6e37837ea352fb649d716bd35befedfc825f531b1b07a0f1427cca08f379989c7a1e2a13c9a62de17fee09fb72e647cee367bd
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.zip 1871909 BLAKE2B fa2d419a5bdff43385f70e3c6e61f8c1b3528b6c4e21c3105f66dc358515b6336673188ff68b27a792be9ae69d77cd26c82b7e30605b974e4435634f961c7583 SHA512 de179d887c4ed6ebba0a1cdcfa67b8312b8b2dcd9bd04589d581c872f6fa7a8606ad1376dc6933dec41938781218a91f31fa27331d80cbda30542b8cd14c5af1
@@ -915,7 +938,6 @@ DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190130055435-99b60b757ec1.mod 233 B
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
-DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip 81912 BLAKE2B 647b2edcfc6109ea26a1844c259174eb37e3a97cbf12242716d4cc308b3918b5a0b104c9a5c2f3b4974bd94c28afa7ecaf40e71aae5fdd821cb1a5a15ec978e4 SHA512 62b95055b08c73a87c7ef69b2984eefd061e3f7d71eab8e05ce82a4ab1be2ce200aae7929da77a9ec49051b7c73bcc948fa4ee782afdfb8d74dc2d206636313b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip 84373 BLAKE2B 39bd0256afae566a53bb0b7b95adf0416653fd003bf5312c7a316a2d7c3e5d1fa25fd08bdbcdf75df45a56116fea54dcb1bf9b68b07d15d3a909e072f8f9fa06 SHA512 10a924e5fb556c2726795462c91fe7086472d6baab511ac21c1fb3c137e5a3e0db55f9ce8fe1952566d887225e3528ec8b747136f8984163acf71e869a0d8c58
@@ -934,11 +956,12 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190204203706-41f3e6584952.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190221075227-b4e8571b14e0.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190405154228-4b34438f7a67.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -949,6 +972,7 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190529164535-6a60838ec259.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626221950-04f50cda93cb.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -964,6 +988,9 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.zip 1913169 BLAKE2B c50435879fb1df50f91b1f37dd92f6504047944d41797350f0871a581d5bf17cf474845d3b422fb219c56f7627f2fdb302059d68657bd7860ebc604861cfae72 SHA512 b732d79f0828b9a900595b8dc98377436dcdcc24e2d3d9fe0472a8170d477c0e2487bb4b8e2da4eb7ca9b19251e29ea3b38a9de777d03c069425897ac47e325e
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.zip 1916427 BLAKE2B e6030582f47eb0fc2049d9fbf73b03afae4d95a506988d9538d1f094a27ae63c20d5a5ce79d63f09cdd8c0bdf80e80c6de498960c0173e170dd31c8060f89f30 SHA512 62ce13928c6379717545387d68beba5106ef3b745ae7b458ea457889e5c6d186bf96dbbcf8cf4e81f9e6180260b8c60ca34a4bc58c434d7e9150d51fc72540b5
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.zip 1479123 BLAKE2B 45f0af63ffb886cbd78269a103067057346ab756631f228fc27b68459bdde97c84c100f99045e1a4a8d336513c4192b377048db8e09cefa703e94ca814d6eb07 SHA512 57783ce5463ce2a6a2d76d8ed3df08a23de896ca82e7456597a0fa55fe80bec64f899085fc727f0bf369495d1bca70a10e0f7071e7e66f6a5ecba1b4f42ffe54
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
@@ -1059,7 +1086,6 @@ DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip 59626 BLAKE2B 5fb595a1
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
-DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip 41465 BLAKE2B 9a7183d3ac6591399b5208026208047a670c85e8b6014ad29955b168c63bb4953fa972d31025613c2ab12d7207adeebe9578b3c15b65ebb792f1e41df2668297 SHA512 fa7c68a2b5a6bb14f99cda92a3e77aad0e4160f659c54ea73e9813af9ff9449df6b0cab42ee283971e778b6b9da4a6098df805dd284c3b1aedfcd3a0b8504bde
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip 41481 BLAKE2B b952f04dc8d4717c839de5a5b7780ec2434915d11f897cc759647f71073dd3df717e1195ff2f4f804457195886c63620b342a089fc489f5deafa9c928708d4bb SHA512 40a523fc1dcc36677a0dc0e626313d44a308fa2ad5eedf7b616470ae2972dd8f5b78c18384efffa65d58391e60b704ed35db5557a5dce8362ae45204f64b721d
 DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178
@@ -1076,9 +1102,6 @@ DIST gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.mod 38 BLAKE2B d1cedc414de
 DIST gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.zip 7425 BLAKE2B e25afce5349dcf85fff01c6282db6db594626bb20a021e77330868d666cd283306b5efacf2f8d8cc9627380e81763a50477b4ffdf1c0a0f4a71f2b2ba7d8f4ba SHA512 1aac5cca82fd087586924f69e49ecd68c7401a46368fa980c2e1ddcd3e59e170d8e2dc067d96c235442db9fac53817b631c0ded1b75557217385a3888ab5833e
 DIST gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.mod 40 BLAKE2B 3e77c43f0108e2eb7585bd5558385a198b301e2adc7f813cce7981d0979567808d015e60cfd7ac7c6a17e9c0a5d616642c4b9bec919cd5de8d2fd6f86dd00845 SHA512 c498fb321f358d43c35d98913d17242517c415fc3c26d497fd821f30e6c656ca9ba3ce3a73657c43c677d35eab70c90065a7f93dab73214502e604efbc44a180
 DIST gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.zip 7069 BLAKE2B db430bd56c95cb5a40e95368be1f8b23ffa067e4f491ba6a641c12f78855bbd691268f60b4d57307aeede99671a23c437171a446a47ca6ebc1eeaf9defb0755d SHA512 4972724984d58b174b50c1ea81842bc5baa1fca3d74ea5163b6339c2f4a9fee1731eae3dd19f8cb67bca9465a762e44f856537bdc907bbf37394dfc656b2edbc
-DIST gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.2.3.mod 36 BLAKE2B 268adc19223fdd60f8dc01a4eb96290f6c4ae0fe2576d3bac9f82caa3e683e79151d9147a8bf76bfe9b2341ec2bd28d6447248fccfd10e4ed348fd02a88473ed SHA512 a963f19cd93e788d0f5de9873a5b0aa152ea592d829c1513e74c277718ac496d6d2a9dcae0462951fb92ad1fdc59381c30eb5b1bcc2dbb3bcab1cb11928ce05e
-DIST gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.3.0.mod 36 BLAKE2B 268adc19223fdd60f8dc01a4eb96290f6c4ae0fe2576d3bac9f82caa3e683e79151d9147a8bf76bfe9b2341ec2bd28d6447248fccfd10e4ed348fd02a88473ed SHA512 a963f19cd93e788d0f5de9873a5b0aa152ea592d829c1513e74c277718ac496d6d2a9dcae0462951fb92ad1fdc59381c30eb5b1bcc2dbb3bcab1cb11928ce05e
-DIST gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.3.0.zip 55262753 BLAKE2B 42ecb6953d818d5b70bb6ca430ffbb5ee9d2e66feca01d89c41856b99c5d3738b031a1c743cd45860499ae6dd8c0fbe6e949c4954f969dc6bf20be39744f5afd SHA512 8d24dac1e8429af5d26697bb75407490f5a36860cfe5fcb4303c17e931c37454b17d51dd54d6b70112475704da0cdbcb851ed21e1303bde950768192749a822b
 DIST gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.5.0.mod 36 BLAKE2B 268adc19223fdd60f8dc01a4eb96290f6c4ae0fe2576d3bac9f82caa3e683e79151d9147a8bf76bfe9b2341ec2bd28d6447248fccfd10e4ed348fd02a88473ed SHA512 a963f19cd93e788d0f5de9873a5b0aa152ea592d829c1513e74c277718ac496d6d2a9dcae0462951fb92ad1fdc59381c30eb5b1bcc2dbb3bcab1cb11928ce05e
 DIST gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.5.0.zip 55267516 BLAKE2B 75bf270c4214dae356f04ee97895e4811443e013fdb373233c9c7d312c346bdfc7bf74953fe95a8e420a32961f76176fce77246bd384d78512944f9983594748 SHA512 b48eb67302402a67fe0d343eafea34d93063e19b592f6cdb10835ad059c740a90e5f7cdd9eccb66c27d806a8bdf630d5d810681fab97666a953c898444840070
 DIST gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.mod 33 BLAKE2B 0c256369010fa14f2dd95100b3f1b75357816012d226e52588c91c6615eb5b56459061d3bdc8201a84985136912c4d8e62dc281600cb53fd2e9e2a545eb3f35d SHA512 0513089b977716c7cb885b4edced551183b397858963f74f002a078920fd1e2178376261abad2c1c475e7de7ba262670de9d25e8a6e801b4c78385370cd0a489
@@ -1093,12 +1116,9 @@ DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip 5099 BLAKE
 DIST gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.2.mod 28 BLAKE2B 39555ca91c4818bcc1955c20438d83965ad6f1b2058c6d8590f4c30688eab2ac08dfa1655d4de34bd68006afea1788a89fb0240d60b048be9616c8e44d8a801f SHA512 6fe714c089847582c8c01e055e4bd6b991e8fddc6e420aa03a40efb35fc4ecc5e87a60c44aa82fe004899eab427d4b82262cfebb3331b7443a2c7a68718f8f75
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321eacd25c0af1e5b3f031831266abf6a8e5a5ed12f6381778868383c03433f8ef760d6b42ffbff40150f2fee91dedd0b312f9fe81c7f SHA512 3214b38f348921f6a6d9ef93d4337bb90abd0d101d69d16ad8e38415c22d3b9a85bda873df2eb7a271f9b973ef38b74731405e522e1bb8083c78932762cb5535
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.zip 80160 BLAKE2B 7c19bcfee1136e9afaa54bb36a296e48c276e21517eead613313409f3ff85f4a961c1dca7926d3c4fd51feb0f537a85de905294d2a310276bb8177f27f3776c3 SHA512 a8fa21d2f84f8c6f28250e9ec7d678ae160963eaa0a373f345fe67804925b2647239a6117ad6f253f458f34ec9f62bc21e8f2071fc9dfe76dbd2a7ded1e1a0e0
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip 80579 BLAKE2B d5de9f0dbf72902ec2244971ef1d62790008d5686ec66b67ca5ded08503168e507d7afdbc38fbfe3b431432e32d2c79540e407a2916ea93de24d45040262366a SHA512 c4a38c485edfd1773be4d3b3dd97c475b1894603526f5d95b40a3ba34b148f3979f0983444009d716e106fea0a2362836a5277f49ea21f764a55279f343a3920
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d01f3d89a2db6930f406aded7889530b04689ea34b53fa2a7af352c264681ee40b1d192c86ca2f7dcc33dca825d355694527e4dbf SHA512 19f019e85b8c9a533c3cf2fd492b1813272f00cce06a56ffe43046935e49ccf6e191ce83f1d236f6355bae7126aa722016f05174687ff2faf54f121958266edf
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
diff --git a/app-admin/filebeat/filebeat-6.8.12.ebuild b/app-admin/filebeat/filebeat-6.8.13.ebuild
similarity index 100%
rename from app-admin/filebeat/filebeat-6.8.12.ebuild
rename to app-admin/filebeat/filebeat-6.8.13.ebuild
diff --git a/app-admin/filebeat/filebeat-7.7.0.ebuild b/app-admin/filebeat/filebeat-7.10.0.ebuild
similarity index 75%
rename from app-admin/filebeat/filebeat-7.7.0.ebuild
rename to app-admin/filebeat/filebeat-7.10.0.ebuild
index c965a5c47dab..bdee18e6831c 100644
--- a/app-admin/filebeat/filebeat-7.7.0.ebuild
+++ b/app-admin/filebeat/filebeat-7.10.0.ebuild
@@ -54,10 +54,7 @@ EGO_SUM=(
 	"github.com/Azure/go-amqp v0.12.6/go.mod"
 	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
 	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
-	"github.com/Azure/go-autorest v12.2.0+incompatible"
-	"github.com/Azure/go-autorest v12.2.0+incompatible/go.mod"
 	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.9.3"
 	"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
 	"github.com/Azure/go-autorest/autorest v0.9.4"
 	"github.com/Azure/go-autorest/autorest v0.9.4/go.mod"
@@ -87,13 +84,15 @@ EGO_SUM=(
 	"github.com/BurntSushi/toml v0.3.1"
 	"github.com/BurntSushi/toml v0.3.1/go.mod"
 	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/DataDog/zstd v1.4.1"
+	"github.com/DataDog/zstd v1.4.1/go.mod"
 	"github.com/Masterminds/semver v1.4.2"
 	"github.com/Masterminds/semver v1.4.2/go.mod"
-	"github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5"
-	"github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod"
 	"github.com/Microsoft/hcsshim v0.8.7"
 	"github.com/Microsoft/hcsshim v0.8.7/go.mod"
 	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
 	"github.com/PuerkitoBio/purell v1.0.0/go.mod"
 	"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
 	"github.com/Shopify/toxiproxy v2.1.4+incompatible"
@@ -109,14 +108,23 @@ EGO_SUM=(
 	"github.com/akavel/rsrc v0.8.0"
 	"github.com/akavel/rsrc v0.8.0/go.mod"
 	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751"
 	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
 	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4"
 	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
 	"github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20"
 	"github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20/go.mod"
 	"github.com/andrewkroh/sys v0.0.0-20151128191922-287798fe3e43"
 	"github.com/andrewkroh/sys v0.0.0-20151128191922-287798fe3e43/go.mod"
 	"github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod"
+	"github.com/antlr/antlr4 v0.0.0-20200820155224-be881fa6b91d"
+	"github.com/antlr/antlr4 v0.0.0-20200820155224-be881fa6b91d/go.mod"
+	"github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77"
+	"github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77/go.mod"
+	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+	"github.com/armon/go-radix v1.0.0"
+	"github.com/armon/go-radix v1.0.0/go.mod"
 	"github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5"
 	"github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod"
 	"github.com/aws/aws-lambda-go v1.6.0"
@@ -130,6 +138,10 @@ EGO_SUM=(
 	"github.com/beorn7/perks v1.0.0/go.mod"
 	"github.com/beorn7/perks v1.0.1"
 	"github.com/beorn7/perks v1.0.1/go.mod"
+	"github.com/bi-zone/go-winio v0.4.15"
+	"github.com/bi-zone/go-winio v0.4.15/go.mod"
+	"github.com/blakerouse/service v1.1.1-0.20200924160513-057808572ffa"
+	"github.com/blakerouse/service v1.1.1-0.20200924160513-057808572ffa/go.mod"
 	"github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2"
 	"github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2/go.mod"
 	"github.com/blang/semver v3.1.0+incompatible/go.mod"
@@ -142,6 +154,8 @@ EGO_SUM=(
 	"github.com/cavaliercoder/go-rpm v0.0.0-20190131055624-7a9c54e3d83e"
 	"github.com/cavaliercoder/go-rpm v0.0.0-20190131055624-7a9c54e3d83e/go.mod"
 	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cespare/xxhash v1.1.0"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
 	"github.com/cespare/xxhash/v2 v2.1.1"
 	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
 	"github.com/chzyer/logex v1.1.10/go.mod"
@@ -150,8 +164,11 @@ EGO_SUM=(
 	"github.com/client9/misspell v0.3.4/go.mod"
 	"github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f"
 	"github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f/go.mod"
+	"github.com/cloudfoundry/noaa v2.1.0+incompatible"
+	"github.com/cloudfoundry/noaa v2.1.0+incompatible/go.mod"
 	"github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4"
 	"github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
 	"github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0"
 	"github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod"
 	"github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod"
@@ -168,29 +185,39 @@ EGO_SUM=(
 	"github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod"
 	"github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod"
 	"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod"
-	"github.com/coreos/bbolt v1.3.1-coreos.6.0.20180318001526-af9db2027c98"
-	"github.com/coreos/bbolt v1.3.1-coreos.6.0.20180318001526-af9db2027c98/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
 	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e"
 	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
 	"github.com/coreos/go-systemd/v22 v22.0.0"
 	"github.com/coreos/go-systemd/v22 v22.0.0/go.mod"
 	"github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea"
 	"github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod"
-	"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
+	"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+	"github.com/cucumber/godog v0.8.1"
+	"github.com/cucumber/godog v0.8.1/go.mod"
+	"github.com/cyphar/filepath-securejoin v0.2.2"
+	"github.com/cyphar/filepath-securejoin v0.2.2/go.mod"
 	"github.com/davecgh/go-spew v1.1.0/go.mod"
 	"github.com/davecgh/go-spew v1.1.1"
 	"github.com/davecgh/go-spew v1.1.1/go.mod"
 	"github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892"
 	"github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892/go.mod"
-	"github.com/denisenkom/go-mssqldb v0.0.0-20181014144952-4e0d7dc8888f"
-	"github.com/denisenkom/go-mssqldb v0.0.0-20181014144952-4e0d7dc8888f/go.mod"
+	"github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e"
+	"github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e/go.mod"
 	"github.com/devigned/tab v0.1.1/go.mod"
 	"github.com/devigned/tab v0.1.2-0.20190607222403-0c15cf42f9a2"
 	"github.com/devigned/tab v0.1.2-0.20190607222403-0c15cf42f9a2/go.mod"
-	"github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda/go.mod"
+	"github.com/dgraph-io/badger/v2 v2.2007.3-0.20201012072640-f5a7e0a1c83b"
+	"github.com/dgraph-io/badger/v2 v2.2007.3-0.20201012072640-f5a7e0a1c83b/go.mod"
+	"github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de"
+	"github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod"
 	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
 	"github.com/dgrijalva/jwt-go v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible"
 	"github.com/dgrijalva/jwt-go v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible/go.mod"
+	"github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2"
+	"github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod"
 	"github.com/digitalocean/go-libvirt v0.0.0-20180301200012-6075ea3c39a1"
 	"github.com/digitalocean/go-libvirt v0.0.0-20180301200012-6075ea3c39a1/go.mod"
 	"github.com/dimchansky/utfbom v1.1.0"
@@ -207,13 +234,15 @@ EGO_SUM=(
 	"github.com/docker/go-metrics v0.0.1/go.mod"
 	"github.com/docker/go-units v0.4.0"
 	"github.com/docker/go-units v0.4.0/go.mod"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96"
 	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
 	"github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6"
 	"github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6/go.mod"
-	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4"
 	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
-	"github.com/eapache/go-resiliency v1.1.0"
-	"github.com/eapache/go-resiliency v1.1.0/go.mod"
+	"github.com/dustin/go-humanize v1.0.0"
+	"github.com/dustin/go-humanize v1.0.0/go.mod"
+	"github.com/eapache/go-resiliency v1.2.0"
+	"github.com/eapache/go-resiliency v1.2.0/go.mod"
 	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21"
 	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
 	"github.com/eapache/queue v1.1.0"
@@ -222,14 +251,18 @@ EGO_SUM=(
 	"github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2/go.mod"
 	"github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3"
 	"github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3/go.mod"
-	"github.com/elastic/ecs v1.5.0"
-	"github.com/elastic/ecs v1.5.0/go.mod"
+	"github.com/elastic/ecs v1.6.0"
+	"github.com/elastic/ecs v1.6.0/go.mod"
+	"github.com/elastic/elastic-agent-client/v7 v7.0.0-20200709172729-d43b7ad5833a"
+	"github.com/elastic/elastic-agent-client/v7 v7.0.0-20200709172729-d43b7ad5833a/go.mod"
 	"github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270"
 	"github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270/go.mod"
-	"github.com/elastic/go-libaudit v0.4.0"
-	"github.com/elastic/go-libaudit v0.4.0/go.mod"
-	"github.com/elastic/go-licenser v0.2.1"
-	"github.com/elastic/go-licenser v0.2.1/go.mod"
+	"github.com/elastic/go-concert v0.0.4"
+	"github.com/elastic/go-concert v0.0.4/go.mod"
+	"github.com/elastic/go-libaudit/v2 v2.0.2"
+	"github.com/elastic/go-libaudit/v2 v2.0.2/go.mod"
+	"github.com/elastic/go-licenser v0.3.1"
+	"github.com/elastic/go-licenser v0.3.1/go.mod"
 	"github.com/elastic/go-lookslike v0.3.0"
 	"github.com/elastic/go-lookslike v0.3.0/go.mod"
 	"github.com/elastic/go-lumber v0.1.0"
@@ -240,35 +273,38 @@ EGO_SUM=(
 	"github.com/elastic/go-plugins-helpers v0.0.0-20200207104224-bdf17607b79f/go.mod"
 	"github.com/elastic/go-seccomp-bpf v1.1.0"
 	"github.com/elastic/go-seccomp-bpf v1.1.0/go.mod"
-	"github.com/elastic/go-structform v0.0.6"
-	"github.com/elastic/go-structform v0.0.6/go.mod"
+	"github.com/elastic/go-structform v0.0.7"
+	"github.com/elastic/go-structform v0.0.7/go.mod"
+	"github.com/elastic/go-sysinfo v1.1.1/go.mod"
 	"github.com/elastic/go-sysinfo v1.3.0"
 	"github.com/elastic/go-sysinfo v1.3.0/go.mod"
 	"github.com/elastic/go-txfile v0.0.7"
 	"github.com/elastic/go-txfile v0.0.7/go.mod"
-	"github.com/elastic/go-ucfg v0.7.0"
 	"github.com/elastic/go-ucfg v0.7.0/go.mod"
 	"github.com/elastic/go-ucfg v0.8.3"
 	"github.com/elastic/go-ucfg v0.8.3/go.mod"
 	"github.com/elastic/go-windows v1.0.0/go.mod"
 	"github.com/elastic/go-windows v1.0.1"
 	"github.com/elastic/go-windows v1.0.1/go.mod"
-	"github.com/elastic/gosigar v0.10.5"
-	"github.com/elastic/gosigar v0.10.5/go.mod"
-	"github.com/elastic/sarama v0.0.0-20191122160421-355d120d0970"
-	"github.com/elastic/sarama v0.0.0-20191122160421-355d120d0970/go.mod"
-	"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
+	"github.com/elastic/gosigar v0.10.6-0.20200715000138-f115143bb233"
+	"github.com/elastic/gosigar v0.10.6-0.20200715000138-f115143bb233/go.mod"
+	"github.com/elastic/sarama v1.19.1-0.20200629123429-0e7b69039eec"
+	"github.com/elastic/sarama v1.19.1-0.20200629123429-0e7b69039eec/go.mod"
+	"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153"
+	"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
 	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
 	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
 	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-	"github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550/go.mod"
+	"github.com/evanphx/json-patch v4.2.0+incompatible"
 	"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
 	"github.com/fatih/color v1.5.0"
 	"github.com/fatih/color v1.5.0/go.mod"
 	"github.com/fortytw2/leaktest v1.3.0"
 	"github.com/fortytw2/leaktest v1.3.0/go.mod"
-	"github.com/frankban/quicktest v1.4.1"
-	"github.com/frankban/quicktest v1.4.1/go.mod"
+	"github.com/frankban/quicktest v1.7.2"
+	"github.com/frankban/quicktest v1.7.2/go.mod"
 	"github.com/garyburd/redigo v1.0.1-0.20160525165706-b8dc90050f24"
 	"github.com/garyburd/redigo v1.0.1-0.20160525165706-b8dc90050f24/go.mod"
 	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
@@ -296,6 +332,8 @@ EGO_SUM=(
 	"github.com/go-sql-driver/mysql v1.4.1/go.mod"
 	"github.com/go-stack/stack v1.8.0"
 	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/gobuffalo/here v0.6.0"
+	"github.com/gobuffalo/here v0.6.0/go.mod"
 	"github.com/gocarina/gocsv v0.0.0-20170324095351-ffef3ffc77be"
 	"github.com/gocarina/gocsv v0.0.0-20170324095351-ffef3ffc77be/go.mod"
 	"github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e"
@@ -307,17 +345,15 @@ EGO_SUM=(
 	"github.com/gofrs/flock v0.7.1/go.mod"
 	"github.com/gofrs/flock v0.7.2-0.20190320160742-5135e617513b"
 	"github.com/gofrs/flock v0.7.2-0.20190320160742-5135e617513b/go.mod"
-	"github.com/gofrs/uuid v3.2.0+incompatible"
-	"github.com/gofrs/uuid v3.2.0+incompatible/go.mod"
-	"github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod"
-	"github.com/gogo/protobuf v1.0.0/go.mod"
+	"github.com/gofrs/uuid v3.3.0+incompatible"
+	"github.com/gofrs/uuid v3.3.0+incompatible/go.mod"
 	"github.com/gogo/protobuf v1.1.1/go.mod"
 	"github.com/gogo/protobuf v1.2.1/go.mod"
 	"github.com/gogo/protobuf v1.3.1"
 	"github.com/gogo/protobuf v1.3.1/go.mod"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
+	"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe"
+	"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod"
 	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903"
 	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
 	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
 	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7"
@@ -328,18 +364,23 @@ EGO_SUM=(
 	"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
 	"github.com/golang/protobuf v1.2.0/go.mod"
 	"github.com/golang/protobuf v1.3.1/go.mod"
-	"github.com/golang/protobuf v1.3.2"
 	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/protobuf v1.3.3/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+	"github.com/golang/protobuf v1.4.0/go.mod"
+	"github.com/golang/protobuf v1.4.2"
+	"github.com/golang/protobuf v1.4.2/go.mod"
 	"github.com/golang/snappy v0.0.1"
 	"github.com/golang/snappy v0.0.1/go.mod"
-	"github.com/google/btree v0.0.0-20160524151835-7d79101e329e/go.mod"
 	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
 	"github.com/google/btree v1.0.0/go.mod"
 	"github.com/google/flatbuffers v1.7.2-0.20170925184458-7a6b2bf521e9"
 	"github.com/google/flatbuffers v1.7.2-0.20170925184458-7a6b2bf521e9/go.mod"
 	"github.com/google/go-cmp v0.2.0/go.mod"
 	"github.com/google/go-cmp v0.3.0/go.mod"
-	"github.com/google/go-cmp v0.3.1"
 	"github.com/google/go-cmp v0.3.1/go.mod"
 	"github.com/google/go-cmp v0.4.0"
 	"github.com/google/go-cmp v0.4.0/go.mod"
@@ -349,10 +390,11 @@ EGO_SUM=(
 	"github.com/google/go-github/v29 v29.0.2/go.mod"
 	"github.com/google/go-querystring v1.0.0"
 	"github.com/google/go-querystring v1.0.0/go.mod"
-	"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
-	"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod"
-	"github.com/google/gofuzz v1.0.0"
 	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/gofuzz v1.1.0"
+	"github.com/google/gofuzz v1.1.0/go.mod"
+	"github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0"
+	"github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0/go.mod"
 	"github.com/google/martian v2.1.0+incompatible"
 	"github.com/google/martian v2.1.0+incompatible/go.mod"
 	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
@@ -360,18 +402,17 @@ EGO_SUM=(
 	"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
 	"github.com/google/renameio v0.1.0/go.mod"
 	"github.com/google/subcommands v1.0.1/go.mod"
-	"github.com/google/uuid v1.0.0/go.mod"
 	"github.com/google/uuid v1.1.1/go.mod"
 	"github.com/google/uuid v1.1.2-0.20190416172445-c2e93f3ae59f"
 	"github.com/google/uuid v1.1.2-0.20190416172445-c2e93f3ae59f/go.mod"
 	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
 	"github.com/googleapis/gax-go/v2 v2.0.5"
 	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
-	"github.com/googleapis/gnostic v0.0.0-20170426233943-68f4ded48ba9/go.mod"
 	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
+	"github.com/googleapis/gnostic v0.1.0/go.mod"
 	"github.com/googleapis/gnostic v0.3.1-0.20190624222214-25d8b0b66985"
 	"github.com/googleapis/gnostic v0.3.1-0.20190624222214-25d8b0b66985/go.mod"
-	"github.com/gophercloud/gophercloud v0.0.0-20190126172459-c818fa66e4c8/go.mod"
+	"github.com/gophercloud/gophercloud v0.1.0/go.mod"
 	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
 	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
 	"github.com/gorhill/cronexpr v0.0.0-20161205141322-d520615e531a"
@@ -380,23 +421,38 @@ EGO_SUM=(
 	"github.com/gorilla/mux v1.7.2/go.mod"
 	"github.com/gorilla/websocket v1.4.1"
 	"github.com/gorilla/websocket v1.4.1/go.mod"
-	"github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
 	"github.com/grpc-ecosystem/grpc-gateway v1.13.0"
 	"github.com/grpc-ecosystem/grpc-gateway v1.13.0/go.mod"
+	"github.com/h2non/filetype v1.0.12"
+	"github.com/h2non/filetype v1.0.12/go.mod"
 	"github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-hclog v0.9.2"
+	"github.com/hashicorp/go-hclog v0.9.2/go.mod"
 	"github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.1"
-	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+	"github.com/hashicorp/go-multierror v1.1.0"
+	"github.com/hashicorp/go-multierror v1.1.0/go.mod"
+	"github.com/hashicorp/go-retryablehttp v0.6.6"
+	"github.com/hashicorp/go-retryablehttp v0.6.6/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.2"
+	"github.com/hashicorp/go-uuid v1.0.2/go.mod"
 	"github.com/hashicorp/go-version v1.0.0"
 	"github.com/hashicorp/go-version v1.0.0/go.mod"
 	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
 	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
 	"github.com/hashicorp/golang-lru v0.5.2-0.20190520140433-59383c442f7d"
 	"github.com/hashicorp/golang-lru v0.5.2-0.20190520140433-59383c442f7d/go.mod"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
 	"github.com/haya14busa/go-actions-toolkit v0.0.0-20200105081403-ca0307860f01"
 	"github.com/haya14busa/go-actions-toolkit v0.0.0-20200105081403-ca0307860f01/go.mod"
 	"github.com/haya14busa/go-checkstyle v0.0.0-20170303121022-5e9d09f51fa1/go.mod"
 	"github.com/haya14busa/secretbox v0.0.0-20180525171038-07c7ecf409f5/go.mod"
+	"github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95"
+	"github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95/go.mod"
 	"github.com/hpcloud/tail v1.0.0"
 	"github.com/hpcloud/tail v1.0.0/go.mod"
 	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
@@ -405,7 +461,6 @@ EGO_SUM=(
 	"github.com/imdario/mergo v0.3.6/go.mod"
 	"github.com/inconshreveable/mousetrap v1.0.0"
 	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
-	"github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03/go.mod"
 	"github.com/jcmturner/gofork v1.0.0"
 	"github.com/jcmturner/gofork v1.0.0/go.mod"
 	"github.com/jessevdk/go-flags v1.4.0/go.mod"
@@ -422,12 +477,10 @@ EGO_SUM=(
 	"github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod"
 	"github.com/jpillora/backoff v1.0.0"
 	"github.com/jpillora/backoff v1.0.0/go.mod"
-	"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
-	"github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod"
 	"github.com/json-iterator/go v1.1.6/go.mod"
-	"github.com/json-iterator/go v1.1.7"
 	"github.com/json-iterator/go v1.1.7/go.mod"
-	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024"
+	"github.com/json-iterator/go v1.1.8"
+	"github.com/json-iterator/go v1.1.8/go.mod"
 	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
 	"github.com/jstemmer/go-junit-report v0.9.1"
 	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
@@ -435,19 +488,21 @@ EGO_SUM=(
 	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
 	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
 	"github.com/justinas/nosurf v1.1.0/go.mod"
+	"github.com/karrick/godirwalk v1.15.6"
+	"github.com/karrick/godirwalk v1.15.6/go.mod"
 	"github.com/kisielk/errcheck v1.1.0/go.mod"
 	"github.com/kisielk/errcheck v1.2.0/go.mod"
 	"github.com/kisielk/gotool v1.0.0/go.mod"
-	"github.com/klauspost/compress v1.8.2/go.mod"
-	"github.com/klauspost/compress v1.9.3-0.20191122130757-c099ac9f21dd"
-	"github.com/klauspost/compress v1.9.3-0.20191122130757-c099ac9f21dd/go.mod"
+	"github.com/klauspost/compress v1.9.8"
+	"github.com/klauspost/compress v1.9.8/go.mod"
 	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
 	"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
 	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
 	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515"
 	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-	"github.com/kr/pretty v0.1.0"
 	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pretty v0.2.0"
+	"github.com/kr/pretty v0.2.0/go.mod"
 	"github.com/kr/pty v1.1.1/go.mod"
 	"github.com/kr/text v0.1.0"
 	"github.com/kr/text v0.1.0/go.mod"
@@ -456,12 +511,15 @@ EGO_SUM=(
 	"github.com/lib/pq v1.0.0/go.mod"
 	"github.com/lib/pq v1.1.2-0.20190507191818-2ff3cb3adc01"
 	"github.com/lib/pq v1.1.2-0.20190507191818-2ff3cb3adc01/go.mod"
-	"github.com/magefile/mage v1.9.0"
 	"github.com/magefile/mage v1.9.0/go.mod"
-	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a"
+	"github.com/magefile/mage v1.10.0"
+	"github.com/magefile/mage v1.10.0/go.mod"
+	"github.com/magiconair/properties v1.8.0/go.mod"
 	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
 	"github.com/mailru/easyjson v0.7.1"
 	"github.com/mailru/easyjson v0.7.1/go.mod"
+	"github.com/markbates/pkger v0.17.0"
+	"github.com/markbates/pkger v0.17.0/go.mod"
 	"github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11"
 	"github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11/go.mod"
 	"github.com/mattn/go-colorable v0.0.8"
@@ -493,7 +551,6 @@ EGO_SUM=(
 	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
 	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
 	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-	"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
 	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
 	"github.com/modern-go/reflect2 v1.0.1"
 	"github.com/modern-go/reflect2 v1.0.1/go.mod"
@@ -502,17 +559,17 @@ EGO_SUM=(
 	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
 	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
 	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+	"github.com/oklog/ulid v1.3.1"
+	"github.com/oklog/ulid v1.3.1/go.mod"
 	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
 	"github.com/onsi/ginkgo v1.5.0/go.mod"
 	"github.com/onsi/ginkgo v1.6.0/go.mod"
-	"github.com/onsi/ginkgo v1.8.0/go.mod"
-	"github.com/onsi/ginkgo v1.10.1"
 	"github.com/onsi/ginkgo v1.10.1/go.mod"
+	"github.com/onsi/ginkgo v1.11.0"
+	"github.com/onsi/ginkgo v1.11.0/go.mod"
 	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
-	"github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod"
 	"github.com/onsi/gomega v1.2.0/go.mod"
 	"github.com/onsi/gomega v1.4.3/go.mod"
-	"github.com/onsi/gomega v1.5.0/go.mod"
 	"github.com/onsi/gomega v1.7.0"
 	"github.com/onsi/gomega v1.7.0/go.mod"
 	"github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod"
@@ -528,22 +585,32 @@ EGO_SUM=(
 	"github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod"
 	"github.com/opencontainers/runtime-spec v1.0.1/go.mod"
 	"github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod"
+	"github.com/otiai10/copy v1.2.0"
+	"github.com/otiai10/copy v1.2.0/go.mod"
+	"github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod"
+	"github.com/otiai10/curr v1.0.0"
+	"github.com/otiai10/curr v1.0.0/go.mod"
+	"github.com/otiai10/mint v1.3.0/go.mod"
+	"github.com/otiai10/mint v1.3.1"
+	"github.com/otiai10/mint v1.3.1/go.mod"
 	"github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2"
 	"github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
 	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
-	"github.com/pierrec/lz4 v2.2.6+incompatible"
-	"github.com/pierrec/lz4 v2.2.6+incompatible/go.mod"
-	"github.com/pierrre/gotestcover v0.0.0-20160113212533-7b94f124d338"
-	"github.com/pierrre/gotestcover v0.0.0-20160113212533-7b94f124d338/go.mod"
+	"github.com/pierrec/lz4 v2.4.1+incompatible"
+	"github.com/pierrec/lz4 v2.4.1+incompatible/go.mod"
+	"github.com/pierrre/gotestcover v0.0.0-20160517101806-924dca7d15f0"
+	"github.com/pierrre/gotestcover v0.0.0-20160517101806-924dca7d15f0/go.mod"
 	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1-0.20170505043639-c605e284fe17/go.mod"
 	"github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod"
-	"github.com/pkg/errors v0.8.1"
 	"github.com/pkg/errors v0.8.1/go.mod"
 	"github.com/pkg/errors v0.9.1"
 	"github.com/pkg/errors v0.9.1/go.mod"
-	"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
 	"github.com/pmezard/go-difflib v1.0.0"
 	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/poy/eachers v0.0.0-20181020210610-23942921fe77"
+	"github.com/poy/eachers v0.0.0-20181020210610-23942921fe77/go.mod"
 	"github.com/prometheus/client_golang v0.9.1/go.mod"
 	"github.com/prometheus/client_golang v1.0.0/go.mod"
 	"github.com/prometheus/client_golang v1.1.0/go.mod"
@@ -562,19 +629,20 @@ EGO_SUM=(
 	"github.com/prometheus/procfs v0.0.2/go.mod"
 	"github.com/prometheus/procfs v0.0.3/go.mod"
 	"github.com/prometheus/procfs v0.0.5/go.mod"
-	"github.com/prometheus/procfs v0.0.9-0.20191208103036-42f6e295b56f"
-	"github.com/prometheus/procfs v0.0.9-0.20191208103036-42f6e295b56f/go.mod"
+	"github.com/prometheus/procfs v0.0.11"
+	"github.com/prometheus/procfs v0.0.11/go.mod"
 	"github.com/prometheus/prometheus v2.5.0+incompatible"
 	"github.com/prometheus/prometheus v2.5.0+incompatible/go.mod"
 	"github.com/rakyll/statik v0.1.6/go.mod"
-	"github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a"
-	"github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod"
+	"github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563"
+	"github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod"
 	"github.com/reviewdog/errorformat v0.0.0-20200109134752-8983be9bc7dd"
 	"github.com/reviewdog/errorformat v0.0.0-20200109134752-8983be9bc7dd/go.mod"
 	"github.com/reviewdog/reviewdog v0.9.17"
 	"github.com/reviewdog/reviewdog v0.9.17/go.mod"
 	"github.com/rogpeppe/fastuuid v1.2.0/go.mod"
 	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/russross/blackfriday v1.5.2/go.mod"
 	"github.com/samuel/go-parser v0.0.0-20130731160455-ca8abbf65d0e"
 	"github.com/samuel/go-parser v0.0.0-20130731160455-ca8abbf65d0e/go.mod"
 	"github.com/samuel/go-thrift v0.0.0-20140522043831-2187045faa54"
@@ -584,8 +652,17 @@ EGO_SUM=(
 	"github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522/go.mod"
 	"github.com/sanathkr/yaml v1.0.1-0.20170819201035-0056894fa522"
 	"github.com/sanathkr/yaml v1.0.1-0.20170819201035-0056894fa522/go.mod"
+	"github.com/santhosh-tekuri/jsonschema v1.2.4"
+	"github.com/santhosh-tekuri/jsonschema v1.2.4/go.mod"
+	"github.com/satori/go.uuid v1.2.0"
+	"github.com/satori/go.uuid v1.2.0/go.mod"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/sergi/go-diff v1.1.0"
+	"github.com/sergi/go-diff v1.1.0/go.mod"
 	"github.com/shirou/gopsutil v2.19.11+incompatible"
 	"github.com/shirou/gopsutil v2.19.11+incompatible/go.mod"
+	"github.com/shopspring/decimal v1.2.0"
+	"github.com/shopspring/decimal v1.2.0/go.mod"
 	"github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod"
 	"github.com/sirupsen/logrus v1.2.0/go.mod"
 	"github.com/sirupsen/logrus v1.4.1/go.mod"
@@ -595,37 +672,55 @@ EGO_SUM=(
 	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
 	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a"
 	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spaolacci/murmur3 v1.1.0"
+	"github.com/spaolacci/murmur3 v1.1.0/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
 	"github.com/spf13/afero v1.2.2/go.mod"
+	"github.com/spf13/cast v1.3.0/go.mod"
 	"github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod"
-	"github.com/spf13/cobra v0.0.3"
-	"github.com/spf13/cobra v0.0.3/go.mod"
+	"github.com/spf13/cobra v0.0.5"
+	"github.com/spf13/cobra v0.0.5/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
 	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
 	"github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod"
-	"github.com/spf13/pflag v1.0.1/go.mod"
-	"github.com/spf13/pflag v1.0.3"
 	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/pflag v1.0.5"
+	"github.com/spf13/pflag v1.0.5/go.mod"
+	"github.com/spf13/viper v1.3.2/go.mod"
 	"github.com/stretchr/objx v0.1.0/go.mod"
 	"github.com/stretchr/objx v0.1.1/go.mod"
-	"github.com/stretchr/objx v0.1.2-0.20180702103455-b8b73a35e983"
-	"github.com/stretchr/objx v0.1.2-0.20180702103455-b8b73a35e983/go.mod"
-	"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
+	"github.com/stretchr/objx v0.2.0"
+	"github.com/stretchr/objx v0.2.0/go.mod"
+	"github.com/stretchr/testify v1.1.5-0.20170601210322-f6abca593680/go.mod"
 	"github.com/stretchr/testify v1.2.2/go.mod"
 	"github.com/stretchr/testify v1.3.0/go.mod"
-	"github.com/stretchr/testify v1.4.0"
 	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.5.0/go.mod"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/stretchr/testify v1.6.1"
+	"github.com/stretchr/testify v1.6.1/go.mod"
 	"github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod"
 	"github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b"
 	"github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b/go.mod"
-	"github.com/tsg/gopacket v0.0.0-20190320122513-dd3d0e41124a"
-	"github.com/tsg/gopacket v0.0.0-20190320122513-dd3d0e41124a/go.mod"
+	"github.com/tsg/gopacket v0.0.0-20200626092518-2ab8e397a786"
+	"github.com/tsg/gopacket v0.0.0-20200626092518-2ab8e397a786/go.mod"
+	"github.com/ugorji/go v1.1.8"
+	"github.com/ugorji/go v1.1.8/go.mod"
+	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+	"github.com/ugorji/go/codec v1.1.8"
+	"github.com/ugorji/go/codec v1.1.8/go.mod"
 	"github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod"
+	"github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797"
+	"github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797/go.mod"
 	"github.com/urso/go-bin v0.0.0-20180220135811-781c575c9f0e"
 	"github.com/urso/go-bin v0.0.0-20180220135811-781c575c9f0e/go.mod"
+	"github.com/urso/magetools v0.0.0-20190919040553-290c89e0c230"
 	"github.com/urso/magetools v0.0.0-20190919040553-290c89e0c230/go.mod"
-	"github.com/urso/magetools v0.0.0-20200106130147-61080ed7b22b"
-	"github.com/urso/magetools v0.0.0-20200106130147-61080ed7b22b/go.mod"
 	"github.com/urso/qcgen v0.0.0-20180131103024-0b059e7db4f4"
 	"github.com/urso/qcgen v0.0.0-20180131103024-0b059e7db4f4/go.mod"
+	"github.com/urso/sderr v0.0.0-20200210124243-c2a16f3d43ec"
+	"github.com/urso/sderr v0.0.0-20200210124243-c2a16f3d43ec/go.mod"
 	"github.com/vbatts/tar-split v0.11.1/go.mod"
 	"github.com/vmware/govmomi v0.0.0-20170802214208-2cad15190b41"
 	"github.com/vmware/govmomi v0.0.0-20170802214208-2cad15190b41/go.mod"
@@ -643,31 +738,53 @@ EGO_SUM=(
 	"github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod"
 	"github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56"
 	"github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56/go.mod"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
 	"github.com/yuin/gopher-lua v0.0.0-20170403160031-b402f3114ec7"
 	"github.com/yuin/gopher-lua v0.0.0-20170403160031-b402f3114ec7/go.mod"
+	"go.elastic.co/apm v1.7.2/go.mod"
+	"go.elastic.co/apm v1.8.1-0.20200909061013-2aef45b9cf4b"
+	"go.elastic.co/apm v1.8.1-0.20200909061013-2aef45b9cf4b/go.mod"
+	"go.elastic.co/apm/module/apmelasticsearch v1.7.2"
+	"go.elastic.co/apm/module/apmelasticsearch v1.7.2/go.mod"
+	"go.elastic.co/apm/module/apmhttp v1.7.2"
+	"go.elastic.co/apm/module/apmhttp v1.7.2/go.mod"
+	"go.elastic.co/ecszap v0.3.0"
+	"go.elastic.co/ecszap v0.3.0/go.mod"
+	"go.elastic.co/fastjson v1.0.0/go.mod"
+	"go.elastic.co/fastjson v1.1.0"
+	"go.elastic.co/fastjson v1.1.0/go.mod"
+	"go.elastic.co/go-licence-detector v0.4.0"
+	"go.elastic.co/go-licence-detector v0.4.0/go.mod"
+	"go.etcd.io/bbolt v1.3.4"
+	"go.etcd.io/bbolt v1.3.4/go.mod"
 	"go.opencensus.io v0.21.0/go.mod"
-	"go.opencensus.io v0.22.0"
 	"go.opencensus.io v0.22.0/go.mod"
 	"go.opencensus.io v0.22.2"
 	"go.opencensus.io v0.22.2/go.mod"
-	"go.uber.org/atomic v1.3.1"
-	"go.uber.org/atomic v1.3.1/go.mod"
-	"go.uber.org/multierr v1.1.1-0.20170829224307-fb7d312c2c04"
-	"go.uber.org/multierr v1.1.1-0.20170829224307-fb7d312c2c04/go.mod"
-	"go.uber.org/zap v1.7.1"
-	"go.uber.org/zap v1.7.1/go.mod"
+	"go.uber.org/atomic v1.5.0"
+	"go.uber.org/atomic v1.5.0/go.mod"
+	"go.uber.org/goleak v1.0.0"
+	"go.uber.org/goleak v1.0.0/go.mod"
+	"go.uber.org/multierr v1.3.0"
+	"go.uber.org/multierr v1.3.0/go.mod"
+	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee"
+	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
+	"go.uber.org/zap v1.14.0"
+	"go.uber.org/zap v1.14.0/go.mod"
 	"golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod"
 	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-	"golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod"
+	"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
+	"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
 	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190404164418-38d8ce5564a5/go.mod"
+	"golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod"
 	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
 	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
 	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
-	"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413"
 	"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
-	"golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72"
 	"golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod"
+	"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
+	"golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37"
+	"golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod"
 	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
 	"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
 	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
@@ -682,13 +799,16 @@ EGO_SUM=(
 	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
 	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
 	"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
-	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
 	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+	"golang.org/x/lint v0.0.0-20200130185559-910be7a94367"
+	"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
 	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
 	"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
 	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
 	"golang.org/x/mod v0.1.0/go.mod"
-	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+	"golang.org/x/mod v0.3.0"
+	"golang.org/x/mod v0.3.0/go.mod"
 	"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
 	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
 	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
@@ -697,7 +817,6 @@ EGO_SUM=(
 	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
 	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
 	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-	"golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod"
 	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
 	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
 	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
@@ -707,7 +826,9 @@ EGO_SUM=(
 	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
 	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
 	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
 	"golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod"
+	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
 	"golang.org/x/net v0.0.0-20191021144547-ec77196f6094/go.mod"
 	"golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod"
 	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
@@ -718,8 +839,6 @@ EGO_SUM=(
 	"golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod"
 	"golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1/go.mod"
 	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
 	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
 	"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
 	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d"
@@ -729,67 +848,54 @@ EGO_SUM=(
 	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
 	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
 	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
 	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a"
+	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
 	"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
 	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
 	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
 	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
 	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
+	"golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod"
+	"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
 	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
 	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
-	"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
 	"golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67/go.mod"
 	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
 	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
 	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
 	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
 	"golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod"
+	"golang.org/x/sys v0.0.0-20190529164535-6a60838ec259/go.mod"
 	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
-	"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod"
 	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+	"golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod"
 	"golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod"
 	"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
 	"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
+	"golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod"
 	"golang.org/x/sys v0.0.0-20191025021431-6c3a3bfe00ae/go.mod"
 	"golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod"
 	"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
 	"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
-	"golang.org/x/sys v0.0.0-20200102141924-c96a22e43c9c"
 	"golang.org/x/sys v0.0.0-20200102141924-c96a22e43c9c/go.mod"
+	"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+	"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
+	"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae"
+	"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
 	"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
 	"golang.org/x/text v0.3.0/go.mod"
 	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
-	"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
 	"golang.org/x/text v0.3.2"
 	"golang.org/x/text v0.3.2/go.mod"
-	"golang.org/x/time v0.0.0-20161028155119-f51c12702a4d/go.mod"
 	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
 	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
 	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0"
 	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
-	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
-	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
-	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
-	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
-	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
-	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
-	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
-	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
-	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
-	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
-	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
-	"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
-	"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
-	"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
-	"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
-	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4"
-	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+	"golang.org/x/tools v0.0.0-20200602230032-c00d67ef29d0"
+	"golang.org/x/tools v0.0.0-20200602230032-c00d67ef29d0/go.mod"
 	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
 	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
 	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
@@ -824,30 +930,39 @@ EGO_SUM=(
 	"google.golang.org/grpc v1.21.1/go.mod"
 	"google.golang.org/grpc v1.23.0/go.mod"
 	"google.golang.org/grpc v1.24.0/go.mod"
+	"google.golang.org/grpc v1.25.1/go.mod"
 	"google.golang.org/grpc v1.26.0/go.mod"
-	"google.golang.org/grpc v1.27.1"
 	"google.golang.org/grpc v1.27.1/go.mod"
+	"google.golang.org/grpc v1.29.1"
+	"google.golang.org/grpc v1.29.1/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+	"google.golang.org/protobuf v1.21.0/go.mod"
+	"google.golang.org/protobuf v1.23.0"
+	"google.golang.org/protobuf v1.23.0/go.mod"
 	"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
 	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
 	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
 	"gopkg.in/check.v1 v1.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
 	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
 	"gopkg.in/errgo.v2 v2.1.0/go.mod"
 	"gopkg.in/fsnotify.v1 v1.4.7"
 	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
 	"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
-	"gopkg.in/inf.v0 v0.9.0"
-	"gopkg.in/inf.v0 v0.9.0/go.mod"
+	"gopkg.in/inf.v0 v0.9.1"
+	"gopkg.in/inf.v0 v0.9.1/go.mod"
 	"gopkg.in/jcmturner/aescts.v1 v1.0.1"
 	"gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod"
 	"gopkg.in/jcmturner/dnsutils.v1 v1.0.1"
 	"gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod"
 	"gopkg.in/jcmturner/goidentity.v3 v3.0.0"
 	"gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod"
-	"gopkg.in/jcmturner/gokrb5.v7 v7.2.3/go.mod"
-	"gopkg.in/jcmturner/gokrb5.v7 v7.3.0"
-	"gopkg.in/jcmturner/gokrb5.v7 v7.3.0/go.mod"
+	"gopkg.in/jcmturner/gokrb5.v7 v7.5.0"
+	"gopkg.in/jcmturner/gokrb5.v7 v7.5.0/go.mod"
 	"gopkg.in/jcmturner/rpc.v1 v1.1.0"
 	"gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod"
 	"gopkg.in/mgo.v2 v2.0.0-20160818020120-3f83fa500528"
@@ -855,13 +970,15 @@ EGO_SUM=(
 	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
 	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
 	"gopkg.in/yaml.v2 v2.2.1/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2"
 	"gopkg.in/yaml.v2 v2.2.2/go.mod"
 	"gopkg.in/yaml.v2 v2.2.3/go.mod"
-	"gopkg.in/yaml.v2 v2.2.4"
 	"gopkg.in/yaml.v2 v2.2.4/go.mod"
-	"gopkg.in/yaml.v2 v2.2.7"
 	"gopkg.in/yaml.v2 v2.2.7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"gopkg.in/yaml.v2 v2.3.0"
+	"gopkg.in/yaml.v2 v2.3.0/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
 	"gotest.tools v2.2.0+incompatible"
 	"gotest.tools v2.2.0+incompatible/go.mod"
 	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
@@ -872,31 +989,29 @@ EGO_SUM=(
 	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
 	"howett.net/plist v0.0.0-20181124034731-591f970eefbb"
 	"howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod"
-	"k8s.io/api v0.0.0-20190620084959-7cf5895f2711/go.mod"
-	"k8s.io/api v0.0.0-20190722141453-b90922c02518"
-	"k8s.io/api v0.0.0-20190722141453-b90922c02518/go.mod"
-	"k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719/go.mod"
-	"k8s.io/apimachinery v0.0.0-20190719140911-bfcf53abc9f8"
-	"k8s.io/apimachinery v0.0.0-20190719140911-bfcf53abc9f8/go.mod"
-	"k8s.io/client-go v0.0.0-20190620085101-78d2af792bab"
-	"k8s.io/client-go v0.0.0-20190620085101-78d2af792bab/go.mod"
+	"k8s.io/api v0.18.3"
+	"k8s.io/api v0.18.3/go.mod"
+	"k8s.io/apimachinery v0.18.3"
+	"k8s.io/apimachinery v0.18.3/go.mod"
+	"k8s.io/client-go v0.18.3"
+	"k8s.io/client-go v0.18.3/go.mod"
 	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
 	"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
 	"k8s.io/klog v0.3.0/go.mod"
-	"k8s.io/klog v0.3.1/go.mod"
-	"k8s.io/klog v0.3.4-0.20190719014911-6a023d6d0e09"
-	"k8s.io/klog v0.3.4-0.20190719014911-6a023d6d0e09/go.mod"
-	"k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod"
-	"k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058/go.mod"
+	"k8s.io/klog v1.0.0"
+	"k8s.io/klog v1.0.0/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6"
+	"k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod"
 	"k8s.io/kubernetes v1.13.0/go.mod"
-	"k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod"
-	"k8s.io/utils v0.0.0-20190712204705-3dccf664f023"
-	"k8s.io/utils v0.0.0-20190712204705-3dccf664f023/go.mod"
+	"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89"
+	"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod"
 	"rsc.io/binaryregexp v0.2.0/go.mod"
-	"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
+	"sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod"
+	"sigs.k8s.io/structured-merge-diff/v3 v3.0.0"
+	"sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod"
 	"sigs.k8s.io/yaml v1.1.0/go.mod"
-	"sigs.k8s.io/yaml v1.1.1-0.20190704183835-4cd0c284b15f"
-	"sigs.k8s.io/yaml v1.1.1-0.20190704183835-4cd0c284b15f/go.mod"
+	"sigs.k8s.io/yaml v1.2.0"
+	"sigs.k8s.io/yaml v1.2.0/go.mod"
 )
 
 go-module_set_globals
diff --git a/app-admin/filebeat/filebeat-7.3.2.ebuild b/app-admin/filebeat/filebeat-7.3.2.ebuild
deleted file mode 100644
index bd5e95bbdc95..000000000000
--- a/app-admin/filebeat/filebeat-7.3.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
-HOMEPAGE="https://www.elastic.co/products/beats"
-SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.12.9"
-RDEPEND="!app-admin/filebeat-bin"
-
-# Do not complain about CFLAGS etc since go projects do not use them.
-QA_FLAGS_IGNORED='.*'
-
-S="${WORKDIR}/src/github.com/elastic/beats"
-
-src_unpack() {
-	mkdir -p "${S%/*}" || die
-	default
-	mv beats-${PV} "${S}" || die
-}
-
-src_prepare() {
-	default
-
-	# avoid Elastic license
-	rm -r x-pack || die
-
-	# use ${PV} instead of git commit id
-	sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /var/{lib,log}/${PN}
-
-	fperms 0750 /var/{lib,log}/${PN}
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
-
-	docinto examples
-	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
-
-	dobin filebeat/filebeat
-}
-
-pkg_postinst() {
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-		elog "Please read the migration guide at:"
-		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
-		elog ""
-	fi
-
-	elog "Example configurations:"
-	elog "${EROOT}/usr/share/doc/${PF}/examples"
-}
diff --git a/app-admin/filebeat/filebeat-7.6.1.ebuild b/app-admin/filebeat/filebeat-7.6.1.ebuild
deleted file mode 100644
index 8836479b860d..000000000000
--- a/app-admin/filebeat/filebeat-7.6.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
-HOMEPAGE="https://www.elastic.co/products/beats"
-SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.12.9"
-RDEPEND="!app-admin/filebeat-bin"
-
-# Do not complain about CFLAGS etc since go projects do not use them.
-QA_FLAGS_IGNORED='.*'
-
-S="${WORKDIR}/src/github.com/elastic/beats"
-
-src_unpack() {
-	mkdir -p "${S%/*}" || die
-	default
-	mv beats-${PV} "${S}" || die
-}
-
-src_prepare() {
-	default
-
-	# avoid Elastic license
-	rm -r x-pack || die
-
-	# use ${PV} instead of git commit id
-	sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /var/{lib,log}/${PN}
-
-	fperms 0750 /var/{lib,log}/${PN}
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
-
-	docinto examples
-	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
-
-	dobin filebeat/filebeat
-}
-
-pkg_postinst() {
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-		elog "Please read the migration guide at:"
-		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
-		elog ""
-	fi
-
-	elog "Example configurations:"
-	elog "${EROOT}/usr/share/doc/${PF}/examples"
-}
diff --git a/app-admin/filebeat/filebeat-7.9.1.ebuild b/app-admin/filebeat/filebeat-7.9.3.ebuild
similarity index 100%
rename from app-admin/filebeat/filebeat-7.9.1.ebuild
rename to app-admin/filebeat/filebeat-7.9.3.ebuild
diff --git a/app-admin/gopass/Manifest b/app-admin/gopass/Manifest
index 2be98ec9c85c..e2650d133084 100644
--- a/app-admin/gopass/Manifest
+++ b/app-admin/gopass/Manifest
@@ -3,10 +3,6 @@ DIST filippo.io%2Fage%2F@v%2Fv1.0.0-beta4.mod 133 BLAKE2B 4140d5578e9738f5f0edff
 DIST filippo.io%2Fage%2F@v%2Fv1.0.0-beta4.zip 50964 BLAKE2B ec82c1c2cc70f7de63f8b3c83fcaf85c5f4f07b166fecb520e48ad4ef0aab865193311b2f6af650e840c0019d5915e7f7361931fcb569ba8873f5f6daeeda353 SHA512 22f86d62c7a6325a294db906d3733d0904e769e9a837d12821f856842b1adac58882d6a2141c972bb804bb1829b97deb7f93427dd460dbb2d137714f854b6475
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
-DIST github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.3.3.mod 38 BLAKE2B eb94b6f6f4bf332f916cb642fae50486c6ad9f6a7aa1bb57aade3ed640bc98236ae167d30c140c106cee0ada737eca6bdf54d36bcab0751a940f283f55f08c5c SHA512 43bc64732c4ca2ff23bb09cd67f002b05a1b68963116fb42cf9bd60ac8dade8b2efa1cab798217a73b221ea86fb4e219e36912ffe338c7bd505f2a877be05c09
-DIST github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.3.3.zip 42823 BLAKE2B cb9b71b7dc0372ee4fed1c9c4c51abbd6cffa907f0eb5dd156475187256e5f8d007e667324edcecb3bbe51badf51c7d46643b89f30613670506c0aa5e76833a6 SHA512 b419a038368e290028a8e10066a95044d1b4aadfc3d33d396c05482f155dec4bd04f5a2277092761fa4433f4e25263a64b31524198dbe669526871ee540070d1
-DIST github.com%2F!proton!mail%2Fgo-appdir%2F@v%2Fv1.1.0.mod 39 BLAKE2B 696da67110d64d679050be21d91a8a6ccd196a4f9990c0e29bc202391852290bbf35ce0dc86a28c01edab0288234b03774e0d1484b8083d3e8017e79aa3ca1a7 SHA512 c68be8303533a91ba5c7d7b228c26a37db09e898d5c05071620779a49007e7b7a40a2f9de6a058ef2756afc9f599367e5e1add6ab31cd0f15184e786c0551b4b
-DIST github.com%2F!proton!mail%2Fgo-appdir%2F@v%2Fv1.1.0.zip 5168 BLAKE2B 682005c2c1a14084958dd0b0046cf270fccab44b6039c7dbc9268d575442b4884ed7278d11282d21b3ef91cf3101539f5e7a3e3bb00ffb3bbd9f8d8fbbf4caa9 SHA512 1240ae1e2d19804912fd96ea170fb37bc9a67570404bf88c708b2434af9ec50f0cffbd96aeaed571a25201960b3ae7ecb0b96f9959eb03148ae99996c8c48b1f
 DIST github.com%2Falecthomas%2Fbinary%2F@v%2Fv0.0.0-20190922233330-fb1b1d9c299c.mod 36 BLAKE2B a276a7a6f741d44088769d7f398dc149179e64f54b3c37a2698f9d6d399af81d3b193e5fc6ffd34f222c9664d3f00ef26f8cab6b319c87b9c0cb327fc499a8a6 SHA512 9f41a508d98b7131e46a5cca2211372985f8bd1ea9bd2327ca46262855593b990f0d76aceae6cc92f30cfd8590d74c77bf99cff870bff88aef422aa20c700d5b
 DIST github.com%2Falecthomas%2Fbinary%2F@v%2Fv0.0.0-20190922233330-fb1b1d9c299c.zip 5309 BLAKE2B 9edc07c07aaee14eaaf052da0084d0414011f087aec821dc8d3c51144fcdb04f39eda9912b243e20f26d00ef09a43df6aadc6bcfb30f75e85d692c3eed484eca SHA512 7e655c05f5f86243fd2ddbbb23b1001b8f3134733a9fc45a3f26ecda5dacf8de0dddd5053b92fe9071b67e7b7c0bede38736540fbbc13282b9c08b5bcec00166
 DIST github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.2.mod 35 BLAKE2B 15461787708b56993bf7904db63ae2a711c78fe67157ff2adec29bcdce2f6c29b7ef5d997ed7a0123ab24b0f3069d3833405849924037ca4da8c05032725706a SHA512 49d95d7db5b42c6948c50dcbee20a5ec6b554e78f8ee4beec2303b318d6289a32be807084806bd17ee8e680e58c2693f753614fdb6788f424c9d7496790b20ba
@@ -34,23 +30,13 @@ DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod 39 BLAKE2B 71e70b038748ac196496
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
-DIST github.com%2Fdominikschulz%2Fgithub-releases%2F@v%2Fv0.0.2.mod 48 BLAKE2B 6d45c07a9caf59fe567db0a9ee6559e1b6bf9d0cf29319b92dd2fb20de10f60e478b6c90cf9c65c3761c33007c78ecceb6e75990bc118e59ba50e91e74abce81 SHA512 fd3c622c8677770dbd7f6afcea139839603f2d5cb74e3a8413964cf61f0b673f08b510d8b70ff8c17196f14cacf4a78d91622d0d7c410810cefcd26381aea47d
-DIST github.com%2Fdominikschulz%2Fgithub-releases%2F@v%2Fv0.0.2.zip 2093 BLAKE2B a9962cf11c8ddb52f5627865a8f4cd19d283ffe70b0113ebcdcbf21ae6bca97be280b3f10393148ab3c78dc6e360c9a6ebfaa52a8506efce2b0b44697800d132 SHA512 73b1bebd953c1a196e4577d703eac245c82985fd30b9b87bba568e05b156f1b1ec97c5d4c30a18aa07fa9d41c8c2c24ffbb61dabd94645fcd28193326b60aa63
 DIST github.com%2Fdominikschulz%2Fgithub-releases%2F@v%2Fv0.0.3.mod 48 BLAKE2B 6d45c07a9caf59fe567db0a9ee6559e1b6bf9d0cf29319b92dd2fb20de10f60e478b6c90cf9c65c3761c33007c78ecceb6e75990bc118e59ba50e91e74abce81 SHA512 fd3c622c8677770dbd7f6afcea139839603f2d5cb74e3a8413964cf61f0b673f08b510d8b70ff8c17196f14cacf4a78d91622d0d7c410810cefcd26381aea47d
 DIST github.com%2Fdominikschulz%2Fgithub-releases%2F@v%2Fv0.0.3.zip 2957 BLAKE2B a0c29f8a47edebae63c9276f9e7f6420a865eaa82c6ad57c43312b974163ceb251b293eb37e03b50cee9b26bb72764cab1d1d1b2842a60b38f6f84455eb6a7b1 SHA512 f24d07d37bc5e59ef29b687ebdd9401f5f72ea049388cc808f62555873914e79cebcc88ce48265b4ec3945c5d5529abdca56a0581106fc5fc06514ff6f00f11c
-DIST github.com%2Fdoronbehar%2Fgocui%2F@v%2Fv0.4.2.mod 176 BLAKE2B 3c435505d80ca197dbb90ae2b806b2ab89d7f29dd012d454f30a8d4e1aeacc1f7fec04d18f3e5654abf6a635659dce5b2d9e606e428556afec94b2dfc8ea26d9 SHA512 a6cef71bb9131591837ea3bb0f8e46c56cde469a2c0f062481f036c00ce49b13d60b208c6c6c1cc4ab124305b1f62c26baa0336167a40e0a56a0543843cf9600
-DIST github.com%2Fdoronbehar%2Fgocui%2F@v%2Fv0.4.2.zip 46226 BLAKE2B 99ac5c2c5c69f77df602fbf62231f935434325e14b41338842fa487b8f564c115b70d4e2f553d16eee4438c4c35c40842fc54171840433890f1d681dcff84f0f SHA512 52c76c3cd9f1f0853c239bbdf8b372923da79cf92277b811adcc41014c27614385de8d10d2fd55cbf30e23f3d8a0e0a791395ee27efe693bdaea50b27360bece
-DIST github.com%2Fdoronbehar%2Ftermbox-go%2F@v%2Fv0.0.0-20191006141301-8c9470559e05.mod 40 BLAKE2B 2f3acd29af54ff6db117efcbd44997cfeed321dd21c1e4765921b4189f3eff653c585a2d289d0bcf367241826985367a30d33ead7dda1055fb927a2740128f1a SHA512 1f6bcb6beb3bafb41a251b0ecf912e0151d79ad1bcc70ece5a79667df7165f149ba6d57b2317ae8008fde4df098fe265d2601721d12805e50806cc7b7880e7dd
-DIST github.com%2Fdoronbehar%2Ftermbox-go%2F@v%2Fv0.0.0-20191006141301-8c9470559e05.zip 47173 BLAKE2B 3fda57610df0d4910bcbbbafe474c3135a83cacbcc2153289284242c3d11348dbea7075a8c88baf4f3a1bede52e5dd16f758326a7d2932c23af0fe67d59336d9 SHA512 09ecb725872e3195dd3ccf7568daa162d34bad4ec19cd65535a360f5b3222a07b1ed223708f6efd38dc930b4a43469a09c3914b803fd0dcb131becca58ff6fe5
 DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
 DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod 126 BLAKE2B 629ef676ff997553b93c44e9024e6b3d613b51e276d2ffb65bd9042ec1cb0455124e5ea7c5dd0e69599a25031ed536cb3356321e37248921fd8287b47656104a SHA512 a61784b08b335d2a893688c279cf6f4b1ca222c3bc8236fd24536aad2b185fa718805c9022e1ce142bd87e39fed639fdc9035c9ea9ff110e985cd01cd612e9a0
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip 12428 BLAKE2B caf7a05e79d8b7dca069966765705619ee15800d8276d968bdf4385bc1141cc06b24755ac49c65caafdde5d8b34869df1f7e42ca302ee6a80b9ac7edd8a803d2 SHA512 c757f8455ce261c06749eda03ba807ba8b2427f0a14b0b62a6ee4e9d1ba220986e6f122b061fed6f44d68e4802864a988c722604b52989a4e31761e0e7ea8163
-DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.mod 77 BLAKE2B 1b81c4c20a890027242b50f1566f4dfdaf120ee26d3dc56d0c2b6465df2ba79b208289eb40c3d7b666a4e7e874210f59aea545d5125c9a55c5597a3ca7f37feb SHA512 fb153c4e481c073133f0c933c67eba8a1f160ab146921f2c77125b6ff5c348cea57e3a5701a557c8db2212d32e3cba1c09b9509210660c17b66c2a45ba97cb75
-DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.zip 19867 BLAKE2B a772206ce6dc48b32d7125a25b26694325d367ebcbad85466b2e6cfdb9fc9f0e08b98b7ecede5397344e5f7e623c4c76edcf69dcee99917adccf5b31aad80bf8 SHA512 127767c725e376b43fe4e2003ddc12fe89693d6d7e52b01e6d47d73fd04496decc0fd60b64c7a65303428e00a52ece1848610ea35231789a814187ef8503bee3
-DIST github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.3.0.mod 250 BLAKE2B 27970513f459c49bf9bccb001157a605c14e5546d6459e3f6e2bb3851cd8fcffefd12fb2f6f918c01a06c6aede2532656d809b80b46ef4dccb838fd40bef7930 SHA512 7fdc52fea1b91ab1c81f426948f7153c0c16cfcf1f79c64a695b62f5195f25468b08c4e1b2358ab834c94efd7b9ab9a2edddf1b00ee22ea5454b46cee19302df
-DIST github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.3.0.zip 219885 BLAKE2B 1a8e3a5a8543b871d30c9fec272a50adac9755de8945cfc0ce553e7163e942d6a1ffd22b4e2de6d8e24785d906d86ec2f18afae04d27e3065115ca5436064e85 SHA512 69c17dbdf99d75b54ef71fa2c856a72b24a50cec0a34d8b99ce3bff01d32c6f325bb1e8dd747e3d448ba73fd5af66c1cc1f6042b0b12e292441234e7ed928658
 DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190623212516-8a1682060722.mod 39 BLAKE2B 9884f8a07f2a84a159eb17ef62e9b17398b84bdea38fc37591af050dcebc2f56b83f851046c3333e604a7f954b7628c16b267c0c94807f7a41d5d2b797db0918 SHA512 c32a84bb302c9db3f31f714484131ee3ea96fa98b224b9cbf2c5fdd15100a24094e94b55175cf1fb0b6326128c2db8950677d8f6d281b49645b0c7b51b759093
 DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190623212516-8a1682060722.zip 93044 BLAKE2B 2c3eb15f4f2792ae60e9712392db623ab2a662e1f2e319da7014c0e94b82452ce141a5c8d7656b02dce44d01cce06a58ac4d8b5bb29ab53a8e3b6d6c65c41582 SHA512 60dd4f9e8b60d72d65c7a35bea054ece6045a32dd033908daec3acbfcef17d6f85b6050c7bff53d49032eb08097e36588911e56622b81d3fb2ed2543187c3478
 DIST github.com%2Fgokyle%2Ftwofactor%2F@v%2Fv1.0.1.mod 35 BLAKE2B 8e6a890bcd1d25cab5f07d335454e2251dfe47b7eb40adb1c8479f93bc2134adaa53f7c594caa5e790c06e634ff9789ea0e438b2382baf416be76b335aeea1a9 SHA512 ab41dcf4805fae3baccc64c61ef13ea3e4dad8e92807ca77bb0a8300968b498d5f2b05a0b1aa3269d38fe37391bed80eb7de5c626b90714a8ba490ee05b67682
@@ -113,16 +99,10 @@ DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod 68 BLAKE2B 91222794e2d517a33cb43bb9430e2e7b497ace820ab8c47dcde253226e54f08b922404df7ba7a2dc74555a059e95b81471dc36fc5b63b55e385004fd9a16d61f SHA512 9fbff125d97ce2c4b9b301021a987edbeb686b37927504df4e5c2f0ddbebc8ed28ee5152de7db2eceb0a0fc5728579823dc4145f36df9ba1961b9c2da1ac4461
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip 12607 BLAKE2B 40090e35e5bfb0f1570cc11a3d3c3b6f9c4d097ffadb161280ac4dda90e7b74fe3784dbd31a74be243a2a0d6f3f3273f24a0dcb07523c7db8975171327de25d5 SHA512 5fbe5884d311244c5250d4a1b249749a84fc6a50d4d5d6b3967a4bccb317ebb807917fe540f13fea788abd863d7d2f2537a40b57cf156a3f920b15cd8b365ac0
-DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.2.mod 98 BLAKE2B 074cd6d5ef6f25ec043afc4f23272f5fad1d7bf100e75122f85c49ee93fc3c6205c72a1e5b4227ca45f3267be1b2001e743b51e54ca5f11302c2610e93630858 SHA512 f7ddb2f6ef35b65ae4a9106e31cbbbd08a7d011d3d9d5827445bf35ec0243041c3e4881a850161134d62ff822610d3aeeab2941472dc7ff0d664edabf2ec4eb9
-DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.2.zip 442733 BLAKE2B 17af8168c2253f09f1ff15c5d78359bd8449c84027b10594eb5878fbba0ed2ecb250b34809693ab75869ab02d7677f874029e85ed352295896f9658293ecf4ea SHA512 b1515c6fce781a653025c41ef164ca2a625879b2f7ba1349c470cb9afab9b92b173a89513bf601ef7dcf53e0665010a12d44311f75c9282c244d58a154af781b
-DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.mod 51 BLAKE2B be532e33c9a0e83b9d0b760b21d97ac83850299adb329f754f31e4b46dc7fb7a7157d2a41cdc258924ef8ee5c111a95ac3b0037d749cc936e1988a46612522cd SHA512 270b19446ac9a396f5ce7a000873928a44edb1457f86d294971dae08be37cd64ddb8edc0293e100ee60d56c504851aa69ab11db0b4cfd46649c5f79459e40011
-DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.zip 442291 BLAKE2B 02ee4982a588e0fd1575206340bd97663147459664a2942edf151c4aec2bd20da83984c68c76e1c505c1ef930b77f934a8210f6c0ca106a0c0c91ff63733b92d SHA512 8e275955eb9e5034c155c6e469e2a3117bee30fbe42e8ae394f496b83f473a1568847707707716dd5a3c57dd0e0a4bb4f4cc9af04940218ce24420493e923f14
 DIST github.com%2Fmartinhoefling%2Fgoxkcdpwgen%2F@v%2Fv0.0.0-20190331205820-7dc3d102eca3.mod 45 BLAKE2B ca27cda838147e1d68ba10649109192dd05cb2b100910f940579b6bd89b9ecfcbd186b7f6482edee593ff773360abc8ed8ad7c35deb5106fcf498d1394fede80 SHA512 ed4b221709e662bd34be729b9a409caa16ede1b3d82300b5acc45b61e2d28cbcf2baf23d61e61112a0f66c363adc8ed7662a9ff12f9fddebbd198529c101740c
 DIST github.com%2Fmartinhoefling%2Fgoxkcdpwgen%2F@v%2Fv0.0.0-20190331205820-7dc3d102eca3.zip 292019 BLAKE2B 46a3c8f8023a8d1c5f22fe1fdb4bb959f48e9b890b81664a850625e00325ca7a60892166a7ebab0887e45dc4c294084f2dc15cf50aecf66abdcbab2b5ac6ad13 SHA512 5ba20536d8534cd4e95ba441d42db3828770146ff1ec3efeb31e56ff7a75cb528eeb0100f13ba7a3ef70df136ae7b06a0e10057b94fc8194ea188e8679ecfb48
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip 12838 BLAKE2B 668586a4df02fa2d5db174a4ada1245a463946d4bccdef2599b791414af4f10eb07f56c61484977eeb21499db7f9b46f8fea03feebbaae5511504c13e3f7a64d SHA512 c3104e921a94b1a424cbf6936e8e5cdf5823947132f41190c211e050c9c8b7135c7b319eee0667a2b958c9f4fda27b9cbad4436d37b512e269716249dbfbef65
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip 13586 BLAKE2B 8f8bc0b542920d0effcd6939a66e34609401f564af0c1f6330bff2925abc664add3c36534bdf8602ac176e74ed85ec8c8597f748a7ec82db9e9f86207c563fee SHA512 bd6adb6aaf44c6c59bda2407a05e192d3336154cec35d0a6b6244cc5b93dc5e53509abded7c5999af166821749dd2e55333a8813ce64c310ba5db2df597bc171
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.zip 13682 BLAKE2B d7065d3799d84593a9f7f7d93b8c286b7673505bb292208ba0475573667831ecf1aca5236f4703f1bd4d43e41b7cb688a9abe7502181edc9a76305e2a5842ebf SHA512 60a5dfa6c733fa6f71f2b0fb16ee153b2905f940b5eb7e95ff0d04bd3537961467426a1f6064d079fb164190d6a8b3c4bdeece2bf643057f34f7f96e9842f54f
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod 104 BLAKE2B b8d6df41ff2e8952e12f0518d455969d7a496b8318052ca37ffabc663d9602b9df70385274818af8bf1b50e70a44ade59b0436133e08818ceb385d34a3b44c03 SHA512 218110264da1c7396295627414259fcc65cc9823216d6c03f2a6d7499e17205e540821add3216ba673efda92f1e5bfbb817416874fc745ed1d926c43fdd9bc99
@@ -131,10 +111,6 @@ DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.zip 7430 BLAKE2B becaf402e397202c86c156c3a5b7ee8f785290ca134d87cb36106a9496d18b1b45e97d306c6280c7186976a18307a7ef04d6ffa29a2e6cc2a3dd378fb400ff44 SHA512 1a7efd886840455b37b44b4d0c048b457eae14e509a740455db995e84c98f8fe94449e7dd11c544ff241e784ebeedf0f60c87838adca21fed08146fa3adeeecd
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.zip 22344 BLAKE2B 9dcfe0ef5fb4f7e493f29ed3e5edc8ef2744351a4e2a5b70f5a8931b503925ed58b5f5f58e3512fe5fb5fb8d2e7bd1598037f29dac4520e7d966f60ce5f2d307 SHA512 fb2bd143a0eb1be1faacc0069ec8c2d53b16b6969e6c4dd7ae4802f16606a80ff1c362712f0836b97f1453df468e7e12bb5dfabf9161436fbe9b87231f593068
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip 20005 BLAKE2B c0f71323efd262296b78867d2b387a74491cfae3f4498e0dd22c036b20dd6fc1b6569171eebf267effd140ec009527fa5ccbcedda4f8cebab2679582766331ea SHA512 fad08292597cbd4a359e06f85bc7cc37b3d3d84b8046e47828259e36872063069c4ab17b7c89f2a5de4b5d0ab1ca5cc66cc515847a7887339a3a04b5f44e3c92
 DIST github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.mod 90 BLAKE2B e375688bb7c11de48d29d17c72a3e7675fd36d4c214bc39acd6d73386b007b51c34ff050b1b6ebf251f1f1cb98ce0022246ce7280a91f14d2136ee3e226f05c4 SHA512 aa292d2eb3045fa595c28c69fa87c329e6bfe29f2e88d5424b28a5b6270a869cc8455a88a6c076cdc5e6c76e36dd7d2d820ea7a8f3995c0af6374ab5c02ec735
 DIST github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.zip 106445 BLAKE2B 5aa2489ac1b0c4dd5c1c633731c7db35a0e84afcfff3d4317025d16e6c7f62e9a06ee1c56072a26ad45716f90fece953dca9b0831bc004c4081eda012d32944f SHA512 431bfd66971e8936204d8bd9b02aafa25e4300b3a3d8d78f63dc8f6e5dd0b436e1987074b5bd52e856759477f6d154625b5f1c565146fad909ce510322721b79
 DIST github.com%2Fminio%2Fminio-go%2Fv6%2F@v%2Fv6.0.57.mod 518 BLAKE2B cab9e78c6c835ffe72bb26db0b47da1b364d93c1bc450ceef0d25fc7ba39e1cc5330d6e38dc955c0237e04c781e968569697ebe81867030407b7bc6efaab5e96 SHA512 d0e4dcf05a6ef0bae5c79290669ed2bb6d5ba6d1a2f99b03fd95f966197ba013da352f35a62348f315793f77d6ae1a23e5de7c2f69f6bacef4ac516aca8dfae8
@@ -155,8 +131,6 @@ DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod 37 BLAKE2B 3643a4250f81
 DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip 25694 BLAKE2B 59d0a645e3fc29e94a04fbed5329cfaf2162f5779f1c13bfe96c9d979c7acd1b356587b6e30760568607ea15d2088a76bb58e4504e17abf360f2702eb6e8c3c8 SHA512 8fb62179a48e212b74f0e8af79ee1c20479b1725c089c75a12b43bf4936caaf87d42b35f2b7a7de87c60e793347bb185486beb8061e588b8085ac354a3ef8562
 DIST github.com%2Fmuesli%2Fcrunchy%2F@v%2Fv0.4.0.mod 112 BLAKE2B 50b4b6b4d07888fd6bbcc3d88b7f4b542bf2f3c61733319c918104f9f3a8cbbd9c8c2b724751ea2ee4bb09369dee4cf22dca0cd334733826ac882f270300f944 SHA512 bf10719acba9ec2fab1e504fc2a02f542b347cdc4b891237fb9cac81f5aa72882adc25bef2a4a9d43dc33c5d2dfe8f0398c698e65ba74352a8b498b7445e3aa6
 DIST github.com%2Fmuesli%2Fcrunchy%2F@v%2Fv0.4.0.zip 11581 BLAKE2B 6faf8c5d4368c6456db989791fa327e341a791b601e6a561ef3081ffababa7dd0a97190c1e96888f41b1d6af8b9231db09434adad8471737d54b25f515260e7f SHA512 3bf633884ff896d94b70815ad990806ebcb89ab69e297bb3f07b8b186697216053b886eb2029df3769910df7be6f7c99b590606b0a02e5fa46aa5e68281cefb1
-DIST github.com%2Fmuesli%2Fgoprogressbar%2F@v%2Fv0.0.0-20190807022807-e540249d2ac1.mod 112 BLAKE2B 1dc44bd5ccdd4e327130d587d3c79204209dcdd52210365bb473cc35cb765b52ae7dcd4500539f97e53516789994613d4d20528a4e8fd43c80accb7d66983ffa SHA512 2eeb6ee54be862261bbce1fef101e855631d7dfc6933c710721a4b04fe189149ddc3b19c32c2e8f5ed1e94c11514556c06d8c7661a1d3b6d0982e986947453da
-DIST github.com%2Fmuesli%2Fgoprogressbar%2F@v%2Fv0.0.0-20190807022807-e540249d2ac1.zip 9869 BLAKE2B da2716aad7472147c432a5979bc5254474a7cd4961edb5f4643c96bcf9e19d35d6e7d47b62b61ec510594a5c93cca3e5b69c6f08d2f1f8b1666cd391de074797 SHA512 29fa8b4914ed77a6bd35b8c3b786a1f3e4773cda67621bbb5b0c31658defe5f8e77eeecb5e976a94dcbc709e03cef643db036c4888b9ab50e98876b8b0b56c65
 DIST github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20180912185939-ae427f1e4c1d.mod 38 BLAKE2B e88cae8efddc7e87d193f1dfa70990188cf6997f38aaf0d22135aaed71abd543291661bf5628d0c3d7dc90e64fa0a7ee58e65db2af21bd160c7733b5971059e2 SHA512 96389bbcfe0ff698d1638ea020d8a6311f7caffce3c9d8ab1fb6da6870dc1685313803af2f79da15ad0d5fbc33e17eb883b2631a2d81fa70dd851fb7133b43da
 DIST github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20180912185939-ae427f1e4c1d.zip 881205 BLAKE2B 29945db060d9c8d855f4ec068e1730050de56c0c446e1fa3996c3fc8d1e6d60562f8b29835e572e1db83e761f325cc1a29b1c1aac92528e832c398ad12522c7d SHA512 9995dc61d55f1235e5e7a0a232a0b7b7f34faaf983f21a64f9fc97f455b21326a8d04c3514a3f0e6b8e10a393fea5fc31dc9b3797f41bca07016a893d2e1bd40
 DIST github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod 78 BLAKE2B 7cde27fce0ec4a1c5c2e5205fb962352037c873d6183a6c1d8a9d385fe6a3bc8c9b66590401f8a715960858576d100626889e02361860bde65f8b66074d93837 SHA512 ee531fe5de94a4f4fc57592864a42beaf57be600d3fc11205ff79b44615429ccf46922cc3d80ab8df77b2db31a85bf40248ce0b1e1079d6861f317828b3305ea
@@ -176,8 +150,6 @@ DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.zip 55374 BLAKE2B 39f93770143cb7
 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip 3399 BLAKE2B 348c2171bf3404d8b69166fd412707d8a348e1d808618036de2ae01fce77e3880fc782ef301f9b4135a19d81ca9ded5cc0cc4fd73d36b66b121b7f0baa73df51 SHA512 d02d5e4b8a24b1709c053138c4128d4bd6347d4adef95d1e25141935cf560fdcfd5c2b7837d6e690f175f1cd5a21b0279ce97b8b3b66d5e0a5006e4103b25f46
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.5.0.mod 301 BLAKE2B 8898fe7003c9143aa51d94430241d950aa22446ba5b7fd087844593db1c99701dcbc9cb2dde3356d22867e72c654bb3e0b30ff2d9c376cb3ef434f70e788ea97 SHA512 7c1f73f33624409363131d5765917cdc40a8666c1d462d72a7206ce4cca74c9fe61738df4f4a48265a9d89faa0b04c3aa49b0e87d8a37ac4f53310fd04913bd9
-DIST github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20191027152451-9434209cb086.mod 34 BLAKE2B fce952a243794343a8e85170c6ab3cc518a9080ea83d12effdeac8e42af930ebf247bd2b3ad5a234be26808eaacc3e5d38b913f9a36231fd1bd585c7816c8e08 SHA512 6e445bd52c07c412bbaf8770168707b5e01d8327b305df406a8fd72feb26502bec6c8ca0199f601a1c102f06882b8dc23f53a09ed265eaffc7a2ca76cf27049c
-DIST github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20191027152451-9434209cb086.zip 46526 BLAKE2B 5b071b1f25998c6475082ae4609b6e88a44627468ce99c8ce5260f471a722caa977e20d385fdeaf7367aca848b48dc90aae4017c243c4540c7f35b6a96334acc SHA512 c66ecc4b694cebaa36a172550348e086eb161df7625230b2b50342f39760d47d595aab202f0ad700be1c3748a8f42919c189b66496f9c9ed3dd6fcb1013b0e03
 DIST github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20200617195104-da1b6568686e.mod 43 BLAKE2B 7190cd8561b8a4ec93fe2c1512a3207a5d0d81553ad9705b5c91eac8a72ba52d69ef728c3202134787f60b29bff5b9231bba009cb1cf116b1e86bce6e051e441 SHA512 f40e45d730137deb85788b5b5f63140d6e02b5af6892a10352e14599f9eaaf6315b10c8497568f965253b995fe7fa454101db5cd4a8378f0ad3eb10bad9e51ce
 DIST github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20200617195104-da1b6568686e.zip 47370 BLAKE2B 7c9d7c015d07c664f15e50b5f84add0149ac2ef72cf4a0aacb46aa5edf15f40b3d61efc95f4bba001bf67f8042a2a29da3a740888b55fad7581738e660435bca SHA512 fcab30f5f11cadfc0e443520d4fb01c567da10048d840588c90fd1f29a9b3adbc28a53beeb0675dd14cf1da0b70553f24b44f5790f98e3f7f4a9f4efeb6782d6
 DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
@@ -193,8 +165,6 @@ DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip 91883 BLAKE2B 8bb8f10ba7a3c719844dbbcbdbb87773487921f493cf6f72d1a9fd1d553f7f7784b01b9795a5c26a352490ed6d75c29a542a0b3d7c18d8888c57e447d9d227eb SHA512 c539cd964718439715caee454b38fdb61eb5d4e20489e10f7f6a030b4b941b2ca52d33f950c0b04149962399f0c3cb5b6a90efa2d79acc0f57a7f49d508c67c7
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip 98541 BLAKE2B 369a625a7b05ee56619698e8067ee7b99a9d0508db655aefd23cf42f5ee1abb150a6b262be089fce6951f84fe9f1cc0fa46b75830b851888fd17f123852558e7 SHA512 073f44125d4bbce27d69b914385e05028c4d275585e275ff1ee2ffe299059646394163dde2b6b5c175ac9379d388fe34c1c874deda4138121541e2a639d7635f
 DIST github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.mod 183 BLAKE2B 43fea991eaa4bf055a796d40ee3a72557fca99711c698b3ef2feec5d175ff6cd1af486f7e3b08c6f95b6035ea5a6c9bd76478264102ce85cb0bf08f22b841957 SHA512 4630a9172936eba1e550a8f6e95847faff6c2a3687900143cb8ad593df1b1f7f793969efb94dbf42a529074f6a4049554773157c3bc4eb7179f435d0af317c90
@@ -205,11 +175,7 @@ DIST github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20200730060457-89a2a8a1fb0b.mod
 DIST github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20200730060457-89a2a8a1fb0b.zip 1827540 BLAKE2B 0858b3c62e1a18ce64d7612cb716c0754678a9aee956af8fb51fd654f57d532bf5a0a5f4dd28cebcbceb9ffe7ee620a6d0b1a7744f65603069c02f6224d736c6 SHA512 f1469fbdaa90a0d341bc53bf77cb928d2bc80cb41267ec453aedff7d3f56a7b7597019a420b93fc86617ee0b9be584f31f7d4d2ddd66afbf051a9031c5f13c55
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190513172903-22d7a77e9e5f.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.zip 1825995 BLAKE2B 043e1f926e0ae47ededfa2ced40e95fe6c564122b2e2a64ed631f3bd4dc52c8ccf5b5bd4641d17ed996875dc1e64ca8edcb6f02dca34be178e611cee74e4ce7d SHA512 a596a5c0e3ae5fcf366d84dddc7b884fb72d6dd89dbadc79f9ac2cea397f2795ba3ea5408cfcb75f248ddb18c9774ac7f55d0e355f1be1468812565c5403fa5c
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200423211502-4bdfaf469ed5.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200423211502-4bdfaf469ed5.zip 1874180 BLAKE2B 20899757b255a90730b8f62f656f6edd1f41539f3e6b5ff1034d274b0f47ca81b862072b9a619120befd2a3260e8b7f84aeb80b51aeb126d5f2ff5f3bb843ecb SHA512 e04eeee38e8ab6ce597d4a342c71823940cc227ce5eab7c245b7035c194ac1bcd33472f1f07ffd125dd3fed59e878fb95857ff93ce90dcd49d26bcbe77d22a64
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.zip 1876304 BLAKE2B fa57b9b35fbd6fc1e9c64a15e5f3545be4affa2bf773e375dc3658b4384a501de6e480e0b268d1f2c4eaebdd8f0cda71d42e7642472b4b89106bee11e58138d0 SHA512 cbffe21e7836f45412e5c7b2d07fb820b1c2f79e4708d1a3974eab3840460231083069fff4850499f2305326c4c5097b6b16754ba7ab3c39655ccf2218bad259
@@ -223,8 +189,6 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod 24 BLAKE
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200421231249-e086a090c8fd.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200421231249-e086a090c8fd.zip 1500505 BLAKE2B aed582fa92d06c76e5c250a9eaf7645b4147d384422e263ecff6136b660dd2af8a40cdf539b9966059e754301afed01b3fcf59d2680ed88bc438d6297a44d7b3 SHA512 7cfa0dc01fa55ff83d10087ddc6358e2e7021d1a8a27393f5778607cf3dfe0c31363676e1663ab4ee485273e580d6f92a486ea62d5944892104f13cac5080b82
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.zip 1503811 BLAKE2B c8cfe6b14a455a6ad71c42ce03235c650b7efe842131874cf99570716907e02c9fbe42df586e69332189518cbdcf6e2e417caebec84ce928e7ba959b66ab869c SHA512 bc3772a7ae7cd2b50f61ec8d07e7f7e1af9f24e0b737131da375a525be44dc993ee740ce0a11e0baaf0cbd81e819e3ecad889c0c7ece95086cb428e52b10a785
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
@@ -236,19 +200,14 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200420163511-1957bb5e6d1f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200420163511-1957bb5e6d1f.zip 1471954 BLAKE2B 0ed87e29adaaf2e15dfa803fef857f82f73f5e45864a2d52a21e94a1436fd22773b5921c229472ccdb1e715c081f4865feffe618ddbf258a1ebdac5636386b84 SHA512 bf736828279ead6fabd59a1608870ed72ea610e32effb1c65015c925d214e81712f636ae60e39636dc7820e88a4e6a728f18b3f08b517d9c5877cb08f85bfa60
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200808120158-1030fc2bf1d9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200808120158-1030fc2bf1d9.zip 1484367 BLAKE2B a512590e02d5d2282e07b9385bb15d1285d529f0ade14159e6b2ff6b0a8e7a2ab01d2acc1a3b7308e4e937162a04b25a7efbddaeb3ac2449d574a4cb7f60d75e SHA512 46daf2fbf8c5d70abc5d6f4044865999004208adfb15f7db924d603980ccac5f87dd4264628dd65087837eec6c34c57528ad5376e019545523af4260f1c3b792
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
@@ -282,7 +241,6 @@ DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.m
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod 186 BLAKE2B 7df4a9ba66d7fcfc40d73332ba6fcece38a38ffef4e9686fe7887272cdc81904438cfdd0e733224058289d24ee23efe087ed9a2b4f2dc31e7213bc3038ed9512 SHA512 1b0e5543fcdbca876b51ed261aa7b8abf09e985e4622111d46378893b7a2bbad882135fc1eb26ebbf97078800f6ad9f2983dd11c62a8aaa2ab1a4f0774585e65
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip 1543881 BLAKE2B 2f556bdf8ed16bde9e6ecc8fc7339578c719ed0ec73ee426caa75b672ff5fcc442ea7dfed7f737900c98d5a5afc014b9e44b1b7f0f8147edb4627f3b390814c2 SHA512 29073698d91f0bd9d37cba38102b19e6223ea362f6eb331bb186670a0549391eaf856855d2978f70861e775af0a1f678a7669754862c9247edb0a682992debc7
 DIST gopass-1.10.1.tar.gz 475921 BLAKE2B 5f62c099c36b0222ba0764a0b8290522201373b80141c8f5b90c17c979269d99d756a72aa04525d31641dab247b4e5a8ae6fe4f94e3c0489d27389c0d48a7060 SHA512 9bbaefe8642cd1eea94c5b4d582835c636ad511ab4e315997f5f2b0b74d9d0f3cd430182f84ce2cc36080f14b8cbf03c71a8f4a84f6365a6cdd5e6aaac90f7fc
-DIST gopass-1.9.2.tar.gz 420384 BLAKE2B ca8190fa65a74dccdb645741dfff0b9e30572bced4f8c6438e6bd23d97ed9d567b698bcceaece52a6cbbd4a9d9ef5051b24435d3933eb08498370faf7f39f227 SHA512 90be234718c4c26ee6e92565ce609d5f075d5e574827e15ff57a6d9e71f1933add7d76aa26b39602d5a72485890bfe8e158dc89213098377899d0f721aacf1d7
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
@@ -294,8 +252,6 @@ DIST gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.zip 64742 BLAKE2B 55c7f791bb3ba2d1af24dd07
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321eacd25c0af1e5b3f031831266abf6a8e5a5ed12f6381778868383c03433f8ef760d6b42ffbff40150f2fee91dedd0b312f9fe81c7f SHA512 3214b38f348921f6a6d9ef93d4337bb90abd0d101d69d16ad8e38415c22d3b9a85bda873df2eb7a271f9b973ef38b74731405e522e1bb8083c78932762cb5535
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d01f3d89a2db6930f406aded7889530b04689ea34b53fa2a7af352c264681ee40b1d192c86ca2f7dcc33dca825d355694527e4dbf SHA512 19f019e85b8c9a533c3cf2fd492b1813272f00cce06a56ffe43046935e49ccf6e191ce83f1d236f6355bae7126aa722016f05174687ff2faf54f121958266edf
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip 80765 BLAKE2B d6d8bfba5082aabb1a247add43b21ffa058b58fef60e8efbf973b724273cda2496ef0c9b226ad14bfea17f141f077d3bd98dfe3dbcf3c2938fd64570abd662b2 SHA512 2a89b2bce856cc11f3b71edec9e538048acf07f6aabbe27236b663b284c086c5862f086734e58727e9db8912a113fea51f72dad1a45a9e85860764f9c27b19d2
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200121175148-a6ecf24a6d71.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
diff --git a/app-admin/gopass/gopass-1.10.1-r2.ebuild b/app-admin/gopass/gopass-1.10.1-r2.ebuild
index b38c388776d3..7d75af30eb68 100644
--- a/app-admin/gopass/gopass-1.10.1-r2.ebuild
+++ b/app-admin/gopass/gopass-1.10.1-r2.ebuild
@@ -284,7 +284,7 @@ SRC_URI="https://github.com/gopasspw/gopass/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 DEPEND=">=dev-lang/go-1.11"
 RDEPEND="
diff --git a/app-admin/gopass/gopass-1.10.1.ebuild b/app-admin/gopass/gopass-1.10.1.ebuild
deleted file mode 100644
index 934fd1f58cad..000000000000
--- a/app-admin/gopass/gopass-1.10.1.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module bash-completion-r1
-
-EGO_SUM=(
-	"cloud.google.com/go v0.26.0/go.mod"
-	"filippo.io/age v1.0.0-beta4"
-	"filippo.io/age v1.0.0-beta4/go.mod"
-	"github.com/BurntSushi/toml v0.3.1"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/alecthomas/binary v0.0.0-20190922233330-fb1b1d9c299c"
-	"github.com/alecthomas/binary v0.0.0-20190922233330-fb1b1d9c299c/go.mod"
-	"github.com/atotto/clipboard v0.1.2"
-	"github.com/atotto/clipboard v0.1.2/go.mod"
-	"github.com/blang/semver v0.0.0-20190414182527-1a9109f8c4a1"
-	"github.com/blang/semver v0.0.0-20190414182527-1a9109f8c4a1/go.mod"
-	"github.com/caspr-io/yamlpath v0.0.0-20200722075116-502e8d113a9b"
-	"github.com/caspr-io/yamlpath v0.0.0-20200722075116-502e8d113a9b/go.mod"
-	"github.com/cenkalti/backoff v2.2.1+incompatible"
-	"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
-	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-	"github.com/chzyer/logex v1.1.10"
-	"github.com/chzyer/logex v1.1.10/go.mod"
-	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
-	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
-	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1"
-	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
-	"github.com/client9/misspell v0.3.4"
-	"github.com/client9/misspell v0.3.4/go.mod"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
-	"github.com/creack/pty v1.1.9/go.mod"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/dominikschulz/github-releases v0.0.3"
-	"github.com/dominikschulz/github-releases v0.0.3/go.mod"
-	"github.com/dustin/go-humanize v1.0.0/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
-	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-	"github.com/fatih/color v1.9.0"
-	"github.com/fatih/color v1.9.0/go.mod"
-	"github.com/godbus/dbus v0.0.0-20190623212516-8a1682060722"
-	"github.com/godbus/dbus v0.0.0-20190623212516-8a1682060722/go.mod"
-	"github.com/gokyle/twofactor v1.0.1"
-	"github.com/gokyle/twofactor v1.0.1/go.mod"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-	"github.com/golang/mock v1.1.1/go.mod"
-	"github.com/golang/protobuf v1.2.0/go.mod"
-	"github.com/golang/protobuf v1.3.2/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
-	"github.com/golang/protobuf v1.4.0"
-	"github.com/golang/protobuf v1.4.0/go.mod"
-	"github.com/golang/protobuf v1.4.1/go.mod"
-	"github.com/golang/protobuf v1.4.2"
-	"github.com/golang/protobuf v1.4.2/go.mod"
-	"github.com/google/go-cmp v0.2.0/go.mod"
-	"github.com/google/go-cmp v0.3.0"
-	"github.com/google/go-cmp v0.3.0/go.mod"
-	"github.com/google/go-cmp v0.3.1"
-	"github.com/google/go-cmp v0.3.1/go.mod"
-	"github.com/google/go-cmp v0.4.0"
-	"github.com/google/go-cmp v0.4.0/go.mod"
-	"github.com/google/go-cmp v0.5.0"
-	"github.com/google/go-cmp v0.5.0/go.mod"
-	"github.com/google/go-cmp v0.5.1"
-	"github.com/google/go-cmp v0.5.1/go.mod"
-	"github.com/google/go-github v17.0.0+incompatible"
-	"github.com/google/go-github v17.0.0+incompatible/go.mod"
-	"github.com/google/go-querystring v1.0.0"
-	"github.com/google/go-querystring v1.0.0/go.mod"
-	"github.com/google/gofuzz v1.0.0/go.mod"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
-	"github.com/hashicorp/errwrap v1.0.0"
-	"github.com/hashicorp/errwrap v1.0.0/go.mod"
-	"github.com/hashicorp/go-multierror v1.1.0"
-	"github.com/hashicorp/go-multierror v1.1.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.4"
-	"github.com/hashicorp/golang-lru v0.5.4/go.mod"
-	"github.com/jsimonetti/pwscheme v0.0.0-20160922125227-76804708ecad"
-	"github.com/jsimonetti/pwscheme v0.0.0-20160922125227-76804708ecad/go.mod"
-	"github.com/json-iterator/go v1.1.9"
-	"github.com/json-iterator/go v1.1.9/go.mod"
-	"github.com/json-iterator/go v1.1.10"
-	"github.com/json-iterator/go v1.1.10/go.mod"
-	"github.com/jtolds/gls v4.20.0+incompatible"
-	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
-	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51"
-	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod"
-	"github.com/klauspost/cpuid v1.2.3"
-	"github.com/klauspost/cpuid v1.2.3/go.mod"
-	"github.com/klauspost/cpuid v1.3.1"
-	"github.com/klauspost/cpuid v1.3.1/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-	"github.com/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/text v0.1.0"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/kr/text v0.2.0"
-	"github.com/kr/text v0.2.0/go.mod"
-	"github.com/martinhoefling/goxkcdpwgen v0.0.0-20190331205820-7dc3d102eca3"
-	"github.com/martinhoefling/goxkcdpwgen v0.0.0-20190331205820-7dc3d102eca3/go.mod"
-	"github.com/mattn/go-colorable v0.1.4"
-	"github.com/mattn/go-colorable v0.1.4/go.mod"
-	"github.com/mattn/go-colorable v0.1.7"
-	"github.com/mattn/go-colorable v0.1.7/go.mod"
-	"github.com/mattn/go-isatty v0.0.8"
-	"github.com/mattn/go-isatty v0.0.8/go.mod"
-	"github.com/mattn/go-isatty v0.0.11"
-	"github.com/mattn/go-isatty v0.0.11/go.mod"
-	"github.com/mattn/go-isatty v0.0.12"
-	"github.com/mattn/go-isatty v0.0.12/go.mod"
-	"github.com/minio/md5-simd v1.1.0"
-	"github.com/minio/md5-simd v1.1.0/go.mod"
-	"github.com/minio/minio-go/v6 v6.0.57"
-	"github.com/minio/minio-go/v6 v6.0.57/go.mod"
-	"github.com/minio/sha256-simd v0.1.1"
-	"github.com/minio/sha256-simd v0.1.1/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/mitchellh/go-ps v1.0.0"
-	"github.com/mitchellh/go-ps v1.0.0/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421"
-	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742"
-	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
-	"github.com/modern-go/reflect2 v1.0.1"
-	"github.com/modern-go/reflect2 v1.0.1/go.mod"
-	"github.com/muesli/crunchy v0.4.0"
-	"github.com/muesli/crunchy v0.4.0/go.mod"
-	"github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d"
-	"github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod"
-	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
-	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
-	"github.com/pkg/errors v0.8.1/go.mod"
-	"github.com/pkg/errors v0.9.1"
-	"github.com/pkg/errors v0.9.1/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
-	"github.com/russross/blackfriday/v2 v2.0.1"
-	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
-	"github.com/schollz/closestmatch v0.0.0-20190308193919-1fbe626be92e"
-	"github.com/schollz/closestmatch v0.0.0-20190308193919-1fbe626be92e/go.mod"
-	"github.com/sergi/go-diff v1.1.0"
-	"github.com/sergi/go-diff v1.1.0/go.mod"
-	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
-	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
-	"github.com/sirupsen/logrus v1.5.0/go.mod"
-	"github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e"
-	"github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod"
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
-	"github.com/smartystreets/assertions v1.0.0"
-	"github.com/smartystreets/assertions v1.0.0/go.mod"
-	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a"
-	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
-	"github.com/smartystreets/goconvey v1.6.4"
-	"github.com/smartystreets/goconvey v1.6.4/go.mod"
-	"github.com/spf13/pflag v1.0.3/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/testify v1.2.2/go.mod"
-	"github.com/stretchr/testify v1.3.0/go.mod"
-	"github.com/stretchr/testify v1.4.0/go.mod"
-	"github.com/stretchr/testify v1.6.1"
-	"github.com/stretchr/testify v1.6.1/go.mod"
-	"github.com/urfave/cli/v2 v2.2.0"
-	"github.com/urfave/cli/v2 v2.2.0/go.mod"
-	"github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9"
-	"github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9/go.mod"
-	"github.com/xrash/smetrics v0.0.0-20200730060457-89a2a8a1fb0b"
-	"github.com/xrash/smetrics v0.0.0-20200730060457-89a2a8a1fb0b/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod"
-	"golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod"
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
-	"golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de"
-	"golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod"
-	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
-	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
-	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
-	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
-	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
-	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
-	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
-	"golang.org/x/net v0.0.0-20200707034311-ab3426394381"
-	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
-	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
-	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
-	"golang.org/x/sys v0.0.0-20200808120158-1030fc2bf1d9"
-	"golang.org/x/sys v0.0.0-20200808120158-1030fc2bf1d9/go.mod"
-	"golang.org/x/text v0.3.0"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.3"
-	"golang.org/x/text v0.3.3/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
-	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
-	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-	"golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
-	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
-	"google.golang.org/appengine v1.1.0/go.mod"
-	"google.golang.org/appengine v1.4.0/go.mod"
-	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
-	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
-	"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
-	"google.golang.org/grpc v1.19.0/go.mod"
-	"google.golang.org/grpc v1.23.0/go.mod"
-	"google.golang.org/grpc v1.27.0/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
-	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
-	"google.golang.org/protobuf v1.21.0"
-	"google.golang.org/protobuf v1.21.0/go.mod"
-	"google.golang.org/protobuf v1.22.0/go.mod"
-	"google.golang.org/protobuf v1.23.0/go.mod"
-	"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
-	"google.golang.org/protobuf v1.25.0"
-	"google.golang.org/protobuf v1.25.0/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f"
-	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
-	"gopkg.in/ini.v1 v1.42.0"
-	"gopkg.in/ini.v1 v1.42.0/go.mod"
-	"gopkg.in/ini.v1 v1.57.0"
-	"gopkg.in/ini.v1 v1.57.0/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2"
-	"gopkg.in/yaml.v2 v2.2.2/go.mod"
-	"gopkg.in/yaml.v2 v2.2.4/go.mod"
-	"gopkg.in/yaml.v2 v2.3.0"
-	"gopkg.in/yaml.v2 v2.3.0/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776"
-	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod"
-	"gotest.tools v2.2.0+incompatible"
-	"gotest.tools v2.2.0+incompatible/go.mod"
-	"gotest.tools/v3 v3.0.2"
-	"gotest.tools/v3 v3.0.2/go.mod"
-	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
-	"rsc.io/qr v0.2.0"
-	"rsc.io/qr v0.2.0/go.mod"
-)
-
-go-module_set_globals
-
-DESCRIPTION="a simple but powerful password manager for the terminal"
-HOMEPAGE="https://www.gopass.pw/"
-SRC_URI="https://github.com/gopasspw/gopass/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-DEPEND=">=dev-lang/go-1.11"
-RDEPEND="
-	dev-vcs/git
-	>=app-crypt/gnupg-2
-"
-
-src_install() {
-	dobin gopass
-
-	einstalldocs
-
-	# install fish completion
-	./gopass completion fish > "${T}"/${PN}.fish || die
-	insinto /usr/share/fish/vendor_completions.d
-	doins "${T}"/${PN}.fish
-
-	# install bash completion
-	./gopass completion bash > "${T}"/${PN} || die
-	dobashcomp "${T}"/${PN}
-
-	# install zsh completion
-	./gopass completion zsh > "${T}"/${PN}.zsh || die
-	insinto /usr/share/zsh/site-functions
-	newins "${T}"/${PN}.zsh _${PN}
-}
diff --git a/app-admin/gopass/gopass-1.9.2.ebuild b/app-admin/gopass/gopass-1.9.2.ebuild
deleted file mode 100644
index 06f1fb2faf01..000000000000
--- a/app-admin/gopass/gopass-1.9.2.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module bash-completion-r1
-
-EGO_SUM=(
-	"github.com/BurntSushi/toml v0.3.1"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/DATA-DOG/go-sqlmock v1.3.3"
-	"github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod"
-	"github.com/ProtonMail/go-appdir v1.1.0"
-	"github.com/ProtonMail/go-appdir v1.1.0/go.mod"
-	"github.com/alecthomas/binary v0.0.0-20190922233330-fb1b1d9c299c"
-	"github.com/alecthomas/binary v0.0.0-20190922233330-fb1b1d9c299c/go.mod"
-	"github.com/atotto/clipboard v0.1.2"
-	"github.com/atotto/clipboard v0.1.2/go.mod"
-	"github.com/blang/semver v0.0.0-20190414182527-1a9109f8c4a1"
-	"github.com/blang/semver v0.0.0-20190414182527-1a9109f8c4a1/go.mod"
-	"github.com/cenkalti/backoff v2.2.1+incompatible"
-	"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
-	"github.com/creack/pty v1.1.9/go.mod"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/dominikschulz/github-releases v0.0.2"
-	"github.com/dominikschulz/github-releases v0.0.2/go.mod"
-	"github.com/doronbehar/gocui v0.4.2"
-	"github.com/doronbehar/gocui v0.4.2/go.mod"
-	"github.com/doronbehar/termbox-go v0.0.0-20191006141301-8c9470559e05"
-	"github.com/doronbehar/termbox-go v0.0.0-20191006141301-8c9470559e05/go.mod"
-	"github.com/fatih/color v1.9.0"
-	"github.com/fatih/color v1.9.0/go.mod"
-	"github.com/gdamore/encoding v1.0.0"
-	"github.com/gdamore/encoding v1.0.0/go.mod"
-	"github.com/gdamore/tcell v1.3.0"
-	"github.com/gdamore/tcell v1.3.0/go.mod"
-	"github.com/godbus/dbus v0.0.0-20190623212516-8a1682060722"
-	"github.com/godbus/dbus v0.0.0-20190623212516-8a1682060722/go.mod"
-	"github.com/gokyle/twofactor v1.0.1"
-	"github.com/gokyle/twofactor v1.0.1/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
-	"github.com/golang/protobuf v1.4.0"
-	"github.com/golang/protobuf v1.4.0/go.mod"
-	"github.com/google/go-cmp v0.3.0"
-	"github.com/google/go-cmp v0.3.0/go.mod"
-	"github.com/google/go-cmp v0.3.1"
-	"github.com/google/go-cmp v0.3.1/go.mod"
-	"github.com/google/go-cmp v0.4.0"
-	"github.com/google/go-cmp v0.4.0/go.mod"
-	"github.com/google/go-github v17.0.0+incompatible"
-	"github.com/google/go-github v17.0.0+incompatible/go.mod"
-	"github.com/google/go-querystring v1.0.0"
-	"github.com/google/go-querystring v1.0.0/go.mod"
-	"github.com/hashicorp/errwrap v1.0.0"
-	"github.com/hashicorp/errwrap v1.0.0/go.mod"
-	"github.com/hashicorp/go-multierror v1.1.0"
-	"github.com/hashicorp/go-multierror v1.1.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.4"
-	"github.com/hashicorp/golang-lru v0.5.4/go.mod"
-	"github.com/jsimonetti/pwscheme v0.0.0-20160922125227-76804708ecad"
-	"github.com/jsimonetti/pwscheme v0.0.0-20160922125227-76804708ecad/go.mod"
-	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51"
-	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/text v0.1.0"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/kr/text v0.2.0"
-	"github.com/kr/text v0.2.0/go.mod"
-	"github.com/lucasb-eyer/go-colorful v1.0.2"
-	"github.com/lucasb-eyer/go-colorful v1.0.2/go.mod"
-	"github.com/lucasb-eyer/go-colorful v1.0.3"
-	"github.com/lucasb-eyer/go-colorful v1.0.3/go.mod"
-	"github.com/martinhoefling/goxkcdpwgen v0.0.0-20190331205820-7dc3d102eca3"
-	"github.com/martinhoefling/goxkcdpwgen v0.0.0-20190331205820-7dc3d102eca3/go.mod"
-	"github.com/mattn/go-colorable v0.1.4"
-	"github.com/mattn/go-colorable v0.1.4/go.mod"
-	"github.com/mattn/go-colorable v0.1.6"
-	"github.com/mattn/go-colorable v0.1.6/go.mod"
-	"github.com/mattn/go-isatty v0.0.8"
-	"github.com/mattn/go-isatty v0.0.8/go.mod"
-	"github.com/mattn/go-isatty v0.0.11"
-	"github.com/mattn/go-isatty v0.0.11/go.mod"
-	"github.com/mattn/go-isatty v0.0.12"
-	"github.com/mattn/go-isatty v0.0.12/go.mod"
-	"github.com/mattn/go-runewidth v0.0.4"
-	"github.com/mattn/go-runewidth v0.0.4/go.mod"
-	"github.com/mattn/go-runewidth v0.0.9"
-	"github.com/mattn/go-runewidth v0.0.9/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/mitchellh/go-ps v1.0.0"
-	"github.com/mitchellh/go-ps v1.0.0/go.mod"
-	"github.com/muesli/crunchy v0.4.0"
-	"github.com/muesli/crunchy v0.4.0/go.mod"
-	"github.com/muesli/goprogressbar v0.0.0-20190807022807-e540249d2ac1"
-	"github.com/muesli/goprogressbar v0.0.0-20190807022807-e540249d2ac1/go.mod"
-	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
-	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
-	"github.com/pkg/errors v0.9.1"
-	"github.com/pkg/errors v0.9.1/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/russross/blackfriday/v2 v2.0.1"
-	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
-	"github.com/schollz/closestmatch v0.0.0-20190308193919-1fbe626be92e"
-	"github.com/schollz/closestmatch v0.0.0-20190308193919-1fbe626be92e/go.mod"
-	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
-	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
-	"github.com/skip2/go-qrcode v0.0.0-20191027152451-9434209cb086"
-	"github.com/skip2/go-qrcode v0.0.0-20191027152451-9434209cb086/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/testify v1.5.1"
-	"github.com/stretchr/testify v1.5.1/go.mod"
-	"github.com/urfave/cli/v2 v2.2.0"
-	"github.com/urfave/cli/v2 v2.2.0/go.mod"
-	"github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9"
-	"github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4"
-	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
-	"golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5"
-	"golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20200421231249-e086a090c8fd"
-	"golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod"
-	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
-	"golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f"
-	"golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.2"
-	"golang.org/x/text v0.3.2/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
-	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
-	"google.golang.org/protobuf v1.21.0"
-	"google.golang.org/protobuf v1.21.0/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f"
-	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2"
-	"gopkg.in/yaml.v2 v2.2.2/go.mod"
-	"gopkg.in/yaml.v2 v2.2.8"
-	"gopkg.in/yaml.v2 v2.2.8/go.mod"
-	"rsc.io/qr v0.2.0"
-	"rsc.io/qr v0.2.0/go.mod"
-)
-
-go-module_set_globals
-
-DESCRIPTION="a simple but powerful password manager for the terminal"
-HOMEPAGE="https://www.gopass.pw/"
-SRC_URI="https://github.com/gopasspw/gopass/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-DEPEND=">=dev-lang/go-1.11"
-RDEPEND="
-	dev-vcs/git
-	>=app-crypt/gnupg-2
-"
-
-src_install() {
-	dobin gopass
-
-	einstalldocs
-
-	# install fish completion
-	./gopass completion fish > "${T}"/${PN}.fish || die
-	insinto /usr/share/fish/vendor_completions.d
-	doins "${T}"/${PN}.fish
-
-	# install bash completion
-	./gopass completion bash > "${T}"/${PN} || die
-	dobashcomp "${T}"/${PN}
-
-	# install zsh completion
-	./gopass completion zsh > "${T}"/${PN}.zsh || die
-	insinto /usr/share/zsh/site-functions
-	newins "${T}"/${PN}.zsh _${PN}
-}
diff --git a/app-admin/kpcli/Manifest b/app-admin/kpcli/Manifest
index 81f060a24589..2d1e59e1fbf6 100644
--- a/app-admin/kpcli/Manifest
+++ b/app-admin/kpcli/Manifest
@@ -1,2 +1 @@
-DIST kpcli-3.4.pl 211243 BLAKE2B 4880d832554de1956e033bba2e2021b9dc0b77202585663b0f4ad2acca520bcb430ac974bbea00c21aa37c2c8e8fa8c5cf2e8131542c20ecc3c6b0ac6dd85d9a SHA512 1ec9ea46f769a6891700565a51c592fd4809a0f3bc1d2088ca694233b276652506b470328b8b840cd0876b945faad27a16a5685d8655868cd20760f24619ffaf
 DIST kpcli-3.6.pl 232478 BLAKE2B 2c7ea808e840954d2661d7c89dbc7cd7f955d2bfba2c70034d95f480bdfbce8e5e3533105aa4f78c2c4386c1414ca78d678e0487571d93e23381e697054a7c01 SHA512 12c7fdeb613451d1bfcbed18fdec0b555a1ec2ce28ffd7969313a9a5acac582d1c019ea660a550ab2a28d947c5d14a63fcdea252757291aeb44ceae63c205b0f
diff --git a/app-admin/kpcli/kpcli-3.4.ebuild b/app-admin/kpcli/kpcli-3.4.ebuild
deleted file mode 100644
index d12d84ae8359..000000000000
--- a/app-admin/kpcli/kpcli-3.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature
-
-DESCRIPTION="A command line interface to KeePass database files"
-HOMEPAGE="http://kpcli.sourceforge.net"
-SRC_URI="https://downloads.sourceforge.net/project/kpcli/${P}.pl"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-lang/perl
-	dev-perl/Clone
-	dev-perl/Crypt-Rijndael
-	dev-perl/TermReadKey
-	dev-perl/Sort-Naturally
-	dev-perl/Term-ShellUI
-	dev-perl/File-KeePass
-	virtual/perl-File-Spec
-	virtual/perl-Getopt-Long
-	virtual/perl-Digest-MD5
-	virtual/perl-Digest-SHA
-	virtual/perl-Data-Dumper
-	virtual/perl-Term-ANSIColor
-	virtual/perl-Time-Piece
-	virtual/perl-Carp"
-
-src_unpack() {
-	mkdir "${S}" || die
-	cp "${DISTDIR}/${P}.pl" "${S}/${PN}" || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	dobin kpcli
-}
-
-pkg_postinst() {
-	optfeature "X clipboard support" "dev-perl/Capture-Tiny dev-perl/Clipboard"
-}
diff --git a/app-admin/kpcli/kpcli-3.6.ebuild b/app-admin/kpcli/kpcli-3.6.ebuild
index 73dabd93e84a..d274b38218b7 100644
--- a/app-admin/kpcli/kpcli-3.6.ebuild
+++ b/app-admin/kpcli/kpcli-3.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/project/kpcli/${P}.pl"
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-perl/Clone
 	dev-perl/Crypt-Rijndael
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index bf353bcd7ec9..8d6efb62f389 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,14 +1,10 @@
-DIST logstash-6.8.11.tar.gz 176909941 BLAKE2B f3a7085b179215982df87433523735dab35832ae73a41b8b98a66dacc95bd79985f14f78699902c3b7153ff7c11d21ea3f150899095790ad888bdfbb2eaa6fda SHA512 0ebb938784a4a4ea8c1e1691d1953d69605860b6b61fb818d73054b4488fd4c43914c369b468948633ea52d2c8c4f0bfe0e610912cb8c7436b15c5ac5a7047d6
-DIST logstash-6.8.12.tar.gz 176911027 BLAKE2B 03f95452c3823863e78a24c7bdf2709cc4041b19f94c96e747d6398576aef2f3d3cefed311301ca40eef8c6cd8ce4ac2b042a08d664b7e7f83a0df226bef90db SHA512 4070e813ab39b884f05197b9c8c983770af93bfc52bb7f31dd5eb375d509b31f56a5aca5b8a7011acb4fa506d991bef8567e6f4b2f0ee72cfce67089c80bcb47
-DIST logstash-7.6.2.tar.gz 172679447 BLAKE2B afeaab06178669559ff532cf72575f8063d07f95f2401060d33e0a99c87bb9e0c251e45634b9723efe456892ac19586accc89cf7272163e48eeaef438632b777 SHA512 c86dcf36cd0d578467c7013234040d5ea100f08ef69a185f6aa86c87dfa46936282abf10d0f495ffe649274136b735d17ab513ef3401205140c2d98bd9f91238
-DIST logstash-7.7.0.tar.gz 166451553 BLAKE2B 30b732f1ef516b275246b0e14212b0b00b78502e0b4e78211b3bfdd77e2190639ed8c35f775dae7817b0b43a446d34941b968e8a0785302c337a326a507fc607 SHA512 970740adc47551d7967b9841cc39d15f2cbdcd46c2fee1f84b5688fac266fdcd2202cbb10d3a10cf3768606f693ed2e4fc79e91d293a3295083718bafaa7bc9d
+DIST logstash-6.8.13.tar.gz 176911221 BLAKE2B 644dc67dea638e2e2307e807bf2f08e9758db4f8b1a01deb13585b925ceeaaaafba0e573f125c095603b5c7e5329ae82677472c72f53af9d26d792de31c896ed SHA512 f253b566e8f67063bea6dd183ca495d7b53b0062566278e0937af71763fb0b3339ef90c7620edd3370719faa2c49a162e1757141fa60b7136e9d9c3d83657d32
+DIST logstash-7.10.0-linux-x86_64.tar.gz 351102587 BLAKE2B 47f8d84d4d42a313e9c2b17fbf3b0aaf3a22145b3ba27a5f6a272e9698c4a21ef061752010ee8c37539373c033eca910ba21f799e87a9f155141a1bd09cbf3e5 SHA512 f9484bb2e3511ee172fc96b7cd0649a5ecc581f31672f54690e03d0efae65e0dda091143db3486a671012b5c7382bd40d8aa18ca39768fdc88f4c7a4e5b373ff
 DIST logstash-7.8.1.tar.gz 159599529 BLAKE2B c7ba03fc106add6ee0b956de1c3a1ed221c2571087aeedec178d65be3cc83a10f7a4eb35898fc441ffd1c27322668d8e95344a5509cc703b4788d76422a5a1f1 SHA512 7ad6d380e92e90fad2a058a24571b85a49d5ed81835837c12dfa2f4ae4c776483de39b099ed6852ca7f4bab833cd5aba44d28df3048557dfc4a52d4c5486e276
-DIST logstash-7.9.1.tar.gz 158473271 BLAKE2B deeaccb5dd1c9acc52ee395e699fa67d816dfb4144068409f375c20a161837d07f4b0ad269f044076104bc57d84d2decf2bbb4bce17c00737afb74186e706ebb SHA512 d7e359523f4a7deba095d6a1a71f141c29ecc4cf58cdd5f81ea5af80d30be9716b1a9c824d4fc000cafc9457cf7d587d346fd8b1d0d04411a7fd8d280054671d
 DIST logstash-7.9.2.tar.gz 158690951 BLAKE2B a50d959d0d032896b64f2957f299efead1ef51cda77c440f612500ba7193bc8cc81b092c59513dc70a412cf813920df4da5cadff5a494136c5d284d5b9060f34 SHA512 54ec3f58f6fea9d8dee9cbe8eaf755bb9f5d26858082f6594f6fe5f006af6e3f2ee2d5899ada71ef4ad6856d27c0c91ad7a0769aea16c09a8cf6ab234ffc939e
-DIST logstash-oss-6.8.11.tar.gz 176779121 BLAKE2B 2b3f62fd78a5ffcea07954c4e9b90fc7df10b933a327ac5400d73eb6c4ecd1013049d04b6cecd014b17ff6361a4be0ee535112267cce71cf8c9dc95b551ed6f6 SHA512 4e0d6ebaa620ebb0039687859f28e8620e5604d8452ad1338b2a670cec3153e521f4c3bdc3a78e10b843c1356e73c96065c1c624efc2baa9b2277fa1f8cabaa9
-DIST logstash-oss-6.8.12.tar.gz 176780408 BLAKE2B 4a58efc6e12b6f390022f8d4fb3f4cb3abb4af486eadd65bed840d9a0e8bf0a02659d23d7de6e0cf7068f9e3e20f65cc4e62a39350f60e1f7b3af56e3bcc3859 SHA512 2782b029a2e4880282518ed591a9dd2ee7fd6e6aca15289067f3f45922e0b1fd6adb036b4cc5d256d9aaf8d8cf06bb4ff59cfae6519fac549b6b7f36700f7c94
-DIST logstash-oss-7.6.2.tar.gz 172501347 BLAKE2B 2a83d7617c8e13a0b736ed0023a164d2191102f49e7d7174bf3ea9c56370c51e4fd760f7bb3aba97f1b9bd2ec122ba22e00dec9ac9636f7b79128c6bb2da548e SHA512 c425a9748964ef38fc58f67778cd88fc367df91087362353cfee316e54528e4a23407e1fc53d628008fd4c829b427061758112f10e7805cec88c0a1f0a966d2a
-DIST logstash-oss-7.7.0.tar.gz 166272505 BLAKE2B a12b065874e03ae985c590b8bcbaabf4d2ee6d0ce3ca1f5d60b0874074996e7f8c40bad4fd242e26e74c11741620103e41bdeade2f60f6fabe97652d1c9fbb1e SHA512 a455fcf5c9a44c326ae581f9390ddf206064e6e6b3801cca312cef91e8d33086f8a6598ed68f81f2cfc6d8d66783632b983bef7c8a4ad0f24e929827ec137da4
+DIST logstash-7.9.3.tar.gz 158711139 BLAKE2B 5a5426e3ee41e3f985318e7356a3b13df1042b887a627824e9d14a73839e648ea6291333921902320b20cc3e474a15d9b1f4c76bfcfdc0b6aaa08ed098df0ae4 SHA512 f4bfc97203bcad589d3682a4dfd8f7e6172efa958775541b128f43b151cedf4065b1eab012d60a8aa5005dbb504e4c3638a26492c30fba3ba5b271ad17876f25
+DIST logstash-oss-6.8.13.tar.gz 176780212 BLAKE2B 68a5f262023f75525e8b8f98d279920011a0a4cbb34c7297c51f3e45034ab12ca2e2f57b2bb22453107e24fdbca65f16f73a69776fbfd321ea87c6fd1b8d0292 SHA512 0919c8f7bbf39ac9cb41d0065267eb39ba359393e629bf360d6795a68efc9444ab99c7287c533b53efe9ec74fbe403ebe5e5e178b42c48b92d79281a3a5f2045
+DIST logstash-oss-7.10.0-linux-x86_64.tar.gz 350920148 BLAKE2B 77f2a8668a7b3e46224da7383b34ebe632360d833a5f99d010afe94e48d5f3ac2431fb1f220bdf28b9bdb1a8639f9f64db07862bf24c4f340caba2403d60ac0c SHA512 b9deffe41ef051c851b6a456cebcf66cd2a17de6f49dcac8cdb29189ebbcac0ee286b9973456fa8a37bebbf7ba34295cd192f1f5c9dbbdde7da71fde126c230e
 DIST logstash-oss-7.8.1.tar.gz 159415077 BLAKE2B b6dd108679d813cf4ba0d0426ea8acfb460cdcfeec052359a6ce79f194fe4631349973ce1bc726fe7356264211608328204332c74e49ba0aa92e626571789142 SHA512 60d964c0b1f6afebcd41a8036e2dbbee62ca15365c840a5664406428c6b692588ea9343a600ba12d4355ff46ae60a08d42c61c5f33bb7590ce119e15fa1a32e4
-DIST logstash-oss-7.9.1.tar.gz 158289592 BLAKE2B 91d89b4375e51721a5d3181b916cdac33b65e4a020bdec57b3bece9b25595e1588366c69c9e07e4c25b148b4ed2703eef936d1924fac7387fb25cf750226f089 SHA512 ddd6c0db8b59b9ad719a69f04eea81e0261061b5a26569819d4c9306c6f3a63acf575bf50e5f22b17e9b44ed8750d83762b41b866a25b2a2e283b5186c9cdf61
 DIST logstash-oss-7.9.2.tar.gz 158510234 BLAKE2B 568f5ba0ebe2baf75211af2e4c859ec5496e28149a060d7688606b56a7972924f0a163914f1c085bc2600694bfc7363fa5300785457f64f3210b97e1074c7210 SHA512 dbd83299a5b3ec76f3e4b235d0b6aff9aad2ab395412b570e3ef82c2ba761a1899a7009b117af9b13b623c00579f323751da7b54c613047efa2558394a19387d
+DIST logstash-oss-7.9.3.tar.gz 158530838 BLAKE2B 0a37f05a42848e6d99ac6741f7fa92a73794d292ad72f793754805d45bdff940163875046258148f71cf953ce40be8747d201d0782de0cf60f2ed16db0136b29 SHA512 13d7a2e417d061b838c8be8a2a874f5964fd32c70cb437ab4bab7c4f8a17882b7874dabe53ba6a588250e56557e972b6d1f5be7970debbfbd893d4532705e6f2
diff --git a/app-admin/logstash-bin/files/logstash.initd-r2 b/app-admin/logstash-bin/files/logstash.initd-r2
index e05c837ae709..e76f00ff9a3f 100644
--- a/app-admin/logstash-bin/files/logstash.initd-r2
+++ b/app-admin/logstash-bin/files/logstash.initd-r2
@@ -21,6 +21,7 @@ command="${LS_INSTALL_DIR}/bin/logstash"
 command_args="--path.data ${LS_DATA_DIR} --path.logs ${LS_LOG_DIR} --path.settings ${LS_SETTINGS_DIR} ${LS_OPTS}"
 command_background="true"
 pidfile="/run/${RC_SVCNAME}.pid"
+retry="30"
 
 start_stop_daemon_args="--user ${LS_USER}:${LS_GROUP} \
 	--chdir ${LS_HOME}
diff --git a/app-admin/logstash-bin/logstash-bin-6.8.12.ebuild b/app-admin/logstash-bin/logstash-bin-6.8.12.ebuild
deleted file mode 100644
index 08167fb02874..000000000000
--- a/app-admin/logstash-bin/logstash-bin-6.8.12.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-MY_PN="${PN%-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-RDEPEND="acct-group/logstash
-	acct-user/logstash
-	virtual/jre:1.8"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
-	keepdir "/var/log/${MY_PN}"
-
-	insinto "/usr/share/${MY_PN}"
-	newins "${FILESDIR}/agent.conf.sample" agent.conf
-
-	rm -v config/{pipelines.yml,startup.options} || die
-	insinto /etc/${MY_PN}
-	doins -r config/.
-	doins "${FILESDIR}/pipelines.yml"
-	rm -rv config data || die
-
-	insinto "/opt/${MY_PN}"
-	doins -r .
-	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
-
-	newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
-
-	insinto /usr/share/eselect/modules
-	doins "${FILESDIR}"/logstash-plugin.eselect
-}
-
-pkg_postinst() {
-	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
-	ewarn "Install the plugins via eselect module that will automatically re-install"
-	ewarn "all self installed plugins after Logstash upgrades."
-	elog
-	elog "Installing plugins:"
-	elog "eselect logstash-plugin install logstash-output-gelf"
-	elog
-
-	elog "Reinstalling self installed plugins (installed via eselect module):"
-	eselect logstash-plugin reinstall
-
-	elog
-	elog "Sample configuration:"
-	elog "${EROOT}/usr/share/${MY_PN}"
-	elog
-	elog "The default pipeline configuration expects the configuration(s) to be found in:"
-	elog "${EROOT}/etc/logstash/conf.d/*.conf"
-}
diff --git a/app-admin/logstash-bin/logstash-bin-6.8.11.ebuild b/app-admin/logstash-bin/logstash-bin-6.8.13.ebuild
similarity index 100%
rename from app-admin/logstash-bin/logstash-bin-6.8.11.ebuild
rename to app-admin/logstash-bin/logstash-bin-6.8.13.ebuild
diff --git a/app-admin/logstash-bin/logstash-bin-7.6.2.ebuild b/app-admin/logstash-bin/logstash-bin-7.10.0.ebuild
similarity index 74%
rename from app-admin/logstash-bin/logstash-bin-7.6.2.ebuild
rename to app-admin/logstash-bin/logstash-bin-7.10.0.ebuild
index 9e7d19873de3..e016d18660d0 100644
--- a/app-admin/logstash-bin/logstash-bin-7.6.2.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-7.10.0.ebuild
@@ -10,8 +10,8 @@ MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Tool for managing events and logs"
 HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )"
 
 # source: LICENSE.txt and NOTICE.txt
 LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
@@ -28,6 +28,22 @@ RDEPEND="acct-group/logstash
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	default
+
+	rm vendor/jruby/lib/jni/aarch64-Linux/libjffi-1.2.so \
+		vendor/jruby/lib/jni/arm-Linux/libjffi-1.2.so \
+		vendor/jruby/lib/jni/i386-SunOS/libjffi-1.2.so \
+		vendor/jruby/lib/jni/mips64el-Linux/libjffi-1.2.so \
+		vendor/jruby/lib/jni/ppc64-Linux/libjffi-1.2.so \
+		vendor/jruby/lib/jni/ppc64le-Linux/libjffi-1.2.so \
+		vendor/jruby/lib/jni/sparcv9-Linux/libjffi-1.2.so \
+		vendor/jruby/lib/jni/sparcv9-SunOS/libjffi-1.2.so \
+		vendor/jruby/lib/jni/x86_64-DragonFlyBSD/libjffi-1.2.so \
+		vendor/jruby/lib/jni/x86_64-FreeBSD/libjffi-1.2.so \
+		vendor/jruby/lib/jni/x86_64-SunOS/libjffi-1.2.so || die
+}
+
 src_install() {
 	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
 	keepdir "/var/log/${MY_PN}"
diff --git a/app-admin/logstash-bin/logstash-bin-7.7.0.ebuild b/app-admin/logstash-bin/logstash-bin-7.7.0.ebuild
deleted file mode 100644
index 9e7d19873de3..000000000000
--- a/app-admin/logstash-bin/logstash-bin-7.7.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-MY_PN="${PN%-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-RDEPEND="acct-group/logstash
-	acct-user/logstash
-	virtual/jre"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
-	keepdir "/var/log/${MY_PN}"
-
-	insinto "/usr/share/${MY_PN}"
-	newins "${FILESDIR}/agent.conf.sample" agent.conf
-
-	rm -v config/{pipelines.yml,startup.options} || die
-	insinto /etc/${MY_PN}
-	doins -r config/.
-	doins "${FILESDIR}/pipelines.yml"
-	rm -rv config data || die
-
-	insinto "/opt/${MY_PN}"
-	doins -r .
-	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
-
-	newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
-
-	insinto /usr/share/eselect/modules
-	doins "${FILESDIR}"/logstash-plugin.eselect
-}
-
-pkg_postinst() {
-	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
-	ewarn "Install the plugins via eselect module that will automatically re-install"
-	ewarn "all self installed plugins after Logstash upgrades."
-	elog
-	elog "Installing plugins:"
-	elog "eselect logstash-plugin install logstash-output-gelf"
-	elog
-
-	elog "Reinstalling self installed plugins (installed via eselect module):"
-	eselect logstash-plugin reinstall
-
-	elog
-	elog "Sample configuration:"
-	elog "${EROOT}/usr/share/${MY_PN}"
-	elog
-	elog "The default pipeline configuration expects the configuration(s) to be found in:"
-	elog "${EROOT}/etc/logstash/conf.d/*.conf"
-}
diff --git a/app-admin/logstash-bin/logstash-bin-7.9.1.ebuild b/app-admin/logstash-bin/logstash-bin-7.9.3.ebuild
similarity index 100%
rename from app-admin/logstash-bin/logstash-bin-7.9.1.ebuild
rename to app-admin/logstash-bin/logstash-bin-7.9.3.ebuild
diff --git a/app-admin/rex/metadata.xml b/app-admin/rex/metadata.xml
index a1b89deccc29..ca2406f144a2 100644
--- a/app-admin/rex/metadata.xml
+++ b/app-admin/rex/metadata.xml
@@ -13,10 +13,6 @@
 		<email>kentnl@gentoo.org</email>
 		<name>Kent Fredric</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">RexOps/Rex</remote-id>
 		<remote-id type="cpan">Rex</remote-id>
diff --git a/app-admin/rex/rex-9999.ebuild b/app-admin/rex/rex-9999.ebuild
index 9f5222cbfb74..6942c13d2e55 100644
--- a/app-admin/rex/rex-9999.ebuild
+++ b/app-admin/rex/rex-9999.ebuild
@@ -65,7 +65,7 @@ RDEPEND="
 	virtual/perl-MIME-Base64
 	dev-perl/Net-OpenSSH
 	dev-perl/Net-SFTP-Foreign
-	virtual/perl-Scalar-List-Utils
+	>=virtual/perl-Scalar-List-Utils-1.450.0
 	dev-perl/Parallel-ForkManager
 	dev-perl/Sort-Naturally
 	dev-perl/String-Escape
@@ -81,7 +81,7 @@ RDEPEND="
 	dev-perl/YAML
 	virtual/perl-version
 "
-
+# NB: would add test? !minimal? Test-mysqld, but I can't get that to work
 BDEPEND="
 	${RDEPEND}
 	>=virtual/perl-CPAN-Meta-Requirements-2.120.620
@@ -89,6 +89,9 @@ BDEPEND="
 	>=dev-perl/File-ShareDir-Install-0.60.0
 	virtual/perl-Module-Metadata
 	test? (
+		!minimal? (
+			dev-perl/File-LibMagic
+		)
 		virtual/perl-File-Temp
 		dev-perl/Test-Deep
 		dev-perl/Test-Output
@@ -130,10 +133,16 @@ dzil_src_prep() {
 		-e '/^\[OptionalFeature/,/^$/d' \
 		-e '/^\[Test::MinimumVersion\]/{N;d}' \
 		-i dist.ini || die "Can't patch dist.ini"
+
+	# Removals/additons have to be tracked by git or dzil build fails
+	# Spurious warning during src_prepare
+	git rm -f xt/author/critic-progressive.t || die "Can't rm author/critic-progressive.t"
+	# Spurious warning during src_prepare
+	git rm -f xt/author/perltidy.t || die "Can't rm author/perltidy.t"
 }
 dzil_env_setup() {
 	# NextRelease noise :(
-	mkdir -p ~/.dzil/
+	mkdir -p ~/.dzil/ || die "mkdir -p ~/.dzil/ failed"
 	local user="$(whoami)"
 	local host="$(hostname)"
 	printf '[%%User]\nname = %s\nemail = %s' "${user}" "${user}@${host}" >> ~/.dzil/config.ini
@@ -146,7 +155,7 @@ dzil_to_distdir() {
 
 	cd "${dzil_root}" || die "Can't enter git workdir '${dzil_root}'";
 
-	dzil_src_prep
+	S="${dzil_root}" dzil_src_prep
 	dzil_env_setup
 
 	dzil_version="$(dzil version)" || die "Error invoking 'dzil version'"
@@ -190,6 +199,13 @@ src_prepare() {
 		dzil_to_distdir "${EGIT_CHECKOUT_DIR}" "${S}"
 	fi
 	cd "${S}" || die "Can't enter build dir"
+
+	# If you DIY installed Test::mysqld, but didn't patch
+	# it to handle the fact on Gentoo, mysql_install_db is NOT in PATH
+	# tests fail. So this test is patched out if mysql_install_db is not in PATH
+	if perl_has_module "Test::mysqld" && ! type -P mysql_install_db >/dev/null; then
+		perl_rm_files "t/db.t"
+	fi
 	perl-module_src_prepare
 }
 
diff --git a/app-admin/sudo/sudo-1.9.3_p1.ebuild b/app-admin/sudo/sudo-1.9.3_p1.ebuild
index 5cf225373323..32639cb05df9 100644
--- a/app-admin/sudo/sudo-1.9.3_p1.ebuild
+++ b/app-admin/sudo/sudo-1.9.3_p1.ebuild
@@ -22,7 +22,7 @@ else
 	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~sparc-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris"
 	fi
 fi
 
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index c3a10bbda660..b54d3c9cbaa0 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/duff/duff-0.5.2.ebuild b/app-arch/duff/duff-0.5.2.ebuild
index 94522ba771dd..f41ed1e86ad0 100644
--- a/app-arch/duff/duff-0.5.2.ebuild
+++ b/app-arch/duff/duff-0.5.2.ebuild
@@ -1,19 +1,17 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 DESCRIPTION="Command-line utility for quickly finding duplicates in a given set of files"
 HOMEPAGE="http://duff.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND=""
-RDEPEND=""
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog HACKING NEWS README* TODO
+	default
+	dodoc HACKING
 }
diff --git a/app-arch/fastjar/fastjar-0.98-r3.ebuild b/app-arch/fastjar/fastjar-0.98-r3.ebuild
index c33c9d06c5b7..791e30817363 100644
--- a/app-arch/fastjar/fastjar-0.98-r3.ebuild
+++ b/app-arch/fastjar/fastjar-0.98-r3.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="A jar program written in C"
 HOMEPAGE="https://savannah.nongnu.org/projects/fastjar"
@@ -13,12 +11,12 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
 
-IUSE=""
-
-# bug #188542
-RDEPEND="!<=dev-java/kaffe-1.1.7-r5"
+DEPEND="sys-libs/zlib"
+RDEPEND="
+	${DEPEND}
+	!<=dev-java/kaffe-1.1.7-r5" # bug 188542
 
-src_prepare() {
-	# bug #325557
-	epatch "${FILESDIR}/0.98-traversal.patch"
-}
+PATCHES=(
+	# bug 325557
+	"${FILESDIR}"/0.98-traversal.patch
+)
diff --git a/app-arch/gtk-splitter/gtk-splitter-2.2.1-r1.ebuild b/app-arch/gtk-splitter/gtk-splitter-2.2.1-r2.ebuild
similarity index 65%
rename from app-arch/gtk-splitter/gtk-splitter-2.2.1-r1.ebuild
rename to app-arch/gtk-splitter/gtk-splitter-2.2.1-r2.ebuild
index 0ccad4c508c7..288cc392ddae 100644
--- a/app-arch/gtk-splitter/gtk-splitter-2.2.1-r1.ebuild
+++ b/app-arch/gtk-splitter/gtk-splitter-2.2.1-r2.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Split files into smaller pieces and combine them back together"
 HOMEPAGE="http://gtk-splitter.sourceforge.net"
@@ -14,18 +12,16 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="crypt"
 
-RDEPEND="x11-libs/gtk+:2
+RDEPEND="
+	x11-libs/gtk+:2
 	virtual/libintl:0
 	crypt? ( >=app-crypt/mhash-0.8:0 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-DEPEND="${RDEPEND}
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	epatch "${FILESDIR}/"${P}-r1-desktop-QA-fixes.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-r1-desktop-QA-fixes.patch )
 
-src_compile() {
+src_configure() {
 	default
 
 	if ! use crypt ; then
@@ -35,5 +31,5 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install
+	emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}" install
 }
diff --git a/app-arch/libpar2/libpar2-0.4.ebuild b/app-arch/libpar2/libpar2-0.4.ebuild
index 6408f5475665..31de2a7569ff 100644
--- a/app-arch/libpar2/libpar2-0.4.ebuild
+++ b/app-arch/libpar2/libpar2-0.4.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit autotools-utils flag-o-matic
+EAPI=7
 
 DESCRIPTION="A library for par2, extracted from par2cmdline"
 HOMEPAGE="https://launchpad.net/libpar2/"
@@ -12,18 +10,18 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="static-libs"
 
 RDEPEND="dev-libs/libsigc++:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-DOCS=( AUTHORS ChangeLog README )
+src_configure() {
+	econf --disable-static
+}
 
-# Needed to install all headers properly (bug #391815)
-AUTOTOOLS_IN_SOURCE_BUILD=1
+src_install() {
+	default
 
-src_prepare() {
-	autotools-utils_src_prepare
-	append-cxxflags -std=c++11 #567498
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-arch/mscompress/files/mscompress-0.3-amd64.patch b/app-arch/mscompress/files/mscompress-0.3-amd64.patch
index 95e4e617aefc..305b809d2b60 100644
--- a/app-arch/mscompress/files/mscompress-0.3-amd64.patch
+++ b/app-arch/mscompress/files/mscompress-0.3-amd64.patch
@@ -1,5 +1,5 @@
---- mscompress.c.old	2006-11-27 23:58:51.000000000 +0100
-+++ mscompress.c	2006-11-27 23:59:50.000000000 +0100
+--- a/mscompress.c
++++ b/mscompress.c
 @@ -25,6 +25,7 @@
  #include <unistd.h>
  #include <fcntl.h>
diff --git a/app-arch/mscompress/mscompress-0.3-r1.ebuild b/app-arch/mscompress/mscompress-0.3-r1.ebuild
index 23ab7db21192..7cb1bda438f0 100644
--- a/app-arch/mscompress/mscompress-0.3-r1.ebuild
+++ b/app-arch/mscompress/mscompress-0.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Microsoft compress.exe/expand.exe compatible (de)compressor"
 HOMEPAGE="http://gnuwin32.sourceforge.net/packages/mscompress.htm"
@@ -12,13 +12,11 @@ SRC_URI="ftp://ftp.penguin.cz/pub/users/mhi/mscompress/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-makefile.patch \
-		"${FILESDIR}"/${P}-amd64.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-amd64.patch
+)
 
 src_configure() {
 	tc-export CC
@@ -29,5 +27,5 @@ src_configure() {
 src_install() {
 	dobin mscompress msexpand
 	doman mscompress.1 msexpand.1
-	dodoc README ChangeLog
+	einstalldocs
 }
diff --git a/app-arch/tarsync/files/tarsync-0.2.1-make.patch b/app-arch/tarsync/files/tarsync-0.2.1-make.patch
index 72591115a45a..4f3d062f3619 100644
--- a/app-arch/tarsync/files/tarsync-0.2.1-make.patch
+++ b/app-arch/tarsync/files/tarsync-0.2.1-make.patch
@@ -1,13 +1,13 @@
-Respect CC and LDFLAGS.
+Respect CC, CPPFLAGS and LDFLAGS.
 
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -2,7 +2,7 @@
  	CC=gcc
  endif
  tarsync:	main.o names.o tar.o string-misc.o fs.o options.o excludes.o
 -	gcc $(CFLAGS) $^ -o tarsync -lcfile
-+	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o tarsync -lcfile
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $^ -o tarsync -lcfile
  all:		tarsync
  
  clean:	
diff --git a/app-arch/tarsync/tarsync-0.2.1-r1.ebuild b/app-arch/tarsync/tarsync-0.2.1-r1.ebuild
index c9db986bc6c6..f2048606800d 100644
--- a/app-arch/tarsync/tarsync-0.2.1-r1.ebuild
+++ b/app-arch/tarsync/tarsync-0.2.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Delta compression suite for using/generating binary patches"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
@@ -12,22 +12,22 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux"
-IUSE=""
 
 DEPEND=">=dev-util/diffball-0.7"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
-pkg_setup() {
-	tc-export CC
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-make.patch
+	"${FILESDIR}"/${P}-gcc5.patch
+)
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-make.patch
-	epatch "${FILESDIR}"/${P}-gcc5.patch
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	dobin "${PN}" #make install doesn't support prefix
+	dobin tarsync #make install doesn't support prefix
+	einstalldocs
 }
diff --git a/app-arch/wimlib/wimlib-1.12.0.ebuild b/app-arch/wimlib/wimlib-1.12.0.ebuild
index c8a393c40055..3fb8e91ab6c9 100644
--- a/app-arch/wimlib/wimlib-1.12.0.ebuild
+++ b/app-arch/wimlib/wimlib-1.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -55,6 +55,7 @@ src_configure() {
 		$(use_enable cpu_flags_x86_ssse3 ssse3-sha1)
 		$(use_with openssl libcrypto)
 		$(use_enable threads multithreaded-compression)
+		--disable-static
 	)
 	has test ${FEATURES} && myeconfargs+=( --enable-test-support )
 	ac_cv_prog_NASM="$(usex yasm yasm nasm)" \
@@ -65,3 +66,8 @@ src_compile() {
 	emake
 	pax-mark m "${S}"/.libs/wimlib-imagex
 }
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-arch/wimlib/wimlib-1.13.0.ebuild b/app-arch/wimlib/wimlib-1.13.0.ebuild
index c8a393c40055..3fb8e91ab6c9 100644
--- a/app-arch/wimlib/wimlib-1.13.0.ebuild
+++ b/app-arch/wimlib/wimlib-1.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -55,6 +55,7 @@ src_configure() {
 		$(use_enable cpu_flags_x86_ssse3 ssse3-sha1)
 		$(use_with openssl libcrypto)
 		$(use_enable threads multithreaded-compression)
+		--disable-static
 	)
 	has test ${FEATURES} && myeconfargs+=( --enable-test-support )
 	ac_cv_prog_NASM="$(usex yasm yasm nasm)" \
@@ -65,3 +66,8 @@ src_compile() {
 	emake
 	pax-mark m "${S}"/.libs/wimlib-imagex
 }
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 43ad1976eac7..ddb50277f4a9 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/borgmatic/borgmatic-1.5.10.ebuild b/app-backup/borgmatic/borgmatic-1.5.10.ebuild
index b92a5f79561b..e1682b5e20da 100644
--- a/app-backup/borgmatic/borgmatic-1.5.10.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.10.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 # Fails due to problems with dev-python/flexmock-0.10.4; see Bug #740128
 RESTRICT="test"
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 2269003bd63d..a32eec0939e4 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/geekbench/Manifest b/app-benchmarks/geekbench/Manifest
index 8b2bae7c45e5..566dd30ec28f 100644
--- a/app-benchmarks/geekbench/Manifest
+++ b/app-benchmarks/geekbench/Manifest
@@ -3,4 +3,4 @@ DIST Geekbench-2.4.3-Linux.tar.gz 3337551 BLAKE2B cb660f3c08cc812cb23374032490a1
 DIST Geekbench-3.4.2-Linux.tar.gz 9986039 BLAKE2B 63d7e768d65bc033260a0d99da17df2e518750f19882e63dbc9bbe6ff0b52a8cddb35b9143e85c01838bf5d77a04599578fc0a57a3e6fd89e7aec8c8ffdd4f5b SHA512 a61a5d5481682baefdce64f6054c3373900e8cd585dcbfa2feabbf386032986b40b603619c552102401a83e0b748831d00af5b5b5278e88ef42dee176adf06e9
 DIST Geekbench-4.4.1-Linux.tar.gz 71076124 BLAKE2B 14c2b80c971798e7d2bb256e76c7ab9c48e8c1c389e2f7547a436f706ac4f21c1e52e564cd584893071ee2f9f0a4747cd03ea72cc728ff8e4f369d5cc794d77a SHA512 fa687d33a7d7a2d09c544e3d17de93f41cfa77915c708cd1ef0743f84f7f83df9d3f8df2872a8f85ed2c4c872e3cd41932685ffeb19cdb0ea047ab5116713420
 DIST Geekbench-5.2.3-Linux.tar.gz 93047726 BLAKE2B 22cf414d89ef8854b8797ed7ad6b674ff6162daa003745d94c0481a71a2b7c1b7fbfd06d7a0e997b41da2107feb27a69af768196bf4114681c8bce39d2640112 SHA512 cacc1014b1522de281704e5210c44b81a51b24b63fb4c4be3c28e729261af2f12c5a52ad2a79b10bf597a1b24378cf03d7483d032d5e0c483069f8dc2695339e
-DIST Geekbench-5.3.0-Linux.tar.gz 93049032 BLAKE2B dcf92bcf0a20b18d45f68ded3dfa7167f934ca02118357a2ab20baacdbcc454bbcaa37b12706ae017d046d5b838c27dcfa6c2214ee69336ca26475420cb588c6 SHA512 fbd9d63be7687c6c4238ab37061bff9472611628b496384cb1297ef70308c6059eba25477d7e8492fca6fb3ef3b33d5d059089e184a7fa094f0de3f8f1f9264f
+DIST Geekbench-5.3.1-Linux.tar.gz 93054604 BLAKE2B bf8c2ecb0eeed5c74868499a1bf0cd248b5d8a92888c5df37f674d98e79af4ba636971fe1007edc368a463ce391d273b79ea33cbfa2ed8564a751962e928d2fc SHA512 14f8112b9e76dee726074863dc321b63956804b2666d42835cb863b9c61548168b9cb80f2e45a64695706c77afc91e792e874b4451b7b503f18b194804c16bdf
diff --git a/app-benchmarks/geekbench/geekbench-5.3.0.ebuild b/app-benchmarks/geekbench/geekbench-5.3.1.ebuild
similarity index 100%
rename from app-benchmarks/geekbench/geekbench-5.3.0.ebuild
rename to app-benchmarks/geekbench/geekbench-5.3.1.ebuild
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index f7ed24931969..33b44aebbd0a 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1 +1 @@
-DIST stress-ng-0.11.23.tar.xz 499540 BLAKE2B ccba08bdb756737e782f896fe364869e4f939f7c8e9d5a02f8138d85f3d1922740100a58d9652169735eab994ab89df331b97bb08b588a721a6b1a8511fab937 SHA512 1642e6ea8ee75e400d5ea4e40d61384f9a895cd489715be1107d6cd06eea2274ac0b32320cabe806d0f919efbea8061848d9c9c4bdc5980704e7a2db45c9be70
+DIST stress-ng-0.11.24.tar.xz 502772 BLAKE2B 33d96dec17238c2633811702cc613774f1a203628be7718a97f93f8d281749039a5121175554593bc4fef6ff6f39d404d8333ad1d2e0e5227bd248775c81511c SHA512 2546ac1d17304e61c21b52003a93e5f7c32b746d2ed4088e1af24ed151072b7965c3a4be50058c36637ec0d2e5eccc4daace2d4113e5655f3520a7392f393f44
diff --git a/app-benchmarks/stress-ng/stress-ng-0.11.23.ebuild b/app-benchmarks/stress-ng/stress-ng-0.11.24.ebuild
similarity index 100%
rename from app-benchmarks/stress-ng/stress-ng-0.11.23.ebuild
rename to app-benchmarks/stress-ng/stress-ng-0.11.24.ebuild
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index a929c58931c0..75c47e4ebc3d 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/cardpeek/cardpeek-0.7.2.ebuild b/app-crypt/cardpeek/cardpeek-0.7.2.ebuild
index 9148963c4c4a..92e53c5466c4 100644
--- a/app-crypt/cardpeek/cardpeek-0.7.2.ebuild
+++ b/app-crypt/cardpeek/cardpeek-0.7.2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit xdg
+
 DESCRIPTION="Tool to read the contents of smartcards"
 HOMEPAGE="http://pannetrat.com/Cardpeek"
 SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
diff --git a/app-crypt/cardpeek/cardpeek-0.8.4.ebuild b/app-crypt/cardpeek/cardpeek-0.8.4.ebuild
index f3a3ade8f3b0..7845cde99bb1 100644
--- a/app-crypt/cardpeek/cardpeek-0.8.4.ebuild
+++ b/app-crypt/cardpeek/cardpeek-0.8.4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 LUA_COMPAT=( lua5-2 )
 
-inherit lua-single
+inherit lua-single xdg
 
 DESCRIPTION="Tool to read the contents of smartcards"
 HOMEPAGE="http://pannetrat.com/Cardpeek"
diff --git a/app-crypt/dieharder/dieharder-3.31.1-r3.ebuild b/app-crypt/dieharder/dieharder-3.31.1-r3.ebuild
index 8fd1209bd490..269cb352cf1f 100644
--- a/app-crypt/dieharder/dieharder-3.31.1-r3.ebuild
+++ b/app-crypt/dieharder/dieharder-3.31.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,6 +37,10 @@ pkg_setup() {
 	)
 }
 
+src_configure() {
+	econf --disable-static
+}
+
 src_compile() {
 	emake -j1
 	use doc && emake -C manual
@@ -53,4 +57,6 @@ src_install() {
 	dodoc dieharder/README dieharder/NOTES
 	docinto "libdieharder"
 	dodoc libdieharder/README libdieharder/NOTES
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-crypt/easy-rsa/Manifest b/app-crypt/easy-rsa/Manifest
index d042618d8340..358ba633d06e 100644
--- a/app-crypt/easy-rsa/Manifest
+++ b/app-crypt/easy-rsa/Manifest
@@ -2,3 +2,4 @@ DIST EasyRSA-3.0.4.tgz 37721 BLAKE2B 84d81eb86dfee42f6de935cbd308262d36626170880
 DIST easy-rsa-3.0.5.tar.gz 638366 BLAKE2B 990ef0cc7effd80d06d15dbb2dc3ef9a0a282a4adb501475fbd43c1b50bead374ba78ee9652e9c0f8d2e54354be4da6a0ae302e4ef2d576bd7fd981d59566d64 SHA512 9231ca7fda489a230d8418679d8824503ae680e2de6682d5f2d2fa716597f7df5980b7b88a3f6eb4fa0b7d9bbead59a1e2e4b8f4a5a36bda7f78ffa8f3c23d34
 DIST easy-rsa-3.0.6.tar.gz 663190 BLAKE2B 2c7f526c3ddddf13b4c6193bcd52bc992b9e81db28dec8cd9b5f44aba231eed18b6f25c64a42072a6409a5dd23db21fa8ccefc210ce924c68ad3a79475d2eaa1 SHA512 ce553b483ed2facab71d9bc212c4a454c6ed4a6489a0b963c4fc190916c71d048955e1e24d3e58a39438a51a83a02bf696bb2b9292c6ff665113043509062eb1
 DIST easy-rsa-3.0.7.tar.gz 3863830 BLAKE2B e76db344912296d4659ae61e094595a0ebb30258e2819908f80028a771bf49b5ee02293ba4bd46c19926828724f27b149d2727a2f898fa7fbe48abdb16dbee86 SHA512 4e7dadafd9e3f8381029cf4a20f0a6fe58c6bee0571e0f8ff9711e1dae386bbfd81b5d8bbec58f415e367d613b90465a4635e8f924668ad73de555fe8bb8c82c
+DIST easy-rsa-3.0.8.tar.gz 3864366 BLAKE2B 8bbb16a8885a2141c59f590882002f5e4fa5c52c77130ac56b7ee5b1817a6c3acdecac2d8db4f4f4bce39f62b469afaf60b5d56f46c1ea9472afe36a5fb7a818 SHA512 db23262ba2cd1b7fec17340ebe11504741baff23098ea9b4b1118077abf8ff3091b1299f9624a6dd788b2e1c169d9820ba41d11b091949f3f6c96ee8e0509231
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild
index e6a124b4fe80..c506a0e1a230 100644
--- a/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="libressl"
 
 DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0= )
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.7.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.7.ebuild
index e6a124b4fe80..c506a0e1a230 100644
--- a/app-crypt/easy-rsa/easy-rsa-3.0.7.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="libressl"
 
 DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0= )
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.8.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.8.ebuild
new file mode 100644
index 000000000000..e6a124b4fe80
--- /dev/null
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.8.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Small RSA key management package, based on OpenSSL"
+HOMEPAGE="https://openvpn.net/"
+SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="libressl"
+
+DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	exeinto /usr/share/easy-rsa
+	doexe easyrsa3/easyrsa
+	insinto /usr/share/easy-rsa
+	doins -r easyrsa3/{vars.example,openssl-easyrsa.cnf,x509-types}
+	dodoc README.quickstart.md ChangeLog
+	dodoc -r doc
+	doenvd "${FILESDIR}/65easy-rsa" # config-protect easy-rsa
+}
diff --git a/app-crypt/gpgme/gpgme-1.14.0.ebuild b/app-crypt/gpgme/gpgme-1.14.0.ebuild
index 316fd019d61e..af8ddedf98f4 100644
--- a/app-crypt/gpgme/gpgme-1.14.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.14.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="1/11" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp static-libs +cxx python qt5"
 
 RDEPEND=">=app-crypt/gnupg-2
diff --git a/app-crypt/ima-evm-utils/ima-evm-utils-1.1-r1.ebuild b/app-crypt/ima-evm-utils/ima-evm-utils-1.1-r1.ebuild
index 93152d948962..4d2555451e10 100644
--- a/app-crypt/ima-evm-utils/ima-evm-utils-1.1-r1.ebuild
+++ b/app-crypt/ima-evm-utils/ima-evm-utils-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -35,5 +35,12 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_enable debug)
+	econf \
+		$(use_enable debug) \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild b/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild
index 1a92d1287ad1..d967038aff71 100644
--- a/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild
+++ b/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,5 +30,12 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_enable debug)
+	econf \
+		$(use_enable debug) \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-crypt/libu2f-host/libu2f-host-1.1.10.ebuild b/app-crypt/libu2f-host/libu2f-host-1.1.10.ebuild
index 143846becc38..dc653e48ba0b 100644
--- a/app-crypt/libu2f-host/libu2f-host-1.1.10.ebuild
+++ b/app-crypt/libu2f-host/libu2f-host-1.1.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE="kernel_linux static-libs systemd"
+IUSE="kernel_linux systemd"
 
 DEPEND="dev-libs/hidapi
 	dev-libs/json-c:="
@@ -27,13 +27,17 @@ CONFIG_CHECK="~HIDRAW"
 
 PATCHES=( "${FILESDIR}/${P}-json-boolean.patch" )
 
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
 	default
 	if use kernel_linux; then
 		udev_dorules 70-u2f.rules
 	fi
 
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/app-crypt/openpgp-keys-kernel/metadata.xml b/app-crypt/openpgp-keys-kernel/metadata.xml
index 57fd2b433042..bd7d87876616 100644
--- a/app-crypt/openpgp-keys-kernel/metadata.xml
+++ b/app-crypt/openpgp-keys-kernel/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="project">
 		<email>dist-kernel@gentoo.org</email>
 	</maintainer>
 	<stabilize-allarches/>
diff --git a/app-crypt/signify/Manifest b/app-crypt/signify/Manifest
index e6b2482ccb5c..052c07712367 100644
--- a/app-crypt/signify/Manifest
+++ b/app-crypt/signify/Manifest
@@ -1,3 +1,4 @@
 DIST signify-23.tar.gz 95335 BLAKE2B 4cdbee5dae7f217644a5df41d4253938c5cb8fb1f621f945addfceb64090234199e8dd81d7ef42c41aae13e9e5158541f40062296ca07562977473e39f68cd0b SHA512 f0330994f3d308e9ad7c7bf4b6d6f8e8bef914d6d10d83507002ad97f853b4e0a829997a0225373e2c34829a611b70980d7d3674247d4b5b447204ad7f039608
 DIST signify-24.tar.gz 92038 BLAKE2B 4d9413a423534fb4f9adfb50494802b737e6099b47933eed9686ba751f7ffb6999b084c5a5431652a33baab11d7384e762c4709bab52bb0de4694a885c8eb570 SHA512 d612aca617f44ea7bf32a31d65da7e265dfdbe67f7983fc095b1f2d5c83cfa27f4c857279d98f6928199d15193c706cf3c77022fec70529a7b5d38b16ce64df5
 DIST signify-29.tar.gz 94553 BLAKE2B eba286618c5ea9fb9515c44330297276504009078a09d7b36c208225e4fd33e014623829dd582ededc2f35f207058ad2c93412ad006852966c37466ed87e7b9a SHA512 a0fc07c176f3e0e6ea32d059fb6cc27849159dcc3975c47b2b0a54f7047cb1f1dc0e032f2c55eaf84096b0a84288193afec0777e669851a7c7f97a880fb0f0ab
+DIST signify-30.tar.gz 94593 BLAKE2B 2d432cef9990a8ce23d0f05449ef02dcf7a00f4328a25dcab98cd25c2c74875fd8ea7ed7a67b7e4ac6c9f432a91564edcc1fc9260627c37352c19cc17581aea3 SHA512 4a1ebcdbf7aa74865b97cadbf5380460702306b6d0a77306e6c943bb0c3419ca929ecd3455522da4448d780a56c8eddeb26fb4d7fb006fc3bf23f69693c39e87
diff --git a/app-crypt/signify/files/signify-30-man_compress.patch b/app-crypt/signify/files/signify-30-man_compress.patch
new file mode 100644
index 000000000000..f33a6c9d44b5
--- /dev/null
+++ b/app-crypt/signify/files/signify-30-man_compress.patch
@@ -0,0 +1,18 @@
+diff --git a/Makefile b/Makefile
+index f908451..1537eb6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -224,11 +224,11 @@ sha512_256hl.c:	helper.c
+ 	    -e 's/HASH/SHA512_256/g' \
+ 	    -e 's/SHA512_256_CTX/SHA2_CTX/g' $< > $@
+ 
+-install: signify signify.1.gz
++install: signify
+ 	install -m 755 -d $(DESTDIR)$(PREFIX)/bin
+ 	install -m 755 -t $(DESTDIR)$(PREFIX)/bin signify
+ 	install -m 755 -d $(DESTDIR)$(PREFIX)/share/man/man1
+-	install -m 644 -t $(DESTDIR)$(PREFIX)/share/man/man1 signify.1.gz
++	install -m 644 -t $(DESTDIR)$(PREFIX)/share/man/man1 signify.1
+ 
+ .PHONY: install
+ 
diff --git a/app-crypt/signify/signify-30.ebuild b/app-crypt/signify/signify-30.ebuild
new file mode 100644
index 000000000000..474220e8fa16
--- /dev/null
+++ b/app-crypt/signify/signify-30.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Cryptographically sign and verify files"
+HOMEPAGE="http://www.openbsd.org/ https://github.com/aperezdc/signify"
+SRC_URI="https://github.com/aperezdc/signify/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-1"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-libs/libbsd-0.7"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-30-man_compress.patch )
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${ED}" PREFIX="/usr" install
+	einstalldocs
+}
diff --git a/app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.06.ebuild b/app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.06.ebuild
index 1c0e8dc2f60f..bc22e3b9faea 100644
--- a/app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.06.ebuild
+++ b/app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.06.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -34,3 +34,12 @@ src_prepare() {
 	eapply_user
 	eautoreconf
 }
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index bbdd68252403..84891c9a8863 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -1 +1,2 @@
 DIST trousers-0.3.14.tar.gz 1378438 BLAKE2B 3dc2824fa2ca1b1f1181f98d59e85276e7d38af4bfc07ee8246431d9ccb300a8e0820b318643d4cf5d757d2a49492c8686e2fe9de03484263d2189d4bbaa32d0 SHA512 bf87f00329cf1d76a12cf6b6181fa22f90e76af3c5786e6e2db98438d2d3f0c0e05364374664173f45e3a2f6c0e2364948d0b958a7845cb23fcb340150cd9b21
+DIST trousers-0.3.15.tar.gz 4699936 BLAKE2B 53c60498ed6a9d3d87295b00676e5d0d82452918c35af6b98c7979ffa2dc04dd817e7cd3f4a33ca17c30b90eab53d80b2bb25306fe9db7bda2125019edfed280 SHA512 769c7d891c6306c1b3252448f86e3043ee837e566c9431f5b4353512113e2907f6ce29c91e8044c420025b79c5f3ff2396ddce93f73b1eb2a15ea1de89ac0fdb
diff --git a/app-crypt/trousers/trousers-0.3.15.ebuild b/app-crypt/trousers/trousers-0.3.15.ebuild
new file mode 100644
index 000000000000..94a40dd74e31
--- /dev/null
+++ b/app-crypt/trousers/trousers-0.3.15.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info readme.gentoo-r1 systemd udev
+
+DESCRIPTION="An open-source TCG Software Stack (TSS) v1.1 implementation"
+HOMEPAGE="http://trousers.sf.net"
+SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
+
+LICENSE="CPL-1.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~s390 ~x86"
+IUSE="doc libressl selinux" # gtk
+
+# gtk support presently does NOT compile.
+#	gtk? ( >=x11-libs/gtk+-2 )
+
+DEPEND="acct-group/tss
+	acct-user/tss
+	>=dev-libs/glib-2
+	!libressl? ( >=dev-libs/openssl-0.9.7:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-tcsd )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.3.13-nouseradd.patch"
+	"${FILESDIR}/${PN}-0.3.14-Makefile.am-Mark-tddl.a-nodist.patch"
+)
+
+DOCS="AUTHORS ChangeLog NICETOHAVES README TODO"
+
+DOC_CONTENTS="
+	If you have problems starting tcsd, please check permissions and
+	ownership on /dev/tpm* and ~tss/system.data
+"
+
+CONFIG_CHECK="~TCG_TPM"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# econf --with-gui=$(usex gtk gtk openssl)
+	econf --with-gui=openssl
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+
+	keepdir /var/lib/tpm
+	use doc && dodoc doc/*
+	newinitd "${FILESDIR}"/tcsd.initd tcsd
+	newconfd "${FILESDIR}"/tcsd.confd tcsd
+	systemd_dounit "${FILESDIR}"/tcsd.service
+	udev_dorules "${FILESDIR}"/61-trousers.rules
+	fowners tss:tss /var/lib/tpm
+	readme.gentoo_create_doc
+}
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index d2a07c7efea3..e25d130faf93 100644
Binary files a/app-dicts/Manifest.gz and b/app-dicts/Manifest.gz differ
diff --git a/app-dicts/libydpdict/libydpdict-1.0.4.ebuild b/app-dicts/libydpdict/libydpdict-1.0.4.ebuild
index 76fd75b28882..aff0de2c35a6 100644
--- a/app-dicts/libydpdict/libydpdict-1.0.4.ebuild
+++ b/app-dicts/libydpdict/libydpdict-1.0.4.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools
 
 DESCRIPTION="Library for handling the Collins Dictionary database"
@@ -12,12 +13,18 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+DOCS=( AUTHORS )
+
 src_prepare() {
 	default
 	eautoreconf
 }
 
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
 	default
-	dodoc AUTHORS
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-dicts/sword-Josephus/sword-Josephus-1.1.ebuild b/app-dicts/sword-Josephus/sword-Josephus-1.1.ebuild
index 1433529036f6..140bdfc32f68 100644
--- a/app-dicts/sword-Josephus/sword-Josephus-1.1.ebuild
+++ b/app-dicts/sword-Josephus/sword-Josephus-1.1.ebuild
@@ -10,4 +10,4 @@ inherit sword-module
 DESCRIPTION="Josephus: The Complete Works"
 HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Josephus"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
diff --git a/app-dicts/sword-KJV/sword-KJV-2.9.ebuild b/app-dicts/sword-KJV/sword-KJV-2.9.ebuild
index 74744ba459a5..de2b920d80ad 100644
--- a/app-dicts/sword-KJV/sword-KJV-2.9.ebuild
+++ b/app-dicts/sword-KJV/sword-KJV-2.9.ebuild
@@ -10,4 +10,4 @@ inherit sword-module
 DESCRIPTION="King James Version (1769) with Strongs Numbers and Morphology"
 HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=KJV"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
diff --git a/app-dicts/sword-KJVA/sword-KJVA-3.0.1.ebuild b/app-dicts/sword-KJVA/sword-KJVA-3.0.1.ebuild
index 5bc7fcf63e58..97bedded2311 100644
--- a/app-dicts/sword-KJVA/sword-KJVA-3.0.1.ebuild
+++ b/app-dicts/sword-KJVA/sword-KJVA-3.0.1.ebuild
@@ -10,4 +10,4 @@ inherit sword-module
 DESCRIPTION="King James Version (1769) incl. Apocrypha, with Strongs Numbers and Morphology"
 HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=KJVA"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
diff --git a/app-dicts/sword-Scofield/sword-Scofield-1.0.ebuild b/app-dicts/sword-Scofield/sword-Scofield-1.0.ebuild
index ec3210bfcc29..61c6cd94332b 100644
--- a/app-dicts/sword-Scofield/sword-Scofield-1.0.ebuild
+++ b/app-dicts/sword-Scofield/sword-Scofield-1.0.ebuild
@@ -10,4 +10,4 @@ inherit sword-module
 DESCRIPTION="Scofield Reference Notes, 1917 Edition"
 HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Scofield"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
diff --git a/app-dicts/sword-StrongsGreek/sword-StrongsGreek-1.2.ebuild b/app-dicts/sword-StrongsGreek/sword-StrongsGreek-1.2.ebuild
index fa1b7ec2c34a..37c7e3f0ec10 100644
--- a/app-dicts/sword-StrongsGreek/sword-StrongsGreek-1.2.ebuild
+++ b/app-dicts/sword-StrongsGreek/sword-StrongsGreek-1.2.ebuild
@@ -10,4 +10,4 @@ inherit sword-module
 DESCRIPTION="Strong's Greek Bible Dictionary"
 HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=StrongsGreek"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 86f24942552a..facaa9881a2d 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/edumips64/files/edumips64-javadoc-cp.patch b/app-emulation/edumips64/files/edumips64-javadoc-cp.patch
deleted file mode 100644
index 80e389049b5c..000000000000
--- a/app-emulation/edumips64/files/edumips64-javadoc-cp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- edumips64-1.1.orig/build.xml
-+++ edumips64-1.1/build.xml
-@@ -24,7 +24,7 @@
- 
-         <!-- Access the environment -->
-         <property environment="env" />
--        <property name="base.classpath" value="libs:libs/junit-4.10.jar:libs/hamcrest-core-1.3.jar:${env.CLASSPATH}" />
-+        <property name="base.classpath" value="libs:libs/jhall.jar:libs/junit-4.10.jar:libs/hamcrest-core-1.3.jar:${env.CLASSPATH}" />
- 
-         <!-- File names -->
- 		<property name="standalone_jar_filename" value="edumips64-${version}.jar" />
diff --git a/app-emulation/libdsk/libdsk-1.5.8.ebuild b/app-emulation/libdsk/libdsk-1.5.8.ebuild
index e09295e8440b..2b4c246fa6d7 100644
--- a/app-emulation/libdsk/libdsk-1.5.8.ebuild
+++ b/app-emulation/libdsk/libdsk-1.5.8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="LIBDSK is a library for accessing discs and disc image files"
 HOMEPAGE="http://www.seasip.info/Unix/LibDsk/"
@@ -12,12 +12,14 @@ SLOT="0"
 KEYWORDS="amd64"
 IUSE="doc"
 
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-include-sysmacros.patch
-	eapply_user
+PATCHES=( "${FILESDIR}"/${P}-include-sysmacros.patch )
+DOCS=( doc/${PN}.{txt,pdf} )
+
+src_configure() {
+	econf --disable-static
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	DOCS="doc/${PN}.txt doc/${PN}.pdf" einstalldocs
+	default
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.0.2.ebuild
index 2e7b14689c8f..c13d5834460c 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.0.2.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 x86"
+	KEYWORDS="-* amd64 x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-emulation/winetricks/winetricks-20200412.ebuild b/app-emulation/winetricks/winetricks-20200412.ebuild
index 380da376c94c..aa2e4efcf322 100644
--- a/app-emulation/winetricks/winetricks-20200412.ebuild
+++ b/app-emulation/winetricks/winetricks-20200412.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	SRC_URI=""
 else
 	SRC_URI="https://github.com/Winetricks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 wtg="winetricks-gentoo-2012.11.24"
@@ -29,6 +29,9 @@ SLOT="0"
 IUSE="gtk kde rar test"
 RESTRICT="!test? ( test )"
 
+# dev-util/shellcheck is not available for x86
+RESTRICT+=" x86? ( test )"
+
 BDEPEND="
 	test? (
 		dev-python/bashate
diff --git a/app-emulation/winetricks/winetricks-99999999.ebuild b/app-emulation/winetricks/winetricks-99999999.ebuild
index 380da376c94c..3b4cea7a0559 100644
--- a/app-emulation/winetricks/winetricks-99999999.ebuild
+++ b/app-emulation/winetricks/winetricks-99999999.ebuild
@@ -29,6 +29,9 @@ SLOT="0"
 IUSE="gtk kde rar test"
 RESTRICT="!test? ( test )"
 
+# dev-util/shellcheck is not available for x86
+RESTRICT+=" x86? ( test )"
+
 BDEPEND="
 	test? (
 		dev-python/bashate
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 34b17da5c4bd..050932f0c35f 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-lua/files/lua.eselect-1 b/app-eselect/eselect-lua/files/lua.eselect-1
deleted file mode 100644
index d6f951098354..000000000000
--- a/app-eselect/eselect-lua/files/lua.eselect-1
+++ /dev/null
@@ -1,150 +0,0 @@
-# -*-eselect-*-  vim: ft=eselect
-# Copyright 2014-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit config multilib
-
-DESCRIPTION="Manage lua symlinks"
-MAINTAINER="mabi@gentoo.org"
-
-HEADER_FILES="lauxlib.h luaconf.h lua.h lua.hpp lualib.h"
-
-remove_symlinks() {
-	rm -f "${EROOT}"/usr/bin/{lua,luac} &>/dev/null 
-	for dir in $(get_libdirs) ; do
-		rm -f "${EROOT}"${dir}/liblua.so &>/dev/null && \
-		rm -f "${EROOT}"${dir}/pkgconfig/lua.pc &>/dev/null
-	done
-	for f in $HEADER_FILES ; do
-		rm -f "${EROOT}"/usr/include/$f
-	done
-	rm -f "${EROOT}"/usr/share/man/man1/{lua,luac}.1{,.gz,.bz2,.lzma} &>/dev/null
-}
-
-set_symlinks() {
-	local ver=$1
-	ln -s "${EROOT}"/usr/bin/lua{$ver,}
-	ln -s "${EROOT}"/usr/bin/luac{$ver,}
-	for dir in $(get_libdirs) ; do
-		ln -s "${dir}"/liblua{$ver,}.so
-		ln -s "${dir}"/pkgconfig/lua{$ver,}.pc
-	done
-	for orig in "${EROOT}"/usr/share/man/man1/lua*$ver.1* ; do
-		ln -s "${orig}" "${orig//$ver}"
-	done
-	for f in $HEADER_FILES ; do
-		ln -s "${EROOT}"/usr/include/lua$ver/$f "${EROOT}"/usr/include
-	done
-}
-
-get_libdirs() {
-	local dir libdirs
-	for dir in $(list_libdirs); do
-		[[ -L ${EROOT}/usr/${dir} ]] && continue
-		ls "${EROOT}"/usr/${dir}/liblua*.* > /dev/null 2>&1 || continue
-
-		libdirs+=' '${EPREFIX}/usr/${dir}
-	done
-	echo ${libdirs:-${EPREFIX}/usr/lib}
-}
-
-find_targets() {
-	local dirs
-	local prefix="${EROOT}/usr/bin/lua"
-	for f in ${prefix}5* ; do
-		dirs="${dirs} ${f##$prefix}"
-	done
-	echo $dirs
-}
-
-resolv_target() {
-	local targets=( $(find_targets) )
-	if is_number $1; then
-		[[ $1 -le ${#targets[@]} && $1 -gt 0 ]] && echo "${targets[ $(( $1 - 1 )) ]}"
-	elif has $1 ${targets[@]}; then
-	  echo $1
-	fi
-}
-
-get_active_version() {
-	readlink -e "${EROOT}"/usr/bin/lua | sed -ne "s:.*/usr/bin/lua\([\d.-]*\):\1:p"
-}
-
-## Actual actions
-
-## set action
-
-describe_set() {
-	echo "Sets the current version of lua"
-}
-
-describe_set_parameters() {
-	echo '<target>'
-}
-
-describe_set_options() {
-	echo 'target:	Target name or number (from "list" action)'
-}
-
-
-do_set() {
-	local target=$(resolv_target $1)
-	if [[ -z "${target}" ]]; then
-	  die -q "You need to specify a version"
-	fi
-	remove_symlinks
-	set_symlinks $target
-}
-
-## List action
-
-describe_list() {
-	echo 'Lists available lua versions'
-}
-
-do_list() {
-	local targets
-	local a
-	targets=( $(find_targets) )
-	a=$(get_active_version)
-	for (( i = 0; i < ${#targets[@]}; i++ )) ; do
-		[[ $a == ${targets[i]} ]] && targets[i]=$(highlight_marker "${targets[i]}")
-	done
-	write_numbered_list -m '(none found)' "${targets[@]}"
-}
-
-## Show action
-
-describe_show() {
-	echo 'Show the active lua version'
-}
-
-do_show() {
-	get_active_version
-}
-
-## update action
-
-describe_update() {
-	echo 'Automatically update the lua version'
-}
-
-describe_update_options() {
-	echo 'ifunset : Do not override existing implementation'
-}
-
-do_update() {
-	[[ -n ${1} && ! ( ${1} == ifunset || ${1} == '--if-unset' ) ]] && \
-		die -q 'Usage error'
-
-	[[ ( ${1} == ifunset || ${1} == '--if-unset' ) && -n $(get_active_version) ]] && \
-		return
-
-	remove_symlinks
-	
-	local targets=( $(find_targets) )
-	if [[ -n ${#targets[@]} ]] ; then
-		local target=${targets[${#targets[@]} - 1]}
-		set_symlinks $target || echo 'Nothing to update'
-	fi
-}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index c0e54d3fa147..a6b77834829c 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index 241a0a4cc03e..6754bdb51a04 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,2 +1,2 @@
-DIST ibus-typing-booster-2.10.0.tar.gz 9443747 BLAKE2B 65c7a0edb23d09675753dcf8d3bba74b98ce133467d97258bc4f7a4d0a41c82e862b53a17787cdc3d20a55856cb696d00b51d20efaec530a66bc32a28fa3a8a4 SHA512 301f3cc73a63597def1e9687ae5190933bd26f3c9beedb6bb7c1cf8772f6a20994efd2b1acc106435b92aa174066e2e5c1447f605c672200eab233bd9c4f6399
+DIST ibus-typing-booster-2.10.1.tar.gz 9449495 BLAKE2B 36e52d3e6349a89a1202429f7068221dc75dc0072d9e49424cf410ab12c2e732b9ea9fc54a2bbbfe386f2687535b9e0d46e5567f1572c42cf7fe98243c234a38 SHA512 d4262d7bec0b65919f5d25c97b319a48808d1257ea0697163bcaae238870d57640ed8fb44d423abb844416e1c99c130b1d6d5813a0edfa849afc762929e61f66
 DIST ibus-typing-booster-2.9.7.tar.gz 8833452 BLAKE2B 4c4f33bcff2fa9e20afeccf242bec1a6e11fca0b5cb515b2c2dce7ef2401c092a7197a6637e2ca72d4c1bacd694860c07ae645a313e41cd879d6bde8c1736d12 SHA512 984beacdd6b853e074127372a912442ba1dbc536ecf194a34d03025277b9d6277e967e63a9bdcd1620f5094965a191297ccae9adbff2d54d1cd474437a1ec16b
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.0.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.1.ebuild
similarity index 100%
rename from app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.0.ebuild
rename to app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.1.ebuild
diff --git a/app-i18n/libchewing/Manifest b/app-i18n/libchewing/Manifest
index 3a28b3d1b3d2..f32e1bb9a37f 100644
--- a/app-i18n/libchewing/Manifest
+++ b/app-i18n/libchewing/Manifest
@@ -1 +1,2 @@
+DIST libchewing-0.5.1-autoconf-archive-2019.01.06.patch 34944 BLAKE2B 582e2041ff8e99c90df6726ffe0fe7c3f09672ba841def4ded4f367d704a56349da9fe8c555e9b24ec5c82d73774c8690219532c08904cda29a2a33845d2f3d6 SHA512 8e93539fdea3fc6ef01ea070a64d6bdd873ec1c2555fbcb40cc639a22c74a07f8c2936eb100ebb36d146c0e17ce5f80afa8dd3468ff1f5c26a835c3d12b98bb2
 DIST libchewing-0.5.1.tar.bz2 3141084 BLAKE2B 28f9e803c8815c0e1b1a1134becffe12f92c1ae24b4b6d4163769d898861fec024db8332befe7130487a72fc20859b6292837e9d68ab1b6477de4cf4f789f2ee SHA512 a6551661bb5e56bba59730b93b373db56af7d42f2ab4881fbfff8727689dd2604d42d2e5c0b04820df66a431dfb5fcb73cc5c9b538615da76198ee3635501c1f
diff --git a/app-i18n/libchewing/files/libchewing-0.5.1-autoconf-archive-2019.01.06.patch b/app-i18n/libchewing/files/libchewing-0.5.1-autoconf-archive-2019.01.06.patch
deleted file mode 100644
index 5db3d0a23ab0..000000000000
--- a/app-i18n/libchewing/files/libchewing-0.5.1-autoconf-archive-2019.01.06.patch
+++ /dev/null
@@ -1,809 +0,0 @@
-https://github.com/chewing/libchewing/issues/308
-
---- /m4/ax_pthread.m4
-+++ /m4/ax_pthread.m4
-@@ -1,5 +1,5 @@
- # ===========================================================================
--#        http://www.gnu.org/software/autoconf-archive/ax_pthread.html
-+#        https://www.gnu.org/software/autoconf-archive/ax_pthread.html
- # ===========================================================================
- #
- # SYNOPSIS
-@@ -19,10 +19,10 @@
- #   is necessary on AIX to use the special cc_r compiler alias.)
- #
- #   NOTE: You are assumed to not only compile your program with these flags,
--#   but also link it with them as well. e.g. you should link with
-+#   but also to link with them as well. For example, you might link with
- #   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
- #
--#   If you are only building threads programs, you may wish to use these
-+#   If you are only building threaded programs, you may wish to use these
- #   variables in your default LIBS, CFLAGS, and CC:
- #
- #     LIBS="$PTHREAD_LIBS $LIBS"
-@@ -30,8 +30,8 @@
- #     CC="$PTHREAD_CC"
- #
- #   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
--#   has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
--#   (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
-+#   has a nonstandard name, this macro defines PTHREAD_CREATE_JOINABLE to
-+#   that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
- #
- #   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
- #   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
-@@ -67,7 +67,7 @@
- #   Public License for more details.
- #
- #   You should have received a copy of the GNU General Public License along
--#   with this program. If not, see <http://www.gnu.org/licenses/>.
-+#   with this program. If not, see <https://www.gnu.org/licenses/>.
- #
- #   As a special exception, the respective Autoconf Macro's copyright owner
- #   gives unlimited permission to copy, distribute and modify the configure
-@@ -82,35 +82,40 @@
- #   modified version of the Autoconf Macro, you may extend this special
- #   exception to the GPL to apply to your modified version as well.
- 
--#serial 20
-+#serial 24
- 
- AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
- AC_DEFUN([AX_PTHREAD], [
- AC_REQUIRE([AC_CANONICAL_HOST])
-+AC_REQUIRE([AC_PROG_CC])
-+AC_REQUIRE([AC_PROG_SED])
- AC_LANG_PUSH([C])
- ax_pthread_ok=no
- 
- # We used to check for pthread.h first, but this fails if pthread.h
--# requires special compiler flags (e.g. on True64 or Sequent).
-+# requires special compiler flags (e.g. on Tru64 or Sequent).
- # It gets checked for in the link test anyway.
- 
- # First of all, check if the user has set any of the PTHREAD_LIBS,
- # etcetera environment variables, and if threads linking works using
- # them:
--if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
--        save_CFLAGS="$CFLAGS"
-+if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then
-+        ax_pthread_save_CC="$CC"
-+        ax_pthread_save_CFLAGS="$CFLAGS"
-+        ax_pthread_save_LIBS="$LIBS"
-+        AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"])
-         CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
--        save_LIBS="$LIBS"
-         LIBS="$PTHREAD_LIBS $LIBS"
--        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
--        AC_TRY_LINK_FUNC(pthread_join, ax_pthread_ok=yes)
--        AC_MSG_RESULT($ax_pthread_ok)
--        if test x"$ax_pthread_ok" = xno; then
-+        AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS])
-+        AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_join])], [ax_pthread_ok=yes])
-+        AC_MSG_RESULT([$ax_pthread_ok])
-+        if test "x$ax_pthread_ok" = "xno"; then
-                 PTHREAD_LIBS=""
-                 PTHREAD_CFLAGS=""
-         fi
--        LIBS="$save_LIBS"
--        CFLAGS="$save_CFLAGS"
-+        CC="$ax_pthread_save_CC"
-+        CFLAGS="$ax_pthread_save_CFLAGS"
-+        LIBS="$ax_pthread_save_LIBS"
- fi
- 
- # We must check for the threads library under a number of different
-@@ -123,7 +128,7 @@
- # which indicates that we try without any flags at all, and "pthread-config"
- # which is a program returning the flags for the Pth emulation library.
- 
--ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
-+ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
- 
- # The ordering *is* (sometimes) important.  Some notes on the
- # individual items follow:
-@@ -132,68 +137,225 @@
- # none: in case threads are in libc; should be tried before -Kthread and
- #       other compiler flags to prevent continual compiler warnings
- # -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
--# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
--# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
--# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
--# -pthreads: Solaris/gcc
--# -mthreads: Mingw32/gcc, Lynx/gcc
-+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads), Tru64
-+#           (Note: HP C rejects this with "bad form for `-t' option")
-+# -pthreads: Solaris/gcc (Note: HP C also rejects)
- # -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
--#      doesn't hurt to check since this sometimes defines pthreads too;
--#      also defines -D_REENTRANT)
--#      ... -mt is also the pthreads flag for HP/aCC
-+#      doesn't hurt to check since this sometimes defines pthreads and
-+#      -D_REENTRANT too), HP C (must be checked before -lpthread, which
-+#      is present but should not be used directly; and before -mthreads,
-+#      because the compiler interprets this as "-mt" + "-hreads")
-+# -mthreads: Mingw32/gcc, Lynx/gcc
- # pthread: Linux, etcetera
- # --thread-safe: KAI C++
- # pthread-config: use pthread-config program (for GNU Pth library)
- 
--case ${host_os} in
-+case $host_os in
-+
-+        freebsd*)
-+
-+        # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-+        # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-+
-+        ax_pthread_flags="-kthread lthread $ax_pthread_flags"
-+        ;;
-+
-+        hpux*)
-+
-+        # From the cc(1) man page: "[-mt] Sets various -D flags to enable
-+        # multi-threading and also sets -lpthread."
-+
-+        ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags"
-+        ;;
-+
-+        openedition*)
-+
-+        # IBM z/OS requires a feature-test macro to be defined in order to
-+        # enable POSIX threads at all, so give the user a hint if this is
-+        # not set. (We don't define these ourselves, as they can affect
-+        # other portions of the system API in unpredictable ways.)
-+
-+        AC_EGREP_CPP([AX_PTHREAD_ZOS_MISSING],
-+            [
-+#            if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS)
-+             AX_PTHREAD_ZOS_MISSING
-+#            endif
-+            ],
-+            [AC_MSG_WARN([IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support.])])
-+        ;;
-+
-         solaris*)
- 
-         # On Solaris (at least, for some versions), libc contains stubbed
-         # (non-functional) versions of the pthreads routines, so link-based
--        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
--        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
--        # a function called by this macro, so we could check for that, but
--        # who knows whether they'll stub that too in a future libc.)  So,
--        # we'll just look for -pthreads and -lpthread first:
-+        # tests will erroneously succeed. (N.B.: The stubs are missing
-+        # pthread_cleanup_push, or rather a function called by this macro,
-+        # so we could check for that, but who knows whether they'll stub
-+        # that too in a future libc.)  So we'll check first for the
-+        # standard Solaris way of linking pthreads (-mt -lpthread).
-+
-+        ax_pthread_flags="-mt,pthread pthread $ax_pthread_flags"
-+        ;;
-+esac
-+
-+# GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC)
- 
--        ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
-+AS_IF([test "x$GCC" = "xyes"],
-+      [ax_pthread_flags="-pthread -pthreads $ax_pthread_flags"])
-+
-+# The presence of a feature test macro requesting re-entrant function
-+# definitions is, on some systems, a strong hint that pthreads support is
-+# correctly enabled
-+
-+case $host_os in
-+        darwin* | hpux* | linux* | osf* | solaris*)
-+        ax_pthread_check_macro="_REENTRANT"
-         ;;
- 
--        darwin*)
--        ax_pthread_flags="-pthread $ax_pthread_flags"
-+        aix*)
-+        ax_pthread_check_macro="_THREAD_SAFE"
-+        ;;
-+
-+        *)
-+        ax_pthread_check_macro="--"
-         ;;
- esac
-+AS_IF([test "x$ax_pthread_check_macro" = "x--"],
-+      [ax_pthread_check_cond=0],
-+      [ax_pthread_check_cond="!defined($ax_pthread_check_macro)"])
-+
-+# Are we compiling with Clang?
-+
-+AC_CACHE_CHECK([whether $CC is Clang],
-+    [ax_cv_PTHREAD_CLANG],
-+    [ax_cv_PTHREAD_CLANG=no
-+     # Note that Autoconf sets GCC=yes for Clang as well as GCC
-+     if test "x$GCC" = "xyes"; then
-+        AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG],
-+            [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */
-+#            if defined(__clang__) && defined(__llvm__)
-+             AX_PTHREAD_CC_IS_CLANG
-+#            endif
-+            ],
-+            [ax_cv_PTHREAD_CLANG=yes])
-+     fi
-+    ])
-+ax_pthread_clang="$ax_cv_PTHREAD_CLANG"
-+
-+ax_pthread_clang_warning=no
-+
-+# Clang needs special handling, because older versions handle the -pthread
-+# option in a rather... idiosyncratic way
-+
-+if test "x$ax_pthread_clang" = "xyes"; then
-+
-+        # Clang takes -pthread; it has never supported any other flag
-+
-+        # (Note 1: This will need to be revisited if a system that Clang
-+        # supports has POSIX threads in a separate library.  This tends not
-+        # to be the way of modern systems, but it's conceivable.)
-+
-+        # (Note 2: On some systems, notably Darwin, -pthread is not needed
-+        # to get POSIX threads support; the API is always present and
-+        # active.  We could reasonably leave PTHREAD_CFLAGS empty.  But
-+        # -pthread does define _REENTRANT, and while the Darwin headers
-+        # ignore this macro, third-party headers might not.)
-+
-+        PTHREAD_CFLAGS="-pthread"
-+        PTHREAD_LIBS=
-+
-+        ax_pthread_ok=yes
-+
-+        # However, older versions of Clang make a point of warning the user
-+        # that, in an invocation where only linking and no compilation is
-+        # taking place, the -pthread option has no effect ("argument unused
-+        # during compilation").  They expect -pthread to be passed in only
-+        # when source code is being compiled.
-+        #
-+        # Problem is, this is at odds with the way Automake and most other
-+        # C build frameworks function, which is that the same flags used in
-+        # compilation (CFLAGS) are also used in linking.  Many systems
-+        # supported by AX_PTHREAD require exactly this for POSIX threads
-+        # support, and in fact it is often not straightforward to specify a
-+        # flag that is used only in the compilation phase and not in
-+        # linking.  Such a scenario is extremely rare in practice.
-+        #
-+        # Even though use of the -pthread flag in linking would only print
-+        # a warning, this can be a nuisance for well-run software projects
-+        # that build with -Werror.  So if the active version of Clang has
-+        # this misfeature, we search for an option to squash it.
-+
-+        AC_CACHE_CHECK([whether Clang needs flag to prevent "argument unused" warning when linking with -pthread],
-+            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG],
-+            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown
-+             # Create an alternate version of $ac_link that compiles and
-+             # links in two steps (.c -> .o, .o -> exe) instead of one
-+             # (.c -> exe), because the warning occurs only in the second
-+             # step
-+             ax_pthread_save_ac_link="$ac_link"
-+             ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
-+             ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"`
-+             ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
-+             ax_pthread_save_CFLAGS="$CFLAGS"
-+             for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do
-+                AS_IF([test "x$ax_pthread_try" = "xunknown"], [break])
-+                CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
-+                ac_link="$ax_pthread_save_ac_link"
-+                AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
-+                    [ac_link="$ax_pthread_2step_ac_link"
-+                     AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
-+                         [break])
-+                    ])
-+             done
-+             ac_link="$ax_pthread_save_ac_link"
-+             CFLAGS="$ax_pthread_save_CFLAGS"
-+             AS_IF([test "x$ax_pthread_try" = "x"], [ax_pthread_try=no])
-+             ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try"
-+            ])
-+
-+        case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in
-+                no | unknown) ;;
-+                *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;;
-+        esac
-+
-+fi # $ax_pthread_clang = yes
- 
--if test x"$ax_pthread_ok" = xno; then
--for flag in $ax_pthread_flags; do
-+if test "x$ax_pthread_ok" = "xno"; then
-+for ax_pthread_try_flag in $ax_pthread_flags; do
- 
--        case $flag in
-+        case $ax_pthread_try_flag in
-                 none)
-                 AC_MSG_CHECKING([whether pthreads work without any flags])
-                 ;;
- 
-+                -mt,pthread)
-+                AC_MSG_CHECKING([whether pthreads work with -mt -lpthread])
-+                PTHREAD_CFLAGS="-mt"
-+                PTHREAD_LIBS="-lpthread"
-+                ;;
-+
-                 -*)
--                AC_MSG_CHECKING([whether pthreads work with $flag])
--                PTHREAD_CFLAGS="$flag"
-+                AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag])
-+                PTHREAD_CFLAGS="$ax_pthread_try_flag"
-                 ;;
- 
-                 pthread-config)
--                AC_CHECK_PROG(ax_pthread_config, pthread-config, yes, no)
--                if test x"$ax_pthread_config" = xno; then continue; fi
-+                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
-+                AS_IF([test "x$ax_pthread_config" = "xno"], [continue])
-                 PTHREAD_CFLAGS="`pthread-config --cflags`"
-                 PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-                 ;;
- 
-                 *)
--                AC_MSG_CHECKING([for the pthreads library -l$flag])
--                PTHREAD_LIBS="-l$flag"
-+                AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag])
-+                PTHREAD_LIBS="-l$ax_pthread_try_flag"
-                 ;;
-         esac
- 
--        save_LIBS="$LIBS"
--        save_CFLAGS="$CFLAGS"
--        LIBS="$PTHREAD_LIBS $LIBS"
-+        ax_pthread_save_CFLAGS="$CFLAGS"
-+        ax_pthread_save_LIBS="$LIBS"
-         CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+        LIBS="$PTHREAD_LIBS $LIBS"
- 
-         # Check for various functions.  We must include pthread.h,
-         # since some functions may be macros.  (On the Sequent, we
-@@ -204,7 +366,11 @@
-         # pthread_cleanup_push because it is one of the few pthread
-         # functions on Solaris that doesn't have a non-functional libc stub.
-         # We try pthread_create on general principles.
-+
-         AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
-+#                       if $ax_pthread_check_cond
-+#                        error "$ax_pthread_check_macro must be defined"
-+#                       endif
-                         static void routine(void *a) { a = 0; }
-                         static void *start_routine(void *a) { return a; }],
-                        [pthread_t th; pthread_attr_t attr;
-@@ -213,16 +379,14 @@
-                         pthread_attr_init(&attr);
-                         pthread_cleanup_push(routine, 0);
-                         pthread_cleanup_pop(0) /* ; */])],
--                [ax_pthread_ok=yes],
--                [])
-+            [ax_pthread_ok=yes],
-+            [])
- 
--        LIBS="$save_LIBS"
--        CFLAGS="$save_CFLAGS"
-+        CFLAGS="$ax_pthread_save_CFLAGS"
-+        LIBS="$ax_pthread_save_LIBS"
- 
--        AC_MSG_RESULT($ax_pthread_ok)
--        if test "x$ax_pthread_ok" = xyes; then
--                break;
--        fi
-+        AC_MSG_RESULT([$ax_pthread_ok])
-+        AS_IF([test "x$ax_pthread_ok" = "xyes"], [break])
- 
-         PTHREAD_LIBS=""
-         PTHREAD_CFLAGS=""
-@@ -230,70 +394,74 @@
- fi
- 
- # Various other checks:
--if test "x$ax_pthread_ok" = xyes; then
--        save_LIBS="$LIBS"
--        LIBS="$PTHREAD_LIBS $LIBS"
--        save_CFLAGS="$CFLAGS"
-+if test "x$ax_pthread_ok" = "xyes"; then
-+        ax_pthread_save_CFLAGS="$CFLAGS"
-+        ax_pthread_save_LIBS="$LIBS"
-         CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+        LIBS="$PTHREAD_LIBS $LIBS"
- 
-         # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
--        AC_MSG_CHECKING([for joinable pthread attribute])
--        attr_name=unknown
--        for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
--            AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
--                           [int attr = $attr; return attr /* ; */])],
--                [attr_name=$attr; break],
--                [])
--        done
--        AC_MSG_RESULT($attr_name)
--        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
--            AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name,
--                               [Define to necessary symbol if this constant
--                                uses a non-standard name on your system.])
--        fi
--
--        AC_MSG_CHECKING([if more special flags are required for pthreads])
--        flag=no
--        case ${host_os} in
--            aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
--            osf* | hpux*) flag="-D_REENTRANT";;
--            solaris*)
--            if test "$GCC" = "yes"; then
--                flag="-D_REENTRANT"
--            else
--                flag="-mt -D_REENTRANT"
--            fi
--            ;;
--        esac
--        AC_MSG_RESULT(${flag})
--        if test "x$flag" != xno; then
--            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
--        fi
-+        AC_CACHE_CHECK([for joinable pthread attribute],
-+            [ax_cv_PTHREAD_JOINABLE_ATTR],
-+            [ax_cv_PTHREAD_JOINABLE_ATTR=unknown
-+             for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-+                 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
-+                                                 [int attr = $ax_pthread_attr; return attr /* ; */])],
-+                                [ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break],
-+                                [])
-+             done
-+            ])
-+        AS_IF([test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \
-+               test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \
-+               test "x$ax_pthread_joinable_attr_defined" != "xyes"],
-+              [AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE],
-+                                  [$ax_cv_PTHREAD_JOINABLE_ATTR],
-+                                  [Define to necessary symbol if this constant
-+                                   uses a non-standard name on your system.])
-+               ax_pthread_joinable_attr_defined=yes
-+              ])
-+
-+        AC_CACHE_CHECK([whether more special flags are required for pthreads],
-+            [ax_cv_PTHREAD_SPECIAL_FLAGS],
-+            [ax_cv_PTHREAD_SPECIAL_FLAGS=no
-+             case $host_os in
-+             solaris*)
-+             ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
-+             ;;
-+             esac
-+            ])
-+        AS_IF([test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \
-+               test "x$ax_pthread_special_flags_added" != "xyes"],
-+              [PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS"
-+               ax_pthread_special_flags_added=yes])
- 
-         AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
--            ax_cv_PTHREAD_PRIO_INHERIT, [
--                AC_LINK_IFELSE([
--                    AC_LANG_PROGRAM([[#include <pthread.h>]], [[int i = PTHREAD_PRIO_INHERIT;]])],
--                    [ax_cv_PTHREAD_PRIO_INHERIT=yes],
--                    [ax_cv_PTHREAD_PRIO_INHERIT=no])
-+            [ax_cv_PTHREAD_PRIO_INHERIT],
-+            [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
-+                                             [[int i = PTHREAD_PRIO_INHERIT;]])],
-+                            [ax_cv_PTHREAD_PRIO_INHERIT=yes],
-+                            [ax_cv_PTHREAD_PRIO_INHERIT=no])
-             ])
--        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"],
--            AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], 1, [Have PTHREAD_PRIO_INHERIT.]))
-+        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \
-+               test "x$ax_pthread_prio_inherit_defined" != "xyes"],
-+              [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])
-+               ax_pthread_prio_inherit_defined=yes
-+              ])
- 
--        LIBS="$save_LIBS"
--        CFLAGS="$save_CFLAGS"
-+        CFLAGS="$ax_pthread_save_CFLAGS"
-+        LIBS="$ax_pthread_save_LIBS"
- 
-         # More AIX lossage: compile with *_r variant
--        if test "x$GCC" != xyes; then
-+        if test "x$GCC" != "xyes"; then
-             case $host_os in
-                 aix*)
-                 AS_CASE(["x/$CC"],
--                  [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
--                  [#handle absolute path differently from PATH based program lookup
--                   AS_CASE(["x$CC"],
--                     [x/*],
--                     [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
--                     [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
-+                    [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
-+                    [#handle absolute path differently from PATH based program lookup
-+                     AS_CASE(["x$CC"],
-+                         [x/*],
-+                         [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
-+                         [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
-                 ;;
-             esac
-         fi
-@@ -301,13 +469,13 @@
- 
- test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
- 
--AC_SUBST(PTHREAD_LIBS)
--AC_SUBST(PTHREAD_CFLAGS)
--AC_SUBST(PTHREAD_CC)
-+AC_SUBST([PTHREAD_LIBS])
-+AC_SUBST([PTHREAD_CFLAGS])
-+AC_SUBST([PTHREAD_CC])
- 
- # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
--if test x"$ax_pthread_ok" = xyes; then
--        ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
-+if test "x$ax_pthread_ok" = "xyes"; then
-+        ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
-         :
- else
-         ax_pthread_ok=no
---- /m4/ax_with_curses.m4
-+++ /m4/ax_with_curses.m4
-@@ -1,5 +1,5 @@
- # ===========================================================================
--#      http://www.gnu.org/software/autoconf-archive/ax_with_curses.html
-+#      https://www.gnu.org/software/autoconf-archive/ax_with_curses.html
- # ===========================================================================
- #
- # SYNOPSIS
-@@ -12,7 +12,9 @@
- #   present, along with the associated header file.  The NcursesW
- #   (wide-character) library is searched for first, followed by Ncurses,
- #   then the system-default plain Curses.  The first library found is the
--#   one returned.
-+#   one returned. Finding libraries will first be attempted by using
-+#   pkg-config, and should the pkg-config files not be available, will
-+#   fallback to combinations of known flags itself.
- #
- #   The following options are understood: --with-ncursesw, --with-ncurses,
- #   --without-ncursesw, --without-ncurses.  The "--with" options force the
-@@ -52,23 +54,29 @@
- #
- #   (These preprocessor symbols are discussed later in this document.)
- #
--#   The following output variable is defined by this macro; it is precious
--#   and may be overridden on the ./configure command line:
-+#   The following output variables are defined by this macro; they are
-+#   precious and may be overridden on the ./configure command line:
- #
--#     CURSES_LIB  - library to add to xxx_LDADD
-+#     CURSES_LIBS  - library to add to xxx_LDADD
-+#     CURSES_CFLAGS  - include paths to add to xxx_CPPFLAGS
- #
--#   The library listed in CURSES_LIB is NOT added to LIBS by default. You
--#   need to add CURSES_LIB to the appropriate xxx_LDADD line in your
--#   Makefile.am.  For example:
--#
--#     prog_LDADD = @CURSES_LIB@
--#
--#   If CURSES_LIB is set on the configure command line (such as by running
--#   "./configure CURSES_LIB=-lmycurses"), then the only header searched for
--#   is <curses.h>.  The user may use the CPPFLAGS precious variable to
--#   override the standard #include search path.  If the user needs to
--#   specify an alternative path for a library (such as for a non-standard
--#   NcurseW), the user should use the LDFLAGS variable.
-+#   In previous versions of this macro, the flags CURSES_LIB and
-+#   CURSES_CPPFLAGS were defined. These have been renamed, in keeping with
-+#   AX_WITH_CURSES's close bigger brother, PKG_CHECK_MODULES, which should
-+#   eventually supersede the use of AX_WITH_CURSES. Neither the library
-+#   listed in CURSES_LIBS, nor the flags in CURSES_CFLAGS are added to LIBS,
-+#   respectively CPPFLAGS, by default. You need to add both to the
-+#   appropriate xxx_LDADD/xxx_CPPFLAGS line in your Makefile.am. For
-+#   example:
-+#
-+#     prog_LDADD = @CURSES_LIBS@
-+#     prog_CPPFLAGS = @CURSES_CFLAGS@
-+#
-+#   If CURSES_LIBS is set on the configure command line (such as by running
-+#   "./configure CURSES_LIBS=-lmycurses"), then the only header searched for
-+#   is <curses.h>. If the user needs to specify an alternative path for a
-+#   library (such as for a non-standard NcurseW), the user should use the
-+#   LDFLAGS variable.
- #
- #   The following shell variables may be defined by this macro:
- #
-@@ -88,7 +96,7 @@
- #
- #     AX_WITH_CURSES
- #     if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then
--#         AX_MSG_ERROR([requires either NcursesW or Ncurses library])
-+#         AC_MSG_ERROR([requires either NcursesW or Ncurses library])
- #     fi
- #
- #   If any Curses library will do (but one must be present and must support
-@@ -167,7 +175,7 @@
- #   Public License for more details.
- #
- #   You should have received a copy of the GNU General Public License along
--#   with this program. If not, see <http://www.gnu.org/licenses/>.
-+#   with this program. If not, see <https://www.gnu.org/licenses/>.
- #
- #   As a special exception, the respective Autoconf Macro's copyright owner
- #   gives unlimited permission to copy, distribute and modify the configure
-@@ -182,11 +190,66 @@
- #   modified version of the Autoconf Macro, you may extend this special
- #   exception to the GPL to apply to your modified version as well.
- 
--#serial 13
-+#serial 18
-+
-+# internal function to factorize common code that is used by both ncurses
-+# and ncursesw
-+AC_DEFUN([_FIND_CURSES_FLAGS], [
-+    AC_MSG_CHECKING([for $1 via pkg-config])
-+
-+    AX_REQUIRE_DEFINED([PKG_CHECK_EXISTS])
-+    _PKG_CONFIG([_ax_cv_$1_libs], [libs], [$1])
-+    _PKG_CONFIG([_ax_cv_$1_cppflags], [cflags], [$1])
-+
-+    AS_IF([test "x$pkg_failed" = "xyes" || test "x$pkg_failed" = "xuntried"],[
-+        AC_MSG_RESULT([no])
-+        # No suitable .pc file found, have to find flags via fallback
-+        AC_CACHE_CHECK([for $1 via fallback], [ax_cv_$1], [
-+            AS_ECHO()
-+            pkg_cv__ax_cv_$1_libs="-l$1"
-+            pkg_cv__ax_cv_$1_cppflags="-D_GNU_SOURCE $CURSES_CFLAGS"
-+            LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_$1_libs"
-+            CPPFLAGS="$ax_saved_CPPFLAGS $pkg_cv__ax_cv_$1_cppflags"
-+
-+            AC_MSG_CHECKING([for initscr() with $pkg_cv__ax_cv_$1_libs])
-+            AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])],
-+                [
-+                    AC_MSG_RESULT([yes])
-+                    AC_MSG_CHECKING([for nodelay() with $pkg_cv__ax_cv_$1_libs])
-+                    AC_LINK_IFELSE([AC_LANG_CALL([], [nodelay])],[
-+                        ax_cv_$1=yes
-+                        ],[
-+                        AC_MSG_RESULT([no])
-+                        m4_if(
-+                            [$1],[ncursesw],[pkg_cv__ax_cv_$1_libs="$pkg_cv__ax_cv_$1_libs -ltinfow"],
-+                            [$1],[ncurses],[pkg_cv__ax_cv_$1_libs="$pkg_cv__ax_cv_$1_libs -ltinfo"]
-+                        )
-+                        LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_$1_libs"
-+
-+                        AC_MSG_CHECKING([for nodelay() with $pkg_cv__ax_cv_$1_libs])
-+                        AC_LINK_IFELSE([AC_LANG_CALL([], [nodelay])],[
-+                            ax_cv_$1=yes
-+                            ],[
-+                            ax_cv_$1=no
-+                        ])
-+                    ])
-+                ],[
-+                    ax_cv_$1=no
-+            ])
-+        ])
-+        ],[
-+        AC_MSG_RESULT([yes])
-+        # Found .pc file, using its information
-+        LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_$1_libs"
-+        CPPFLAGS="$ax_saved_CPPFLAGS $pkg_cv__ax_cv_$1_cppflags"
-+        ax_cv_$1=yes
-+    ])
-+])
- 
- AU_ALIAS([MP_WITH_CURSES], [AX_WITH_CURSES])
- AC_DEFUN([AX_WITH_CURSES], [
--    AC_ARG_VAR([CURSES_LIB], [linker library for Curses, e.g. -lcurses])
-+    AC_ARG_VAR([CURSES_LIBS], [linker library for Curses, e.g. -lcurses])
-+    AC_ARG_VAR([CURSES_CFLAGS], [preprocessor flags for Curses, e.g. -I/usr/include/ncursesw])
-     AC_ARG_WITH([ncurses], [AS_HELP_STRING([--with-ncurses],
-         [force the use of Ncurses or NcursesW])],
-         [], [with_ncurses=check])
-@@ -195,20 +258,17 @@
-         [], [with_ncursesw=check])
- 
-     ax_saved_LIBS=$LIBS
-+    ax_saved_CPPFLAGS=$CPPFLAGS
-+
-     AS_IF([test "x$with_ncurses" = xyes || test "x$with_ncursesw" = xyes],
-         [ax_with_plaincurses=no], [ax_with_plaincurses=check])
- 
-     ax_cv_curses_which=no
- 
-     # Test for NcursesW
-+    AS_IF([test "x$CURSES_LIBS" = x && test "x$with_ncursesw" != xno], [
-+        _FIND_CURSES_FLAGS([ncursesw])
- 
--    AS_IF([test "x$CURSES_LIB" = x && test "x$with_ncursesw" != xno], [
--        LIBS="$ax_saved_LIBS -lncursesw"
--
--        AC_CACHE_CHECK([for NcursesW wide-character library], [ax_cv_ncursesw], [
--            AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])],
--                [ax_cv_ncursesw=yes], [ax_cv_ncursesw=no])
--        ])
-         AS_IF([test "x$ax_cv_ncursesw" = xno && test "x$with_ncursesw" = xyes], [
-             AC_MSG_ERROR([--with-ncursesw specified but could not find NcursesW library])
-         ])
-@@ -216,7 +276,8 @@
-         AS_IF([test "x$ax_cv_ncursesw" = xyes], [
-             ax_cv_curses=yes
-             ax_cv_curses_which=ncursesw
--            CURSES_LIB="-lncursesw"
-+            CURSES_LIBS="$pkg_cv__ax_cv_ncursesw_libs"
-+            CURSES_CFLAGS="$pkg_cv__ax_cv_ncursesw_cppflags"
-             AC_DEFINE([HAVE_NCURSESW], [1], [Define to 1 if the NcursesW library is present])
-             AC_DEFINE([HAVE_CURSES],   [1], [Define to 1 if a SysV or X/Open compatible Curses library is present])
- 
-@@ -318,16 +379,13 @@
-             ])
-         ])
-     ])
-+    unset pkg_cv__ax_cv_ncursesw_libs
-+    unset pkg_cv__ax_cv_ncursesw_cppflags
- 
-     # Test for Ncurses
-+    AS_IF([test "x$CURSES_LIBS" = x && test "x$with_ncurses" != xno && test "x$ax_cv_curses_which" = xno], [
-+        _FIND_CURSES_FLAGS([ncurses])
- 
--    AS_IF([test "x$CURSES_LIB" = x && test "x$with_ncurses" != xno && test "x$ax_cv_curses_which" = xno], [
--        LIBS="$ax_saved_LIBS -lncurses"
--
--        AC_CACHE_CHECK([for Ncurses library], [ax_cv_ncurses], [
--            AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])],
--                [ax_cv_ncurses=yes], [ax_cv_ncurses=no])
--        ])
-         AS_IF([test "x$ax_cv_ncurses" = xno && test "x$with_ncurses" = xyes], [
-             AC_MSG_ERROR([--with-ncurses specified but could not find Ncurses library])
-         ])
-@@ -335,7 +393,8 @@
-         AS_IF([test "x$ax_cv_ncurses" = xyes], [
-             ax_cv_curses=yes
-             ax_cv_curses_which=ncurses
--            CURSES_LIB="-lncurses"
-+            CURSES_LIBS="$pkg_cv__ax_cv_ncurses_libs"
-+            CURSES_CFLAGS="$pkg_cv__ax_cv_ncurses_cppflags"
-             AC_DEFINE([HAVE_NCURSES], [1], [Define to 1 if the Ncurses library is present])
-             AC_DEFINE([HAVE_CURSES],  [1], [Define to 1 if a SysV or X/Open compatible Curses library is present])
- 
-@@ -390,12 +449,13 @@
-             ])
-         ])
-     ])
-+    unset pkg_cv__ax_cv_ncurses_libs
-+    unset pkg_cv__ax_cv_ncurses_cppflags
- 
--    # Test for plain Curses (or if CURSES_LIB was set by user)
--
-+    # Test for plain Curses (or if CURSES_LIBS was set by user)
-     AS_IF([test "x$with_plaincurses" != xno && test "x$ax_cv_curses_which" = xno], [
--        AS_IF([test "x$CURSES_LIB" != x], [
--            LIBS="$ax_saved_LIBS $CURSES_LIB"
-+        AS_IF([test "x$CURSES_LIBS" != x], [
-+            LIBS="$ax_saved_LIBS $CURSES_LIBS"
-         ], [
-             LIBS="$ax_saved_LIBS -lcurses"
-         ])
-@@ -408,8 +468,8 @@
-         AS_IF([test "x$ax_cv_plaincurses" = xyes], [
-             ax_cv_curses=yes
-             ax_cv_curses_which=plaincurses
--            AS_IF([test "x$CURSES_LIB" = x], [
--                CURSES_LIB="-lcurses"
-+            AS_IF([test "x$CURSES_LIBS" = x], [
-+                CURSES_LIBS="-lcurses"
-             ])
-             AC_DEFINE([HAVE_CURSES], [1], [Define to 1 if a SysV or X/Open compatible Curses library is present])
- 
-@@ -515,4 +575,8 @@
-     AS_IF([test "x$ax_cv_curses_obsolete" != xyes], [ax_cv_curses_obsolete=no])
- 
-     LIBS=$ax_saved_LIBS
-+    CPPFLAGS=$ax_saved_CPPFLAGS
-+
-+    unset ax_saved_LIBS
-+    unset ax_saved_CPPFLAGS
- ])dnl
---- /test/Makefile.am
-+++ /test/Makefile.am
-@@ -65,7 +65,8 @@
- if ENABLE_TEXT_UI
- TEXT_UI_BIN=genkeystroke
- genkeystroke_SOURCES = genkeystroke.c
--genkeystroke_LDADD = $(LDADD) @CURSES_LIB@
-+genkeystroke_CPPFLAGS = $(AM_CPPFLAGS) @CURSES_CFLAGS@
-+genkeystroke_LDADD = $(LDADD) @CURSES_LIBS@
- else
- TEXT_UI_BIN=
- endif
diff --git a/app-i18n/libchewing/libchewing-0.5.1.ebuild b/app-i18n/libchewing/libchewing-0.5.1.ebuild
index 796538bfb4f3..4447cb296419 100644
--- a/app-i18n/libchewing/libchewing-0.5.1.ebuild
+++ b/app-i18n/libchewing/libchewing-0.5.1.ebuild
@@ -15,9 +15,10 @@ fi
 DESCRIPTION="Intelligent phonetic (Zhuyin/Bopomofo) input method library"
 HOMEPAGE="http://chewing.im/ https://github.com/chewing/libchewing"
 if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
+	SRC_URI="https://dev.gentoo.org/~juippis/distfiles/tmp/libchewing-0.5.1-autoconf-archive-2019.01.06.patch"
 else
-	SRC_URI="https://github.com/chewing/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+	SRC_URI="https://github.com/chewing/${PN}/releases/download/v${PV}/${P}.tar.bz2
+	https://dev.gentoo.org/~juippis/distfiles/tmp/libchewing-0.5.1-autoconf-archive-2019.01.06.patch"
 fi
 
 LICENSE="LGPL-2.1"
@@ -33,7 +34,7 @@ DEPEND="${RDEPEND}
 	test? ( sys-libs/ncurses[unicode] )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.5.1-autoconf-archive-2019.01.06.patch"
+	"${DISTDIR}/${PN}-0.5.1-autoconf-archive-2019.01.06.patch"
 )
 
 src_prepare() {
diff --git a/app-i18n/libchewing/libchewing-9999.ebuild b/app-i18n/libchewing/libchewing-9999.ebuild
index 041ef001addd..a02537b46ef3 100644
--- a/app-i18n/libchewing/libchewing-9999.ebuild
+++ b/app-i18n/libchewing/libchewing-9999.ebuild
@@ -15,9 +15,10 @@ fi
 DESCRIPTION="Intelligent phonetic (Zhuyin/Bopomofo) input method library"
 HOMEPAGE="http://chewing.im/ https://github.com/chewing/libchewing"
 if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
+	SRC_URI="https://dev.gentoo.org/~juippis/distfiles/tmp/libchewing-0.5.1-autoconf-archive-2019.01.06.patch"
 else
-	SRC_URI="https://github.com/chewing/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+	SRC_URI="https://github.com/chewing/${PN}/releases/download/v${PV}/${P}.tar.bz2
+	https://dev.gentoo.org/~juippis/distfiles/tmp/libchewing-0.5.1-autoconf-archive-2019.01.06.patch"
 fi
 
 LICENSE="LGPL-2.1"
@@ -33,7 +34,7 @@ DEPEND="${RDEPEND}
 	test? ( sys-libs/ncurses[unicode] )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.5.1-autoconf-archive-2019.01.06.patch"
+	"${DISTDIR}/${PN}-0.5.1-autoconf-archive-2019.01.06.patch"
 )
 
 src_prepare() {
diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest
index 2bd433422036..72d8dc73f386 100644
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@@ -1,3 +1,4 @@
 DIST fcitx-mozc-2.23.2815.102.1.patch 295112 BLAKE2B 709b84f6eaed16da38a173f40ae7cccff362fd167e6deb4090ae8a9ec522ac8e11ccff3c9ef6433907249af8c9eb4b7be12d2c05564cabd45c25e26764286ed3 SHA512 e0d4645df919838f0fe31a97bf6dd759c222a696f68133f7584d2c771f70734ea634a25bebb03a756221000d3552423207ee5163d75778dbf480b6e267ba4cd0
 DIST japanese-usage-dictionary-20120416091336.tar.gz 71051 BLAKE2B 08eecf0aa021e27a2813f58c2d37f1cec760448f6ae086ae7468b8a11575c6ef9f72f656cb4d53e0179b8a7b00f2d91ff51a0ad7825e078dcbac0810f1d8b3e1 SHA512 b7e997a979b6d50e49b9af5dc830ea4df0532f6ab1321b9ef14983f65bb54f1b2967375c82e07957ae7693ebbf43c9b56ecea6bfea8dd1fdaee444bd549d83a7
+DIST mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch 40296 BLAKE2B 982f43fa68031eb0f779ec4d034fef838a4fce7834291db889c9edffba3df4acd5bfdf187dd4a52ee8fd0714de943f9d5112070cd69502e1449dab4dbf8543b2 SHA512 6e05b2f22663ddbfb24a8344928ec24c0b4cf523728c1623367970b8f263142af95c056c82d0827414833d5b9f26c3a024a04a688851021601a5cbcc1474e754
 DIST mozc-2.23.2815.102.tar.gz 47739041 BLAKE2B 045a8a4a07e09cf923b67824111cdf672febc30256a6aef951ae779a3f582b3860042750d766120e376898c63be5b4baea870798a192cee34b0d48647e1ec5e6 SHA512 a3face616ca89990bca52371dcc8003604ebe0e9633116a64550add070152b1bc4d9b21e9f102c5afa6f8b1aa11d8dbc4bafbcebfaf4a12a934f085f245d548f
diff --git a/app-i18n/mozc/files/mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch b/app-i18n/mozc/files/mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch
deleted file mode 100644
index 2cd757281545..000000000000
--- a/app-i18n/mozc/files/mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch
+++ /dev/null
@@ -1,1039 +0,0 @@
-https://github.com/google/mozc/issues/460
-
---- /src/dictionary/user_dictionary.cc
-+++ /src/dictionary/user_dictionary.cc
-@@ -289,7 +289,7 @@
-     }
- 
-     auto_register_mode_ = false;
--    dic_->Load(*(storage.get()));
-+    dic_->Load(storage.get()->user_dictionary_storage_base);
-   }
- 
-  private:
---- /src/dictionary/user_dictionary_session.cc
-+++ /src/dictionary/user_dictionary_session.cc
-@@ -69,11 +69,11 @@
-   }
- 
-   virtual bool RunUndo(mozc::UserDictionaryStorage *storage) {
--    if (storage->dictionaries_size() == 0) {
-+    if (storage->user_dictionary_storage_base.dictionaries_size() == 0) {
-       return false;
-     }
- 
--    storage->mutable_dictionaries()->RemoveLast();
-+    storage->user_dictionary_storage_base.mutable_dictionaries()->RemoveLast();
-     return true;
-   }
- 
-@@ -94,7 +94,7 @@
-     }
- 
-     RepeatedPtrField<UserDictionary> *dictionaries =
--        storage->mutable_dictionaries();
-+        storage->user_dictionary_storage_base.mutable_dictionaries();
-     dictionaries->AddAllocated(dictionary_.release());
- 
-     // Adjust the position of the reverted dictionary.
-@@ -120,10 +120,10 @@
-   }
- 
-   virtual bool RunUndo(mozc::UserDictionaryStorage *storage) {
--    if (storage->dictionaries_size() != 1) {
-+    if (storage->user_dictionary_storage_base.dictionaries_size() != 1) {
-       return false;
-     }
--    dictionary_->Swap(storage->mutable_dictionaries(0));
-+    dictionary_->Swap(storage->user_dictionary_storage_base.mutable_dictionaries(0));
-     return true;
-   }
- 
-@@ -144,7 +144,7 @@
-   virtual bool RunUndo(mozc::UserDictionaryStorage *storage) {
-     UserDictionary *dictionary =
-         UserDictionaryUtil::GetMutableUserDictionaryById(
--            storage, dictionary_id_);
-+            &storage->user_dictionary_storage_base, dictionary_id_);
-     if (dictionary == NULL) {
-       return false;
-     }
-@@ -169,7 +169,7 @@
-   virtual bool RunUndo(mozc::UserDictionaryStorage *storage) {
-     UserDictionary *dictionary =
-         UserDictionaryUtil::GetMutableUserDictionaryById(
--            storage, dictionary_id_);
-+            &storage->user_dictionary_storage_base, dictionary_id_);
-     if (dictionary == NULL || dictionary->entries_size() == 0) {
-       return false;
-     }
-@@ -195,7 +195,7 @@
-   virtual bool RunUndo(mozc::UserDictionaryStorage *storage) {
-     UserDictionary *dictionary =
-         UserDictionaryUtil::GetMutableUserDictionaryById(
--            storage, dictionary_id_);
-+            &storage->user_dictionary_storage_base, dictionary_id_);
-     if (dictionary == NULL ||
-         index_ < 0 || dictionary->entries_size() <= index_) {
-       return false;
-@@ -240,7 +240,7 @@
-   virtual bool RunUndo(mozc::UserDictionaryStorage *storage) {
-     UserDictionary *dictionary =
-         UserDictionaryUtil::GetMutableUserDictionaryById(
--            storage, dictionary_id_);
-+            &storage->user_dictionary_storage_base, dictionary_id_);
-     if (dictionary == NULL) {
-       return false;
-     }
-@@ -306,7 +306,7 @@
-   virtual bool RunUndo(mozc::UserDictionaryStorage *storage) {
-     UserDictionary *dictionary =
-         UserDictionaryUtil::GetMutableUserDictionaryById(
--            storage, dictionary_id_);
-+            &storage->user_dictionary_storage_base, dictionary_id_);
-     if (dictionary == NULL) {
-       return false;
-     }
-@@ -345,7 +345,7 @@
- 
- // TODO(hidehiko) move this to header.
- const UserDictionaryStorage &UserDictionarySession::storage() const {
--  return *storage_;
-+  return storage_->user_dictionary_storage_base;
- }
- mozc::UserDictionaryStorage *UserDictionarySession::mutable_storage() {
-   return storage_.get();
-@@ -464,7 +464,7 @@
-     const string &dictionary_name, uint64 *new_dictionary_id) {
-   UserDictionaryCommandStatus::Status status =
-       UserDictionaryUtil::CreateDictionary(
--          storage_.get(), dictionary_name, new_dictionary_id);
-+          &storage_->user_dictionary_storage_base, dictionary_name, new_dictionary_id);
-   if (status == UserDictionaryCommandStatus::USER_DICTIONARY_COMMAND_SUCCESS) {
-     AddUndoCommand(new UndoCreateDictionaryCommand);
-   }
-@@ -488,7 +488,7 @@
-   int original_index;
-   UserDictionary *deleted_dictionary;
-   if (!UserDictionaryUtil::DeleteDictionary(
--          storage_.get(), dictionary_id,
-+          &storage_->user_dictionary_storage_base, dictionary_id,
-           &original_index, &deleted_dictionary)) {
-     // Failed to delete the dictionary.
-     return UserDictionaryCommandStatus::UNKNOWN_DICTIONARY_ID;
-@@ -510,7 +510,7 @@
-     uint64 dictionary_id, const string &dictionary_name) {
-   string original_name;
-   const UserDictionary *dictionary =
--      UserDictionaryUtil::GetUserDictionaryById(*storage_, dictionary_id);
-+      UserDictionaryUtil::GetUserDictionaryById(storage_->user_dictionary_storage_base, dictionary_id);
-   if (dictionary != NULL) {
-     // Note that if dictionary is null, it means the dictionary_id is invalid
-     // so following RenameDictionary will fail, and error handling is done
-@@ -547,7 +547,7 @@
-     uint64 dictionary_id, const UserDictionary::Entry &entry) {
-   UserDictionary *dictionary =
-       UserDictionaryUtil::GetMutableUserDictionaryById(
--          storage_.get(), dictionary_id);
-+          &storage_->user_dictionary_storage_base, dictionary_id);
-   if (dictionary == NULL) {
-     return UserDictionaryCommandStatus::UNKNOWN_DICTIONARY_ID;
-   }
-@@ -575,7 +575,7 @@
-     uint64 dictionary_id, int index, const UserDictionary::Entry &entry) {
-   UserDictionary *dictionary =
-       UserDictionaryUtil::GetMutableUserDictionaryById(
--          storage_.get(), dictionary_id);
-+          &storage_->user_dictionary_storage_base, dictionary_id);
-   if (dictionary == NULL) {
-     return UserDictionaryCommandStatus::UNKNOWN_DICTIONARY_ID;
-   }
-@@ -604,7 +604,7 @@
-     uint64 dictionary_id, const std::vector<int> &index_list) {
-   UserDictionary *dictionary =
-       UserDictionaryUtil::GetMutableUserDictionaryById(
--          storage_.get(), dictionary_id);
-+          &storage_->user_dictionary_storage_base, dictionary_id);
-   if (dictionary == NULL) {
-     return UserDictionaryCommandStatus::UNKNOWN_DICTIONARY_ID;
-   }
-@@ -644,7 +644,7 @@
-     uint64 dictionary_id, const string &data) {
-   UserDictionary *dictionary =
-       UserDictionaryUtil::GetMutableUserDictionaryById(
--          storage_.get(), dictionary_id);
-+          &storage_->user_dictionary_storage_base, dictionary_id);
-   if (dictionary == NULL) {
-     return UserDictionaryCommandStatus::UNKNOWN_DICTIONARY_ID;
-   }
-@@ -699,7 +699,7 @@
-     uint64 *new_dictionary_id) {
-   UserDictionaryCommandStatus::Status status =
-       UserDictionaryUtil::CreateDictionary(
--          storage_.get(), dictionary_name, new_dictionary_id);
-+          &storage_->user_dictionary_storage_base, dictionary_name, new_dictionary_id);
-   if (status != UserDictionaryCommandStatus::USER_DICTIONARY_COMMAND_SUCCESS) {
-     return status;
-   }
-@@ -709,7 +709,7 @@
- 
-   UserDictionary *dictionary =
-       UserDictionaryUtil::GetMutableUserDictionaryById(
--          storage_.get(), *new_dictionary_id);
-+          &storage_->user_dictionary_storage_base, *new_dictionary_id);
-   if (dictionary == NULL) {
-     // The dictionary should be always found.
-     return UserDictionaryCommandStatus::UNKNOWN_ERROR;
-@@ -719,7 +719,7 @@
- }
- 
- bool UserDictionarySession::EnsureNonEmptyStorage() {
--  if (storage_->dictionaries_size() > 0) {
-+  if (storage_->user_dictionary_storage_base.dictionaries_size() > 0) {
-     // The storage already has at least one dictionary. Do nothing.
-     return false;
-   }
-@@ -728,7 +728,7 @@
-   uint64 new_dictionary_id;
-   UserDictionaryCommandStatus::Status status =
-       UserDictionaryUtil::CreateDictionary(
--          storage_.get(), default_dictionary_name_, &new_dictionary_id);
-+          &storage_->user_dictionary_storage_base, default_dictionary_name_, &new_dictionary_id);
-   CHECK_EQ(
-       status, UserDictionaryCommandStatus::USER_DICTIONARY_COMMAND_SUCCESS);
-   return true;
-@@ -755,7 +755,7 @@
- 
- void UserDictionarySession::ClearDictionariesAndUndoHistory() {
-   ScopedUserDictionaryLocker l(storage_.get());
--  storage_->clear_dictionaries();
-+  storage_->user_dictionary_storage_base.clear_dictionaries();
-   ClearUndoHistory();
- }
- 
---- /src/dictionary/user_dictionary_session_test.cc
-+++ /src/dictionary/user_dictionary_session_test.cc
-@@ -95,12 +95,12 @@
- 
-   ASSERT_EQ(UserDictionaryCommandStatus::FILE_NOT_FOUND, session.Load());
- 
--  session.mutable_storage()->set_version(10);
-+  session.mutable_storage()->user_dictionary_storage_base.set_version(10);
-   ASSERT_EQ(UserDictionaryCommandStatus::USER_DICTIONARY_COMMAND_SUCCESS,
-             session.Save());
- 
-   // Clear once, in order to make sure that Load is actually working.
--  session.mutable_storage()->Clear();
-+  session.mutable_storage()->user_dictionary_storage_base.Clear();
-   ASSERT_EQ(UserDictionaryCommandStatus::USER_DICTIONARY_COMMAND_SUCCESS,
-             session.Load());
- 
-@@ -130,7 +130,7 @@
- 
-   // Create huge dummy data.
-   {
--    UserDictionaryStorage *storage = session.mutable_storage();
-+    UserDictionaryStorage *storage = &session.mutable_storage()->user_dictionary_storage_base;
-     for (int i = 0; i < 100; ++i) {
-       UserDictionary *dictionary = storage->add_dictionaries();
-       for (int j = 0; j < 1000; ++j) {
-@@ -147,7 +147,7 @@
-   ASSERT_EQ(UserDictionaryCommandStatus::FILE_SIZE_LIMIT_EXCEEDED,
-             session.Save());
- 
--  session.mutable_storage()->Clear();
-+  session.mutable_storage()->user_dictionary_storage_base.Clear();
-   ASSERT_EQ(UserDictionaryCommandStatus::USER_DICTIONARY_COMMAND_SUCCESS,
-             session.Load());
- 
-@@ -191,7 +191,7 @@
- 
-   while (session.storage().dictionaries_size() <
-          ::mozc::UserDictionaryStorage::max_dictionary_size()) {
--    session.mutable_storage()->add_dictionaries();
-+    session.mutable_storage()->user_dictionary_storage_base.add_dictionaries();
-   }
-   EXPECT_EQ(UserDictionaryCommandStatus::DICTIONARY_SIZE_LIMIT_EXCEEDED,
-             session.CreateDictionary("dictionary 2", &dummy_dictionary_id));
-@@ -204,7 +204,7 @@
-   const uint64 kDummyId = 10;
-   {
-     UserDictionary *user_dictionary =
--        session.mutable_storage()->add_dictionaries();
-+        session.mutable_storage()->user_dictionary_storage_base.add_dictionaries();
-     user_dictionary->set_id(kDummyId);
-   }
- 
-@@ -229,7 +229,7 @@
-   const uint64 kDummyId = 10;
-   {
-     UserDictionary *user_dictionary =
--        session.mutable_storage()->add_dictionaries();
-+        session.mutable_storage()->user_dictionary_storage_base.add_dictionaries();
-     user_dictionary->set_id(kDummyId);
-   }
- 
---- /src/dictionary/user_dictionary_storage.cc
-+++ /src/dictionary/user_dictionary_storage.cc
-@@ -109,7 +109,7 @@
-   mozc::protobuf::io::IstreamInputStream zero_copy_input(&ifs);
-   mozc::protobuf::io::CodedInputStream decoder(&zero_copy_input);
-   decoder.SetTotalBytesLimit(kDefaultTotalBytesLimit, -1);
--  if (!ParseFromCodedStream(&decoder)) {
-+  if (!user_dictionary_storage_base.ParseFromCodedStream(&decoder)) {
-     LOG(ERROR) << "Failed to parse";
-     if (!decoder.ConsumedEntireMessage() || !ifs.eof()) {
-       LOG(ERROR) << "ParseFromStream failed: file seems broken";
-@@ -137,11 +137,11 @@
-   }
- 
-   // Check dictionary id here. if id is 0, assign random ID.
--  for (int i = 0; i < dictionaries_size(); ++i) {
--    const UserDictionary &dict = dictionaries(i);
-+  for (int i = 0; i < user_dictionary_storage_base.dictionaries_size(); ++i) {
-+    const UserDictionary &dict = user_dictionary_storage_base.dictionaries(i);
-     if (dict.id() == 0) {
--      mutable_dictionaries(i)->set_id(
--          UserDictionaryUtil::CreateNewDictionaryId(*this));
-+      user_dictionary_storage_base.mutable_dictionaries(i)->set_id(
-+          UserDictionaryUtil::CreateNewDictionaryId(this->user_dictionary_storage_base));
-     }
-   }
- 
-@@ -171,7 +171,7 @@
-       return false;
-     }
- 
--    if (!SerializeToOstream(&ofs)) {
-+    if (!user_dictionary_storage_base.SerializeToOstream(&ofs)) {
-       LOG(ERROR) << "SerializeToString failed";
-       last_error_type_ = SYNC_FAILURE;
-       return false;
-@@ -227,7 +227,7 @@
-     return false;
-   }
- 
--  const UserDictionary &dic = dictionaries(index);
-+  const UserDictionary &dic = user_dictionary_storage_base.dictionaries(index);
-   for (size_t i = 0; i < dic.entries_size(); ++i) {
-     const UserDictionaryEntry &entry = dic.entries(i);
-     ofs << entry.key() << "\t" << entry.value() << "\t"
-@@ -241,7 +241,7 @@
- bool UserDictionaryStorage::CreateDictionary(
-     const string &dic_name, uint64 *new_dic_id) {
-   UserDictionaryCommandStatus::Status status =
--      UserDictionaryUtil::CreateDictionary(this, dic_name, new_dic_id);
-+      UserDictionaryUtil::CreateDictionary(&this->user_dictionary_storage_base, dic_name, new_dic_id);
-   // Update last_error_type_
-   switch (status) {
-     case UserDictionaryCommandStatus::DICTIONARY_NAME_EMPTY:
-@@ -273,7 +273,7 @@
- }
- 
- bool UserDictionaryStorage::DeleteDictionary(uint64 dic_id) {
--  if (!UserDictionaryUtil::DeleteDictionary(this, dic_id, NULL, NULL)) {
-+  if (!UserDictionaryUtil::DeleteDictionary(&this->user_dictionary_storage_base, dic_id, NULL, NULL)) {
-     // Failed to delete dictionary.
-     last_error_type_ = INVALID_DICTIONARY_ID;
-     return false;
-@@ -304,8 +304,8 @@
-     return true;
-   }
- 
--  for (int i = 0; i < dictionaries_size(); ++i) {
--    if (dic_name == dictionaries(i).name()) {
-+  for (int i = 0; i < user_dictionary_storage_base.dictionaries_size(); ++i) {
-+    if (dic_name == user_dictionary_storage_base.dictionaries(i).name()) {
-       last_error_type_ = DUPLICATED_DICTIONARY_NAME;
-       LOG(ERROR) << "duplicated dictionary name";
-       return false;
-@@ -318,14 +318,14 @@
- }
- 
- int UserDictionaryStorage::GetUserDictionaryIndex(uint64 dic_id) const {
--  return UserDictionaryUtil::GetUserDictionaryIndexById(*this, dic_id);
-+  return UserDictionaryUtil::GetUserDictionaryIndexById(this->user_dictionary_storage_base, dic_id);
- }
- 
- bool UserDictionaryStorage::GetUserDictionaryId(const string &dic_name,
-                                                 uint64 *dic_id) {
--  for (size_t i = 0; i < dictionaries_size(); ++i) {
--    if (dic_name == dictionaries(i).name()) {
--      *dic_id = dictionaries(i).id();
-+  for (size_t i = 0; i < user_dictionary_storage_base.dictionaries_size(); ++i) {
-+    if (dic_name == user_dictionary_storage_base.dictionaries(i).name()) {
-+      *dic_id = user_dictionary_storage_base.dictionaries(i).id();
-       return true;
-     }
-   }
-@@ -335,7 +335,7 @@
- 
- user_dictionary::UserDictionary *UserDictionaryStorage::GetUserDictionary(
-     uint64 dic_id) {
--  return UserDictionaryUtil::GetMutableUserDictionaryById(this, dic_id);
-+  return UserDictionaryUtil::GetMutableUserDictionaryById(&this->user_dictionary_storage_base, dic_id);
- }
- 
- UserDictionaryStorage::UserDictionaryStorageErrorType
-@@ -352,8 +352,8 @@
-   }
- 
-   int auto_index = -1;
--  for (int i = 0; i < dictionaries_size(); ++i) {
--    if (dictionaries(i).name() == kAutoRegisteredDictionaryName) {
-+  for (int i = 0; i < user_dictionary_storage_base.dictionaries_size(); ++i) {
-+    if (user_dictionary_storage_base.dictionaries(i).name() == kAutoRegisteredDictionaryName) {
-       auto_index = i;
-       break;
-     }
-@@ -361,17 +361,17 @@
- 
-   UserDictionary *dic = NULL;
-   if (auto_index == -1) {
--    if (UserDictionaryUtil::IsStorageFull(*this)) {
-+    if (UserDictionaryUtil::IsStorageFull(this->user_dictionary_storage_base)) {
-       last_error_type_ = TOO_MANY_DICTIONARIES;
-       LOG(ERROR) << "too many dictionaries";
-       UnLock();
-       return false;
-     }
--    dic = add_dictionaries();
--    dic->set_id(UserDictionaryUtil::CreateNewDictionaryId(*this));
-+    dic = user_dictionary_storage_base.add_dictionaries();
-+    dic->set_id(UserDictionaryUtil::CreateNewDictionaryId(this->user_dictionary_storage_base));
-     dic->set_name(kAutoRegisteredDictionaryName);
-   } else {
--    dic = mutable_dictionaries(auto_index);
-+    dic = user_dictionary_storage_base.mutable_dictionaries(auto_index);
-   }
- 
-   if (dic == NULL) {
-@@ -410,13 +410,13 @@
- }
- 
- bool UserDictionaryStorage::ConvertSyncDictionariesToNormalDictionaries() {
--  if (CountSyncableDictionaries(*this) == 0) {
-+  if (CountSyncableDictionaries(this->user_dictionary_storage_base) == 0) {
-     return false;
-   }
- 
--  for (int dictionary_index = dictionaries_size() - 1;
-+  for (int dictionary_index = user_dictionary_storage_base.dictionaries_size() - 1;
-        dictionary_index >= 0; --dictionary_index) {
--    UserDictionary *dic = mutable_dictionaries(dictionary_index);
-+    UserDictionary *dic = user_dictionary_storage_base.mutable_dictionaries(dictionary_index);
-     if (!dic->syncable()) {
-       continue;
-     }
-@@ -433,10 +433,10 @@
- 
-     // Delete removed or unused sync dictionaries.
-     if (dic->removed() || dic->entries_size() == 0) {
--      for (int i = dictionary_index + 1; i < dictionaries_size(); ++i) {
--        mutable_dictionaries()->SwapElements(i - 1, i);
-+      for (int i = dictionary_index + 1; i < user_dictionary_storage_base.dictionaries_size(); ++i) {
-+        user_dictionary_storage_base.mutable_dictionaries()->SwapElements(i - 1, i);
-       }
--      mutable_dictionaries()->RemoveLast();
-+      user_dictionary_storage_base.mutable_dictionaries()->RemoveLast();
-       continue;
-     }
- 
-@@ -445,7 +445,7 @@
-           kDictionaryNameConvertedFromSyncableDictionary;
-       int index = 0;
-       while (UserDictionaryUtil::ValidateDictionaryName(
--                 *this, new_dictionary_name)
-+                 this->user_dictionary_storage_base, new_dictionary_name)
-              != UserDictionaryCommandStatus::USER_DICTIONARY_COMMAND_SUCCESS) {
-         ++index;
-         new_dictionary_name = Util::StringPrintf(
-@@ -456,7 +456,7 @@
-     dic->set_syncable(false);
-   }
- 
--  DCHECK_EQ(0, CountSyncableDictionaries(*this));
-+  DCHECK_EQ(0, CountSyncableDictionaries(this->user_dictionary_storage_base));
- 
-   return true;
- }
-@@ -487,7 +487,7 @@
- bool UserDictionaryStorage::IsValidDictionaryName(const string &name) {
-   UserDictionaryCommandStatus::Status status =
-       UserDictionaryUtil::ValidateDictionaryName(
--          UserDictionaryStorage::default_instance(), name);
-+          user_dictionary::UserDictionaryStorage::default_instance(), name);
- 
-   // Update last_error_type_.
-   switch (status) {
---- /src/dictionary/user_dictionary_storage.h
-+++ /src/dictionary/user_dictionary_storage.h
-@@ -72,13 +72,15 @@
- class Mutex;
- class ProcessMutex;
- 
--// Inherit from ProtocolBuffer
--// TODO(hidehiko): Get rid of this implementation.
--class UserDictionaryStorage : public user_dictionary::UserDictionaryStorage {
-+class UserDictionaryStorage {
-  public:
-   typedef user_dictionary::UserDictionary UserDictionary;
-   typedef user_dictionary::UserDictionary::Entry UserDictionaryEntry;
- 
-+  // Instance of base class generated by Protocol Buffers compiler.
-+  // Regular inheritance strongly discouraged.
-+  user_dictionary::UserDictionaryStorage user_dictionary_storage_base;
-+
-   enum UserDictionaryStorageErrorType {
-     USER_DICTIONARY_STORAGE_NO_ERROR = 0,  // default
-     FILE_NOT_EXISTS,
---- /src/dictionary/user_dictionary_storage_test.cc
-+++ /src/dictionary/user_dictionary_storage_test.cc
-@@ -118,13 +118,13 @@
-   const size_t kDictionariesSize = 3;
-   uint64 id[kDictionariesSize];
- 
--  const size_t dict_size = storage.dictionaries_size();
-+  const size_t dict_size = storage.user_dictionary_storage_base.dictionaries_size();
- 
-   for (size_t i = 0; i < kDictionariesSize; ++i) {
-     EXPECT_TRUE(storage.CreateDictionary(
-         "test" + std::to_string(static_cast<uint32>(i)),
-         &id[i]));
--    EXPECT_EQ(i + 1 + dict_size, storage.dictionaries_size());
-+    EXPECT_EQ(i + 1 + dict_size, storage.user_dictionary_storage_base.dictionaries_size());
-   }
- 
-   for (size_t i = 0; i < kDictionariesSize; ++i) {
-@@ -133,7 +133,7 @@
-   }
- 
-   for (size_t i = 0; i < kDictionariesSize; ++i) {
--    EXPECT_EQ(storage.mutable_dictionaries(i + dict_size),
-+    EXPECT_EQ(storage.user_dictionary_storage_base.mutable_dictionaries(i + dict_size),
-               storage.GetUserDictionary(id[i]));
-     EXPECT_EQ(NULL, storage.GetUserDictionary(id[i] + 1));
-   }
-@@ -165,7 +165,7 @@
-   EXPECT_FALSE(storage.DeleteDictionary(0));
- 
-   EXPECT_TRUE(storage.DeleteDictionary(id[1]));
--  EXPECT_EQ(kDictionariesSize + dict_size - 1, storage.dictionaries_size());
-+  EXPECT_EQ(kDictionariesSize + dict_size - 1, storage.user_dictionary_storage_base.dictionaries_size());
- }
- 
- TEST_F(UserDictionaryStorageTest, DeleteTest) {
-@@ -174,7 +174,7 @@
- 
-   // repeat 10 times
-   for (int i = 0; i < 10; ++i) {
--    storage.Clear();
-+    storage.user_dictionary_storage_base.Clear();
-     std::vector<uint64> ids(100);
-     for (size_t i = 0; i < ids.size(); ++i) {
-       EXPECT_TRUE(storage.CreateDictionary(
-@@ -191,10 +191,10 @@
-       alive.push_back(ids[i]);
-     }
- 
--    EXPECT_EQ(alive.size(), storage.dictionaries_size());
-+    EXPECT_EQ(alive.size(), storage.user_dictionary_storage_base.dictionaries_size());
- 
-     for (size_t i = 0; i < alive.size(); ++i) {
--      EXPECT_EQ(alive[i], storage.dictionaries(i).id());
-+      EXPECT_EQ(alive[i], storage.user_dictionary_storage_base.dictionaries(i).id());
-     }
-   }
- }
-@@ -268,7 +268,7 @@
-         const size_t entry_size = Util::Random(100) + 1;
-         for (size_t j = 0; j < entry_size; ++j) {
-           UserDictionaryStorage::UserDictionary *dic =
--              storage1.mutable_dictionaries(i);
-+              storage1.user_dictionary_storage_base.mutable_dictionaries(i);
-           UserDictionaryStorage::UserDictionaryEntry *entry =
-               dic->add_entries();
-           entry->set_key(GenRandomString(10));
-@@ -288,7 +288,7 @@
-       EXPECT_TRUE(storage2.Load());
-     }
- 
--    EXPECT_EQ(storage1.DebugString(), storage2.DebugString());
-+    EXPECT_EQ(storage1.user_dictionary_storage_base.DebugString(), storage2.user_dictionary_storage_base.DebugString());
-   }
- }
- 
-@@ -352,7 +352,7 @@
-     uint64 dict_id = 0;
-     ASSERT_TRUE(storage.CreateDictionary(data.dictionary_name, &dict_id));
-     UserDictionaryStorage::UserDictionary *dict =
--        storage.mutable_dictionaries(storage.GetUserDictionaryIndex(dict_id));
-+        storage.user_dictionary_storage_base.mutable_dictionaries(storage.GetUserDictionaryIndex(dict_id));
-     dict->set_syncable(data.is_sync_dictionary);
-     dict->set_removed(data.is_removed_dictionary);
-     if (data.has_normal_entry) {
-@@ -369,7 +369,7 @@
-       entry->set_removed(true);
-     }
-   }
--  EXPECT_EQ(9, UserDictionaryStorage::CountSyncableDictionaries(storage));
-+  EXPECT_EQ(9, UserDictionaryStorage::CountSyncableDictionaries(storage.user_dictionary_storage_base));
- 
-   ASSERT_TRUE(storage.ConvertSyncDictionariesToNormalDictionaries());
- 
-@@ -385,12 +385,12 @@
-     { true, kDictionaryNameConvertedFromSyncableDictionary },
-   };
- 
--  EXPECT_EQ(0, UserDictionaryStorage::CountSyncableDictionaries(storage));
--  ASSERT_EQ(arraysize(expected_data), storage.dictionaries_size());
-+  EXPECT_EQ(0, UserDictionaryStorage::CountSyncableDictionaries(storage.user_dictionary_storage_base));
-+  ASSERT_EQ(arraysize(expected_data), storage.user_dictionary_storage_base.dictionaries_size());
-   for (size_t i = 0; i < arraysize(expected_data); ++i) {
-     SCOPED_TRACE(Util::StringPrintf("verify %d", static_cast<int>(i)));
-     const ExpectedData &expected = expected_data[i];
--    const UserDictionaryStorage::UserDictionary &dict = storage.dictionaries(i);
-+    const UserDictionaryStorage::UserDictionary &dict = storage.user_dictionary_storage_base.dictionaries(i);
- 
-     EXPECT_EQ(expected.dictionary_name, dict.name());
-     EXPECT_FALSE(dict.syncable());
-@@ -404,42 +404,42 @@
-   }
- 
-   // Test duplicated dictionary name.
--  storage.Clear();
-+  storage.user_dictionary_storage_base.Clear();
-   {
-     uint64 dict_id = 0;
-     storage.CreateDictionary(
-         UserDictionaryStorage::default_sync_dictionary_name(), &dict_id);
-     storage.CreateDictionary(
-         kDictionaryNameConvertedFromSyncableDictionary, &dict_id);
--    ASSERT_EQ(2, storage.dictionaries_size());
-+    ASSERT_EQ(2, storage.user_dictionary_storage_base.dictionaries_size());
-     UserDictionaryStorage::UserDictionary *dict;
--    dict = storage.mutable_dictionaries(0);
-+    dict = storage.user_dictionary_storage_base.mutable_dictionaries(0);
-     dict->set_syncable(true);
-     dict->add_entries()->set_key("0");
--    dict = storage.mutable_dictionaries(1);
-+    dict = storage.user_dictionary_storage_base.mutable_dictionaries(1);
-     dict->set_syncable(false);
-     dict->add_entries()->set_key("1");
-   }
-   ASSERT_TRUE(storage.ConvertSyncDictionariesToNormalDictionaries());
--  EXPECT_EQ(0, UserDictionaryStorage::CountSyncableDictionaries(storage));
--  EXPECT_EQ(2, storage.dictionaries_size());
-+  EXPECT_EQ(0, UserDictionaryStorage::CountSyncableDictionaries(storage.user_dictionary_storage_base));
-+  EXPECT_EQ(2, storage.user_dictionary_storage_base.dictionaries_size());
-   EXPECT_EQ(Util::StringPrintf("%s_1",
-                                kDictionaryNameConvertedFromSyncableDictionary),
--            storage.dictionaries(0).name());
-+            storage.user_dictionary_storage_base.dictionaries(0).name());
-   EXPECT_EQ(kDictionaryNameConvertedFromSyncableDictionary,
--            storage.dictionaries(1).name());
-+            storage.user_dictionary_storage_base.dictionaries(1).name());
- }
- 
- TEST_F(UserDictionaryStorageTest, AddToAutoRegisteredDictionary) {
-   {
-     UserDictionaryStorage storage(GetUserDictionaryFile());
--    EXPECT_EQ(0, storage.dictionaries_size());
-+    EXPECT_EQ(0, storage.user_dictionary_storage_base.dictionaries_size());
-     EXPECT_TRUE(storage.AddToAutoRegisteredDictionary(
-         "key1", "value1", UserDictionary::NOUN));
--    EXPECT_EQ(1, storage.dictionaries_size());
--    EXPECT_EQ(1, storage.dictionaries(0).entries_size());
-+    EXPECT_EQ(1, storage.user_dictionary_storage_base.dictionaries_size());
-+    EXPECT_EQ(1, storage.user_dictionary_storage_base.dictionaries(0).entries_size());
-     const UserDictionaryStorage::UserDictionaryEntry &entry1 =
--        storage.dictionaries(0).entries(0);
-+        storage.user_dictionary_storage_base.dictionaries(0).entries(0);
-     EXPECT_EQ("key1", entry1.key());
-     EXPECT_EQ("value1", entry1.value());
-     EXPECT_EQ(UserDictionary::NOUN, entry1.pos());
-@@ -447,10 +447,10 @@
- 
-     EXPECT_TRUE(storage.AddToAutoRegisteredDictionary(
-         "key2", "value2", UserDictionary::NOUN));
--    EXPECT_EQ(1, storage.dictionaries_size());
--    EXPECT_EQ(2, storage.dictionaries(0).entries_size());
-+    EXPECT_EQ(1, storage.user_dictionary_storage_base.dictionaries_size());
-+    EXPECT_EQ(2, storage.user_dictionary_storage_base.dictionaries(0).entries_size());
-     const UserDictionaryStorage::UserDictionaryEntry &entry2 =
--        storage.dictionaries(0).entries(1);
-+        storage.user_dictionary_storage_base.dictionaries(0).entries(1);
-     EXPECT_EQ("key2", entry2.key());
-     EXPECT_EQ("value2", entry2.value());
-     EXPECT_EQ(UserDictionary::NOUN, entry2.pos());
-@@ -474,7 +474,7 @@
-   {
-     UserDictionaryStorage storage(GetUserDictionaryFile());
-     {
--      UserDictionary *dictionary = storage.add_dictionaries();
-+      UserDictionary *dictionary = storage.user_dictionary_storage_base.add_dictionaries();
-       dictionary->set_id(kDummyDictionaryId);
-       UserDictionary::Entry *entry = dictionary->add_entries();
-       entry->set_key("key");
---- /src/dictionary/user_dictionary_test.cc
-+++ /src/dictionary/user_dictionary_test.cc
-@@ -334,9 +334,9 @@
-     std::istringstream is(contents);
-     CHECK(is.good());
- 
--    storage->Clear();
-+    storage->user_dictionary_storage_base.Clear();
-     UserDictionaryStorage::UserDictionary *dic
--        = storage->add_dictionaries();
-+        = storage->user_dictionary_storage_base.add_dictionaries();
-     CHECK(dic);
- 
-     string line;
-@@ -389,7 +389,7 @@
-   {
-     UserDictionaryStorage storage("");
-     UserDictionaryTest::LoadFromString(kUserDictionary0, &storage);
--    dic->Load(storage);
-+    dic->Load(storage.user_dictionary_storage_base);
-   }
- 
-   // A normal lookup operation.
-@@ -425,7 +425,7 @@
-   {
-     UserDictionaryStorage storage("");
-     LoadFromString(kUserDictionary1, &storage);
--    dic->Load(storage);
-+    dic->Load(storage.user_dictionary_storage_base);
-   }
- 
-   // A normal lookup again.
-@@ -450,7 +450,7 @@
-   {
-     UserDictionaryStorage storage("");
-     LoadFromString(kUserDictionary0, &storage);
--    dic->Load(storage);
-+    dic->Load(storage.user_dictionary_storage_base);
-   }
- 
-   // A normal lookup operation.
-@@ -480,7 +480,7 @@
-   {
-     UserDictionaryStorage storage("");
-     LoadFromString(kUserDictionary1, &storage);
--    dic->Load(storage);
-+    dic->Load(storage.user_dictionary_storage_base);
-   }
- 
-   // A normal lookup.
-@@ -504,7 +504,7 @@
-   {
-     UserDictionaryStorage storage("");
-     LoadFromString(kUserDictionary0, &storage);
--    dic->Load(storage);
-+    dic->Load(storage.user_dictionary_storage_base);
-   }
- 
-   // A normal lookup operation.
-@@ -540,7 +540,7 @@
-     uint64 id = 0;
-     EXPECT_TRUE(storage.CreateDictionary("test", &id));
-     UserDictionaryStorage::UserDictionary *dic =
--        storage.mutable_dictionaries(0);
-+        storage.user_dictionary_storage_base.mutable_dictionaries(0);
- 
-     // "名詞"
-     UserDictionaryStorage::UserDictionaryEntry *entry =
-@@ -555,7 +555,7 @@
-     entry->set_value("suggest_only");
-     entry->set_pos(user_dictionary::UserDictionary::SUGGESTION_ONLY);
- 
--    user_dic->Load(storage);
-+    user_dic->Load(storage.user_dictionary_storage_base);
-   }
- 
-   // "suggestion_only" should not be looked up.
-@@ -577,7 +577,7 @@
-   {
-     UserDictionaryStorage storage("");
-     UserDictionaryTest::LoadFromString(kUserDictionary0, &storage);
--    dic->Load(storage);
-+    dic->Load(storage.user_dictionary_storage_base);
-   }
- 
-   TestLookupPrefixHelper(nullptr, 0, "start", 4, *dic);
-@@ -612,7 +612,7 @@
-     uint64 id = 0;
-     EXPECT_TRUE(storage.CreateDictionary("test", &id));
-     UserDictionaryStorage::UserDictionary *dic =
--        storage.mutable_dictionaries(0);
-+        storage.user_dictionary_storage_base.mutable_dictionaries(0);
-     for (size_t j = 0; j < 10000; ++j) {
-       UserDictionaryStorage::UserDictionaryEntry *entry =
-           dic->add_entries();
-@@ -681,15 +681,15 @@
-     UserDictionaryStorage storage(filename);
-     EXPECT_TRUE(storage.Load());
-     int index = 0;
--    EXPECT_EQ(1, storage.dictionaries_size());
--    EXPECT_EQ(100, storage.dictionaries(index).entries_size());
-+    EXPECT_EQ(1, storage.user_dictionary_storage_base.dictionaries_size());
-+    EXPECT_EQ(100, storage.user_dictionary_storage_base.dictionaries(index).entries_size());
-     for (int i = 0; i < 100; ++i) {
-       EXPECT_EQ("key" + std::to_string(i),
--                storage.dictionaries(index).entries(i).key());
-+                storage.user_dictionary_storage_base.dictionaries(index).entries(i).key());
-       EXPECT_EQ("value" + std::to_string(i),
--                storage.dictionaries(index).entries(i).value());
-+                storage.user_dictionary_storage_base.dictionaries(index).entries(i).value());
-       EXPECT_EQ(user_dictionary::UserDictionary::NOUN,
--                storage.dictionaries(index).entries(i).pos());
-+                storage.user_dictionary_storage_base.dictionaries(index).entries(i).pos());
-     }
-   }
- 
-@@ -722,12 +722,12 @@
-   {
-     UserDictionaryStorage storage(filename);
-     EXPECT_TRUE(storage.Load());
--    EXPECT_EQ(1, storage.dictionaries_size());
--    EXPECT_EQ(1, storage.dictionaries(0).entries_size());
--    EXPECT_EQ("key", storage.dictionaries(0).entries(0).key());
--    EXPECT_EQ("value", storage.dictionaries(0).entries(0).value());
-+    EXPECT_EQ(1, storage.user_dictionary_storage_base.dictionaries_size());
-+    EXPECT_EQ(1, storage.user_dictionary_storage_base.dictionaries(0).entries_size());
-+    EXPECT_EQ("key", storage.user_dictionary_storage_base.dictionaries(0).entries(0).key());
-+    EXPECT_EQ("value", storage.user_dictionary_storage_base.dictionaries(0).entries(0).value());
-     EXPECT_EQ(user_dictionary::UserDictionary::NOUN,
--              storage.dictionaries(0).entries(0).pos());
-+              storage.user_dictionary_storage_base.dictionaries(0).entries(0).pos());
-   }
- }
- 
-@@ -746,7 +746,7 @@
-     uint64 id = 0;
-     EXPECT_TRUE(storage.CreateDictionary("test", &id));
-     UserDictionaryStorage::UserDictionary *dic =
--        storage.mutable_dictionaries(0);
-+        storage.user_dictionary_storage_base.mutable_dictionaries(0);
-     for (size_t j = 0; j < 10000; ++j) {
-       UserDictionaryStorage::UserDictionaryEntry *entry =
-           dic->add_entries();
-@@ -770,7 +770,7 @@
- 
-     suppression_dictionary_->Lock();
-     EXPECT_TRUE(suppression_dictionary_->IsLocked());
--    user_dic->Load(storage);
-+    user_dic->Load(storage.user_dictionary_storage_base);
-     EXPECT_FALSE(suppression_dictionary_->IsLocked());
- 
-     for (size_t j = 0; j < 10; ++j) {
-@@ -782,11 +782,11 @@
- 
-   // Remove suppression entry
-   {
--    storage.Clear();
-+    storage.user_dictionary_storage_base.Clear();
-     uint64 id = 0;
-     EXPECT_TRUE(storage.CreateDictionary("test", &id));
-     UserDictionaryStorage::UserDictionary *dic =
--        storage.mutable_dictionaries(0);
-+        storage.user_dictionary_storage_base.mutable_dictionaries(0);
-     for (size_t j = 0; j < 10000; ++j) {
-       UserDictionaryStorage::UserDictionaryEntry *entry =
-           dic->add_entries();
-@@ -798,7 +798,7 @@
-     }
- 
-     suppression_dictionary_->Lock();
--    user_dic->Load(storage);
-+    user_dic->Load(storage.user_dictionary_storage_base);
-     EXPECT_FALSE(suppression_dictionary_->IsLocked());
- 
-     for (size_t j = 0; j < 10; ++j) {
-@@ -825,7 +825,7 @@
-     uint64 id = 0;
-     EXPECT_TRUE(storage.CreateDictionary("test", &id));
-     UserDictionaryStorage::UserDictionary *dic =
--        storage.mutable_dictionaries(0);
-+        storage.user_dictionary_storage_base.mutable_dictionaries(0);
- 
-     for (size_t j = 0; j < 10; ++j) {
-       UserDictionaryStorage::UserDictionaryEntry *entry =
-@@ -845,7 +845,7 @@
-       entry->set_pos(user_dictionary::UserDictionary::SUGGESTION_ONLY);
-     }
- 
--    user_dic->Load(storage);
-+    user_dic->Load(storage.user_dictionary_storage_base);
-   }
- 
-   {
-@@ -878,7 +878,7 @@
-   UserDictionaryStorage storage("");
- 
-   {
--    UserDictionaryStorage::UserDictionary *dic1 = storage.add_dictionaries();
-+    UserDictionaryStorage::UserDictionary *dic1 = storage.user_dictionary_storage_base.add_dictionaries();
-     CHECK(dic1);
-     UserDictionaryStorage::UserDictionaryEntry *entry;
-     entry = dic1->add_entries();
-@@ -893,7 +893,7 @@
-     entry->set_pos(user_dictionary::UserDictionary::NOUN);
-   }
-   {
--    UserDictionaryStorage::UserDictionary *dic2 = storage.add_dictionaries();
-+    UserDictionaryStorage::UserDictionary *dic2 = storage.user_dictionary_storage_base.add_dictionaries();
-     CHECK(dic2);
-     UserDictionaryStorage::UserDictionaryEntry *entry;
-     entry = dic2->add_entries();
-@@ -912,7 +912,7 @@
-     entry->set_value("value5");
-     entry->set_pos(user_dictionary::UserDictionary::NOUN);
-   }
--  dic->Load(storage);
-+  dic->Load(storage.user_dictionary_storage_base);
- 
-   EXPECT_INTEGER_STATS("UserRegisteredWord", 5);
- }
-@@ -925,7 +925,7 @@
-   {
-     UserDictionaryStorage storage("");
-     UserDictionaryTest::LoadFromString(kUserDictionary0, &storage);
--    dic->Load(storage);
-+    dic->Load(storage.user_dictionary_storage_base);
-   }
- 
-   // Entry is in user dictionary but has no comment.
---- /src/gui/word_register_dialog/word_register_dialog.cc
-+++ /src/gui/word_register_dialog/word_register_dialog.cc
-@@ -298,7 +298,7 @@
-   }
- 
-   UserDictionary *dic =
--      session_->mutable_storage()->mutable_dictionaries(index);
-+      session_->mutable_storage()->user_dictionary_storage_base.mutable_dictionaries(index);
-   CHECK(dic);
- 
-   if (dic->name() != DictionarycomboBox->currentText().toStdString()) {
---- /src/prediction/user_history_predictor.cc
-+++ /src/prediction/user_history_predictor.cc
-@@ -291,23 +291,23 @@
-     return false;
-   }
- 
--  if (!ParseFromString(input)) {
-+  if (!user_history_base.ParseFromString(input)) {
-     LOG(ERROR) << "ParseFromString failed. message looks broken";
-     return false;
-   }
- 
--  VLOG(1) << "Loaded user histroy, size=" << entries_size();
-+  VLOG(1) << "Loaded user histroy, size=" << user_history_base.entries_size();
-   return true;
- }
- 
- bool UserHistoryStorage::Save() const {
--  if (entries_size() == 0) {
-+  if (user_history_base.entries_size() == 0) {
-     LOG(WARNING) << "etries size is 0. Not saved";
-     return false;
-   }
- 
-   string output;
--  if (!AppendToString(&output)) {
-+  if (!user_history_base.AppendToString(&output)) {
-     LOG(ERROR) << "AppendToString failed";
-     return false;
-   }
-@@ -494,12 +494,12 @@
-     return false;
-   }
- 
--  for (size_t i = 0; i < history.entries_size(); ++i) {
--    dic_->Insert(EntryFingerprint(history.entries(i)),
--                 history.entries(i));
-+  for (size_t i = 0; i < history.user_history_base.entries_size(); ++i) {
-+    dic_->Insert(EntryFingerprint(history.user_history_base.entries(i)),
-+                 history.user_history_base.entries(i));
-   }
- 
--  VLOG(1) << "Loaded user histroy, size=" << history.entries_size();
-+  VLOG(1) << "Loaded user histroy, size=" << history.user_history_base.entries_size();
- 
-   return true;
- }
-@@ -521,13 +521,13 @@
- 
-   UserHistoryStorage history(filename);
-   for (const DicElement *elm = tail; elm != nullptr; elm = elm->prev) {
--    history.add_entries()->CopyFrom(elm->value);
-+    history.user_history_base.add_entries()->CopyFrom(elm->value);
-   }
- 
-   // Updates usage stats here.
-   UsageStats::SetInteger(
-       "UserHistoryPredictorEntrySize",
--      static_cast<int>(history.entries_size()));
-+      static_cast<int>(history.user_history_base.entries_size()));
- 
-   if (!history.Save()) {
-     LOG(ERROR) << "UserHistoryStorage::Save() failed";
---- /src/prediction/user_history_predictor.h
-+++ /src/prediction/user_history_predictor.h
-@@ -61,11 +61,15 @@
- class UserHistoryPredictorSyncer;
- 
- // Added serialization method for UserHistory.
--class UserHistoryStorage : public mozc::user_history_predictor::UserHistory {
-+class UserHistoryStorage {
-  public:
-   explicit UserHistoryStorage(const string &filename);
-   ~UserHistoryStorage();
- 
-+  // Instance of base class generated by Protocol Buffers compiler.
-+  // Regular inheritance strongly discouraged.
-+  mozc::user_history_predictor::UserHistory user_history_base;
-+
-   // Loads from encrypted file.
-   bool Load();
- 
---- /src/prediction/user_history_predictor_test.cc
-+++ /src/prediction/user_history_predictor_test.cc
-@@ -2222,7 +2222,7 @@
- 
-   UserHistoryStorage storage1(filename);
- 
--  UserHistoryPredictor::Entry *entry = storage1.add_entries();
-+  UserHistoryPredictor::Entry *entry = storage1.user_history_base.add_entries();
-   CHECK(entry);
-   entry->set_key("key");
-   entry->set_key("value");
-@@ -2230,7 +2230,7 @@
-   UserHistoryStorage storage2(filename);
-   storage2.Load();
- 
--  EXPECT_EQ(storage1.DebugString(), storage2.DebugString());
-+  EXPECT_EQ(storage1.user_history_base.DebugString(), storage2.user_history_base.DebugString());
-   FileUtil::Unlink(filename);
- }
- 
---- /src/rewriter/usage_rewriter_test.cc
-+++ /src/rewriter/usage_rewriter_test.cc
-@@ -312,7 +312,7 @@
-   // Load mock data
-   {
-     UserDictionaryStorage storage("");
--    UserDictionaryStorage::UserDictionary *dic = storage.add_dictionaries();
-+    UserDictionaryStorage::UserDictionary *dic = storage.user_dictionary_storage_base.add_dictionaries();
- 
-     UserDictionaryStorage::UserDictionaryEntry *entry = dic->add_entries();
-     entry->set_key("うま");
-@@ -320,7 +320,7 @@
-     entry->set_pos(user_dictionary::UserDictionary::NOUN);
-     entry->set_comment("アルパカコメント");
- 
--    user_dictionary_->Load(storage);
-+    user_dictionary_->Load(storage.user_dictionary_storage_base);
-   }
- 
-   // Emulates the conversion of key="うま".
diff --git a/app-i18n/mozc/mozc-2.23.2815.102.ebuild b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
index 3964c794c422..08be8f8c45aa 100644
--- a/app-i18n/mozc/mozc-2.23.2815.102.ebuild
+++ b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
@@ -25,6 +25,7 @@ if [[ "${PV}" == "9999" ]]; then
 else
 	SRC_URI="https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz -> ${P}.tar.gz
 		https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}.tar.gz -> japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
+	https://dev.gentoo.org/~juippis/distfiles/tmp/mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch
 		fcitx4? ( https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${FCITX_PATCH_VERSION}.patch )"
 fi
 
@@ -111,7 +112,7 @@ src_prepare() {
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-python-3_4.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-system_libraries.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-gcc-8.patch"
-	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch"
+	eapply -p2 "${DISTDIR}/${PN}-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-environmental_variables.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-reiwa.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-server_path_check.patch"
diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-9999.ebuild
index bfc9bcea950d..b93a912f62ea 100644
--- a/app-i18n/mozc/mozc-9999.ebuild
+++ b/app-i18n/mozc/mozc-9999.ebuild
@@ -25,6 +25,7 @@ if [[ "${PV}" == "9999" ]]; then
 else
 	SRC_URI="https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz -> ${P}.tar.gz
 		https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}.tar.gz -> japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
+	https://dev.gentoo.org/~juippis/distfiles/tmp/mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch
 		fcitx4? ( https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${FCITX_PATCH_VERSION}.patch )"
 fi
 
@@ -111,7 +112,7 @@ src_prepare() {
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-python-3_4.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-system_libraries.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-gcc-8.patch"
-	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch"
+	eapply -p2 "${DISTDIR}/${PN}-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-environmental_variables.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-reiwa.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-server_path_check.patch"
diff --git a/app-i18n/scim-anthy/Manifest b/app-i18n/scim-anthy/Manifest
index 6479a1c9ffcc..adcad5e78391 100644
--- a/app-i18n/scim-anthy/Manifest
+++ b/app-i18n/scim-anthy/Manifest
@@ -1,2 +1,3 @@
+DIST scim-anthy-1.2.7-gtk2_build.patch 24547 BLAKE2B 22b20c7b34e83a9392fe89a2484d994364e12b5618fd7fac0e19af3c8988c1b3acbfe31872f98308c1c201d4e5c1ea598597bc15e04e77e54cfb2fedea7d9e4d SHA512 2814481606429228891cda1c70ed53b4014d2e192f6ab7859d5033a9353ab02dea044291ec8e5667853ac6db2da19f06c4a42ce6fe27d11110a5b0f6ee56bd0e
 DIST scim-anthy-1.2.7-patches.tar.xz 11236 BLAKE2B 5db168479db59bdd1a9a9561af8635e370a338620f4c4cb1676a707c60c0140e2ddd6517896ff5d8a90cd0fe9e2fe25eea7dca693c02e765fb6b8a584f9f409c SHA512 ff265547ea78912b3cb2519793fc7159d466da6bbd3cd47f63a67731207c46ba8932a5384899ffbe517bb3d91f14ee282906ee287025ae64ccee7636dd633f08
 DIST scim-anthy-1.2.7.tar.gz 680942 BLAKE2B 9f2b33d53e5ed14c806dcae50a73d3bb234ec74b820651b09ccf0e3b78924bb0331ec4f5b93f9b0bcb2429bf528f9ddc35d0cda9b3a4d30780f083493945c963 SHA512 4ece2e458b204a68392ed676134ff45f1e193fda00d5ffb219c4e947f7f069a0221b279f110bf4093a22e57c41cb1555c6be4d42bea1c9e848af06ad8e0bc2da
diff --git a/app-i18n/scim-anthy/files/scim-anthy-1.2.7-gtk2_build.patch b/app-i18n/scim-anthy/files/scim-anthy-1.2.7-gtk2_build.patch
deleted file mode 100644
index 3ab4f3d7d90d..000000000000
--- a/app-i18n/scim-anthy/files/scim-anthy-1.2.7-gtk2_build.patch
+++ /dev/null
@@ -1,1065 +0,0 @@
-diff -ru a/src/scim_anthy_prefs.cpp b/src/scim_anthy_prefs.cpp
---- a/src/scim_anthy_prefs.cpp	2008-04-24 11:49:53.000000000 +0800
-+++ b/src/scim_anthy_prefs.cpp	2018-05-31 09:31:40.289517678 +0800
-@@ -36,7 +36,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_CLOSE_CAND_WIN_ON_SELECT,
-@@ -46,7 +46,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_LEARN_ON_MANUAL_COMMIT,
-@@ -56,7 +56,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_LEARN_ON_AUTO_COMMIT,
-@@ -66,7 +66,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_ROMAJI_HALF_SYMBOL,
-@@ -76,7 +76,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_ROMAJI_HALF_NUMBER,
-@@ -86,7 +86,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_ROMAJI_ALLOW_SPLIT,
-@@ -95,7 +95,7 @@
-         N_("A_llow spliting romaji on editing preedit string"),
-         NULL,
-         N_("If this check is enabled, you can delete each letter."),
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_MODE,
-@@ -104,7 +104,7 @@
-         N_("_Entering the pseudo ASCII input mode with capital letters."),
-         NULL,
-         N_("If this check is enabled, capital letters will becomes a trigger to enter the pseudo ASCII input mode."),
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_BLANK_BEHAVIOR,
-@@ -113,7 +113,7 @@
-         N_("Insert a _blank with a blank key."),
-         NULL,
-         N_("If this check is enabled, a blank key will works to insert a blank when entering the pseudo ASCII input mode."),
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_PREDICT_ON_INPUT,
-@@ -122,7 +122,7 @@
-         N_("_Show predicted candidates while inputting letters"),
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_USE_DIRECT_KEY_ON_PREDICT,
-@@ -131,7 +131,7 @@
-         N_("Use _direct select keys while predicting"),
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_SHOW_INPUT_MODE_LABEL,
-@@ -141,7 +141,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_SHOW_CONVERSION_MODE_LABEL,
-@@ -151,7 +151,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_SHOW_TYPING_METHOD_LABEL,
-@@ -161,7 +161,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_SHOW_PERIOD_STYLE_LABEL,
-@@ -171,7 +171,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_SHOW_SYMBOL_STYLE_LABEL,
-@@ -181,7 +181,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_SHOW_DICT_LABEL,
-@@ -191,7 +191,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_SHOW_DICT_ADMIN_LABEL,
-@@ -201,7 +201,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_SHOW_ADD_WORD_LABEL,
-@@ -211,7 +211,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         NULL,
-@@ -221,7 +221,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
- };
- 
-@@ -237,7 +237,7 @@
-         NULL,
-         N_("Specify the number of candidates to show in a page of the candidates window."),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_N_TRIGGERS_TO_SHOW_CAND_WIN,
-@@ -250,7 +250,7 @@
-         N_("The number of times to press a conversion key until show the candidates window."
-            "Specify 0 to never show it."),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_NICOLA_TIME,
-@@ -262,7 +262,7 @@
-         NULL,
-         N_("Time to regard as simultaneous key pressing."),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         NULL,
-@@ -273,7 +273,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
- };
- 
-@@ -287,7 +287,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_TYPING_METHOD,
-@@ -297,7 +297,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_CONVERSION_MODE,
-@@ -307,7 +307,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_PERIOD_STYLE,
-@@ -317,7 +317,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_SYMBOL_STYLE,
-@@ -327,7 +327,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_SPACE_TYPE,
-@@ -337,7 +337,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_TEN_KEY_TYPE,
-@@ -347,7 +347,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_BEHAVIOR_ON_PERIOD,
-@@ -357,7 +357,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_BEHAVIOR_ON_FOCUS_OUT,
-@@ -367,7 +367,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_LEFT_THUMB_SHIFT_KEY,
-@@ -377,7 +377,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_RIGHT_THUMB_SHIFT_KEY,
-@@ -387,7 +387,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_COMMIT_REVERSE_LEARN_KEY,
-@@ -398,7 +398,7 @@
-         N_("The key events to commit the preedit string "
-            "with reversing the preference of learning. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_COMMIT_FIRST_SEGMENT_REVERSE_LEARN_KEY,
-@@ -409,7 +409,7 @@
-         N_("The key events to commit the first segment "
-            "with reversing the preference of learning. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_COMMIT_SELECTED_SEGMENT_REVERSE_LEARN_KEY,
-@@ -420,7 +420,7 @@
-         N_("The key events to commit the selected segment "
-            "with reversing the preference of learning. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_DICT_ENCODING,
-@@ -433,7 +433,7 @@
-            "but it depends on the implementation of your operating system "
-            "and actual encoding of your dictionary."),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_DICT_ADMIN_COMMAND,
-@@ -443,7 +443,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_ADD_WORD_COMMAND,
-@@ -453,7 +453,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_PREEDIT_STYLE,
-@@ -463,7 +463,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_CONVERSION_STYLE,
-@@ -473,7 +473,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_SELECTED_SEGMENT_STYLE,
-@@ -483,7 +483,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         NULL,
-@@ -493,7 +493,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
- };
- 
-@@ -507,7 +507,7 @@
-         N_("Select toggle on/off keys"),
-         N_("The key events to toggle on/off Japanese mode. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_CIRCLE_INPUT_MODE_KEY,
-@@ -517,7 +517,7 @@
-         N_("Select circle input mode keys"),
-         N_("The key events to circle input mode. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_CIRCLE_KANA_MODE_KEY,
-@@ -527,7 +527,7 @@
-         N_("Select circle kana mode keys"),
-         N_("The key events to circle kana mode. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_LATIN_MODE_KEY,
-@@ -537,7 +537,7 @@
-         N_("Select Latin mode keys"),
-         N_("The key events to switch input mode to Latin. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_WIDE_LATIN_MODE_KEY,
-@@ -547,7 +547,7 @@
-         N_("Select wide Latin mode keys"),
-         N_("The key events to switch input mode to wide Latin. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_HIRAGANA_MODE_KEY,
-@@ -557,7 +557,7 @@
-         N_("Select hiragana mode keys"),
-         N_("The key events to switch input mode to hiragana. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_KATAKANA_MODE_KEY,
-@@ -567,7 +567,7 @@
-         N_("Select katakana mode keys"),
-         N_("The key events to switch input mode to katakana. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_HALF_KATAKANA_MODE_KEY,
-@@ -577,7 +577,7 @@
-         N_("Select half katakana mode keys"),
-         N_("The key events to switch input mode to half katakana. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_CANCEL_PSEUDO_ASCII_MODE_KEY,
-@@ -587,7 +587,7 @@
-         N_("Select pseudo ASCII mode cancel key"),
-         N_("The key events to cancel the pseudo ASCII mode."),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_CIRCLE_TYPING_METHOD_KEY,
-@@ -597,7 +597,7 @@
-         N_("Select circle typing method keys"),
-         N_("The key events to circle typing method. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         NULL,
-@@ -607,7 +607,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
- };
- 
-@@ -621,7 +621,7 @@
-         N_("Select inserting space keys"),
-         N_("The key events to insert a space. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_INSERT_ALT_SPACE_KEY,
-@@ -631,7 +631,7 @@
-         N_("Select inserting alternative space keys"),
-         N_("The key events to insert a alternative space. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_INSERT_HALF_SPACE_KEY,
-@@ -641,7 +641,7 @@
-         N_("Select inserting half width space keys"),
-         N_("The key events to insert a half width space. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_INSERT_WIDE_SPACE_KEY,
-@@ -651,7 +651,7 @@
-         N_("Select inserting wide space keys"),
-         N_("The key events to insert a wide space. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_BACKSPACE_KEY,
-@@ -661,7 +661,7 @@
-         N_("Select backspace keys"),
-         N_("The key events to delete a character before caret. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_DELETE_KEY,
-@@ -671,7 +671,7 @@
-         N_("Select delete keys"),
-         N_("The key events to delete a character after caret. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_COMMIT_KEY,
-@@ -681,7 +681,7 @@
-         N_("Select commit keys"),
-         N_("The key events to commit the preedit string. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_CONVERT_KEY,
-@@ -691,7 +691,7 @@
-         N_("Select convert keys"),
-         N_("The key events to convert the preedit string to kanji. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_PREDICT_KEY,
-@@ -701,7 +701,7 @@
-         N_("Select predict keys"),
-         N_("The key events to predict a word or sentence from already inserted text. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_CANCEL_KEY,
-@@ -711,7 +711,7 @@
-         N_("Select cancel keys"),
-         N_("The key events to cancel preediting or converting. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_CANCEL_ALL_KEY,
-@@ -721,7 +721,7 @@
-         N_("Select cancel all keys"),
-         N_("The key events to return to initial state. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_RECONVERT_KEY,
-@@ -731,7 +731,7 @@
-         N_("Select reconvert keys"),
-         N_("The key events to reconvert the commited string in selection. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_DO_NOTHING_KEY,
-@@ -742,7 +742,7 @@
-         N_("The key events to eat and do nothing anymore. "
-            "For example, it can be used to disable space key completely."),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         NULL,
-@@ -752,7 +752,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
- };
- 
-@@ -766,7 +766,7 @@
-         N_("Select move caret to first keys"),
-         N_("The key events to move the caret to the first of preedit string. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_MOVE_CARET_LAST_KEY,
-@@ -776,7 +776,7 @@
-         N_("Select move caret to last keys"),
-         N_("The key events to move the caret to the last of the preedit string. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_MOVE_CARET_FORWARD_KEY,
-@@ -786,7 +786,7 @@
-         N_("Select move caret forward keys"),
-         N_("The key events to move the caret forward. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_MOVE_CARET_BACKWARD_KEY,
-@@ -796,7 +796,7 @@
-         N_("Select move caret backward keys"),
-         N_("The key events to move the caret backward. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         NULL,
-@@ -806,7 +806,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
- };
- 
-@@ -820,7 +820,7 @@
-         N_("Select keys to select the first segment"),
-         N_("The key events to select the first segment. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_SELECT_LAST_SEGMENT_KEY,
-@@ -830,7 +830,7 @@
-         N_("Select keys to select the last segment"),
-         N_("The key events to select the the last segment. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_SELECT_NEXT_SEGMENT_KEY,
-@@ -840,7 +840,7 @@
-         N_("Select keys to select the next segment"),
-         N_("The key events to select the next segment. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_SELECT_PREV_SEGMENT_KEY,
-@@ -850,7 +850,7 @@
-         N_("Select keys to select the previous segment"),
-         N_("The key events to select the previous segment. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_SHRINK_SEGMENT_KEY,
-@@ -860,7 +860,7 @@
-         N_("Select keys to shrink the segment"),
-         N_("The key events to shrink the selected segment. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_EXPAND_SEGMENT_KEY,
-@@ -870,7 +870,7 @@
-         N_("Select keys to expand the segment"),
-         N_("The key events to expand the selected segment. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_COMMIT_FIRST_SEGMENT_KEY,
-@@ -880,7 +880,7 @@
-         N_("Select keys to commit the first segment"),
-         N_("The key events to commit the first segment. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_COMMIT_SELECTED_SEGMENT_KEY,
-@@ -890,7 +890,7 @@
-         N_("Select keys to commit the selected segment"),
-         N_("The key events to commit the selected segment. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         NULL,
-@@ -900,7 +900,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
- };
- 
-@@ -914,7 +914,7 @@
-         N_("Select the first candidate keys"),
-         N_("The key events to select the first candidate. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_SELECT_LAST_CANDIDATE_KEY,
-@@ -924,7 +924,7 @@
-         N_("Select the last candidate keys"),
-         N_("The key events to the select last candidate. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_SELECT_NEXT_CANDIDATE_KEY,
-@@ -934,7 +934,7 @@
-         N_("Select the next candidate keys"),
-         N_("The key events to select the next candidate. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_SELECT_PREV_CANDIDATE_KEY,
-@@ -944,7 +944,7 @@
-         N_("Select the previous candidate keys"),
-         N_("The key events to select the previous candidate. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_CANDIDATES_PAGE_UP_KEY,
-@@ -954,7 +954,7 @@
-         N_("Select page up candidates keys"),
-         N_("The key events to switch candidates page up. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_CANDIDATES_PAGE_DOWN_KEY,
-@@ -964,7 +964,7 @@
-         N_("Select page down candidates keys"),
-         N_("The key events to switch candidates page down. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         NULL,
-@@ -974,7 +974,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
- };
- 
-@@ -988,7 +988,7 @@
-         N_("Select keys to select 1st candidate"),
-         N_("The key events to select the 1st candidate. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_SELECT_CANDIDATE_2_KEY,
-@@ -998,7 +998,7 @@
-         N_("Select keys to select 2nd candidate"),
-         N_("The key events to select the 2nd candidate. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_SELECT_CANDIDATE_3_KEY,
-@@ -1008,7 +1008,7 @@
-         N_("Select keys to select 3rd candidate"),
-         N_("The key events to select the 3rd candidate. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_SELECT_CANDIDATE_4_KEY,
-@@ -1018,7 +1018,7 @@
-         N_("Select keys to select 4th candidate"),
-         N_("The key events to select the 4th candidate. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_SELECT_CANDIDATE_5_KEY,
-@@ -1028,7 +1028,7 @@
-         N_("Select keys to select 5th candidate"),
-         N_("The key events to select the 5th candidate. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_SELECT_CANDIDATE_6_KEY,
-@@ -1038,7 +1038,7 @@
-         N_("Select keys to select 6th candidate"),
-         N_("The key events to select the 6th candidate. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_SELECT_CANDIDATE_7_KEY,
-@@ -1048,7 +1048,7 @@
-         N_("Select keys to select 7th candidate"),
-         N_("The key events to select the 7th candidate. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_SELECT_CANDIDATE_8_KEY,
-@@ -1058,7 +1058,7 @@
-         N_("Select keys to select 8th candidate"),
-         N_("The key events to select the 8th candidate. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_SELECT_CANDIDATE_9_KEY,
-@@ -1068,7 +1068,7 @@
-         N_("Select keys to select 9th candidate"),
-         N_("The key events to select the 9th candidate. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_SELECT_CANDIDATE_10_KEY,
-@@ -1078,7 +1078,7 @@
-         N_("Select keys to select 10th candidate"),
-         N_("The key events to select the 10th candidate. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         NULL,
-@@ -1088,7 +1088,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
- };
- 
-@@ -1102,7 +1102,7 @@
-         N_("Select keys to convert character type forward"),
-         N_("Rotate character type forward."),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_CONV_CHAR_TYPE_BACKWARD_KEY,
-@@ -1112,7 +1112,7 @@
-         N_("Select keys to convert character type backward"),
-         N_("Rotate character type backward."),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_CONV_TO_HIRAGANA_KEY,
-@@ -1122,7 +1122,7 @@
-         N_("Select keys to convert to hiragana"),
-         N_("The key events to convert the preedit string to hiragana. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_CONV_TO_KATAKANA_KEY,
-@@ -1132,7 +1132,7 @@
-         N_("Select keys to convert to katakana"),
-         N_("The key events to convert the preedit string to katakana. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_CONV_TO_HALF_KEY,
-@@ -1142,7 +1142,7 @@
-         N_("Select keys to convert to half width"),
-         N_("The key events to convert the preedit string to half width. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_CONV_TO_HALF_KATAKANA_KEY,
-@@ -1152,7 +1152,7 @@
-         N_("Select keys to convert to half width katakana"),
-         N_("The key events to convert the preedit string to half width katakana. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_CONV_TO_WIDE_LATIN_KEY,
-@@ -1162,7 +1162,7 @@
-         N_("Select keys to convert to wide latin"),
-         N_("The key events to convert the preedit string to wide latin. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_CONV_TO_LATIN_KEY,
-@@ -1172,7 +1172,7 @@
-         N_("Select keys to convert to latin"),
-         N_("The key events to convert the preedit string to latin. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         NULL,
-@@ -1182,7 +1182,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
- };
- 
-@@ -1196,7 +1196,7 @@
-         N_("Select edit dictionary keys"),
-         N_("The key events to launch dictionary administration tool. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_ADD_WORD_KEY,
-@@ -1206,7 +1206,7 @@
-         N_("Select add a word keys"),
-         N_("The key events to launch the tool to add a word. "),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         NULL,
-@@ -1216,7 +1216,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
- };
- 
-@@ -1233,7 +1233,7 @@
-         N_("The color of preediting text"),
-         N_("The color of preediting text"),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_CONVERSION_FG_COLOR,
-@@ -1246,7 +1246,7 @@
-         N_("The color of conversion text"),
-         N_("The color of conversion text"),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         SCIM_ANTHY_CONFIG_SELECTED_SEGMENT_FG_COLOR,
-@@ -1259,7 +1259,7 @@
-         N_("The color of selected segment text"),
-         N_("The color of selected segment text in the conversion text"),
-         NULL,
--        false,
-+        NULL,
-     },
-     {
-         NULL,
-@@ -1272,7 +1272,7 @@
-         NULL,
-         NULL,
-         NULL,
--        false,
-+        NULL,
-     },
- };
- 
diff --git a/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild b/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild
index ee98d2db2ecf..84ab4c38fa3f 100644
--- a/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild
+++ b/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild
@@ -8,6 +8,7 @@ inherit autotools eutils
 DESCRIPTION="Japanese input method Anthy IMEngine for SCIM"
 HOMEPAGE="http://scim-imengine.sourceforge.jp/index.cgi?cmd=view;name=SCIMAnthy"
 SRC_URI="mirror://sourceforge.jp/scim-imengine/37309/${P}.tar.gz
+	https://dev.gentoo.org/~juippis/distfiles/tmp/scim-anthy-1.2.7-gtk2_build.patch
 	gtk3?	( https://dev.gentoo.org/~heroxbd/${P}-patches.tar.xz )"
 
 LICENSE="GPL-2"
@@ -31,7 +32,7 @@ src_prepare() {
 	if use gtk3; then
 		EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" epatch
 	else
-		epatch "${FILESDIR}/${P}-gtk2_build.patch"
+		epatch "${DISTDIR}/${P}-gtk2_build.patch"
 	fi
 
 	eautoreconf
diff --git a/app-i18n/scim-m17n/scim-m17n-0.2.3.ebuild b/app-i18n/scim-m17n/scim-m17n-0.2.3.ebuild
index 87039f7d14aa..6fb3a51c366f 100644
--- a/app-i18n/scim-m17n/scim-m17n-0.2.3.ebuild
+++ b/app-i18n/scim-m17n/scim-m17n-0.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,6 +17,15 @@ RDEPEND=">=app-i18n/scim-1.4
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
+
 pkg_postinst() {
 	elog
 	elog "To use SCIM with both GTK2 and XIM, you should use the following"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index fb23b118d08c..64d013388a0d 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index 77cdd3b812ff..0475509dd8e5 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -1,3 +1,4 @@
 DIST ca-certificates_20200601.tar.xz 245668 BLAKE2B 1249782dba046f52832d365e4770e02ed24c0b50bff4ceec5e5af932c807eb8120f8e3bc7858503e74789ecb2da577509819f3ffdf9bd1ec5cc22d61f2194ad5 SHA512 7bfd3122430be0a46bd10dcb0e0664561d1e0b2656b9f37677d89f71a1dcb0e668c25ffe08412888125fa9a53ee8245a4b3fc1004c419a159766665b1241113c
 DIST nss-3.53.tar.gz 81178428 BLAKE2B 5e67b02bf0ba9390311d77ee4d7b86fd7339bd4f7d830b32563799e4eef126143f0b76b2933ad14c5c5d3da6cb3fa0e670aca7ce9654316123abadce25a728ec SHA512 280edf24356b764584200bff949af4a7f88514ee8ac80bf5348a9a844a8b1eb263e9aa1d772644bd8bb1bd195c12b6cc173280cfc88cd97e56562e1c40e71503
+DIST nss-3.59.tar.gz 82141516 BLAKE2B 74959b14ec42b4628dfc3365af00420cdbd41d202541e9379f6a4448c4496b76307af48c9ec405b370f8770327ce56742b4382f8cd49724b42732ce5cc5b0779 SHA512 8963e846f2ff7222457ae59f042672cf4e44f7752807226f46c215a772fd1cbd65d0ce634da4afb698eabd4eb1c1e78146cc2a089339ada11da03d259c609a38
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
diff --git a/app-misc/ca-certificates/ca-certificates-20200601.3.59.ebuild b/app-misc/ca-certificates/ca-certificates-20200601.3.59.ebuild
new file mode 100644
index 000000000000..59af3fcebb1f
--- /dev/null
+++ b/app-misc/ca-certificates/ca-certificates-20200601.3.59.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# The Debian ca-certificates package merely takes the CA database as it exists
+# in the nss package and repackages it for use by openssl.
+#
+# The issue with using the compiled debs directly is two fold:
+# - they do not update frequently enough for us to rely on them
+# - they pull the CA database from nss tip of tree rather than the release
+#
+# So we take the Debian source tools and combine them with the latest nss
+# release to produce (largely) the same end result.  The difference is that
+# now we know our cert database is kept in sync with nss and, if need be,
+# can be sync with nss tip of tree more frequently to respond to bugs.
+
+# When triaging bugs from users, here's some handy tips:
+# - To see what cert is hitting errors, use openssl:
+#   openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
+#   Focus on the errors written to stderr.
+#
+# - Look at the upstream log as to why certs were added/removed:
+#   https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
+#
+# - If people want to add/remove certs, tell them to file w/mozilla:
+#   https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit eutils python-any-r1
+
+if [[ ${PV} == *.* ]] ; then
+	# Compile from source ourselves.
+	PRECOMPILED=false
+	inherit eapi7-ver
+
+	DEB_VER=$(ver_cut 1)
+	NSS_VER=$(ver_cut 2-)
+	RTM_NAME="NSS_${NSS_VER//./_}_RTM"
+else
+	# Debian precompiled version.
+	PRECOMPILED=true
+	inherit unpacker
+fi
+
+DESCRIPTION="Common CA Certificates PEM files"
+HOMEPAGE="https://packages.debian.org/sid/ca-certificates"
+NMU_PR=""
+if ${PRECOMPILED} ; then
+	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
+else
+	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
+		https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
+		cacert? (
+			https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch
+		)"
+fi
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+${PRECOMPILED} || IUSE+=" cacert"
+
+DEPEND=""
+if ${PRECOMPILED} ; then
+	DEPEND+=" !<sys-apps/portage-2.1.10.41"
+fi
+# c_rehash: we run `c_rehash`
+# debianutils: we run `run-parts`
+RDEPEND="${DEPEND}
+	app-misc/c_rehash
+	sys-apps/debianutils"
+
+if ! ${PRECOMPILED}; then
+	DEPEND+=" ${PYTHON_DEPS}"
+fi
+
+S=${WORKDIR}
+
+pkg_setup() {
+	# For the conversion to having it in CONFIG_PROTECT_MASK,
+	# we need to tell users about it once manually first.
+	[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
+		|| ewarn "You should run update-ca-certificates manually after etc-update"
+}
+
+src_unpack() {
+	if ! ${PRECOMPILED}; then
+		default
+		# Initial 20200601 deb release had bad naming inside the debian source tarball.
+		DEB_S="${WORKDIR}/${PN}-${DEB_VER}"
+		DEB_BAD_S="${WORKDIR}/work"
+		if [[ -d "${DEB_BAD_S}" ]] && [[ ! -d "${DEB_S}" ]]; then
+			mv "${DEB_BAD_S}" "${DEB_S}"
+		fi
+	fi
+
+	# Do all the work in the image subdir to avoid conflicting with source
+	# dirs in ${WORKDIR}.  Need to perform everything in the offset #381937
+	mkdir -p "image/${EPREFIX}" || die
+	cd "image/${EPREFIX}" || die
+
+	${PRECOMPILED} && unpacker_src_unpack
+}
+
+src_prepare() {
+	cd "image/${EPREFIX}" || die
+	if ! ${PRECOMPILED} ; then
+		mkdir -p usr/sbin || die
+		cp -p "${S}"/${PN}-${DEB_VER}/sbin/update-ca-certificates \
+			usr/sbin/ || die
+
+		if use cacert ; then
+			pushd "${S}"/nss-${NSS_VER} >/dev/null || die
+			eapply -p0 "${DISTDIR}"/nss-cacert-class1-class3.patch
+			popd >/dev/null || die
+		fi
+	fi
+
+	default
+	eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
+	local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
+	sed -i \
+		-e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
+		-e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
+		-e 's/openssl rehash/c_rehash/' \
+		usr/sbin/update-ca-certificates || die
+}
+
+src_compile() {
+	cd "image/${EPREFIX}" || die
+	if ! ${PRECOMPILED} ; then
+		python_setup
+		local d="${S}/${PN}-${DEB_VER}/mozilla" c="usr/share/${PN}"
+		# Grab the database from the nss sources.
+		cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
+		emake -C "${d}"
+
+		# Now move the files to the same places that the precompiled would.
+		mkdir -p etc/ssl/certs \
+			etc/ca-certificates/update.d \
+			"${c}"/mozilla \
+			|| die
+		if use cacert ; then
+			mkdir -p "${c}"/cacert.org || die
+			mv "${d}"/CAcert_Inc..crt \
+				"${c}"/cacert.org/cacert.org_root.crt || die
+		fi
+		mv "${d}"/*.crt "${c}"/mozilla/ || die
+	else
+		mv usr/share/doc/{ca-certificates,${PF}} || die
+	fi
+
+	(
+		echo "# Automatically generated by ${CATEGORY}/${PF}"
+		echo "# $(date -u)"
+		echo "# Do not edit."
+		cd "${c}" || die
+		find * -name '*.crt' | LC_ALL=C sort
+	) > etc/ca-certificates.conf
+
+	sh usr/sbin/update-ca-certificates --root "${S}/image" || die
+}
+
+src_install() {
+	cp -pPR image/* "${D}"/ || die
+	if ! ${PRECOMPILED} ; then
+		cd ${PN}-${DEB_VER} || die
+		doman sbin/*.8
+		dodoc debian/README.* examples/ca-certificates-local/README
+	fi
+
+	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
+	doenvd 98ca-certificates
+}
+
+pkg_postinst() {
+	if [[ -d "${EROOT%/}/usr/local/share/ca-certificates" ]] ; then
+		# if the user has local certs, we need to rebuild again
+		# to include their stuff in the db.
+		# However it's too overzealous when the user has custom certs in place.
+		# --fresh is to clean up dangling symlinks
+		"${EROOT%/}"/usr/sbin/update-ca-certificates --root "${ROOT}"
+	fi
+
+	if [[ -n "$(find -L "${EROOT%/}"/etc/ssl/certs/ -type l)" ]] ; then
+		ewarn "Removing the following broken symlinks:"
+		ewarn "$(find -L "${EROOT%/}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
+	fi
+}
diff --git a/app-misc/egads/egads-0.9.5-r1.ebuild b/app-misc/egads/egads-0.9.5-r1.ebuild
index 415f97ec2038..e6a0e21f3755 100644
--- a/app-misc/egads/egads-0.9.5-r1.ebuild
+++ b/app-misc/egads/egads-0.9.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,7 +28,8 @@ src_prepare() {
 src_configure() {
 	econf \
 		--with-egads-datadir="${EGADS_DATADIR}" \
-		--with-bindir=/usr/sbin
+		--with-bindir="${EPREFIX}"/usr/sbin \
+		--disable-static
 }
 
 src_compile() {
@@ -45,4 +46,6 @@ src_install() {
 		INCLUDEDIR="${D}"/usr/include
 
 	dodoc README* doc/*.txt doc/*.html
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index c1a6a38fc799..9063ddc6f3c4 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -1,14 +1,10 @@
-DIST elasticsearch-6.8.11.tar.gz 149101114 BLAKE2B 7d6550f817c9b367a096dd0637c3d4dca6f68b95f2d3554273e5c32b5d72b6583c5ff84d2811b0cb191d2fc91d7f8bf5dbaeda3bacb94feedb018d097006f819 SHA512 a2dcbaac26b3f35437f967848fe7bfb1b873b3051bd976ccef56bd4e9f99099d8b497d60da892151939c6f63ecccbee44f550e313474cf132407d145cd1667e9
-DIST elasticsearch-6.8.12.tar.gz 149091869 BLAKE2B 9cbc8cc424b1132f3e93de8f2cc7c603202250571d3f83b798ff78f88672bbc9943b5077369b4d06723e0ed24a3c7f01f89de98a5e52ae6eb141427f2db365a5 SHA512 e962e1c1a5dab165b6ef19296ee18faa86627552561b554d4ec97c8ed1ff2b4cc5f6d46bd1268ba25d8b70aab3afcd499fdaa5e06dced96b70f64b62f2e8fb96
-DIST elasticsearch-7.6.2-no-jdk-linux-x86_64.tar.gz 148140124 BLAKE2B 9a850011533052d7a4041484936dfa2c8fe7f7976314147bc2b1d5f239bbdfe68a3593d3e0d2bb4d709a71e81aa7c200f9530921dab9d50c0ab3e349f4769ffb SHA512 aa5f499b26e92e19a673093fe2ff73c1c03a8da029b59cb83db43f9e2dfd7c650ee6a122bcf647b7e83f658ad9b9cc64092e6e7c1b4f8476f2973a6006b8df3c
-DIST elasticsearch-7.7.0-no-jdk-linux-x86_64.tar.gz 157716656 BLAKE2B 812c4db511f844fb23cb79bdfe3778281f1b6dad6a45553380829e330231304ce0e18eb975867e8474f652a63bdab2f4fb8c14158753aa8b29db5debfd3f00ae SHA512 a8d6cb7186301f50ba72ee5cde6c26390bdb6a8c13d902a75c63038b3dbb3cd7e544bbf6934d88324d722a213b7bf2efc0b27f9cae64428e6842d640bda5ee54
+DIST elasticsearch-6.8.13.tar.gz 149094514 BLAKE2B 85ec07c35077acaaafc8096ca5fad2c84617e30d545be36f0b5a8ea7e6344b17a87c6def42d1eab4635bf8dd4d08e632becf153f2c581f0e9d46fd0fe8de55a9 SHA512 8d76b8690a770b16b3dabbbd7f6a06a343b9e6437de8d250562dd005c860255783b8f015d5e3a9fed337aa24c4e256ed3eca549c6ecb0f9a6a8d6856586879d5
+DIST elasticsearch-7.10.0-no-jdk-linux-x86_64.tar.gz 164353416 BLAKE2B 5359adb2bcba8d96f369360a6b3cb28083a0d7cd35c63329ba3307a64c190a8d37dedd06181f683ac5ca4ba67742223c21fd9ab31a0c2f7fe3c1984f2fb66559 SHA512 72e09492aadd552b8894217c5597ffc375424c01099fa8b011311638b056ca0aa612296b1e5260562c8ce8919b7b4cc57e544c79a472249a66e1e7bda5c29c3e
 DIST elasticsearch-7.8.1-no-jdk-linux-x86_64.tar.gz 161598020 BLAKE2B 7950d9570760683a939c961c0babdf66a57adfc49d541d75716ce1dc379f211f60edceae06855de0f4bfe50c9a6b1ca0296aa58fe324a28b009fb8cfe5c2a5d7 SHA512 1fd0dc28cc12f4cafe8499ca2894a00f0aef506429a3cd5fa4c9ec006e4dd281099bd0f41f1e0ff9d67ef25d5d1cf3be7f6c43c1758ef3464ee4b650fb560842
-DIST elasticsearch-7.9.1-no-jdk-linux-x86_64.tar.gz 162821211 BLAKE2B 219f56e1d2f258b20302482889e4da550d94be3e27cbb28282422428ac0cba2eca197f3291581d7a2537cc0ab1e72bbc4adf40e75569410e1f785298371b5224 SHA512 1be0d5c7b761275c0d4e42491fe10e4f105065cfc27861ac034e012653d7cb1b7da1140d61f65eefc6e50ed68d858fcb572a3c6a0c8cdc6f5d9511dbf9600b45
 DIST elasticsearch-7.9.2-no-jdk-linux-x86_64.tar.gz 162795379 BLAKE2B 398815340c93db8bd00766e776b0cb0d2fe6a8cc64f706dc319385cf07714abc42ceade9d3bcdfa115189de604ebc1ba3a54ac9662ee3b1ffc0989206f30f738 SHA512 19bf983f5517338ee8a9e70df67cb8f14df19bab386c20a38118756e9d4a23baba38b94020a0dd6d3f7f4483190747386af99dd3e18e931ff6bd84df55b1ce41
-DIST elasticsearch-oss-6.8.11.tar.gz 68247334 BLAKE2B d35bd5b2cec24923b03fe21e5f31055d0380c71908f9610d9897d7b97e599b65fbc98d04e905f35e7042f3b2697e89f9e927cf1b2b5b652f3a0e8731caaeaf54 SHA512 f92bd4dc68d8a42c1c5a8f424e375e4996d14d8860aef2e9a3208613a438543647e9999cdaa18870de4fb1f7d514929e535891e5cd6b8a668b2c90dab0106c51
-DIST elasticsearch-oss-6.8.12.tar.gz 68241645 BLAKE2B c62790e136c3c968b03a927d6fd67a5f8d6feae14a522213dd2432db1b53f14e931b40eb2120d47d23d7a8895487e2f8a03aaaf66098758a39d802556530b72c SHA512 9f6179ee49baa48b49c5328b88ddf2f0ef868f49c1f04d77975622120749725c48ac09cd565c05f6033eb227eaff905aff9f881a85efcf2fa75cc586cb8c45cb
-DIST elasticsearch-oss-7.6.2-no-jdk-linux-x86_64.tar.gz 72570377 BLAKE2B 5a5ec3e79cba236dd4a6ffd279b0fca4ad882c877b418261b0314d8101885a2d2496c837b44e5dbefe5ed994aeeca488a8f08a2ba26c4b44b156c180dae6004c SHA512 6197a0b62f577cd0692c1fb97a473a9971f8fef383dc6ef618035785dbc662947d2adbc425ce130ef531cbfaf9add9ed5da5a698387e770c49af820644d67e72
-DIST elasticsearch-oss-7.7.0-no-jdk-linux-x86_64.tar.gz 73216528 BLAKE2B f0f1a3d3347ea37703e90bd896b24f6e3c58406d9fb20f3607a4d08eee325b5ae293db48d1afdc208468ee775b9085a28f39f2e175b67e4881bfb61d5cb85a9a SHA512 f9b323cff078a0dc856f99efd164775a9cd0718bb0ddb6c4d4817fa53cae71748f1aec5158afa45d4b29076043cbada9743a996e685439436e93d94a9eff2768
+DIST elasticsearch-7.9.3-no-jdk-linux-x86_64.tar.gz 162808745 BLAKE2B e6a12ec3cc3bec0bdf8dd10680dd86214bf619b1abfdfeb8524b0b0f50a0f1faaf03b13f06ab62055f80c7987dd04b0dd9f2beba16dd59a5d346fc6cceb51acd SHA512 fea21591edc790b9d5c48151619921085d1b0e5dad1f8c43efbd44a58babeb8bfad52f4329f1f34c71d47618e24d7320c0e591f8eb65d15c2b9c3e1492d91680
+DIST elasticsearch-oss-6.8.13.tar.gz 68238766 BLAKE2B 3237641a0b4a36b36cbb48ffb13afa41555247d848ad4c561063418bab68832eb563974febd78a7391b6b5700ee54d0875661f3a283fa460175f842fc8734723 SHA512 e06b3486585e67f1e34e4268834b6625de6c4dcc380b15551306f42b02b5b2a0997fa2c26e82d965e6040cbf2367f399d4802e881fc649972382c895fa925573
+DIST elasticsearch-oss-7.10.0-no-jdk-linux-x86_64.tar.gz 76361198 BLAKE2B 99ca97030f2d39fd9db4c66e454eb21d60672c3489b1eee7b8bf7287f13da6566c2e01d2bedd059b25a6c4182683157667e9240cdb56d75823afb553789ab3a0 SHA512 51f2146e2aacdb9e9f4b16067224f88952bc5495aedc7d7b3936a7f2db336cc5134013c1ee8a273cc4874d533f2a0db2387f8e0bc8508fa91fe21566d5da0355
 DIST elasticsearch-oss-7.8.1-no-jdk-linux-x86_64.tar.gz 75134201 BLAKE2B a3c88ad5f94a5cebefc1a5a3a913a62bc6c8751a78c179a05667f47da71c41b480edf8d7f962ad34aa8ab0eac8168d7b8cd57f33068c17ae7e0a8d5414fbc924 SHA512 f0caa06c1172b25d8f9cb9ddced72185aaaabb1b6d7f31fe1ba67172346236651ca3bc560e7ef206b4bf9521f228d46ee98df2e41b129253215135b583086ccc
-DIST elasticsearch-oss-7.9.1-no-jdk-linux-x86_64.tar.gz 75607610 BLAKE2B 02b3f978bbf26c35c82883cb125ce63a0ede9026308fb0bda73c2e85e68dc1e11b1affa1908f05358f63ac0d7a26a839dcd4f019792c0528ddf9fc101933c3bd SHA512 d306cc63c44dd553f344babf310435bdd857fe81d149ea8179b099cffaebb061d5f4fd51c95e5d65131b15328f390db846b4f485a864ab2b352573d46025c411
 DIST elasticsearch-oss-7.9.2-no-jdk-linux-x86_64.tar.gz 75602317 BLAKE2B f81b785d3f9666a0f863d7423d7dc42b3b35b1a17cc0101fb61870d22ad35a50a56ae1d2abf7ace882f548aa92f2bb6cf05749d556e68fdbf1545cf6059d187d SHA512 282f6a273e8e8f1b1062f310b4f4826a827e2dc507b7689c073bb28e53ecbeadc9a6f1cba01006eafb28d6fdebc77d7eb672e38a554deef2ee8f6652f34131ba
+DIST elasticsearch-oss-7.9.3-no-jdk-linux-x86_64.tar.gz 75609441 BLAKE2B 5c638426c4fd64b877b350a6845da5d771e7ea222af245d50d9361ae27193e1ade555a060493b1ec056bd273d37656c37a11445b73866dc5347cd608a9d3333b SHA512 679d02f2576aa04aefee6ab1b8922d20d9fc1606c2454b32b52e7377187435da50566c9000565df8496ae69d0882724fbf2877b8253bd6036c06367e854c55f6
diff --git a/app-misc/elasticsearch/elasticsearch-6.8.12.ebuild b/app-misc/elasticsearch/elasticsearch-6.8.12.ebuild
deleted file mode 100644
index 6191d3d9e2e0..000000000000
--- a/app-misc/elasticsearch/elasticsearch-6.8.12.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${P}.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}.tar.gz )"
-LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RDEPEND="acct-group/elasticsearch
-	acct-user/elasticsearch
-	virtual/jre:1.8"
-
-QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
-
-src_prepare() {
-	default
-
-	rm bin/*.{bat,exe} LICENSE.txt NOTICE.txt || die
-	rmdir logs || die
-
-	if use x-pack; then
-		rm bin/x-pack/*.bat || die
-		rm -r modules/x-pack-ml/platform/{darwin,windows}-x86_64 || die
-	fi
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /etc/${PN}/scripts
-
-	insinto /etc/${PN}
-	doins -r config/.
-	rm -r config || die
-
-	fowners root:${PN} /etc/${PN}
-	fperms 2750 /etc/${PN}
-
-	insinto /usr/share/${PN}
-	doins -r .
-
-	exeinto /usr/share/${PN}/bin
-	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
-
-	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
-
-	if use x-pack; then
-		chmod +x "${ED}"/usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin/* || die
-	fi
-
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	fperms 0750 /var/{lib,log}/${PN}
-	dodir /usr/share/${PN}/plugins
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
-
-	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
-	newinitd "${FILESDIR}/${PN}.init.6" ${PN}
-
-	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
-	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
-	elog
-	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
-	elog "from /etc/${PN} into the configuration directory of the instance:"
-	elog "/etc/${PN}/instance"
-	elog
-	ewarn "Please make sure you have proper permissions on /etc/${PN}"
-	ewarn "prior to keystore generation or you may experience startup fails."
-	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
-	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
-}
diff --git a/app-misc/elasticsearch/elasticsearch-6.8.11.ebuild b/app-misc/elasticsearch/elasticsearch-6.8.13.ebuild
similarity index 100%
rename from app-misc/elasticsearch/elasticsearch-6.8.11.ebuild
rename to app-misc/elasticsearch/elasticsearch-6.8.13.ebuild
diff --git a/app-misc/elasticsearch/elasticsearch-7.9.1.ebuild b/app-misc/elasticsearch/elasticsearch-7.10.0.ebuild
similarity index 90%
rename from app-misc/elasticsearch/elasticsearch-7.9.1.ebuild
rename to app-misc/elasticsearch/elasticsearch-7.10.0.ebuild
index 2155270debec..826ad97256df 100644
--- a/app-misc/elasticsearch/elasticsearch-7.9.1.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-7.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit systemd
+inherit systemd tmpfiles
 
 DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
 HOMEPAGE="https://www.elastic.co/products/elasticsearch"
@@ -44,10 +44,10 @@ src_install() {
 	exeinto /usr/share/${PN}/bin
 	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
 
-	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
+	fperms -R +x /usr/share/${PN}/bin
 
 	if use x-pack; then
-		chmod +x "${ED}"/usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin/* || die
+		fperms -R +x /usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin
 	fi
 
 	keepdir /var/{lib,log}/${PN}
@@ -62,11 +62,14 @@ src_install() {
 	newinitd "${FILESDIR}/${PN}.init.7" ${PN}
 
 	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
 	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
+
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.d ${PN}.conf
 }
 
 pkg_postinst() {
+	tmpfiles_process /usr/lib/tmpfiles.d/${PN}.conf
+
 	elog
 	elog "You may create multiple instances of ${PN} by"
 	elog "symlinking the init script:"
diff --git a/app-misc/elasticsearch/elasticsearch-7.7.0.ebuild b/app-misc/elasticsearch/elasticsearch-7.7.0.ebuild
deleted file mode 100644
index 2155270debec..000000000000
--- a/app-misc/elasticsearch/elasticsearch-7.7.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${P}-no-jdk-linux-x86_64.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}-no-jdk-linux-x86_64.tar.gz )"
-LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RDEPEND="acct-group/elasticsearch
-	acct-user/elasticsearch
-	virtual/jre"
-
-QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
-
-src_prepare() {
-	default
-
-	rm LICENSE.txt NOTICE.txt || die
-	rmdir logs || die
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /etc/${PN}/scripts
-
-	insinto /etc/${PN}
-	doins -r config/.
-	rm -r config || die
-
-	fowners root:${PN} /etc/${PN}
-	fperms 2750 /etc/${PN}
-
-	insinto /usr/share/${PN}
-	doins -r .
-
-	exeinto /usr/share/${PN}/bin
-	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
-
-	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
-
-	if use x-pack; then
-		chmod +x "${ED}"/usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin/* || die
-	fi
-
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	fperms 0750 /var/{lib,log}/${PN}
-	dodir /usr/share/${PN}/plugins
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
-
-	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
-	newinitd "${FILESDIR}/${PN}.init.7" ${PN}
-
-	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
-	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
-	elog
-	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
-	elog "from /etc/${PN} into the configuration directory of the instance:"
-	elog "/etc/${PN}/instance"
-	elog
-	ewarn "Please make sure you have proper permissions on /etc/${PN}"
-	ewarn "prior to keystore generation or you may experience startup fails."
-	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
-	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
-}
diff --git a/app-misc/elasticsearch/elasticsearch-7.6.2.ebuild b/app-misc/elasticsearch/elasticsearch-7.9.3.ebuild
similarity index 90%
rename from app-misc/elasticsearch/elasticsearch-7.6.2.ebuild
rename to app-misc/elasticsearch/elasticsearch-7.9.3.ebuild
index 2155270debec..826ad97256df 100644
--- a/app-misc/elasticsearch/elasticsearch-7.6.2.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-7.9.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit systemd
+inherit systemd tmpfiles
 
 DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
 HOMEPAGE="https://www.elastic.co/products/elasticsearch"
@@ -44,10 +44,10 @@ src_install() {
 	exeinto /usr/share/${PN}/bin
 	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
 
-	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
+	fperms -R +x /usr/share/${PN}/bin
 
 	if use x-pack; then
-		chmod +x "${ED}"/usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin/* || die
+		fperms -R +x /usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin
 	fi
 
 	keepdir /var/{lib,log}/${PN}
@@ -62,11 +62,14 @@ src_install() {
 	newinitd "${FILESDIR}/${PN}.init.7" ${PN}
 
 	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
 	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
+
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.d ${PN}.conf
 }
 
 pkg_postinst() {
+	tmpfiles_process /usr/lib/tmpfiles.d/${PN}.conf
+
 	elog
 	elog "You may create multiple instances of ${PN} by"
 	elog "symlinking the init script:"
diff --git a/app-misc/gcstar/gcstar-1.7.1-r1.ebuild b/app-misc/gcstar/gcstar-1.7.1-r1.ebuild
index 3ebe4524ca94..ea98b214b1e1 100644
--- a/app-misc/gcstar/gcstar-1.7.1-r1.ebuild
+++ b/app-misc/gcstar/gcstar-1.7.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit desktop xdg-utils
+inherit desktop xdg
 
 DESCRIPTION="Manage your collections of movies, games, books, music and more"
 HOMEPAGE="http://www.gcstar.org/"
@@ -65,15 +65,3 @@ src_install() {
 
 	dodoc CHANGELOG README README.fr
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mime_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mime_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-misc/gramps/gramps-5.1.3.ebuild b/app-misc/gramps/gramps-5.1.3.ebuild
index 12d0fbe43a14..c58969e2d832 100644
--- a/app-misc/gramps/gramps-5.1.3.ebuild
+++ b/app-misc/gramps/gramps-5.1.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+rcs +reports exif geo postscript spell test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-misc/hivex/hivex-1.3.14.ebuild b/app-misc/hivex/hivex-1.3.14.ebuild
index 9f629900febb..cd4e1de9670b 100644
--- a/app-misc/hivex/hivex-1.3.14.ebuild
+++ b/app-misc/hivex/hivex-1.3.14.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://libguestfs.org/download/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="ocaml readline +perl python test static-libs ruby"
+IUSE="ocaml readline +perl python test ruby"
 
 RDEPEND="
 	virtual/libiconv
@@ -82,6 +82,7 @@ src_configure() {
 		--disable-ruby
 		$(use_enable python)
 		--disable-rpath
+		--disable-static
 		)
 
 	econf ${myeconfargs[@]}
@@ -102,4 +103,6 @@ src_install() {
 	if use perl; then
 		perl_delete_localpod
 	fi
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-misc/hivex/hivex-1.3.18.ebuild b/app-misc/hivex/hivex-1.3.18.ebuild
index dad58992eb7d..568b03b92bd9 100644
--- a/app-misc/hivex/hivex-1.3.18.ebuild
+++ b/app-misc/hivex/hivex-1.3.18.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://libguestfs.org/download/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ocaml readline +perl python test static-libs ruby"
+IUSE="ocaml readline +perl python test ruby"
 
 RDEPEND="
 	virtual/libiconv
@@ -82,6 +82,7 @@ src_configure() {
 		--disable-ruby
 		$(use_enable python)
 		--disable-rpath
+		--disable-static
 		)
 
 	econf ${myeconfargs[@]}
@@ -105,4 +106,6 @@ src_install() {
 	if use perl; then
 		perl_delete_localpod
 	fi
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-misc/ps3pf_utils/ps3pf_utils-2.3.ebuild b/app-misc/ps3pf_utils/ps3pf_utils-2.3.ebuild
index d605849936c5..962d1fa8b0f7 100644
--- a/app-misc/ps3pf_utils/ps3pf_utils-2.3.ebuild
+++ b/app-misc/ps3pf_utils/ps3pf_utils-2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,8 +10,16 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/geoff/cell/ps3-utils/ps3
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc ~ppc64"
-IUSE=""
 
 # fixme: depend on a version of sys-kernel/linux-headers that supports ps3
 
 S=${WORKDIR}/ps3-utils-${PV}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-misc/ranger/ranger-1.9.2.ebuild b/app-misc/ranger/ranger-1.9.2.ebuild
index 6bd0785451fb..da1b55db31c5 100644
--- a/app-misc/ranger/ranger-1.9.2.ebuild
+++ b/app-misc/ranger/ranger-1.9.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 PYTHON_REQ_USE="ncurses"
 
-inherit distutils-r1
+inherit distutils-r1 xdg
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/ranger/ranger.git"
@@ -32,6 +32,8 @@ src_prepare() {
 }
 
 pkg_postinst() {
+	xdg_pkg_postinst
+
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		elog "Ranger has many optional dependencies to support enhanced file previews."
 		elog "See the README or homepage for more details."
diff --git a/app-misc/ranger/ranger-1.9.3.ebuild b/app-misc/ranger/ranger-1.9.3.ebuild
index 40ee38f4602b..2a728ea15449 100644
--- a/app-misc/ranger/ranger-1.9.3.ebuild
+++ b/app-misc/ranger/ranger-1.9.3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="ncurses"
 
-inherit distutils-r1
+inherit distutils-r1 xdg
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/ranger/ranger.git"
@@ -32,6 +32,8 @@ src_prepare() {
 }
 
 pkg_postinst() {
+	xdg_pkg_postinst
+
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		elog "Ranger has many optional dependencies to support enhanced file previews."
 		elog "See the README or homepage for more details."
diff --git a/app-misc/ranger/ranger-9999.ebuild b/app-misc/ranger/ranger-9999.ebuild
index 40ee38f4602b..2a728ea15449 100644
--- a/app-misc/ranger/ranger-9999.ebuild
+++ b/app-misc/ranger/ranger-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="ncurses"
 
-inherit distutils-r1
+inherit distutils-r1 xdg
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/ranger/ranger.git"
@@ -32,6 +32,8 @@ src_prepare() {
 }
 
 pkg_postinst() {
+	xdg_pkg_postinst
+
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		elog "Ranger has many optional dependencies to support enhanced file previews."
 		elog "See the README or homepage for more details."
diff --git a/app-misc/reptyr/reptyr-0.8.0.ebuild b/app-misc/reptyr/reptyr-0.8.0.ebuild
index 03ba0408d97b..f8a8c99e0201 100644
--- a/app-misc/reptyr/reptyr-0.8.0.ebuild
+++ b/app-misc/reptyr/reptyr-0.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nelhage/${PN}/archive/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RESTRICT="test"
 
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 4c29eb14a99f..f18bb8bae135 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,3 +1,2 @@
-DIST tmux-3.1b.tar.gz 561152 BLAKE2B f5ff0c68999f9d82c26ab8c781b9f2bab56501573592c741304c49eec283c073119b95ba3c77f266e808ab494577c5098730fc5fb6aad0b82340ac30fbd2310d SHA512 fd5269f5f58ad20c35ece24af74035e622e16511baa331717bded5edcbfd46c1847fd86c02431a7d889ce7d5bec89c8177a680ca60e9ca821f13065d26ca7fa1
 DIST tmux-3.1c.tar.gz 561323 BLAKE2B c6f688a854e128acffa140321a5dd00e4ca090ff79c7cbff15febbca6da9f7626c675fe1820b344637ff0fbe94ae6d0da7f111880ce5d74f97c4b6a90ceef802 SHA512 aad2e6457dd350369f245f711f1936a575d0588b72e660d10e7abc7d373da0d322903b451ad00b96a3e0e6847ca855673da6a4c5447cea91fa756edd23659397
 DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
diff --git a/app-misc/tmux/tmux-3.1b.ebuild b/app-misc/tmux/tmux-3.1b.ebuild
deleted file mode 100644
index 45cd420cb8c4..000000000000
--- a/app-misc/tmux/tmux-3.1b.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Terminal multiplexer"
-HOMEPAGE="https://tmux.github.io/"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	SRC_URI="https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b"
-	EGIT_REPO_URI="https://github.com/tmux/tmux.git"
-else
-	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
-	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-	S="${WORKDIR}/${P/_/-}"
-fi
-
-LICENSE="ISC"
-SLOT="0"
-IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
-
-DEPEND="
-	dev-libs/libevent:0=
-	sys-libs/ncurses:0=
-	utempter? ( sys-libs/libutempter )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	virtual/yacc
-"
-
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-screen )
-	vim-syntax? ( app-vim/vim-tmux )"
-
-DOCS=( CHANGES README )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4-flags.patch"
-
-	# upstream fixes (can be removed with next version bump)
-)
-
-src_prepare() {
-	# bug 438558
-	# 1.7 segfaults when entering copy mode if compiled with -Os
-	replace-flags -Os -O2
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc
-		$(use_enable debug)
-		$(use_enable utempter)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	einstalldocs
-
-	dodoc example_tmux.conf
-	docompress -x /usr/share/doc/${PF}/example_tmux.conf
-}
diff --git a/app-misc/tmux/tmux-3.1c.ebuild b/app-misc/tmux/tmux-3.1c.ebuild
index 65c88d0c662c..45cd420cb8c4 100644
--- a/app-misc/tmux/tmux-3.1c.ebuild
+++ b/app-misc/tmux/tmux-3.1c.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	S="${WORKDIR}/${P/_/-}"
 fi
 
diff --git a/app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild b/app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild
index dfb4046680b1..1851c251719c 100644
--- a/app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild
+++ b/app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit desktop eutils multilib gnome2-utils
+inherit desktop eutils multilib optfeature xdg
 
 MY_PN="${PN}-portable"
 MY_P="${MY_PN}-${PV}"
@@ -15,7 +15,6 @@ SRC_URI="http://dl2.xmind.net/xmind-downloads/${MY_P}.zip
 LICENSE="EPL-1.0 LGPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 DEPEND="app-arch/unzip"
 RDEPEND="
@@ -75,15 +74,7 @@ src_install() {
 	make_desktop_entry ${PN} "XMind" ${PN} "Office" "MimeType=application/x-xmind;"
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
-	gnome2_icon_cache_update
-	elog "For audio notes support, install media-sound/lame"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_pkg_postinst
+	optfeature "audio notes support" media-sound/lame
 }
diff --git a/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild b/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild
index 03ce175e13f3..67866d5575d9 100644
--- a/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild
+++ b/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit desktop font gnome2-utils
+inherit desktop font optfeature xdg
 
 MY_PV="8-update7"
 MY_P="${PN}-${MY_PV}-linux"
@@ -78,16 +78,8 @@ src_install() {
 	font_src_install
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
-	gnome2_icon_cache_update
 	font_pkg_postinst
-	elog "For audio notes support, install media-sound/lame"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_pkg_postinst
+	optfeature "audio notes support" media-sound/lame
 }
diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index 1f044b00af93..028f0e825ef9 100644
Binary files a/app-mobilephone/Manifest.gz and b/app-mobilephone/Manifest.gz differ
diff --git a/app-mobilephone/smstools/files/3.1.15-makefile-whitespace.patch b/app-mobilephone/smstools/files/3.1.15-makefile-whitespace.patch
deleted file mode 100644
index 70455bef6c56..000000000000
--- a/app-mobilephone/smstools/files/3.1.15-makefile-whitespace.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- smstools3/src/Makefile.old	2014-04-25 23:28:46.324045112 +1000
-+++ smstools3/src/Makefile	2014-04-25 23:33:26.453061496 +1000
-@@ -43,7 +43,7 @@
- 
- ifneq (,$(findstring SOLARIS,$(CFLAGS)))
- ifeq (,$(findstring DISABLE_INET_SOCKET,$(CFLAGS)))
--override LFLAGS += -lsocket -lnsl
-+	override LFLAGS += -lsocket -lnsl
- endif
- endif
- 
diff --git a/app-mobilephone/smstools/files/smsd.initd3 b/app-mobilephone/smstools/files/smsd.initd3
deleted file mode 100644
index ae53a7fc0e08..000000000000
--- a/app-mobilephone/smstools/files/smsd.initd3
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount
-}
-
-start() {
-	if ! [ -d /var/run/smsd ]; then
-		ebegin "Creating /var/run/smsd for ${SVCNAME}"
-		mkdir /var/run/smsd \
-			&& chown smsd:sms /var/run/smsd \
-			&& chmod 770 /var/run/smsd
-		eend $?
-	fi
-
-	chown smsd:sms /var/log/smsd.log
-	ebegin "Starting smsd"
-	start-stop-daemon -b -u smsd:sms --start --exec /usr/bin/smsd -- \
-		-c /etc/smsd.conf -p /var/run/smsd/smsd.pid \
-		-i /var/run/smsd/smsd.working
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping smsd"
-	start-stop-daemon --stop -n smsd
-	eend ${?}
-}
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 1b92c5fc29b1..0e9499ad466e 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/texmaker/texmaker-5.0.3.ebuild b/app-office/texmaker/texmaker-5.0.3.ebuild
index d086716524d2..5e8c3e418bce 100644
--- a/app-office/texmaker/texmaker-5.0.3.ebuild
+++ b/app-office/texmaker/texmaker-5.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit qmake-utils readme.gentoo-r1
+inherit qmake-utils readme.gentoo-r1 xdg
 
 DESCRIPTION="A nice LaTeX-IDE"
 HOMEPAGE="https://xm1math.net/texmaker/"
diff --git a/app-office/texmaker/texmaker-5.0.4.ebuild b/app-office/texmaker/texmaker-5.0.4.ebuild
index e2a77a2cb542..d62ff665625c 100644
--- a/app-office/texmaker/texmaker-5.0.4.ebuild
+++ b/app-office/texmaker/texmaker-5.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit qmake-utils readme.gentoo-r1
+inherit qmake-utils readme.gentoo-r1 xdg
 
 DESCRIPTION="A nice LaTeX-IDE"
 HOMEPAGE="https://xm1math.net/texmaker/"
diff --git a/app-office/upwork/files/upwork-desktop-r1.patch b/app-office/upwork/files/upwork-desktop-r1.patch
deleted file mode 100644
index cffc1bb92e97..000000000000
--- a/app-office/upwork/files/upwork-desktop-r1.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur a/usr/share/applications/upwork.desktop b/usr/share/applications/upwork.desktop
---- a/usr/share/applications/upwork.desktop	2018-07-04 16:38:55.000000000 +0200
-+++ b/usr/share/applications/upwork.desktop	2018-09-25 15:06:27.021679329 +0200
-@@ -2,8 +2,8 @@
- Encoding=UTF-8
- Name=Upwork
- Exec=upwork
--Icon=upwork.png
-+Icon=upwork
- Terminal=false
- Type=Application
--Categories=GTK;Network;Project Management
-+Categories=GTK;Network;X-Project Management
- StartupNotify=false
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 715d885bea3f..0b19a428ad4a 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
index 3c9347c0e93c..1db74e52a9a5 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
@@ -68,7 +68,6 @@ pkg_postinst() {
 		elog "    app-admin/eclean-kernel"
 		elog "    app-portage/diffmask"
 		elog "    app-portage/flaggie"
-		elog "    app-portage/install-mask"
 		elog "    app-portage/portpeek"
 		elog "    app-portage/smart-live-rebuild"
 	fi
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild
index 34ae357f65de..318ac20f777c 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild
@@ -68,7 +68,6 @@ pkg_postinst() {
 		elog "    app-admin/eclean-kernel"
 		elog "    app-portage/diffmask"
 		elog "    app-portage/flaggie"
-		elog "    app-portage/install-mask"
 		elog "    app-portage/portpeek"
 		elog "    app-portage/smart-live-rebuild"
 	fi
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild
index d2a61bf8f622..36cbf7459fc6 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild
@@ -68,7 +68,6 @@ pkg_postinst() {
 		elog "    app-admin/eclean-kernel"
 		elog "    app-portage/diffmask"
 		elog "    app-portage/flaggie"
-		elog "    app-portage/install-mask"
 		elog "    app-portage/portpeek"
 		elog "    app-portage/smart-live-rebuild"
 	fi
diff --git a/app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild b/app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild
index 77fdfb33cf18..accbf346bf8b 100644
--- a/app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild
@@ -71,7 +71,6 @@ pkg_postinst() {
 		elog "    app-admin/eclean-kernel"
 		elog "    app-portage/diffmask"
 		elog "    app-portage/flaggie"
-		elog "    app-portage/install-mask"
 		elog "    app-portage/portpeek"
 		elog "    app-portage/smart-live-rebuild"
 	fi
diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild
index 983d63f9d31e..44c2b480a314 100644
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild
@@ -67,7 +67,6 @@ pkg_postinst() {
 		elog "    app-admin/eclean-kernel"
 		elog "    app-portage/diffmask"
 		elog "    app-portage/flaggie"
-		elog "    app-portage/install-mask"
 		elog "    app-portage/portpeek"
 		elog "    app-portage/smart-live-rebuild"
 	fi
diff --git a/app-portage/pfl/pfl-3.1-r1.ebuild b/app-portage/pfl/pfl-3.1-r1.ebuild
index 3e726717097c..2e7e4ffa3adb 100644
--- a/app-portage/pfl/pfl-3.1-r1.ebuild
+++ b/app-portage/pfl/pfl-3.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/portagefilelist/client/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+network-cron"
 
 DEPEND=""
diff --git a/app-portage/portage-utils/portage-utils-0.90.ebuild b/app-portage/portage-utils/portage-utils-0.90.ebuild
index 5e609f02741e..ea8608f43c1c 100644
--- a/app-portage/portage-utils/portage-utils-0.90.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.90.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
 else
 	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 RDEPEND="
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 116cdd6aa587..6a976155d5f8 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/bibletime/bibletime-3.0.ebuild b/app-text/bibletime/bibletime-3.0.ebuild
index 90a2898d6d33..2291044e8729 100644
--- a/app-text/bibletime/bibletime-3.0.ebuild
+++ b/app-text/bibletime/bibletime-3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 # Some tests fail due to being unable to find an icon directory relative
 # to ${WORKDIR}, some others segfault. Needs work.
diff --git a/app-text/calibre/files/calibre-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch b/app-text/calibre/files/calibre-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch
deleted file mode 100644
index fb55e0025b7d..000000000000
--- a/app-text/calibre/files/calibre-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 6f947d88d323bb08bb6e076d442662aa281fe197 Mon Sep 17 00:00:00 2001
-From: Zac Medico <zmedico@gentoo.org>
-Date: Sun, 9 Feb 2020 12:16:04 -0800
-Subject: [PATCH] py3: Ignore TypeError when sorting device collections for
- kobo driver
-
-https://github.com/kovidgoyal/calibre/pull/1098
-
-Use the same approach as the usbms driver when cmp raises a
-TypeError (see a8deb4b1f8dfb768a32b95b1540be32d5d6e871e).
-
-This should suppress the following error which was reported for
-python3 and not python2:
-
-Traceback (most recent call last):
-  File "/usr/lib64/calibre/calibre/gui2/device.py", line 90, in run
-    self.result = self.func(*self.args, **self.kwargs)
-  File "/usr/lib64/calibre/calibre/gui2/device.py", line 543, in _sync_booklists
-    self.device.sync_booklists(booklists, end_session=False)
-  File "/usr/lib64/calibre/calibre/devices/kobo/driver.py", line 970, in sync_booklists
-    self.update_device_database_collections(blist, collections, oncard)
-  File "/usr/lib64/calibre/calibre/devices/kobo/driver.py", line 2398, in update_device_database_collections
-    collections = booklists.get_collections(collections_attributes) if bookshelf_attribute else None
-  File "/usr/lib64/calibre/calibre/devices/kobo/books.py", line 314, in get_collections
-    books = sorted(itervalues(lpaths), key=cmp_to_key(none_cmp))
-  File "/usr/lib64/calibre/calibre/devices/kobo/books.py", line 307, in none_cmp
-    c = cmp(x, y)
-  File "/usr/lib64/calibre/polyglot/builtins.py", line 106, in cmp
-    return (a > b) - (a < b)
-TypeError: '>' not supported between instances of 'float' and 'str'
-
-See: https://bugs.gentoo.org/708742
----
- src/calibre/devices/kobo/books.py | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/calibre/devices/kobo/books.py b/src/calibre/devices/kobo/books.py
-index f725751d00..fc1dee6b7e 100644
---- a/src/calibre/devices/kobo/books.py
-+++ b/src/calibre/devices/kobo/books.py
-@@ -304,11 +304,17 @@ class KTCollectionsBookList(CollectionsBookList):
-                 return -1
-             if isinstance(x, string_or_bytes) and isinstance(y, string_or_bytes):
-                 x, y = sort_key(force_unicode(x)), sort_key(force_unicode(y))
--            c = cmp(x, y)
-+            try:
-+                c = cmp(x, y)
-+            except TypeError:
-+                c = 0
-             if c != 0:
-                 return c
-             # same as above -- no sort_key needed here
--            return cmp(xx[2], yy[2])
-+            try:
-+                return cmp(xx[2], yy[2])
-+            except TypeError:
-+                return 0
- 
-         for category, lpaths in iteritems(collections):
-             books = sorted(itervalues(lpaths), key=cmp_to_key(none_cmp))
--- 
-2.24.1
-
diff --git a/app-text/fbreader/Manifest b/app-text/fbreader/Manifest
index ce4f596e3257..a7e551e718ce 100644
--- a/app-text/fbreader/Manifest
+++ b/app-text/fbreader/Manifest
@@ -1 +1,2 @@
+DIST fbreader-0.99.4-combined.patch 23589 BLAKE2B 81cb00abe9ba0f40723e6c1cac626916f90eede960d8b191bcb48c8186be8fc3d1fb18954f62e3ba5f15de159034a6060dc7efaf94f9531aabad9f76b6f53658 SHA512 c4dd5237113fa9d54ae3e63a19a06841570e5751108befe4d18ae7b4730628d3a4a5613dd302bc426b14c280f2b5abf9e394aedca821de995efb45ae7b32f632
 DIST fbreader-sources-0.99.4.tgz 2345664 BLAKE2B 29d921a953df98def51740d9b7fed5a7164f5df6410c70daf03f30ba8f77e9aa898d6f50038945155dc46243165860ffaf13abc81f662abccdeb6dc91652b3d5 SHA512 d4b11d7ab03df002ad4212db805b10b80a24ea4384e92122b12c25a3f817a0eb343509ae30e31d68417fd4ce27f77e043235436f0081ff2c785a2830d6211dc7
diff --git a/app-text/fbreader/fbreader-0.99.4-r5.ebuild b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
index 75cd8347fff2..d309f9f7a5f8 100644
--- a/app-text/fbreader/fbreader-0.99.4-r5.ebuild
+++ b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
@@ -7,7 +7,8 @@ inherit flag-o-matic qmake-utils
 
 DESCRIPTION="E-Book Reader. Supports many e-book formats"
 HOMEPAGE="https://www.fbreader.org/"
-SRC_URI="https://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz"
+SRC_URI="https://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz
+	https://dev.gentoo.org/~juippis/distfiles/tmp/fbreader-0.99.4-combined.patch"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -33,7 +34,7 @@ BDEPEND="
 "
 
 # bugs #452636, #515698, #516794, #437262, #592588
-PATCHES=( "${FILESDIR}"/${P}-combined.patch )
+PATCHES=( "${DISTDIR}"/${P}-combined.patch )
 
 src_prepare() {
 	default
diff --git a/app-text/fbreader/files/fbreader-0.99.4-combined.patch b/app-text/fbreader/files/fbreader-0.99.4-combined.patch
deleted file mode 100644
index f75c0fdf1e2c..000000000000
--- a/app-text/fbreader/files/fbreader-0.99.4-combined.patch
+++ /dev/null
@@ -1,535 +0,0 @@
-diff -r -U2 fbreader-0.99.4.orig/fbreader/Makefile fbreader-0.99.4/fbreader/Makefile
---- fbreader-0.99.4.orig/fbreader/Makefile	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/fbreader/Makefile	2018-01-11 22:18:18.000208200 +0700
-@@ -23,5 +23,5 @@
- 	done;
- 	@echo -n 'Linking $(TARGET) ...'
--	@$(LD) $(LDFLAGS) -o $(TARGET) `find src -name *.o` $(TEXT_LIBS) $(CORE_LIBS) $(ZLUI_LIB) -lsqlite3
-+	@$(LD) -fuse-ld=bfd $(LDFLAGS) -o $(TARGET) `find src -name *.o` $(TEXT_LIBS) $(CORE_LIBS) $(ZLUI_LIB) -lsqlite3
- 	@echo ' OK'
- 
-diff -r -U2 fbreader-0.99.4.orig/fbreader/desktop/desktop fbreader-0.99.4/fbreader/desktop/desktop
---- fbreader-0.99.4.orig/fbreader/desktop/desktop	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/fbreader/desktop/desktop	2018-01-11 22:13:58.401219117 +0700
-@@ -22,2 +22,3 @@
- Icon=FBReader
- Categories=Office;Viewer;Literature;
-+MimeType=application/epub+zip;application/rtf;application/x-fictionbook+xml;application/x-zip-compressed-fb2;application/x-mobipocket-ebook;application/xhtml+xml;text/html;text/plain;
-diff -r -U2 fbreader-0.99.4.orig/fbreader/src/formats/doc/OleStorage.cpp fbreader-0.99.4/fbreader/src/formats/doc/OleStorage.cpp
---- fbreader-0.99.4.orig/fbreader/src/formats/doc/OleStorage.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/fbreader/src/formats/doc/OleStorage.cpp	2018-01-11 22:18:33.000207569 +0700
-@@ -60,5 +60,5 @@
- 		return false;
- 	}
--	static const char OLE_SIGN[] = {0xD0, 0xCF, 0x11, 0xE0, 0xA1, 0xB1, 0x1A, 0xE1, 0};
-+	static const char OLE_SIGN[] = {(char)0xD0, (char)0xCF, (char)0x11, (char)0xE0, (char)0xA1, (char)0xB1, (char)0x1A, (char)0xE1, 0};
- 	if (std::strncmp(oleBuf, OLE_SIGN, 8) != 0) {
- 		clear();
-diff -r -U2 fbreader-0.99.4.orig/makefiles/arch/desktop.mk fbreader-0.99.4/makefiles/arch/desktop.mk
---- fbreader-0.99.4.orig/makefiles/arch/desktop.mk	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/makefiles/arch/desktop.mk	2018-01-11 22:18:40.119207269 +0700
-@@ -15,27 +15,9 @@
- CFLAGS = -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG
- LDFLAGS =
--EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi) 
-+EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi)
- 
--ifeq "$(UI_TYPE)" "qt"
--  MOC = moc-qt3
--  QTINCLUDE = -I /usr/include/qt3
--else
--  MOC = $(shell pkg-config QtCore --variable=moc_location)
--  QTINCLUDE = -I $(shell pkg-config --cflags QtCore)
--endif
--
--GTKINCLUDE = $(shell pkg-config --cflags gtk+-2.0 libpng xft)
--
--ifeq "$(UI_TYPE)" "qt"
--  UILIBS = -lqt-mt
--endif
--
--ifeq "$(UI_TYPE)" "qt4"
--  UILIBS = $(shell pkg-config --libs QtCore QtGui QtNetwork)
--endif
--
--ifeq "$(UI_TYPE)" "gtk"
--  UILIBS = $(shell pkg-config --libs gtk+-2.0 gio-2.0) -lpng -ljpeg
--endif
-+MOC = "$(shell pkg-config --variable=host_bins Qt5Core)/moc"
-+QTINCLUDE = $(shell pkg-config --cflags Qt5Gui Qt5Widgets Qt5Network)
-+UILIBS = $(shell pkg-config --libs Qt5Gui Qt5Widgets Qt5Network)
- 
- RM = rm -rvf
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/LineEditParameter.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/application/LineEditParameter.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/LineEditParameter.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/application/LineEditParameter.cpp	2018-01-11 22:18:40.120207269 +0700
-@@ -18,7 +18,7 @@
-  */
- 
--#include <QtGui/QBoxLayout>
--#include <QtGui/QLineEdit>
--#include <QtGui/QToolBar>
-+#include <QtWidgets/QBoxLayout>
-+#include <QtWidgets/QLineEdit>
-+#include <QtWidgets/QToolBar>
- #include <QtGui/QKeyEvent>
- 
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp	2018-01-11 22:18:40.120207269 +0700
-@@ -18,15 +18,15 @@
-  */
- 
--#include <QtGui/QApplication>
-+#include <QtWidgets/QApplication>
- #include <QtGui/QPixmap>
- #include <QtGui/QImage>
- #include <QtGui/QIcon>
--#include <QtGui/QToolBar>
--#include <QtGui/QMenuBar>
--#include <QtGui/QMenu>
--#include <QtGui/QToolButton>
--#include <QtGui/QLayout>
-+#include <QtWidgets/QToolBar>
-+#include <QtWidgets/QMenuBar>
-+#include <QtWidgets/QMenu>
-+#include <QtWidgets/QToolButton>
-+#include <QtWidgets/QLayout>
- #include <QtGui/QWheelEvent>
--#include <QtGui/QDockWidget>
-+#include <QtWidgets/QDockWidget>
- #include <QtCore/QObjectList>
- 
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h	2018-01-11 22:18:40.120207269 +0700
-@@ -23,6 +23,6 @@
- #include <map>
- 
--#include <QtGui/QMainWindow>
--#include <QtGui/QAction>
-+#include <QtWidgets/QMainWindow>
-+#include <QtWidgets/QAction>
- #include <QtGui/QCursor>
- 
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp	2018-01-11 22:18:40.120207269 +0700
-@@ -18,6 +18,6 @@
-  */
- 
--#include <QtGui/QApplication>
--#include <QtGui/QPushButton>
-+#include <QtWidgets/QApplication>
-+#include <QtWidgets/QPushButton>
- 
- #include <ZLDialogManager.h>
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h	2018-01-11 22:18:40.120207269 +0700
-@@ -21,6 +21,6 @@
- #define __ZLQTDIALOG_H__
- 
--#include <QtGui/QDialog>
--#include <QtGui/QLayout>
-+#include <QtWidgets/QDialog>
-+#include <QtWidgets/QLayout>
- 
- #include <ZLDialog.h>
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp	2018-01-11 22:18:40.120207269 +0700
-@@ -18,8 +18,8 @@
-  */
- 
--#include <QtGui/QApplication>
--#include <QtGui/QDesktopWidget>
--#include <QtGui/QWidget>
--#include <QtGui/QLayout>
-+#include <QtWidgets/QApplication>
-+#include <QtWidgets/QDesktopWidget>
-+#include <QtWidgets/QWidget>
-+#include <QtWidgets/QLayout>
- 
- #include "ZLQtDialogContent.h"
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp	2018-01-11 22:18:40.120207269 +0700
-@@ -18,9 +18,9 @@
-  */
- 
--#include <QtGui/QApplication>
--#include <QtGui/QMessageBox>
--#include <QtGui/QFileDialog>
-+#include <QtWidgets/QApplication>
-+#include <QtWidgets/QMessageBox>
-+#include <QtWidgets/QFileDialog>
- #include <QtGui/QClipboard>
--#include <QtGui/QDesktopWidget>
-+#include <QtWidgets/QDesktopWidget>
- 
- #include "ZLQtDialogManager.h"
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp	2018-01-11 22:18:40.120207269 +0700
-@@ -18,5 +18,5 @@
-  */
- 
--#include <QtGui/QFileDialog>
-+#include <QtWidgets/QFileDialog>
- 
- #include "ZLQtOpenFileDialog.h"
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp	2018-01-11 22:18:40.121207269 +0700
-@@ -20,14 +20,14 @@
- #include <cctype>
- 
--#include <QtGui/QCheckBox>
--#include <QtGui/QComboBox>
--#include <QtGui/QLabel>
--#include <QtGui/QGroupBox>
--#include <QtGui/QRadioButton>
--#include <QtGui/QPushButton>
--#include <QtGui/QSpinBox>
--#include <QtGui/QLineEdit>
--#include <QtGui/QSlider>
--#include <QtGui/QLayout>
-+#include <QtWidgets/QCheckBox>
-+#include <QtWidgets/QComboBox>
-+#include <QtWidgets/QLabel>
-+#include <QtWidgets/QGroupBox>
-+#include <QtWidgets/QRadioButton>
-+#include <QtWidgets/QPushButton>
-+#include <QtWidgets/QSpinBox>
-+#include <QtWidgets/QLineEdit>
-+#include <QtWidgets/QSlider>
-+#include <QtWidgets/QLayout>
- 
- #include <ZLStringUtil.h>
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp	2018-01-11 22:18:40.121207269 +0700
-@@ -18,9 +18,9 @@
-  */
- 
--#include <QtGui/QApplication>
--#include <QtGui/QDesktopWidget>
--#include <QtGui/QLayout>
--#include <QtGui/QPushButton>
--#include <QtGui/QButtonGroup>
-+#include <QtWidgets/QApplication>
-+#include <QtWidgets/QDesktopWidget>
-+#include <QtWidgets/QLayout>
-+#include <QtWidgets/QPushButton>
-+#include <QtWidgets/QButtonGroup>
- #include <QtGui/QResizeEvent>
- 
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h	2018-01-11 22:18:40.121207269 +0700
-@@ -21,7 +21,7 @@
- #define __ZLQTOPTIONSDIALOG_H__
- 
--#include <QtGui/QWidget>
--#include <QtGui/QTabWidget>
--#include <QtGui/QDialog>
-+#include <QtWidgets/QWidget>
-+#include <QtWidgets/QTabWidget>
-+#include <QtWidgets/QDialog>
- 
- #include "../../../../core/src/desktop/dialogs/ZLDesktopOptionsDialog.h"
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp	2018-01-11 22:18:40.121207269 +0700
-@@ -20,9 +20,9 @@
- #include <unistd.h>
- 
--#include <QtGui/QApplication>
--#include <QtGui/QDesktopWidget>
--#include <QtGui/QWidget>
--#include <QtGui/QLabel>
--#include <QtGui/QLayout>
-+#include <QtWidgets/QApplication>
-+#include <QtWidgets/QDesktopWidget>
-+#include <QtWidgets/QWidget>
-+#include <QtWidgets/QLabel>
-+#include <QtWidgets/QLayout>
- #include <QtCore/QThreadPool>
- 
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h	2018-01-11 22:18:40.121207269 +0700
-@@ -23,9 +23,9 @@
- #include <string>
- 
--#include <QtGui/QWidget>
-+#include <QtWidgets/QWidget>
- #include <QtGui/QCursor>
--#include <QtGui/QDialog>
--#include <QtGui/QProgressBar>
--#include <QtGui/QLabel>
-+#include <QtWidgets/QDialog>
-+#include <QtWidgets/QProgressBar>
-+#include <QtWidgets/QLabel>
- #include <QtCore/QRunnable>
- 
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp	2018-01-11 22:18:40.120207269 +0700
-@@ -20,10 +20,10 @@
- #include <algorithm>
- 
--#include <QtGui/QSplitter>
--#include <QtGui/QVBoxLayout>
--#include <QtGui/QHBoxLayout>
--#include <QtGui/QScrollBar>
- #include <QtGui/QResizeEvent>
- #include <QtCore/QDebug>
-+#include <QtWidgets/QSplitter>
-+#include <QtWidgets/QVBoxLayout>
-+#include <QtWidgets/QHBoxLayout>
-+#include <QtWidgets/QScrollBar>
- 
- #include <ZLFile.h>
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h	2018-01-11 22:18:40.121207269 +0700
-@@ -25,10 +25,10 @@
- #include <QtCore/QMap>
- 
--#include <QtGui/QDialog>
--#include <QtGui/QScrollArea>
--#include <QtGui/QPushButton>
--#include <QtGui/QLabel>
--#include <QtGui/QLineEdit>
--#include <QtGui/QWidget>
-+#include <QtWidgets/QDialog>
-+#include <QtWidgets/QScrollArea>
-+#include <QtWidgets/QPushButton>
-+#include <QtWidgets/QLabel>
-+#include <QtWidgets/QLineEdit>
-+#include <QtWidgets/QWidget>
- 
- #include <ZLTreeDialog.h>
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp	2018-01-11 22:13:28.444220377 +0700
-@@ -49,3 +49,4 @@
- 	  path = replacement + path.substr(1);
- 	}
-+	ZLUnixFSManager::normalizeRealPath(path);
- }
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLQApplication.h fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLQApplication.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLQApplication.h	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLQApplication.h	2018-01-11 22:18:40.121207269 +0700
-@@ -21,5 +21,5 @@
- #define __ZLQAPPLICATION_H__
- 
--#include <QtGui/QApplication>
-+#include <QtWidgets/QApplication>
- 
- class ZLQApplication : public QApplication {
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLibrary.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLibrary.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLibrary.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLibrary.cpp	2018-01-11 22:18:40.121207269 +0700
-@@ -20,5 +20,5 @@
- #include <QtCore/QTextCodec>
- #include <QtCore/QFile>
--#include <QtGui/QApplication>
-+#include <QtWidgets/QApplication>
- #include <QtGui/QFileOpenEvent>
- 
-@@ -73,5 +73,5 @@
- 	new ZLQApplication(argc, argv);
- 
--	QTextCodec::setCodecForCStrings(QTextCodec::codecForName("utf-8"));
-+	QTextCodec::setCodecForLocale(QTextCodec::codecForName("utf-8"));
- 
- 	ZLibrary::parseArguments(argc, argv);
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp	2018-01-11 22:18:40.120207269 +0700
-@@ -25,5 +25,7 @@
- #include <QtCore/QList>
- #include <QtCore/QTimer>
-+#include <QtCore/QUrlQuery>
- 
-+#include <QtNetwork/QNetworkCookie>
- #include <QtNetwork/QNetworkRequest>
- #include <QtNetwork/QNetworkReply>
-@@ -150,10 +152,10 @@
- 	if (!scope.request->postParameters().empty()) {
- 		QByteArray data;
--		QUrl tmp;
-+		QUrlQuery tmp;
- 		typedef std::pair<std::string, std::string> string_pair;
- 		foreach (const string_pair &pair, scope.request->postParameters()) {
- 			tmp.addQueryItem(QString::fromStdString(pair.first), QString::fromStdString(pair.second));
- 		}
--		data = tmp.encodedQuery();
-+		data = tmp.query(QUrl::FullyEncoded).toUtf8(); //encodedQuery();
- 		reply = const_cast<QNetworkAccessManager&>(myManager).post(networkRequest, data);
- 	} else {
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp	2018-01-11 22:13:39.639219906 +0700
-@@ -87,5 +87,5 @@
- 
- void QtWaitingSpinner::setRoundness(qreal roundness) {
--	myRoundness = std::max(0.0, std::min(100.0, roundness));
-+	myRoundness = std::max(static_cast<qreal>(0.0), std::min(static_cast<qreal>(100.0), roundness));
- }
- 
-@@ -149,5 +149,5 @@
- 	qreal gradation = alphaDiff / (qreal)(distanceThreshold + 1);
- 	qreal resultAlpha = color.alphaF() - gradation * distance;
--	resultAlpha = std::min(1.0, std::max(0.0, resultAlpha)); //if alpha is out of bound, force it to bounds
-+	resultAlpha = std::min(static_cast<qreal>(1.0), std::max(static_cast<qreal>(0.0), resultAlpha)); //if alpha is out of bound, force it to bounds
- 	color.setAlphaF(resultAlpha);
- 	return color;
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h	2018-01-11 22:18:40.121207269 +0700
-@@ -4,5 +4,5 @@
- #include <QtCore/QTimer>
- 
--#include <QtGui/QWidget>
-+#include <QtWidgets/QWidget>
- #include <QtGui/QColor>
- 
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp	2018-01-11 22:18:40.120207269 +0700
-@@ -18,12 +18,12 @@
-  */
- 
--#include <QtGui/QVBoxLayout>
--#include <QtGui/QHBoxLayout>
- #include <QtGui/QPixmap>
- #include <QtGui/QPalette>
- #include <QtGui/QPainter>
- #include <QtGui/QPaintEvent>
--#include <QtGui/QScrollBar>
- #include <QtCore/QTimer>
-+#include <QtWidgets/QVBoxLayout>
-+#include <QtWidgets/QHBoxLayout>
-+#include <QtWidgets/QScrollBar>
- 
- #include <QtCore/QDebug>
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h	2018-01-11 22:18:40.120207269 +0700
-@@ -21,10 +21,10 @@
- #define __ZLQTITEMSLISTWIDGET_H__
- 
--#include <QtGui/QWidget>
--#include <QtGui/QFrame>
--#include <QtGui/QPushButton>
--#include <QtGui/QLabel>
--#include <QtGui/QVBoxLayout>
--#include <QtGui/QScrollArea>
-+#include <QtWidgets/QWidget>
-+#include <QtWidgets/QFrame>
-+#include <QtWidgets/QPushButton>
-+#include <QtWidgets/QLabel>
-+#include <QtWidgets/QVBoxLayout>
-+#include <QtWidgets/QScrollArea>
- 
- #include <ZLTreeTitledNode.h>
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp	2018-01-11 22:18:40.120207269 +0700
-@@ -18,8 +18,8 @@
-  */
- 
--#include <QtGui/QVBoxLayout>
--#include <QtGui/QHBoxLayout>
--#include <QtGui/QScrollBar>
--#include <QtGui/QGraphicsDropShadowEffect>
-+#include <QtWidgets/QVBoxLayout>
-+#include <QtWidgets/QHBoxLayout>
-+#include <QtWidgets/QScrollBar>
-+#include <QtWidgets/QGraphicsDropShadowEffect>
- 
- #include <QtCore/QDebug>
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h	2018-01-11 22:18:40.121207269 +0700
-@@ -21,9 +21,9 @@
- #define __ZLQTPREVIEWWIDGET_H__
- 
--#include <QtGui/QWidget>
--#include <QtGui/QPushButton>
--#include <QtGui/QLabel>
--#include <QtGui/QScrollArea>
--#include <QtGui/QVBoxLayout>
-+#include <QtWidgets/QWidget>
-+#include <QtWidgets/QPushButton>
-+#include <QtWidgets/QLabel>
-+#include <QtWidgets/QScrollArea>
-+#include <QtWidgets/QVBoxLayout>
- #include <QtCore/QSet>
- 
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp	2018-01-11 22:18:40.120207269 +0700
-@@ -19,7 +19,7 @@
- 
- #include <QtCore/QDebug>
--#include <QtGui/QStyle>
--#include <QtGui/QCompleter>
--#include <QtGui/QStringListModel>
-+#include <QtCore/QStringListModel>
-+#include <QtWidgets/QStyle>
-+#include <QtWidgets/QCompleter>
- 
- #include <ZLibrary.h>
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h	2018-01-11 22:18:40.121207269 +0700
-@@ -22,6 +22,6 @@
- 
- #include <QtCore/QSet>
--#include <QtGui/QLabel>
--#include <QtGui/QLineEdit>
-+#include <QtWidgets/QLabel>
-+#include <QtWidgets/QLineEdit>
- 
- #include "QtWaitingSpinner.h"
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp	2018-01-11 22:18:40.121207269 +0700
-@@ -20,6 +20,6 @@
- #include <algorithm>
- 
--#include <QtGui/QLayout>
--#include <QtGui/QScrollBar>
-+#include <QtWidgets/QLayout>
-+#include <QtWidgets/QScrollBar>
- #include <QtGui/QPainter>
- #include <QtGui/QPixmap>
-@@ -186,9 +186,9 @@
- void ZLQtViewWidget::setScrollbarEnabled(ZLView::Direction direction, bool enabled) {
- 	if (direction == ZLView::VERTICAL) {
--		myRightScrollBar->setShown(enabled && myShowScrollBarAtRight);
--		myLeftScrollBar->setShown(enabled && !myShowScrollBarAtRight);
-+		myRightScrollBar->setVisible(enabled && myShowScrollBarAtRight);
-+		myLeftScrollBar->setVisible(enabled && !myShowScrollBarAtRight);
- 	} else {
--		myBottomScrollBar->setShown(enabled && myShowScrollBarAtBottom);
--		myTopScrollBar->setShown(enabled && !myShowScrollBarAtBottom);
-+		myBottomScrollBar->setVisible(enabled && myShowScrollBarAtBottom);
-+		myTopScrollBar->setVisible(enabled && !myShowScrollBarAtBottom);
- 	}
- }
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h	2018-01-11 22:18:40.121207269 +0700
-@@ -21,5 +21,5 @@
- #define __ZLQTVIEWWIDGET_H__
- 
--#include <QtGui/QWidget>
-+#include <QtWidgets/QWidget>
- 
- #include "../../../../core/src/view/ZLViewWidget.h"
diff --git a/app-text/flpsed/flpsed-0.7.3.ebuild b/app-text/flpsed/flpsed-0.7.3.ebuild
index d5c909badb01..f3c15f0bc3f0 100644
--- a/app-text/flpsed/flpsed-0.7.3.ebuild
+++ b/app-text/flpsed/flpsed-0.7.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop
+inherit desktop xdg
 
 DESCRIPTION="Pseudo PostScript editor"
 HOMEPAGE="https://flpsed.org/flpsed.html"
diff --git a/app-text/gnome-doc-utils/Manifest b/app-text/gnome-doc-utils/Manifest
index 93aec0d90a1d..93fd7cd93417 100644
--- a/app-text/gnome-doc-utils/Manifest
+++ b/app-text/gnome-doc-utils/Manifest
@@ -1 +1,2 @@
+DIST gnome-doc-utils-0.20.10-python3.patch 21576 BLAKE2B 487b2f7d3758d1df475178154ed92ee548c63fd492d59fb0c6cc3a75e6378ebe75e74e3bdc60b46a74ea0670ca77f9bbad279b625bb64d4cb8a432a869eb426b SHA512 500e952f12c1baae08a0f520ea7e08c09d20ee58c3ed5fdc5f6dd1b7a192d90f66de26956306ab685ef62298df9770af184c0f33b7d4e015023ef2129da351bf
 DIST gnome-doc-utils-0.20.10.tar.xz 526700 BLAKE2B 6019aa9b1d2c8153ddc1e6af589f79628ceafb6c14b0de5dc8f9ef518b5e626bbafdc2a4d93bfb70c6823ba0605a5abe899989e9f893c976d7a5fcd9c99a90dc SHA512 1cb5e3b9ca9e45e6c551801e9c9c4aac725c2ce85238c230a4c70b36c90419886b921d8dd464df0643fc3bbb877df075abaa83a36d1609c5664960c31e11d151
diff --git a/app-text/gnome-doc-utils/files/gnome-doc-utils-0.20.10-python3.patch b/app-text/gnome-doc-utils/files/gnome-doc-utils-0.20.10-python3.patch
deleted file mode 100644
index 2c4836974086..000000000000
--- a/app-text/gnome-doc-utils/files/gnome-doc-utils-0.20.10-python3.patch
+++ /dev/null
@@ -1,520 +0,0 @@
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/__init__.py gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/__init__.py	2011-08-04 09:36:03.000000000 -0500
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py	2019-09-10 09:30:28.018627919 -0500
-@@ -86,14 +86,14 @@
-                 self.messages.append(t)
-                 if spacepreserve:
-                     self.nowrap[t] = True
--                if t in self.linenos.keys():
-+                if t in list(self.linenos.keys()):
-                     self.linenos[t].append((self.filename, tag, lineno))
-                 else:
-                     self.linenos[t] = [ (self.filename, tag, lineno) ]
-                 if (not self.do_translations) and comment and not t in self.comments:
-                     self.comments[t] = comment
-             else:
--                if t in self.linenos.keys():
-+                if t in list(self.linenos.keys()):
-                     self.linenos[t].append((self.filename, tag, lineno))
-                 else:
-                     self.linenos[t] = [ (self.filename, tag, lineno) ]
-@@ -166,7 +166,7 @@
-         elif node.isText():
-             if node.isBlankNode():
-                 if self.app.options.get('expand_entities') or \
--                  (not (node.prev and not node.prev.isBlankNode() and node.next and not node.next.isBlankNode()) ):
-+                  (not (node.prev and not node.prev.isBlankNode() and node.__next__ and not node.next.isBlankNode()) ):
-                     #print >>sys.stderr, "BLANK"
-                     node.setContent('')
-             else:
-@@ -176,7 +176,7 @@
-             child = node.children
-             while child:
-                 self.normalizeNode(child)
--                child = child.next
-+                child = child.__next__
- 
-     def normalizeString(self, text, spacepreserve = False):
-         """Normalizes string to be used as key for gettext lookup.
-@@ -200,7 +200,7 @@
-             tree = ctxt.doc()
-             newnode = tree.getRootElement()
-         except:
--            print >> sys.stderr, """Error while normalizing string as XML:\n"%s"\n""" % (text)
-+            print("""Error while normalizing string as XML:\n"%s"\n""" % (text), file=sys.stderr)
-             return text
- 
-         self.normalizeNode(newnode)
-@@ -209,7 +209,7 @@
-         child = newnode.children
-         while child:
-             result += child.serialize('utf-8')
--            child = child.next
-+            child = child.__next__
- 
-         result = re.sub('^ ','', result)
-         result = re.sub(' $','', result)
-@@ -235,7 +235,7 @@
-         ctxt.parseDocument()
-         tree = ctxt.doc()
-         if next:
--            newnode = tree.children.next
-+            newnode = tree.children.__next__
-         else:
-             newnode = tree.children
- 
-@@ -243,7 +243,7 @@
-         child = newnode.children
-         while child:
-             result += child.serialize('utf-8')
--            child = child.next
-+            child = child.__next__
-         tree.freeDoc()
-         return result
- 
-@@ -262,7 +262,7 @@
-                         result += child.content.decode('utf-8')
-                 else:
-                     result += self.myAttributeSerialize(child)
--                child = child.next
-+                child = child.__next__
-         else:
-             result = node.serialize('utf-8')
-         return result
-@@ -338,7 +338,7 @@
-                 pass
- 
-             if not newnode:
--                print >> sys.stderr, """Error while parsing translation as XML:\n"%s"\n""" % (text.encode('utf-8'))
-+                print("""Error while parsing translation as XML:\n"%s"\n""" % (text.encode('utf-8')), file=sys.stderr)
-                 return
- 
-             newelem = newnode.getRootElement()
-@@ -346,13 +346,13 @@
-             if newelem and newelem.children:
-                 free = node.children
-                 while free:
--                    next = free.next
-+                    next = free.__next__
-                     free.unlinkNode()
-                     free = next
- 
-                 if node:
-                     copy = newelem.copyNodeList()
--                    next = node.next
-+                    next = node.__next__
-                     node.replaceNode(newelem.copyNodeList())
-                     node.next = next
- 
-@@ -378,7 +378,7 @@
-             if child.type in ['text'] and  child.content.strip()!='':
-                 final = True
-                 break
--            child = child.next
-+            child = child.__next__
- 
-         node.__autofinal__ = final
-         return final
-@@ -457,7 +457,7 @@
-                     outtxt += '<%s>%s</%s>' % (starttag, content, endtag)
-                 else:
-                     outtxt += self.doSerialize(child)
--            child = child.next
-+            child = child.__next__
- 
-         if self.app.operation == 'merge':
-             norm_outtxt = self.normalizeString(outtxt, self.app.isSpacePreserveNode(node))
-@@ -534,7 +534,7 @@
-             outtxt = ''
-             while child:
-                 outtxt += self.doSerialize(child)
--                child = child.next
-+                child = child.__next__
-             return outtxt
- 
- def xml_error_handler(arg, ctxt):
-@@ -577,8 +577,8 @@
-                 raise IOError("Unable to read file '%s'" % xmlfile)
-             try:
-                 doc = XMLDocument(xmlfile, self)
--            except Exception, e:
--                print >> sys.stderr, "Unable to parse XML file '%s': %s" % (xmlfile, str(e))
-+            except Exception as e:
-+                print("Unable to parse XML file '%s': %s" % (xmlfile, str(e)), file=sys.stderr)
-                 sys.exit(1)
-             self.current_mode.preProcessXml(doc.doc, self.msg)
-             doc.generate_messages()
-@@ -590,14 +590,14 @@
-             raise IOError("Unable to read file '%s'" % xmlfile)
-         try:
-             doc = XMLDocument(xmlfile, self)
--        except Exception, e:
--            print >> sys.stderr, str(e)
-+        except Exception as e:
-+            print(str(e), file=sys.stderr)
-             sys.exit(1)
- 
-         try:
-             mfile = open(mofile, "rb")
-         except:
--            print >> sys.stderr, "Can't open MO file '%s'." % (mofile)
-+            print("Can't open MO file '%s'." % (mofile), file=sys.stderr)
-         self.gt = gettext.GNUTranslations(mfile)
-         self.gt.add_fallback(NoneTranslations())
-         # Has preProcessXml use cases for merge?
-@@ -619,16 +619,16 @@
-             raise IOError("Unable to read file '%s'" % xmlfile)
-         try:
-             doc = XMLDocument(xmlfile, self)
--        except Exception, e:
--            print >> sys.stderr, str(e)
-+        except Exception as e:
-+            print(str(e), file=sys.stderr)
-             sys.exit(1)
-         doc.generate_messages()
- 
-         self.msg.translationsFollow()
-         try:
-             doc = XMLDocument(origxml, self)
--        except Exception, e:
--            print >> sys.stderr, str(e)
-+        except Exception as e:
-+            print(str(e), file=sys.stderr)
-             sys.exit(1)
-         doc.generate_messages()
-         self.output_po()
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/docbook.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/docbook.py	2011-01-10 10:08:10.000000000 -0600
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py	2019-09-10 09:31:15.199572286 -0500
-@@ -43,7 +43,7 @@
- except ImportError:
-     from md5 import new as md5_new
- 
--from basic import basicXmlMode
-+from .basic import basicXmlMode
- 
- class docbookXmlMode(basicXmlMode):
-     """Class for special handling of DocBook document types.
-@@ -131,7 +131,7 @@
-                     hash = self._md5_for_file(fullpath)
-                 else:
-                     hash = "THIS FILE DOESN'T EXIST"
--                    print >>sys.stderr, "Warning: image file '%s' not found." % fullpath
-+                    print("Warning: image file '%s' not found." % fullpath, file=sys.stderr)
- 
-                 msg.outputMessage("@@image: '%s'; md5=%s" % (attr, hash), node.lineNo(),
-                                   "When image changes, this message will be marked fuzzy or untranslated for you.\n"+
-@@ -198,10 +198,10 @@
- # Perform some tests when ran standalone
- if __name__ == '__main__':
-     test = docbookXmlMode()
--    print "Ignored tags       : " + repr(test.getIgnoredTags())
--    print "Final tags         : " + repr(test.getFinalTags())
--    print "Space-preserve tags: " + repr(test.getSpacePreserveTags())
-+    print("Ignored tags       : " + repr(test.getIgnoredTags()))
-+    print("Final tags         : " + repr(test.getFinalTags()))
-+    print("Space-preserve tags: " + repr(test.getSpacePreserveTags()))
- 
--    print "Credits from string: '%s'" % test.getStringForTranslators()
--    print "Explanation for credits:\n\t'%s'" % test.getCommentForTranslators()
-+    print("Credits from string: '%s'" % test.getStringForTranslators())
-+    print("Explanation for credits:\n\t'%s'" % test.getCommentForTranslators())
- 
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/gs.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/gs.py
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/gs.py	2010-12-13 10:14:07.000000000 -0600
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/gs.py	2019-09-10 09:31:15.201572284 -0500
-@@ -20,7 +20,7 @@
- # Special case Gnome Summary
- #
- 
--from basic import basicXmlMode
-+from .basic import basicXmlMode
- 
- class gsXmlMode(basicXmlMode):
-     """Abstract class for special handling of document types."""
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/mallard.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/mallard.py
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/mallard.py	2011-01-10 10:08:50.000000000 -0600
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/mallard.py	2019-09-10 09:31:15.212572271 -0500
-@@ -39,7 +39,7 @@
- except ImportError:
-     from md5 import new as md5_new
- 
--from basic import basicXmlMode
-+from .basic import basicXmlMode
- 
- class mallardXmlMode(basicXmlMode):
-     """Class for special handling of Mallard document types."""
-@@ -112,7 +112,7 @@
-                     hash = self._md5_for_file(fullpath)
-                 else:
-                     hash = "THIS FILE DOESN'T EXIST"
--                    print >>sys.stderr, "Warning: image file '%s' not found." % fullpath
-+                    print("Warning: image file '%s' not found." % fullpath, file=sys.stderr)
-                     
-                 msg.outputMessage("@@image: '%s'; md5=%s" % (attr, hash), node.lineNo(),
-                                   "When image changes, this message will be marked fuzzy or untranslated for you.\n"+
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/ubuntu.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/ubuntu.py
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/ubuntu.py	2010-12-13 10:14:07.000000000 -0600
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/ubuntu.py	2019-09-10 09:31:15.213572270 -0500
-@@ -2,7 +2,7 @@
- 
- import libxml2
- 
--from docbook import docbookXmlMode
-+from .docbook import docbookXmlMode
- 
- class ubuntuXmlMode (docbookXmlMode):
-     """Special-casing Ubuntu DocBook website documentation."""
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/xhtml.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/xhtml.py
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/xhtml.py	2010-12-13 10:14:07.000000000 -0600
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/xhtml.py	2019-09-10 09:31:15.214572269 -0500
-@@ -21,7 +21,7 @@
- # This implements special instructions for handling XHTML documents
- # in a better way, particularly to extract some attributes in HTML tags
- 
--from basic import basicXmlMode
-+from .basic import basicXmlMode
- 
- class xhtmlXmlMode(basicXmlMode):
-     """Class for special handling of XHTML document types."""
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/xml2po.py.in gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/xml2po.py.in	2010-12-13 10:14:07.000000000 -0600
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in	2019-09-10 09:30:28.217627684 -0500
-@@ -41,9 +41,9 @@
- if not os.path.exists('/dev/null'): NULL_STRING = 'NUL'
- 
- def usage (with_help = False):
--    print >> sys.stderr, "Usage:  %s [OPTIONS] [XMLFILE]..." % (sys.argv[0])
-+    print("Usage:  %s [OPTIONS] [XMLFILE]..." % (sys.argv[0]), file=sys.stderr)
-     if with_help:
--        print >> sys.stderr, """
-+        print("""
- OPTIONS may be some of:
-     -a    --automatic-tags     Automatically decides if tags are to be considered
-                                  "final" or not
-@@ -72,7 +72,7 @@
-     using -p option for each XML file:
-         %(command)s -p de.po chapter1.xml > chapter1.de.xml
-         %(command)s -p de.po chapter2.xml > chapter2.de.xml
--""" % {'command': sys.argv[0]}
-+""" % {'command': sys.argv[0]}, file=sys.stderr)
- 
- 
- def main(argv):
-@@ -82,7 +82,7 @@
- 
-     name = os.path.join(os.path.dirname(__file__), '..')
-     if os.path.exists(os.path.join(name, 'tests')):
--        print >> sys.stderr, 'Running from source folder, modifying PYTHONPATH'
-+        print('Running from source folder, modifying PYTHONPATH', file=sys.stderr)
-         sys.path.insert(0, name)
- 
-     from xml2po import Main
-@@ -142,14 +142,14 @@
-         elif opt in ('-o', '--output'):
-             output = arg
-         elif opt in ('-v', '--version'):
--            print VERSION
-+            print(VERSION)
-             sys.exit(0)
-         elif opt in ('-h', '--help'):
-             usage(True)
-             sys.exit(0)
- 
-     if operation == 'update' and output != "-":
--        print >> sys.stderr, "Option '-o' is not yet supported when updating translations directly. Ignoring this option."
-+        print("Option '-o' is not yet supported when updating translations directly. Ignoring this option.", file=sys.stderr)
- 
-     # Treat remaining arguments as XML files
-     filenames = []
-@@ -159,16 +159,16 @@
-     try:
-         xml2po_main = Main(default_mode, operation, output, options)
-     except IOError:
--        print >> sys.stderr, "Error: cannot open file %s for writing." % (output)
-+        print("Error: cannot open file %s for writing." % (output), file=sys.stderr)
-         sys.exit(5)
- 
-     if operation == 'merge':
-         if len(filenames) > 1:
--            print  >> sys.stderr, "Error: You can merge translations with only one XML file at a time."
-+            print("Error: You can merge translations with only one XML file at a time.", file=sys.stderr)
-             sys.exit(2)
- 
-         if not mofile:
--            print >> sys.stderr, "Error: You must specify MO file when merging translations."
-+            print("Error: You must specify MO file when merging translations.", file=sys.stderr)
-             sys.exit(3)
- 
-         xml2po_main.merge(mofile, filenames[0])
---- gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py.orig	2019-09-10 09:34:42.110328324 -0500
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py	2019-09-10 09:34:44.170325899 -0500
-@@ -166,7 +166,7 @@
-         elif node.isText():
-             if node.isBlankNode():
-                 if self.app.options.get('expand_entities') or \
--                  (not (node.prev and not node.prev.isBlankNode() and node.__next__ and not node.next.isBlankNode()) ):
-+                  (not (node.prev and not node.prev.isBlankNode() and node.next and not node.next.isBlankNode()) ):
-                     #print >>sys.stderr, "BLANK"
-                     node.setContent('')
-             else:
-@@ -176,7 +176,7 @@
-             child = node.children
-             while child:
-                 self.normalizeNode(child)
--                child = child.__next__
-+                child = child.next
- 
-     def normalizeString(self, text, spacepreserve = False):
-         """Normalizes string to be used as key for gettext lookup.
-@@ -209,7 +209,7 @@
-         child = newnode.children
-         while child:
-             result += child.serialize('utf-8')
--            child = child.__next__
-+            child = child.next
- 
-         result = re.sub('^ ','', result)
-         result = re.sub(' $','', result)
-@@ -235,7 +235,7 @@
-         ctxt.parseDocument()
-         tree = ctxt.doc()
-         if next:
--            newnode = tree.children.__next__
-+            newnode = tree.children.next
-         else:
-             newnode = tree.children
- 
-@@ -243,7 +243,7 @@
-         child = newnode.children
-         while child:
-             result += child.serialize('utf-8')
--            child = child.__next__
-+            child = child.next
-         tree.freeDoc()
-         return result
- 
-@@ -262,7 +262,7 @@
-                         result += child.content.decode('utf-8')
-                 else:
-                     result += self.myAttributeSerialize(child)
--                child = child.__next__
-+                child = child.next
-         else:
-             result = node.serialize('utf-8')
-         return result
-@@ -346,13 +346,13 @@
-             if newelem and newelem.children:
-                 free = node.children
-                 while free:
--                    next = free.__next__
-+                    next = free.next
-                     free.unlinkNode()
-                     free = next
- 
-                 if node:
-                     copy = newelem.copyNodeList()
--                    next = node.__next__
-+                    next = node.next
-                     node.replaceNode(newelem.copyNodeList())
-                     node.next = next
- 
-@@ -378,7 +378,7 @@
-             if child.type in ['text'] and  child.content.strip()!='':
-                 final = True
-                 break
--            child = child.__next__
-+            child = child.next
- 
-         node.__autofinal__ = final
-         return final
-@@ -457,7 +457,7 @@
-                     outtxt += '<%s>%s</%s>' % (starttag, content, endtag)
-                 else:
-                     outtxt += self.doSerialize(child)
--            child = child.__next__
-+            child = child.next
- 
-         if self.app.operation == 'merge':
-             norm_outtxt = self.normalizeString(outtxt, self.app.isSpacePreserveNode(node))
-@@ -534,7 +534,7 @@
-             outtxt = ''
-             while child:
-                 outtxt += self.doSerialize(child)
--                child = child.__next__
-+                child = child.next
-             return outtxt
- 
- def xml_error_handler(arg, ctxt):
---- gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py.orig	2019-09-10 09:39:57.733974912 -0500
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py	2019-09-10 09:40:24.761946962 -0500
-@@ -326,7 +326,7 @@
-                 pass
- 
-             content = '<%s>%s</%s>' % (starttag, text, endtag)
--            tmp = tmp + content.encode('utf-8')
-+            tmp = tmp + content
- 
-             newnode = None
-             try:
-@@ -663,7 +663,7 @@
-         if not text or text.strip() == '':
-             return text
-         if self.gt:
--            res = self.gt.ugettext(text.decode('utf-8'))
-+            res = self.gt.gettext(text)
-             return res
- 
-         return text
---- gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py.orig	2019-09-10 09:41:23.853885851 -0500
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py	2019-09-10 09:44:23.580699979 -0500
-@@ -352,9 +352,10 @@
- 
-                 if node:
-                     copy = newelem.copyNodeList()
--                    next = node.next
-+                    #next = node.next
-                     node.replaceNode(newelem.copyNodeList())
--                    node.next = next
-+                    #print(type(next))
-+                    #node.next = next
- 
-             else:
-                 # In practice, this happens with tags such as "<para>    </para>" (only whitespace in between)
-@@ -470,7 +471,7 @@
- 
-         worth = self.worthOutputting(node)
-         if not translation:
--            translation = outtxt.decode('utf-8')
-+            translation = outtxt
-             if worth and self.app.options.get('mark_untranslated'):
-                 node.setLang('C')
- 
---- gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py.orig	2019-09-10 09:46:15.409584334 -0500
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py	2019-09-10 09:46:30.164569075 -0500
-@@ -184,7 +184,7 @@
-                     else:
-                         ai.addChild(copy)
-                     if match.group(3):
--                        copy.newChild(None, "year", match.group(3).encode('utf-8'))
-+                        copy.newChild(None, "year", match.group(3))
-                     if match.group(1) and match.group(2):
-                         holder = match.group(1)+"(%s)" % match.group(2)
-                     elif match.group(1):
-@@ -193,7 +193,7 @@
-                         holder = match.group(2)
-                     else:
-                         holder = "???"
--                    copy.newChild(None, "holder", holder.encode('utf-8'))
-+                    copy.newChild(None, "holder", holder)
- 
- # Perform some tests when ran standalone
- if __name__ == '__main__':
---- gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in~	2019-09-10 09:50:34.000000000 -0500
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in	2019-09-10 09:50:45.114305443 -0500
-@@ -1,4 +1,4 @@
--#!/usr/bin/python -u
-+#!/usr/bin/python3 -u
- # -*- encoding: utf-8 -*-
- # Copyright (c) 2004, 2005, 2006 Danilo Šegan <danilo@gnome.org>.
- # Copyright (c) 2009 Claude Paroz <claude@2xlibre.net>.
diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
index 41e86c4e7136..616ebab3992b 100644
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
@@ -8,6 +8,7 @@ inherit gnome2 multibuild python-r1
 
 DESCRIPTION="A collection of documentation utilities for the Gnome project"
 HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDocUtils"
+SRC_URI+=" https://dev.gentoo.org/~juippis/distfiles/tmp/gnome-doc-utils-0.20.10-python3.patch"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
@@ -36,7 +37,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	# Stop build from relying on installed package
 	eapply "${FILESDIR}"/${P}-fix-out-of-tree-build.patch
-	eapply "${FILESDIR}"/${P}-python3.patch
+	eapply "${DISTDIR}"/${P}-python3.patch
 
 	gnome2_src_prepare
 
diff --git a/app-text/htp/files/strip.patch b/app-text/htp/files/strip.patch
deleted file mode 100644
index 9c92e757bc9e..000000000000
--- a/app-text/htp/files/strip.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-don't strip
-
-http://bugs.gentoo.org/240110
-
---- src/Makefile
-+++ src/Makefile
-@@ -33,7 +33,7 @@
- 
- install-bin: $(MAINEXE)
- 	mkdir -p $(bindir)
--	$(INSTALL) -s $(MAINEXE) $(bindir)
-+	$(INSTALL) $(MAINEXE) $(bindir)
- 
- #
- # explicit dependency: final executable
diff --git a/app-text/llpp/llpp-33.ebuild b/app-text/llpp/llpp-33.ebuild
index 5899dc63eacc..d8c83ada0750 100644
--- a/app-text/llpp/llpp-33.ebuild
+++ b/app-text/llpp/llpp-33.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/moosotc/llpp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="+ocamlopt"
 
 RDEPEND=">=app-text/mupdf-1.17.0:0=
diff --git a/app-text/sigil/sigil-1.3.0.ebuild b/app-text/sigil/sigil-1.3.0.ebuild
index e8e87585b3fa..c3e4d3bb5d4e 100644
--- a/app-text/sigil/sigil-1.3.0.ebuild
+++ b/app-text/sigil/sigil-1.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-3+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+plugins system-mathjax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild b/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild
index 483918e1ca11..f9e61be4a138 100644
--- a/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild
+++ b/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,6 @@ SRC_URI="http://www.hyperrealm.com/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 hppa ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
 PATCHES=(
 	"${FILESDIR}"/${P}-format-security.patch
@@ -21,3 +20,12 @@ PATCHES=(
 src_prepare() {
 	epatch "${PATCHES[@]}"
 }
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-text/unrtf/files/unrtf-0.21.8-automake-fix.patch b/app-text/unrtf/files/unrtf-0.21.8-automake-fix.patch
deleted file mode 100644
index fdfb52a4637b..000000000000
--- a/app-text/unrtf/files/unrtf-0.21.8-automake-fix.patch
+++ /dev/null
@@ -1,6 +0,0 @@
---- unrtf-0.21.8/charmaps/Makefile.am
-+++ unrtf-0.21.8/charmaps/Makefile.am
-@@ -1,2 +1,2 @@
--outputsdir = ${libdir}/${PACKAGE}
-+outputsdir = ${pkgdatadir}
- dist_outputs_DATA = SYMBOL.charmap
diff --git a/app-text/unrtf/files/unrtf-0.21.8-iconv-detection.patch b/app-text/unrtf/files/unrtf-0.21.8-iconv-detection.patch
deleted file mode 100644
index d5bb142ce558..000000000000
--- a/app-text/unrtf/files/unrtf-0.21.8-iconv-detection.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- unrtf-0.21.8/configure.ac
-+++ unrtf-0.21.8/configure.ac
-@@ -46,6 +46,7 @@
-     *-*-cygwin*)	AC_SUBST(LIBS, ["-liconv"]);;
-     *aix*)		AC_SUBST(LIBS, ["-liconv"]);;
-     *-*-darwin*)	AC_SUBST(LIBS, ["-liconv"]);;
-+    *-*-solaris*)	AC_SUBST(LIBS, ["-liconv"]);;
- esac
- 
- AC_CONFIG_FILES([Makefile
diff --git a/app-text/vgrep/Manifest b/app-text/vgrep/Manifest
index 392fc95ec721..f8585f5da0fa 100644
--- a/app-text/vgrep/Manifest
+++ b/app-text/vgrep/Manifest
@@ -2,3 +2,4 @@ DIST vgrep-2.3.1.tar.gz 1149421 BLAKE2B c4c9a414bba5e509d57faa9ca6f6ce5cae1dbb00
 DIST vgrep-2.3.3.tar.gz 1149769 BLAKE2B 59f15e0f2d9fd069b4926cb26a0517cb1d201dccce53d7c6b3ec1954693a3286396e8d4d72e2c3bcc4bb8e70083ba1ea349dfc4bec244caa112fcc2289063c25 SHA512 b745ec24bb5c329a3d0e4e756e54432f3acf9c24f9492339b69850d5a8e688074323d7e56c584e59f3aedf3a41b84997497791512dae2950424eaed56d6b7329
 DIST vgrep-2.4.0.tar.gz 1196159 BLAKE2B f8b6b8166feb17ddeea7978ff14fd729ee395feb9658cbfc838f978f33169c7ca15dcd4008af54582aca25a0803924c508da11603d02e42d1e597a5813f78c3b SHA512 c614b52fe7fa720d3d2bb57830805c1ebb7c47db549aadda9309676b9c286447e693e51f74f969ccd0450934510bfe79c1603717022dd69c9f7f2709cbfd4465
 DIST vgrep-2.5.0.tar.gz 1355064 BLAKE2B 7a724fed16ec4589ace159dd5dcbea8e4450393f2c356430d9e8e87b799191b06137e20f2d0c32c53b71ff79d5abaa5551f6254ef6989631d9f6b9d771a5fe18 SHA512 95ee8ff1ca705cec8deaabf8e20d39df23dbac1ab797d025ca253904bcb7f4cbedda3ef052d006064c8d652c06b50cc3e5e532108b23a95511ee7b85b8abb3d4
+DIST vgrep-2.5.1.tar.gz 1355092 BLAKE2B 82b9da137400ede07b3fc2472168139385df8ee639aa0ba34832d20e437ac3da5a86f89fcc9139faa0ca3a037a358a50947b982473d114056483aaf9cfdde52e SHA512 97561ac933fa8a716c9205910d088bf0bb852f2d68ea2226e27e30b5885aabd37223ec4368d72cd0ae5c72735e273004bd054a2b633e61ecb7fd854254cfaecd
diff --git a/app-text/vgrep/vgrep-2.5.1.ebuild b/app-text/vgrep/vgrep-2.5.1.ebuild
new file mode 100644
index 000000000000..6b7efaf86cf6
--- /dev/null
+++ b/app-text/vgrep/vgrep-2.5.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit go-module
+
+DESCRIPTION="A pager for grep, git-grep and similar grep implementations"
+HOMEPAGE="https://github.com/vrothberg/vgrep"
+SRC_URI="https://github.com/vrothberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-3+ MIT MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Uses golangci-lint
+RESTRICT="test"
+
+BDEPEND="dev-go/go-md2man"
+
+DOCS=( README.md )
+
+# go binary
+QA_PRESTRIPPED="usr/bin/vgrep"
+
+src_compile() {
+	emake build
+}
+
+src_install() {
+	local prefix="${D}/usr"
+	mkdir -p "${prefix}"/bin || die
+
+	emake PREFIX="${prefix}" install
+}
diff --git a/app-text/xournalpp/files/xournalpp-1.0.17-translations.patch b/app-text/xournalpp/files/xournalpp-1.0.17-translations.patch
deleted file mode 100644
index 95283b014009..000000000000
--- a/app-text/xournalpp/files/xournalpp-1.0.17-translations.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 12387b01a1c7e529580c6f27e92dad3e8b4f9858 Mon Sep 17 00:00:00 2001
-From: Bryan Tan <techniux@gmail.com>
-Date: Fri, 7 Feb 2020 19:47:18 -0800
-Subject: [PATCH] Fix translation target
-
-- Do not modify po files in place
-- Always build translations
----
- po/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
-index f957a199d..73ce0f04f 100644
---- a/po/CMakeLists.txt
-+++ b/po/CMakeLists.txt
-@@ -20,7 +20,7 @@ if (XGETTEXT_FOUND)
-       "${PROJECT_SOURCE_DIR}/ui/*.glade"
-   )
- 
--  gettext_create_translations ("${potfile}")
-+  gettext_create_translations ("${potfile}" ALL NOUPDATE)
- 
- else (XGETTEXT_FOUND)
-   message (ERROR "Gettext not found!")
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 5b2dac46ce87..85d014e02b11 100644
Binary files a/app-vim/Manifest.gz and b/app-vim/Manifest.gz differ
diff --git a/app-vim/csound-syntax/Manifest b/app-vim/csound-syntax/Manifest
index 13e5c0d5e4bf..782d85f0c0c8 100644
--- a/app-vim/csound-syntax/Manifest
+++ b/app-vim/csound-syntax/Manifest
@@ -1 +1,2 @@
+DIST csound-syntax-0.8.1.tar.gz 404555 BLAKE2B a26d158a3a050b3767cade77a0ccb8f12491a4b9e6957c6c8ccf1de5402367f58ddf9c367f314c0410346de08ddde49964cc4c5e38f6bc7605a4965f28afcedd SHA512 a87458efabcef4e3681b8f6b6325ad1fbe5b68befbf602fe858db2baf455c66c3a5b953a6aeeb28155867f7c53ae29618801c6b66a30118346069a1598b5ada1
 DIST csound-syntax-20160804.tar.bz2 326658 BLAKE2B 04ba7e1eb3afee6b32de4603e91f78fdc7fd3b70b137bd05ecac5ace2b34222a1cc8c095cd7776abe46b7bb18bd67d1711bca75f20e2f656162d414f2c6e2b2f SHA512 83ba89768be3d9e5dd701cc8323fbbff75ce399210891fc1e5676e278c39cfdb4b5e4a354c93c1f439a667d0ea65f459aea0b6f79740a061381e22d2557c0eb8
diff --git a/app-vim/csound-syntax/csound-syntax-0.8.1.ebuild b/app-vim/csound-syntax/csound-syntax-0.8.1.ebuild
new file mode 100644
index 000000000000..a2e3cf0246cc
--- /dev/null
+++ b/app-vim/csound-syntax/csound-syntax-0.8.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vim-plugin
+MY_P="csound-vim-${PV}"
+
+DESCRIPTION="vim plugin: set of tools for editing Csound files with vim"
+HOMEPAGE="https://github.com/luisjure/csound"
+SRC_URI="https://github.com/luisjure/csound-vim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+PATCHES=( "${FILESDIR}/${PN}-doc.patch" )
+
+src_prepare() {
+	rm -v LICENSE README.md || die
+	default
+}
diff --git a/app-vim/csound-syntax/csound-syntax-20160804.ebuild b/app-vim/csound-syntax/csound-syntax-20160804.ebuild
index 1562317fb7f5..f562b9ebe09c 100644
--- a/app-vim/csound-syntax/csound-syntax-20160804.ebuild
+++ b/app-vim/csound-syntax/csound-syntax-20160804.ebuild
@@ -12,7 +12,7 @@ KEYWORDS="amd64 x86"
 
 VIM_PLUGIN_HELPFILES="${PN}"
 
-PATCHES=( "${FILESDIR}/${P}-doc.patch" )
+PATCHES=( "${FILESDIR}/${PN}-doc.patch" )
 
 src_prepare() {
 	rm -v LICENSE README.md || die
diff --git a/app-vim/csound-syntax/files/csound-syntax-20160804-doc.patch b/app-vim/csound-syntax/files/csound-syntax-doc.patch
similarity index 100%
rename from app-vim/csound-syntax/files/csound-syntax-20160804-doc.patch
rename to app-vim/csound-syntax/files/csound-syntax-doc.patch
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 42f4ca19c531..48ec4fba7805 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/eigen/eigen-3.3.7-r1.ebuild b/dev-cpp/eigen/eigen-3.3.7-r1.ebuild
index 5c24e8c3aaaf..ab7874dd7e3b 100644
--- a/dev-cpp/eigen/eigen-3.3.7-r1.ebuild
+++ b/dev-cpp/eigen/eigen-3.3.7-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/libeigen/eigen/-/archive/3.3.7/${P}.tar.bz2 -> ${P}-
 
 LICENSE="MPL-2.0"
 SLOT="3"
-KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_ppc_vsx cuda debug doc openmp test" #zvector
 
 RESTRICT="!test? ( test )"
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 3adf5803dcf7..5d41ff1d61e5 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/libdbi/files/dbi.pc.in b/dev-db/libdbi/files/dbi.pc.in
deleted file mode 100644
index a0144549db9b..000000000000
--- a/dev-db/libdbi/files/dbi.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/dbi
-
-Name: libdbi
-Description: database-independent abstraction layer in C
-Version: @VERSION@
-Libs: -L${libdir} -ldbi
-Cflags: -I${includedir} -I${includedir}/dbi
diff --git a/dev-db/mariadb/mariadb-10.2.32-r3.ebuild b/dev-db/mariadb/mariadb-10.2.32-r3.ebuild
index 6cea3a5b2fc4..035ba47888e5 100644
--- a/dev-db/mariadb/mariadb-10.2.32-r3.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.32-r3.ebuild
@@ -35,7 +35,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mariadb/mariadb-10.3.23-r3.ebuild b/dev-db/mariadb/mariadb-10.3.23-r3.ebuild
index fdadccc6415f..f88cc3ce89f2 100644
--- a/dev-db/mariadb/mariadb-10.3.23-r3.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.23-r3.ebuild
@@ -35,7 +35,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mariadb/mariadb-10.4.13-r3.ebuild b/dev-db/mariadb/mariadb-10.4.13-r3.ebuild
index d87c5a8beba6..9e8d9744449c 100644
--- a/dev-db/mariadb/mariadb-10.4.13-r3.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.13-r3.ebuild
@@ -33,7 +33,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mysql/mysql-5.7.31.ebuild b/dev-db/mysql/mysql-5.7.31.ebuild
index 642f7c6ef0d9..d83c16e32a1e 100644
--- a/dev-db/mysql/mysql-5.7.31.ebuild
+++ b/dev-db/mysql/mysql-5.7.31.ebuild
@@ -28,7 +28,7 @@ RESTRICT="!test? ( test ) libressl? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc )"
 
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mysql/mysql-8.0.21-r1.ebuild b/dev-db/mysql/mysql-8.0.21-r1.ebuild
index abb6b3cbd3c4..a12c3b675960 100644
--- a/dev-db/mysql/mysql-8.0.21-r1.ebuild
+++ b/dev-db/mysql/mysql-8.0.21-r1.ebuild
@@ -37,7 +37,7 @@ REQUIRED_USE="?? ( tcmalloc jemalloc )
 	router? ( server )
 	tcmalloc? ( server )"
 
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/oracle-instantclient-basic/files/tnsnames.ora.sample b/dev-db/oracle-instantclient-basic/files/tnsnames.ora.sample
deleted file mode 100644
index f0524f5993cd..000000000000
--- a/dev-db/oracle-instantclient-basic/files/tnsnames.ora.sample
+++ /dev/null
@@ -1,93 +0,0 @@
-# This file contains the syntax information for 
-# the entries to be put in any tnsnames.ora file
-# The entries in this file are need based. 
-# There are no defaults for entries in this file
-# that Sqlnet/Net3 use that need to be overridden 
-#
-# Typically you could have two tnsnames.ora files
-# in the system, one that is set for the entire system
-# and is called the system tnsnames.ora file, and a
-# second file that is used by each user locally so that
-# he can override the definitions dictated by the system
-# tnsnames.ora file.
-
-# The entries in tnsnames.ora are an alternative to using
-# the names server with the onames adapter.
-# They are a collection of aliases for the addresses that 
-# the listener(s) is(are) listening for a database or 
-# several databases.
-
-# The following is the general syntax for any entry in 
-# a tnsnames.ora file. There could be several such entries 
-# tailored to the user's needs.
-
-<alias>= [ (DESCRIPTION_LIST =  # Optional depending on whether u have 
-				# one or more descriptions
-				# If there is just one description, unnecessary ]
-	  (DESCRIPTION=
-	    [ (SDU=2048) ]	# Optional, defaults to 2048
-				# Can take values between 512 and 32K
-	    [ (ADDRESS_LIST=    # Optional depending on whether u have
-				# one or more addresses
-				# If there is just one address, unnecessary ]
-	      (ADDRESS=
-		[ (COMMUNITY=<community_name>) ] 
-		(PROTOCOL=tcp)
-		(HOST=<hostname>)
-		(PORT=<portnumber (1521 is a standard port used)>)
-	      )
-	      [ (ADDRESS=
-		  (PROTOCOL=ipc)
-		  (KEY=<ipckey (PNPKEY is a standard key used)>)	
-		)
-	      ]
-	      [ (ADDRESS=
-		  [ (COMMUNITY=<community_name>) ]
-		  (PROTOCOL=decnet)
-		  (NODE=<nodename>)
-		  (OBJECT=<objectname>)
-		)
-	      ]
-              ... # More addresses
-	    [ ) ] # Optional depending on whether ADDRESS_LIST is used or not 
-	    [ (CONNECT_DATA=
-		(SID=<oracle_sid>)
-		[ (GLOBAL_NAME=<global_database_name>) ]
-	      )
-	    ]
-	    [ (SOURCE_ROUTE=yes) ]  
-	  )
-	  (DESCRIPTION=     
-	    [ (SDU=2048) ]	# Optional, defaults to 2048
-				# Can take values between 512 and 32K
-	    [ (ADDRESS_LIST= ]	# Optional depending on whether u have more
-				# than one address or not
-				# If there is just one address, unnecessary
-	      (ADDRESS
-		[ (COMMUNITY=<community_name>) ]
-		(PROTOCOL=tcp)
-		(HOST=<hostname>)
-		(PORT=<portnumber (1521 is a standard port used)>)
-	      )
-	      [ (ADDRESS=
-		  (PROTOCOL=ipc)
-		  (KEY=<ipckey (PNPKEY is a standard key used)>)
-	         )
-	      ]
-	      ... 		# More addresses
-	    [ ) ] 		# Optional depending on whether ADDRESS_LIST  
-				# is being used
-	    [ (CONNECT_DATA=
-		(SID=<oracle_sid>)
-		[ (GLOBAL_NAME=<global_database_name>) ]
-	      )
-	    ]
-	    [ (SOURCE_ROUTE=yes) ]
-	  )
-	  [ (CONNECT_DATA=
-	      (SID=<oracle_sid>)
-	      [ (GLOBAL_NAME=<global_database_name>) ]
-	    )
-	  ]
-	  ...   # More descriptions 
-	[ ) ]	# Optional depending on whether DESCRIPTION_LIST is used or not
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index d712757a7431..47dbd153fd05 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,6 +1,12 @@
 DIST postgresql-10.14.tar.bz2 19042154 BLAKE2B addddf00179190780bd30ed97cf6881670d18fda77062cdb5dc7cc161c64c3d5522db288902d0612db30fc6fcc1b619c7a102887ed438e27739e936bf5659425 SHA512 eecd2aa8df7e4779606ec547b7bf0207ebb2be10a4b332f06c3b72116f0619fe27fb651f2fd4504c73b740ab7f92468919244a615d460bb9c35085174a0dbc78
+DIST postgresql-10.15.tar.bz2 19089779 BLAKE2B 3b1b30fca0253122aa20eb3fc0cac0b022379b0f0daded46d3295e76167c0063698226198bc905bed5b689a71f4dd2bab5795861207767c2091f037a2b0e9663 SHA512 88fe322a8691692f8c1b8ca7f7a5a035c399c1d2a0e6276b60863f2c0cb8e4857b041d7364641e0738438aee0836688e712b9c176ac454ee98386dfd18754636
+DIST postgresql-11.10.tar.bz2 20003842 BLAKE2B 21446b5e9202c84dad4d6c768f16aab539e656d0a836121343ca4051269845a9ef06859ea37dab09030467336599eb1b72175115d61ca965ed74b7c2fed9ffbf SHA512 0cc0e9b0f76e00727dc699ea59a45d760d37d91ec736a62cbc9bda3e38eb1ef1565e4e399dd3ae96bad87f866e56e364f916de7740d8be6e1cfc2bf654dfbb68
 DIST postgresql-11.9.tar.bz2 19959019 BLAKE2B 655d1c9e6eebde19402a4c220ee674c589641c5b6f4e6298c8c06d3330069178952455f5af58f90b9af196ba9c8fd03db0ccd70b8bc49335e465f0ed537eaf59 SHA512 2c5c2f51aa01f02af4aa0849441767383e30fef69dd52efa442892f39d2456bfa8bf01f633a265e00eca0745e792609d2c1d33f77d8f29a02f5f374c84f2bf6e
 DIST postgresql-12.4.tar.bz2 20669776 BLAKE2B fb3f865a8a5e5280e7cc5da43f8658029170cd15dae8cc5fb1e741a122ea1f13418ac7743ec417ab4436976bc0ce12753fc8a301200143c975e8739d59816fa7 SHA512 36daf10878ca153370829178786dd6ee366ab4d4d6dc9c527536740fdb14b688ae4c33f850eb4243a7667d23f87e4bfd1ddee0755447ad4f3996e423e391c2f3
+DIST postgresql-12.5.tar.bz2 20729654 BLAKE2B 7f7458346a0823d155f5caea0061aa14048d6f3cac27b1ea23dba03b02a39f39314ad1d44e589520d5e287004ffd32e042fea99ebfeda24b2cc23867b402d336 SHA512 9895bcb1bb26206500666ab4441e663ef83702d428b85a6ff177a4eaf44b0ae06b35d5c4da2672ccb4ec18296649af95bf2f0aed526afaa6a216a8c2d2c5627e
 DIST postgresql-13.0.tar.bz2 20999465 BLAKE2B c2c6475ad3c1c79afac1bc181ae3f9b74c097f9679bf562a0f1b4e16f426c9b0235aec476582ef548d14987a9232b938f2920446a8d5a8aa08ae5752f40481f2 SHA512 1fde89487c3e50a7a07e1d42fba60d415645ea89c5d4c5c7fcc93fbd5330feca7ec991d5b274f6ab757d5d04667ca1a7efdf4eaaa760add19d2e02437465f8f5
+DIST postgresql-13.1.tar.bz2 21034192 BLAKE2B 609ac10f87da800754223c7f7d6b02efa3ed1308a5d27cc793c937be983f4041576e20de3b2efe514e3f61dc863e6212ec01d73adb93f6bcc373a596b2946675 SHA512 b7bd378db1dcb74ebcd5fffba03b82d8117d182029e4caca48eef62d8bcdbeef2c2e10f18eef0cdafb9d7acf21aa164d040e56687709f97b08c51540a786eeca
 DIST postgresql-9.5.23.tar.bz2 17682366 BLAKE2B 74713d6483ae1ad3d2dfc4b1ac9d30a6785ff34f61b735924f2d469861516ad5160cbfda9c09b96adf264237b6f3ad8fd6ddeef60b6af6b5b63d6c1a36fb9354 SHA512 b7a1e936a0043b57b3ece79610855820d2ea6a86e4a4be0c4c8358bf3e1ef8fa88bc60106d6b865d86231d16b5e3c098b4dbd93125a125b3cc5d468ffea64db1
+DIST postgresql-9.5.24.tar.bz2 17881872 BLAKE2B b86019c4616142a0f5a8db3d00422e16181650d1e1ba755bf6453b76e50b3feff75d7319839ee6f28949d743e46bbdaea32fa3d51f39dd4b4439c88943665d6d SHA512 6e649cd31f2761e2d070d8028b59a690ad76ff3d83a3aa982c4b222c8ea2927fda5e8f473330526673e27ad4b3cc99e8c66810e097c3dfc6517571405c6aede3
 DIST postgresql-9.6.19.tar.bz2 18880036 BLAKE2B ad9c5684e2c0fb276589560f7dbe01241b5caf763f5a20991244ad7b473397576c9530658eb91e085e8416156b0ac81750f08ed85d5e5a689321891d10b6e114 SHA512 4d8d4a0e4645d71683a5fccb9cd88917e1870ba139f102e0ea82da9c8d1ad669f029e0feb6d409e2016dfd247229ec7daf04f7f2de3ab6c5b4053834ac244a26
+DIST postgresql-9.6.20.tar.bz2 18944478 BLAKE2B 46c7b27ca60f967f71984d6b747c3054ae6ef4acdcbcd14cfbe3c1ede32a9303b99911e521ed0aa2ba6f899c0d8b9ec03e4e6804379ea6e2371a696f32a6f867 SHA512 6d247e5640a515fa6e6a4c68a992c83aeb19e35924b8e3d21191b3289200766588d1426c5863a13bfc4a11944da3202df9efebc94460d16454c29e5a79384c75
diff --git a/dev-db/postgresql/files/postgresql-10.0-icu68.patch b/dev-db/postgresql/files/postgresql-10.0-icu68.patch
new file mode 100644
index 000000000000..789e47f746ae
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql-10.0-icu68.patch
@@ -0,0 +1,12 @@
+diff -rupN a/src/backend/commands/collationcmds.c b/src/backend/commands/collationcmds.c
+--- a/src/backend/commands/collationcmds.c	2020-11-07 08:03:24.122756440 +0300
++++ b/src/backend/commands/collationcmds.c	2020-11-07 08:04:18.168901199 +0300
+@@ -464,7 +464,7 @@ get_icu_language_tag(const char *localen
+ 	UErrorCode	status;
+ 
+ 	status = U_ZERO_ERROR;
+-	uloc_toLanguageTag(localename, buf, sizeof(buf), TRUE, &status);
++	uloc_toLanguageTag(localename, buf, sizeof(buf), true, &status);
+ 	if (U_FAILURE(status))
+ 		ereport(ERROR,
+ 				(errmsg("could not convert locale name \"%s\" to language tag: %s",
diff --git a/dev-db/postgresql/postgresql-10.15.ebuild b/dev-db/postgresql/postgresql-10.15.ebuild
new file mode 100644
index 000000000000..ccd03770937c
--- /dev/null
+++ b/dev-db/postgresql/postgresql-10.15.ebuild
@@ -0,0 +1,459 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd
+
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris"
+
+SLOT=$(ver_cut 1)
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="https://www.postgresql.org/"
+
+IUSE="debug doc icu kerberos kernel_linux ldap libressl nls pam perl
+	  python +readline selinux +server systemd ssl static-libs tcl
+	  threads uuid xml zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+acct-group/postgres
+acct-user/postgres
+sys-apps/less
+virtual/libintl
+icu? ( dev-libs/icu:= )
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( sys-libs/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+server? ( systemd? ( sys-apps/systemd ) )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Work around PPC{,64} compilation bug where bool is already defined
+	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-10.2-no-server.patch"
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	# https://bugs.gentoo.org/753257
+	eapply "${FILESDIR}"/postgresql-10.0-icu68.patch
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !alpha spinlocks) \
+		$(use_enable debug) \
+		$(use_enable threads thread-safety) \
+		$(use_with icu) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(usex server "$(use_with systemd)" '--without-systemd') \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		$(use_enable nls)
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		serverman=(
+			initdb
+			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
+			pg_{test_{fsync,timing},upgrade,waldump}
+			post{gres,master}
+		)
+		for m in ${serverman[@]} ; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	# Don't delete libpg{port,common}.a (Bug #571046). They're always
+	# needed by extensions utilizing PGXS.
+	use static-libs || \
+		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
+			 -delete
+
+	# Make slot specific links to programs
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.6-r1" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+			systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	use server && use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+
+		if [[ -n ${REPLACING_VERSIONS} ]] ; then
+			ewarn "If your system is using 'pg_stat_statements' and you are running a"
+			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
+			ewarn "the following command after upgrading:"
+			ewarn
+			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
+		fi
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	if ! use systemd; then
+		einfo "The PostgreSQL server, by default, will log events to:"
+		einfo "    ${DATA_DIR%/}/postmaster.log"
+		einfo
+	fi
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	elif use systemd; then
+		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	else
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-11.10.ebuild b/dev-db/postgresql/postgresql-11.10.ebuild
new file mode 100644
index 000000000000..2c2d6218bcb0
--- /dev/null
+++ b/dev-db/postgresql/postgresql-11.10.ebuild
@@ -0,0 +1,461 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd
+
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+SLOT=$(ver_cut 1)
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="https://www.postgresql.org/"
+
+IUSE="debug doc icu kerberos kernel_linux ldap libressl llvm nls pam
+	  perl python +readline selinux +server systemd ssl static-libs tcl
+	  threads uuid xml zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+acct-group/postgres
+acct-user/postgres
+sys-apps/less
+virtual/libintl
+icu? ( dev-libs/icu:= )
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+llvm? (
+	sys-devel/llvm:=
+	sys-devel/clang:=
+)
+pam? ( sys-libs/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+server? ( systemd? ( sys-apps/systemd ) )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-11_beta1-no-server.patch"
+
+	if use pam ; then
+		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	# https://bugs.gentoo.org/753257
+	eapply "${FILESDIR}"/postgresql-10.0-icu68.patch
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !alpha spinlocks) \
+		$(use_enable debug) \
+		$(use_enable threads thread-safety) \
+		$(use_with icu) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with llvm) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(usex server "$(use_with systemd)" '--without-systemd') \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		$(use_enable nls)
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		serverman=(
+			initdb
+			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
+			pg_{test_{fsync,timing},upgrade,waldump}
+			post{gres,master}
+		)
+		for m in ${serverman[@]} ; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	# Don't delete libpg{port,common}.a (Bug #571046). They're always
+	# needed by extensions utilizing PGXS.
+	use static-libs || \
+		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
+			 -delete
+
+	# Make slot specific links to programs
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.6-r1" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+			systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	use server && use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+
+		if [[ -n ${REPLACING_VERSIONS} ]] ; then
+			ewarn "If your system is using 'pg_stat_statements' and you are running a"
+			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
+			ewarn "the following command after upgrading:"
+			ewarn
+			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
+		fi
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
+		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
+		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	if ! use systemd; then
+		einfo "The PostgreSQL server, by default, will log events to:"
+		einfo "    ${DATA_DIR%/}/postmaster.log"
+		einfo
+	fi
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	elif use systemd; then
+		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	else
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-12.5.ebuild b/dev-db/postgresql/postgresql-12.5.ebuild
new file mode 100644
index 000000000000..d1b15a8f3102
--- /dev/null
+++ b/dev-db/postgresql/postgresql-12.5.ebuild
@@ -0,0 +1,461 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd
+
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+SLOT=$(ver_cut 1)
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="https://www.postgresql.org/"
+
+IUSE="debug doc icu kerberos kernel_linux ldap libressl llvm nls pam
+	  perl python +readline selinux +server systemd ssl static-libs tcl
+	  threads uuid xml zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+acct-group/postgres
+acct-user/postgres
+sys-apps/less
+virtual/libintl
+icu? ( dev-libs/icu:= )
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+llvm? (
+	sys-devel/llvm:=
+	sys-devel/clang:=
+)
+pam? ( sys-libs/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+server? ( systemd? ( sys-apps/systemd ) )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-12.1-no-server.patch"
+
+	if use pam ; then
+		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	# https://bugs.gentoo.org/753257
+	eapply "${FILESDIR}"/postgresql-10.0-icu68.patch
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !alpha spinlocks) \
+		$(use_enable debug) \
+		$(use_enable threads thread-safety) \
+		$(use_with icu) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with llvm) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(usex server "$(use_with systemd)" '--without-systemd') \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		$(use_enable nls)
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		serverman=(
+			initdb
+			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
+			pg_{test_{fsync,timing},upgrade,waldump}
+			post{gres,master}
+		)
+		for m in ${serverman[@]} ; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	# Don't delete libpg{port,common}.a (Bug #571046). They're always
+	# needed by extensions utilizing PGXS.
+	use static-libs || \
+		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
+			 -delete
+
+	# Make slot specific links to programs
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.6-r1" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+			systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	use server && use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+
+		if [[ -n ${REPLACING_VERSIONS} ]] ; then
+			ewarn "If your system is using 'pg_stat_statements' and you are running a"
+			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
+			ewarn "the following command after upgrading:"
+			ewarn
+			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
+		fi
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
+		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
+		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	if ! use systemd; then
+		einfo "The PostgreSQL server, by default, will log events to:"
+		einfo "    ${DATA_DIR%/}/postmaster.log"
+		einfo
+	fi
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	elif use systemd; then
+		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	else
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-13.1.ebuild b/dev-db/postgresql/postgresql-13.1.ebuild
new file mode 100644
index 000000000000..d40e0d61ff5c
--- /dev/null
+++ b/dev-db/postgresql/postgresql-13.1.ebuild
@@ -0,0 +1,465 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+SLOT=$(ver_cut 1)
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="https://www.postgresql.org/"
+
+IUSE="debug doc icu kerberos kernel_linux ldap libressl llvm nls pam
+	  perl python +readline selinux +server systemd ssl static-libs tcl
+	  threads uuid xml zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+acct-group/postgres
+acct-user/postgres
+sys-apps/less
+virtual/libintl
+icu? ( dev-libs/icu:= )
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+llvm? (
+	sys-devel/llvm:=
+	sys-devel/clang:=
+)
+pam? ( sys-libs/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+server? ( systemd? ( sys-apps/systemd ) )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-13_beta1-no-server.patch"
+
+	if use pam ; then
+		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	# https://bugs.gentoo.org/753257
+	eapply "${FILESDIR}"/postgresql-10.0-icu68.patch
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !alpha spinlocks) \
+		$(use_enable debug) \
+		$(use_enable threads thread-safety) \
+		$(use_with icu) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with llvm) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(usex server "$(use_with systemd)" '--without-systemd') \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		$(use_enable nls)
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		serverman=(
+			initdb
+			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
+			pg_{test_{fsync,timing},upgrade,waldump}
+			post{gres,master}
+		)
+		for m in ${serverman[@]} ; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	# Don't delete libpg{port,common}.a (Bug #571046). They're always
+	# needed by extensions utilizing PGXS.
+	use static-libs || \
+		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
+			 -delete
+
+	# Make slot specific links to programs
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.6-r1" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+			systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	use server && use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+
+		if [[ -n ${REPLACING_VERSIONS} ]] ; then
+			ewarn "If your system is using 'pg_stat_statements' and you are running a"
+			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
+			ewarn "the following command after upgrading:"
+			ewarn
+			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
+		fi
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
+		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
+		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	if ! use systemd; then
+		einfo "The PostgreSQL server, by default, will log events to:"
+		einfo "    ${DATA_DIR%/}/postmaster.log"
+		einfo
+	fi
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	elif use systemd; then
+		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	else
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		# Some ICU tests fail if LC_CTYPE and LC_COLLATE aren't the same. We set
+		# LC_CTYPE to be equal to LC_COLLATE since LC_COLLATE is set by Portage.
+		local old_ctype=${LC_CTYPE}
+		export LC_CTYPE=${LC_COLLATE}
+		emake check
+		export LC_CTYPE=${old_ctype}
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-9.5.24.ebuild b/dev-db/postgresql/postgresql-9.5.24.ebuild
new file mode 100644
index 000000000000..acc5e9779fd6
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.5.24.ebuild
@@ -0,0 +1,476 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd
+
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris"
+
+SLOT=$(ver_cut 1-2)
+
+SRC_URI="https://ftp.postgresql.org/pub/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="https://www.postgresql.org/"
+
+IUSE="debug doc kerberos kernel_linux ldap libressl nls pam perl
+	  -pg-legacytimestamp python +readline selinux +server systemd ssl
+	  static-libs tcl threads uuid xml zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+acct-group/postgres
+acct-user/postgres
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( sys-libs/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Work around PPC{,64} compilation bug where bool is already defined
+	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-9.5.5-no-server.patch"
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !alpha spinlocks) \
+		$(use_enable !pg-legacytimestamp integer-datetimes) \
+		$(use_enable debug) \
+		$(use_enable threads thread-safety) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		$(use_enable nls)
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT/.}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	# Don't delete libpg{port,common}.a (Bug #571046). They're always
+	# needed by extensions utilizing PGXS.
+	use static-libs || \
+		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
+			 -delete
+
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		# Temporarily tack on tmp to workaround a file collision
+		# issue. This is only necessary for 9.7 and earlier. 10 never
+		# had this issue.
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}tmp"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+
+		docinto sgml
+		dodoc doc/src/sgml/*.{sgml,dsl}
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.2" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_preinst() {
+	# Find all of the slot-specific symlinks, if any, in /usr/bin (e.g.,
+	# /usr/bin/psql96). They may have been created by the
+	# postgresql.eselect module, but they're handled within this ebuild
+	# now. It's alright if we momentarily delete /usr/bin/psql as it
+	# will be recreated by the eselect module in pkg_ppostinst(). This
+	# is only necessary for 9.7 and earlier. 10 and later were never
+	# handled in this manner.
+	local canonicalise
+	if type -p realpath > /dev/null; then
+		canonicalise=realpath
+	elif type -p readlink > /dev/null; then
+		canonicalise='readlink -f'
+	else
+		# can't die, subshell
+		die "No readlink nor realpath found, cannot canonicalise"
+	fi
+
+	local l
+	# First remove any symlinks in /usr/bin that may have been created
+	# by the old eselect
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
+			rm "${l}" || ewarn "Couldn't remove ${l}"
+		fi
+	done
+
+	# Then move the symlinks created by the ebuild to their proper place.
+	for l in "${ED}"/usr/bin/*tmp ; do
+		mv "${l}" "${l%tmp}" \
+			|| ewarn "Couldn't rename $(basename ${l}) to $(basename ${l%tmp})"
+	done
+}
+
+pkg_postinst() {
+	use server && use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	if use alpha && use server ; then
+		ewarn "PostgreSQL 9.5+ no longer has native spinlock support on Alpha platforms."
+		ewarn "As a result, performance will be extremely degraded."
+	fi
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-9.6.20.ebuild b/dev-db/postgresql/postgresql-9.6.20.ebuild
new file mode 100644
index 000000000000..b36d51b81cea
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.6.20.ebuild
@@ -0,0 +1,481 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd
+
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+SLOT=$(ver_cut 1-2)
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="https://www.postgresql.org/"
+
+IUSE="debug doc kerberos kernel_linux ldap libressl nls pam perl
+	  -pg-legacytimestamp python +readline selinux +server systemd ssl
+	  static-libs tcl threads uuid xml zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+acct-group/postgres
+acct-user/postgres
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( sys-libs/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+server? ( systemd? ( sys-apps/systemd ) )
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Work around PPC{,64} compilation bug where bool is already defined
+	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-${SLOT}.3-no-server.patch"
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !alpha spinlocks) \
+		$(use_enable !pg-legacytimestamp integer-datetimes) \
+		$(use_enable debug) \
+		$(use_enable threads thread-safety) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(usex server "$(use_with systemd)" '--without-systemd') \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		$(use_enable nls)
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT/.}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	# Don't delete libpg{port,common}.a (Bug #571046). They're always
+	# needed by extensions utilizing PGXS.
+	use static-libs || \
+		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
+			 -delete
+
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		# Temporarily tack on tmp to workaround a file collision
+		# issue. This is only necessary for 9.7 and earlier. 10 never
+		# had this issue.
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}tmp"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+
+		docinto sgml
+		dodoc doc/src/sgml/*.{sgml,dsl}
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.6-r1" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_preinst() {
+	# Find all of the slot-specific symlinks, if any, in /usr/bin (e.g.,
+	# /usr/bin/psql96). They may have been created by the
+	# postgresql.eselect module, but they're handled within this ebuild
+	# now. It's alright if we momentarily delete /usr/bin/psql as it
+	# will be recreated by the eselect module in pkg_ppostinst(). This
+	# is only necessary for 9.7 and earlier. 10 and later were never
+	# handled in this manner.
+	local canonicalise
+	if type -p realpath > /dev/null; then
+		canonicalise=realpath
+	elif type -p readlink > /dev/null; then
+		canonicalise='readlink -f'
+	else
+		# can't die, subshell
+		die "No readlink nor realpath found, cannot canonicalise"
+	fi
+
+	local l
+	# First remove any symlinks in /usr/bin that may have been created
+	# by the old eselect
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
+			rm "${l}" || ewarn "Couldn't remove ${l}"
+		fi
+	done
+
+	# Then move the symlinks created by the ebuild to their proper place.
+	for l in "${ED}"/usr/bin/*tmp ; do
+		mv "${l}" "${l%tmp}" \
+			|| ewarn "Couldn't rename $(basename ${l}) to $(basename ${l%tmp})"
+	done
+}
+
+pkg_postinst() {
+	use server && use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	if ! use systemd; then
+		einfo "The PostgreSQL server, by default, will log events to:"
+		einfo "    ${DATA_DIR%/}/postmaster.log"
+		einfo
+	fi
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	elif use systemd; then
+		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	else
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild
index 1ca6f1f03d09..9b9884bf901e 100644
--- a/dev-db/postgresql/postgresql-9999.ebuild
+++ b/dev-db/postgresql/postgresql-9999.ebuild
@@ -455,7 +455,12 @@ pkg_config() {
 
 src_test() {
 	if [[ ${UID} -ne 0 ]] ; then
+		# Some ICU tests fail if LC_CTYPE and LC_COLLATE aren't the same. We set
+		# LC_CTYPE to be equal to LC_COLLATE since LC_COLLATE is set by Portage.
+		local old_ctype=${LC_CTYPE}
+		export LC_CTYPE=${LC_COLLATE}
 		emake check
+		export LC_CTYPE=${old_ctype}
 
 		einfo "If you think other tests besides the regression tests are necessary, please"
 		einfo "submit a bug including a patch for this ebuild to enable them."
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 15ee8b695671..b1f0383a62d6 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/avrdude/avrdude-6.3.ebuild b/dev-embedded/avrdude/avrdude-6.3.ebuild
index 8038f454685b..6e1f5db129f9 100644
--- a/dev-embedded/avrdude/avrdude-6.3.ebuild
+++ b/dev-embedded/avrdude/avrdude-6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -40,7 +40,7 @@ src_configure() {
 	export ac_cv_lib_ftdi_ftdi_usb_get_strings=$(usex ftdi)
 	export ac_cv_lib_ncurses_tputs=$(usex ncurses)
 	export ac_cv_lib_readline_readline=$(usex readline)
-	default
+	econf --disable-static
 }
 
 src_compile() {
@@ -57,4 +57,6 @@ src_install() {
 		newdoc "${DISTDIR}/${PN}-doc-${PV}.pdf" avrdude.pdf
 		dodoc -r "${WORKDIR}/avrdude-html/"
 	fi
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-embedded/avrdude/avrdude-9999.ebuild b/dev-embedded/avrdude/avrdude-9999.ebuild
index f483079be8f7..22e68dc39daf 100644
--- a/dev-embedded/avrdude/avrdude-9999.ebuild
+++ b/dev-embedded/avrdude/avrdude-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -49,7 +49,7 @@ src_configure() {
 	export ac_cv_lib_ftdi_ftdi_usb_get_strings=$(usex ftdi)
 	export ac_cv_lib_ncurses_tputs=$(usex ncurses)
 	export ac_cv_lib_readline_readline=$(usex readline)
-	default
+	econf --disable-static
 }
 
 src_compile() {
@@ -68,4 +68,6 @@ src_install() {
 
 		dodoc -r atmel-docs
 	fi
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-embedded/mcu8051ide/mcu8051ide-1.4.10.ebuild b/dev-embedded/mcu8051ide/mcu8051ide-1.4.10.ebuild
index 8d2c46293886..3a27616ef354 100644
--- a/dev-embedded/mcu8051ide/mcu8051ide-1.4.10.ebuild
+++ b/dev-embedded/mcu8051ide/mcu8051ide-1.4.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit cmake-utils
+inherit cmake-utils xdg
 
 DESCRIPTION="Graphical IDE for microcontrollers based on 8051."
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/dev-embedded/stlink/stlink-1.6.0.ebuild b/dev-embedded/stlink/stlink-1.6.0.ebuild
index 0579066f0bc7..7d2549c15a32 100644
--- a/dev-embedded/stlink/stlink-1.6.0.ebuild
+++ b/dev-embedded/stlink/stlink-1.6.0.ebuild
@@ -29,6 +29,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DSTLINK_UDEV_RULES_DIR="$(get_udevdir)"/rules.d
 		-DSTLINK_MODPROBED_DIR="${EPREFIX}/etc/modprobe.d"
+		-DSTLINK_STATIC_LIB=OFF
 		-DLIB_INSTALL_DIR:PATH="$(get_libdir)"
 	)
 
diff --git a/dev-embedded/stlink/stlink-9999.ebuild b/dev-embedded/stlink/stlink-9999.ebuild
index 479ca67cd591..cadef633bb8a 100644
--- a/dev-embedded/stlink/stlink-9999.ebuild
+++ b/dev-embedded/stlink/stlink-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -29,6 +29,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DSTLINK_UDEV_RULES_DIR="$(get_udevdir)"/rules.d
 		-DSTLINK_MODPROBED_DIR="${EPREFIX}/etc/modprobe.d"
+		-DSTLINK_STATIC_LIB=OFF
 		-DLIB_INSTALL_DIR:PATH="$(get_libdir)"
 	)
 
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 2e5b5e83e060..a62409410c12 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/libmaitretarot/libmaitretarot-0.1.98.ebuild b/dev-games/libmaitretarot/libmaitretarot-0.1.98.ebuild
index 82da3cb36b6c..ef9389f6791c 100644
--- a/dev-games/libmaitretarot/libmaitretarot-0.1.98.ebuild
+++ b/dev-games/libmaitretarot/libmaitretarot-0.1.98.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,9 +9,17 @@ SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.t
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="dev-libs/glib:2
 	dev-libs/libxml2"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-games/libmt_client/libmt_client-0.1.98.ebuild b/dev-games/libmt_client/libmt_client-0.1.98.ebuild
index 46c1e6efde71..611635f26520 100644
--- a/dev-games/libmt_client/libmt_client-0.1.98.ebuild
+++ b/dev-games/libmt_client/libmt_client-0.1.98.ebuild
@@ -12,7 +12,6 @@ SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.t
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 DEPEND="dev-libs/glib:2
 	dev-libs/libxml2
@@ -22,3 +21,12 @@ RDEPEND=${DEPEND}
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-format.patch
 }
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-games/libnw/libnw-1.30.02.ebuild b/dev-games/libnw/libnw-1.30.02.ebuild
index 7cd617c7c93e..2d64032d35d8 100644
--- a/dev-games/libnw/libnw-1.30.02.ebuild
+++ b/dev-games/libnw/libnw-1.30.02.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="Tools and libraries for NWN file manipulation"
@@ -11,21 +12,33 @@ SRC_URI="mirror://sourceforge/openknights/${P}.tar.gz"
 LICENSE="openknights"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-DEPEND="sys-devel/bison
-	sys-devel/flex"
 RDEPEND="!sci-biology/newick-utils"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex"
+
+DOCS=( AUTHORS ChangeLog NEWS README README.tech TODO )
 
 src_prepare() {
-	sed -i \
-		-e '/^CC =/d' \
-		-e '/^CXX =/d' \
-		$(find . -name Makefile.in) || die
+	default
+
+	local f
+	while IFS="" read -d $'\0' -r f; do
+		einfo "Removing hardcoded CC/CXX from ${f}"
+		sed -i \
+			-e '/^CC =/d' \
+			-e '/^CXX =/d' \
+			"${f}" || die
+	done < <(find "${S}" -name Makefile.in -type f -print0)
+}
+
+src_configure() {
 	tc-export CC CXX
+	econf --disable-static
 }
 
 src_install() {
-	DOCS="AUTHORS ChangeLog NEWS README README.tech TODO" \
-		default
+	default
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-games/paklib/paklib-0.3.ebuild b/dev-games/paklib/paklib-0.3.ebuild
index b046ce39026f..746547e06b5b 100644
--- a/dev-games/paklib/paklib-0.3.ebuild
+++ b/dev-games/paklib/paklib-0.3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="library for accessing Quake pak files"
@@ -11,19 +12,23 @@ SRC_URI="mirror://sourceforge/paklib/pak-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-S=${WORKDIR}/pak
+S="${WORKDIR}/pak"
 
 src_compile() {
-	$(tc-getCC) ${LDFLAGS} ${CFLAGS} -fPIC -shared pak.c -o libpak.so || die "pak.so failed"
-	$(tc-getCC) ${CFLAGS} -c pak.c -o libpak.a || die "pak.a failed"
+	"$(tc-getCC)" \
+		${LDFLAGS} \
+		${CFLAGS} \
+		${CPPFLAGS} \
+		-Wl,-soname,libpak.so \
+		-fPIC \
+		-shared \
+		pak.c -o libpak.so || die "pak.so failed"
 }
 
 src_install() {
 	dolib.so libpak.so
-	dolib.a libpak.a
-	insinto /usr/include
-	doins pak.h
+	doheader pak.h
+
 	dodoc AUTHORS NEWS README TODO pak.c pak.h
 }
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index cf6967c4b497..a5f774f9b113 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index c9a9cedc62ca..bf4067b1c5e3 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -2,8 +2,5 @@ DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc387
 DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
 DIST apache-tomcat-7.0.106-src.tar.gz 5302091 BLAKE2B f60975ef5570501b03e71645969170c44450f2b56f37688001ad1b4dce3a394f6800e9b28a8fabf59241116345fb7e2a287441f3eace020bc5c0203d57630c91 SHA512 5ce5a5af93c58e69c4758c2c0dedeadeceb6be920421b9d3b3d071d32fc8eb59ba8312c98d037b8434fe43d57a9f720ad8790de29a26ed2959f6c761fe1fd573
-DIST apache-tomcat-8.5.57-src.tar.gz 5730658 BLAKE2B f9bd2e159abc6af62c8681c38ea4eae8155f95df11f7c244e45018929189ef6b6a37a11e84119c3ddcb134a8ab58773add19cbab7506bb87c43b0039899fde60 SHA512 8bf4334b190c36900b708ee7097097e513f2d4572f119173bee732c76b5b660350fe516e58ac867250c2ef7a1371b55c116d3a1abd18323ceb92337f1dcb0f60
-DIST apache-tomcat-8.5.58-src.tar.gz 5773000 BLAKE2B e361cc359f86bb02fa4c39ebd51b52b4552aa78603c4d8fa5c5c8d87bcb89f6ed391408e3713a5011b7b8cc29506ad65f25b6047ec1009267ce8a68d396b3bc6 SHA512 f9e21c0c60b80e1a15049ff4ee6a4914036d19ed171c40bc614fc999c81c59c394c0a6595ac969a5b86662fa6c366676e7ecb2695c28518473b3f6c79e9a0e05
 DIST apache-tomcat-8.5.59-src.tar.gz 5787634 BLAKE2B 8ca1aa8b4d12d0e73c0d7937e906530037168ac349b196e172935332e632b1e9ab15379f532cb8fb1b2f853d01567332af9c031393882c833dcea65f9e626b09 SHA512 bed80e86c4dc972fd6ad414a804ed2bffc797e22b0a5e0e6e93c8540fb87cffb2fd2f1f8d97873a3ee24397f7961a8fdeb6756c542a532e4b73468bccec6e626
-DIST apache-tomcat-9.0.37-src.tar.gz 5894559 BLAKE2B 63148418ef96e90f212ce8a00dc6a274a8da2a1aa8a53ad0f6d3960efc8e876dd2812f425c0f21c73ee291752c5fd3bc8025eed46d18d31ae72e8bbe6dc1ba10 SHA512 6e819fe255c467b0081e91c17a53fa383fe84d922492c62d7dd93cabf00e22ab30872ecaa298a9b12977b8c7518f36c8429091b24c9fb5200db64e80e853ce98
 DIST apache-tomcat-9.0.38-src.tar.gz 5948083 BLAKE2B ac076684f10a51bf0e0b5b0dbf18ee476ec900bead0089010de7b4a7d380a1e18035eaa0d0f661c863aa53491e51f719c2a5985e4791bcc9dada4c421db39fe7 SHA512 13c79abed71ead564b108ec8a046e78374611acd906f4b6e775ac0427446117192be6b25f29894e625e2dc13f79abbc97bc52b32120ce5701cbe0f5ae05bc57b
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.57.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.57.ebuild
deleted file mode 100644
index 05c60361600c..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.57.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.1"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8"
-
-S="${WORKDIR}/${MY_P}/"
-
-src_prepare() {
-	default
-
-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
-	rm -fR */*/build.xml
-	einfo "Removing bundled jars and classes"
-	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/output/build/lib/*.jar
-	use source && java-pkg_dosrc java/javax/servlet/
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.58.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.58.ebuild
deleted file mode 100644
index 05c60361600c..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.58.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.1"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8"
-
-S="${WORKDIR}/${MY_P}/"
-
-src_prepare() {
-	default
-
-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
-	rm -fR */*/build.xml
-	einfo "Removing bundled jars and classes"
-	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/output/build/lib/*.jar
-	use source && java-pkg_dosrc java/javax/servlet/
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.59.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.59.ebuild
index fcb11c58fd93..05c60361600c 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.59.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.59.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.37.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.37.ebuild
deleted file mode 100644
index 585a158ab74f..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.37.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${PN}-${PV}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4.0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8"
-
-S="${WORKDIR}/${MY_P}/"
-
-src_prepare() {
-	default
-
-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
-	rm -fR */*/build.xml
-	einfo "Removing bundled jars and classes"
-	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/output/build/lib/*.jar
-	use source && java-pkg_dosrc java/javax/servlet/
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 0236b36c4e31..f2c7f5d68d05 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/duktape/Manifest b/dev-lang/duktape/Manifest
index 7099c24cff5b..a9ff63d0552c 100644
--- a/dev-lang/duktape/Manifest
+++ b/dev-lang/duktape/Manifest
@@ -1,2 +1,3 @@
 DIST duktape-2.4.0.tar.xz 1027744 BLAKE2B 9fb74b0586a5ccf5ef80d69955ab0ddb94428d463e300a558b5ab6e279d2c416b794434466604caa80581883df85f889694af1dd3ea0aaa4a3d53babb855f3ef SHA512 be6b7c73ae7c3419e8ced375fcff9680946e780b71d30e3be4e4e3b4b3a2710aa8f86530081c64958507a11fc215cacc5409c7d3a1d30b757838a00c748fa281
 DIST duktape-2.5.0.tar.xz 1031188 BLAKE2B 15d9190e9c723bacf8249ea31bf528793ca06e86d2697648192fee50b4ba2f7cf091e1392ac14a7a5c35b05a3ff5f200e0318cc8a4b873ad26f0c97683a2cb72 SHA512 230e298a91cb48407d7c2a4b7c85cf9d53151d550e2fd7ba6cb8f9115682abce295fb78a3c3cd22b4812ce86944dd6d28c2b25c3845668a17232e3a08ea63837
+DIST duktape-2.6.0.tar.xz 1035160 BLAKE2B 98155e1bf7e76aab37f5ccdb951d9d456df3d984ebed5058d8931e25317ffd94b4d95f08e102eb6eb2fa36ab6d2d60be6072b4101b7754e1c1440f7d6fb2c91b SHA512 d72a2aaa05391fa243861aca6ca6082f91a08b9c5d60c7b246d35d7161532b0048bb67bd8fec7996c700ee317ac2bb52e528582682e5425b0431757d8b1c5be4
diff --git a/dev-lang/duktape/duktape-2.6.0.ebuild b/dev-lang/duktape/duktape-2.6.0.ebuild
new file mode 100644
index 000000000000..f84cdd45b4bd
--- /dev/null
+++ b/dev-lang/duktape/duktape-2.6.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Embeddable Javascript engine"
+HOMEPAGE="https://duktape.org"
+SRC_URI="https://duktape.org/${P}.tar.xz"
+
+LICENSE="MIT"
+# Upstream don't maintain binary compatibility
+# https://github.com/svaarala/duktape/issues/1524
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.6.0-respect-tc-env.patch"
+)
+
+src_prepare() {
+	# Set install path
+	sed -i "s#INSTALL_PREFIX = /usr/local#INSTALL_PREFIX = ${D%/}/usr#" \
+			Makefile.sharedlibrary || die "failed to set install path"
+
+	# Edit pkgconfig
+	sed "s#VERSION#${PV}#" "${FILESDIR}/${PN}.pc" > "${S}/${PN}.pc" || die
+	sed -i "s#LIBDIR#$(get_libdir)#" "${S}/${PN}.pc" || die
+
+	# Set lib folder
+	sed -i "s#(INSTALL_PREFIX)/lib#(INSTALL_PREFIX)/$(get_libdir)#" \
+		Makefile.sharedlibrary || die
+
+	mv Makefile.sharedlibrary Makefile || die "failed to rename makefile"
+
+	default
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dodir /usr/$(get_libdir)
+	dodir /usr/include
+	emake install
+
+	insinto /usr/$(get_libdir)/pkgconfig/
+	doins "${S}/${PN}.pc"
+}
diff --git a/dev-lang/duktape/files/duktape-2.6.0-respect-tc-env.patch b/dev-lang/duktape/files/duktape-2.6.0-respect-tc-env.patch
new file mode 100644
index 000000000000..ab58e7f9a6d7
--- /dev/null
+++ b/dev-lang/duktape/files/duktape-2.6.0-respect-tc-env.patch
@@ -0,0 +1,33 @@
+diff --git a/Makefile b/Makefile
+index 156ea96..a0997b1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -52,7 +52,7 @@ INSTALL_PREFIX = /var/tmp/portage/dev-lang/duktape-2.6.0/image/usr
+ DUKTAPE_SRCDIR = ./src
+ #DUKTAPE_SRCDIR = ./src-noline
+ 
+-CC = gcc
++CC ?= gcc
+ 
+ .PHONY: all
+ all: libduktape.$(SO_REALNAME_SUFFIX) libduktaped.$(SO_REALNAME_SUFFIX)
+@@ -62,11 +62,11 @@ all: libduktape.$(SO_REALNAME_SUFFIX) libduktaped.$(SO_REALNAME_SUFFIX)
+ # to $INSTALL_PREFIX/include on installation.
+ 
+ libduktape.$(SO_REALNAME_SUFFIX):
+-	$(CC) -shared -fPIC -Wall -Wextra -Os -Wl,$(LD_SONAME_ARG),libduktape.$(SO_SONAME_SUFFIX) \
++	$(CC) -shared -fPIC ${CFLAGS} ${LDFLAGS} -Wl,$(LD_SONAME_ARG),libduktape.$(SO_SONAME_SUFFIX) -lm \
+ 		-o $@ $(DUKTAPE_SRCDIR)/duktape.c
+ 
+ libduktaped.$(SO_REALNAME_SUFFIX):
+-	$(CC) -shared -fPIC -g -Wall -Wextra -Os -Wl,$(LD_SONAME_ARG),libduktaped.$(SO_SONAME_SUFFIX) \
++	$(CC) -shared -fPIC ${CFLAGS} ${LDFLAGS}  -Wl,$(LD_SONAME_ARG),libduktaped.$(SO_SONAME_SUFFIX) -lm \
+ 		-o $@ $(DUKTAPE_SRCDIR)/duktape.c
+ 
+ # Symlinks depend on platform conventions.
+@@ -85,4 +85,4 @@ install: libduktape.$(SO_REALNAME_SUFFIX) libduktaped.$(SO_REALNAME_SUFFIX)
+ 
+ CCOPTS = -I./examples/cmdline
+ duk:
+-	$(CC) $(CCOPTS) -I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib64 -Wall -Wextra -Os -o $@ ./examples/cmdline/duk_cmdline.c -lduktape -lm
++	$(CC) $(CCOPTS) -I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib64 ${CFLAGS} -o $@ ./examples/cmdline/duk_cmdline.c -lduktape -lm
diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest
index 7955a4a57e30..3be61950c00e 100644
--- a/dev-lang/elixir/Manifest
+++ b/dev-lang/elixir/Manifest
@@ -1,3 +1,2 @@
 DIST elixir-1.10.4.tar.gz 2331003 BLAKE2B 8cb54bcb16762ae345ad9d36a25c28696fd5bb57cf97c5037c21458671e001cfe51a722287243c6a70fe3cea65c9c219e759c8312fc168e93974ac5f0870b47a SHA512 844e405cf344539a9d32dc7f1ead0dc1dfb0d70a9ab718269f4e25e5262f611f96346f5be93cf8e34a75c58c6aabb12e8a796c5cb182955922510c270ef169e7
-DIST elixir-1.11.1.tar.gz 2390974 BLAKE2B 2cf8d3490bcd40e6157a2ce1f21087591db2586fd259d1a287883c4dbc74cd21ccefc1393c37401aaa635abd0848333682965cdf405def6849f5dad919458a0f SHA512 39f8e0cf14545b3ec72e6bfb414204869f8e252e0d2b5538b85d966fcc7c7879b1696d7a02e0e230d38bda20559a14ab03699f9c65cbf4c37d33e8aeadf6ec53
 DIST elixir-1.11.2.tar.gz 2391833 BLAKE2B 1c11e96830c8719e05e5bc832d4e1d9ca5bb8036803360568fbf4a06a11bb8eb4656aaf1e57a7e04669ddc240d1c04c6a15475e98fcf613ea8bf52b15723fe7f SHA512 472a531353d5f393b0223008ac95ae67b0dc6708143df59a4dd359fdb631329f8a8bded886f53be232e076d194e14a76325fab51a59ec2451706f4f35836bc70
diff --git a/dev-lang/elixir/elixir-1.11.1.ebuild b/dev-lang/elixir/elixir-1.11.1.ebuild
deleted file mode 100644
index 74f24bfac275..000000000000
--- a/dev-lang/elixir/elixir-1.11.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Elixir programming language"
-HOMEPAGE="https://elixir-lang.org"
-SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 ErlPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-lang/erlang-21:0=[ssl]
-"
-# 'mix' tool collides with sci-biology/phylip, bug #537514
-RDEPEND="${DEPEND}
-	!!sci-biology/phylip
-"
-DEPEND+="
-	test? ( dev-vcs/git )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.1-disable-network-tests.patch
-	"${FILESDIR}"/${PN}-1.10.3-no-Q.patch
-	"${FILESDIR}"/${PN}-1.10.3-epmd-daemon.patch
-)
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="${EPREFIX}/usr" install
-	dodoc README.md CHANGELOG.md CODE_OF_CONDUCT.md
-}
diff --git a/dev-lang/erlang/erlang-23.1.1.ebuild b/dev-lang/erlang/erlang-23.1.1.ebuild
index 29722820b306..d5356fa36a45 100644
--- a/dev-lang/erlang/erlang-23.1.1.ebuild
+++ b/dev-lang/erlang/erlang-23.1.1.ebuild
@@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
 # 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"
+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="
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index e5721fc39ea2..8ae550c5ca00 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,6 +1,2 @@
-DIST go1.14.10.src.tar.gz 22542956 BLAKE2B 9f056e5cf69ca7e0a73372b9b373c534fb638868e32ae37258c4d7d927f880879b337274111d1d1bb8ad253c3a629c5d618ad00a2a973a55d784c8989013ab3a SHA512 f33fd3a06088f9b3594632e0429d3543987f0f93bf52a7383a05e0d845f981fd437d5545cebed6c146a500570f3fbdc35765d842c4c08cfc695a2c3b64223626
-DIST go1.14.11.src.tar.gz 22552087 BLAKE2B d75ecaa1fd385c2efc578db30bd9f2146c9f06bc5a9293937a83bae95e74cb026d2d0dd601442ebc3fcae6f2a364a524f076c3fc0369136b46d8e1874f5cf4f1 SHA512 93cac0ee9f499417dfdc196eb12a91f335ec5693be59d08f9fa3fa5202f717789408077b8180ce9122079768cb94a7293875c0fab2ebef2ecf2c83a86ca0a4ec
 DIST go1.14.12.src.tar.gz 22553834 BLAKE2B f2b3f750cc451c00376846962a5337c8e57aa9f4f737c7a8ab826772547ca0677bb3c6e52d004259f7e53d49efb013f645ce5223241fd29b35121149dc09a76c SHA512 cba26b97878d5bd57d75bd1541932786779ddb7e9fa0bfb7bf003c7ae9e7bee8318c0d2108ce918453b863892b8f562e481bd0ed6cfc44e43d901522603adff2
-DIST go1.15.3.src.tar.gz 23015071 BLAKE2B a2f4f944cdd7347c2b01abe1e4da66559e07571c3f822a8502164a791e3c5d5e7b36907910392ec940361b644a08609f0a7635bfea9f990ec1ae8fd499cb2b87 SHA512 883fb327ce8aec77381aaa01e95acd0826c74d56a769d2077449b964411e30a5844117fdd941737015983c451a3e8d419bd40954842b199a09c26704577b5bca
-DIST go1.15.4.src.tar.gz 23017785 BLAKE2B f398ea81f925d342ddc24bd24d4081278b7329757436bf5f3835bc8ac830b61965d96d2b4f72c5a491c13a83102abce2344c826da52066faf7e7670cda35de63 SHA512 84fc687806d7904be0afcdfb4f45a74b4b45820c5c79b21b0c82cd51d07f3f8ae37e7f80730a411b96bdcf7f635b473ab0233c1bce977d2cf307d9a63aeb3df5
 DIST go1.15.5.src.tar.gz 23019303 BLAKE2B 549f0e9c4e22432db7a1c6e06724d6ada0ac90c09c0886d3053296390d85686df89bcaff86c703e8a2789119f670ffb2c6c11f4bf7e186c14a75896e8e6b8c6e SHA512 8e1d71f628d364b949b1e124af8950a563bbe9d9ae73b94c66af6ce029f67c26e2654556c0c118d0bc8566af52a7e9ed736b4667bbef7ccdab2bd338c43e6eb4
diff --git a/dev-lang/go/go-1.14.10.ebuild b/dev-lang/go/go-1.14.10.ebuild
deleted file mode 100644
index 178eb1504f2f..000000000000
--- a/dev-lang/go/go-1.14.10.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-case ${PV}  in
-*9999*)
-	EGIT_REPO_URI="https://github.com/golang/go.git"
-	inherit git-r3
-	;;
-*)
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-	S="${WORKDIR}"/go
-	case ${PV} in
-	*_beta*|*_rc*) ;;
-	*)
-		KEYWORDS="-* amd64 arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-		;;
-	esac
-esac
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://golang.org"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-
-BDEPEND="|| (
-		dev-lang/go
-		dev-lang/go-bootstrap )"
-RDEPEND="!<dev-go/go-tools-0_pre20150902"
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-AUTHORS
-CONTRIBUTING.md
-CONTRIBUTORS
-PATENTS
-README.md
-)
-
-go_arch()
-{
-	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
-	esac
-}
-
-go_arm()
-{
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os()
-{
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple()
-{
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile()
-{
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-src_compile()
-{
-	if has_version -b dev-lang/go; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
-	elif has_version -b dev-lang/go-bootstrap; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
-	else
-		eerror "Go cannot be built without go or go-bootstrap installed"
-		die "Should not be here, please report a bug"
-	fi
-
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="$(pwd)"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	if [[ ${ARCH} == arm ]]; then
-		export GOARM=$(go_arm)
-	fi
-
-	cd src
-	bash -x ./make.bash || die "build failed"
-}
-
-src_test()
-{
-	go_cross_compile && return 0
-
-	cd src
-	PATH="${GOBIN}:${PATH}" \
-	./run.bash -no-rebuild || die "tests failed"
-	cd ..
-	rm -fr pkg/*_race || die
-	rm -fr pkg/obj/go-build || die
-}
-
-src_install()
-{
-	local bin_path f x
-
-	dodir /usr/lib/go
-
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# [1] https://golang.org/issue/2775
-	#
-	# deliberately use cp to retain permissions
-	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-	# testdata directories are not needed on the installed system
-	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-	einstalldocs
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_name for test object (binutils_test) on Darwin, it
-		# is never used in real circumstances
-		local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
-		      libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
-		install_name_tool -id "${libmac64}" "${D}${libmac64}"
-	fi
-}
diff --git a/dev-lang/go/go-1.14.11.ebuild b/dev-lang/go/go-1.14.11.ebuild
deleted file mode 100644
index fa07749bdeb3..000000000000
--- a/dev-lang/go/go-1.14.11.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-case ${PV}  in
-*9999*)
-	EGIT_REPO_URI="https://github.com/golang/go.git"
-	inherit git-r3
-	;;
-*)
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-	S="${WORKDIR}"/go
-	case ${PV} in
-	*_beta*|*_rc*) ;;
-	*)
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-		;;
-	esac
-esac
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://golang.org"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-
-BDEPEND="|| (
-		dev-lang/go
-		dev-lang/go-bootstrap )"
-RDEPEND="!<dev-go/go-tools-0_pre20150902"
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-AUTHORS
-CONTRIBUTING.md
-CONTRIBUTORS
-PATENTS
-README.md
-)
-
-go_arch()
-{
-	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
-	esac
-}
-
-go_arm()
-{
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os()
-{
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple()
-{
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile()
-{
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-src_compile()
-{
-	if has_version -b dev-lang/go; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
-	elif has_version -b dev-lang/go-bootstrap; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
-	else
-		eerror "Go cannot be built without go or go-bootstrap installed"
-		die "Should not be here, please report a bug"
-	fi
-
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="$(pwd)"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	if [[ ${ARCH} == arm ]]; then
-		export GOARM=$(go_arm)
-	fi
-
-	cd src
-	bash -x ./make.bash || die "build failed"
-}
-
-src_test()
-{
-	go_cross_compile && return 0
-
-	cd src
-	PATH="${GOBIN}:${PATH}" \
-	./run.bash -no-rebuild || die "tests failed"
-	cd ..
-	rm -fr pkg/*_race || die
-	rm -fr pkg/obj/go-build || die
-}
-
-src_install()
-{
-	local bin_path f x
-
-	dodir /usr/lib/go
-
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# [1] https://golang.org/issue/2775
-	#
-	# deliberately use cp to retain permissions
-	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-	# testdata directories are not needed on the installed system
-	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-	einstalldocs
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_name for test object (binutils_test) on Darwin, it
-		# is never used in real circumstances
-		local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
-		      libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
-		install_name_tool -id "${libmac64}" "${D}${libmac64}"
-	fi
-}
diff --git a/dev-lang/go/go-1.14.12.ebuild b/dev-lang/go/go-1.14.12.ebuild
index 722bf3bbbee6..7c0569dd4b05 100644
--- a/dev-lang/go/go-1.14.12.ebuild
+++ b/dev-lang/go/go-1.14.12.ebuild
@@ -21,7 +21,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 arm arm64 ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
diff --git a/dev-lang/go/go-1.15.3.ebuild b/dev-lang/go/go-1.15.3.ebuild
deleted file mode 100644
index 178eb1504f2f..000000000000
--- a/dev-lang/go/go-1.15.3.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-case ${PV}  in
-*9999*)
-	EGIT_REPO_URI="https://github.com/golang/go.git"
-	inherit git-r3
-	;;
-*)
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-	S="${WORKDIR}"/go
-	case ${PV} in
-	*_beta*|*_rc*) ;;
-	*)
-		KEYWORDS="-* amd64 arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-		;;
-	esac
-esac
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://golang.org"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-
-BDEPEND="|| (
-		dev-lang/go
-		dev-lang/go-bootstrap )"
-RDEPEND="!<dev-go/go-tools-0_pre20150902"
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-AUTHORS
-CONTRIBUTING.md
-CONTRIBUTORS
-PATENTS
-README.md
-)
-
-go_arch()
-{
-	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
-	esac
-}
-
-go_arm()
-{
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os()
-{
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple()
-{
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile()
-{
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-src_compile()
-{
-	if has_version -b dev-lang/go; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
-	elif has_version -b dev-lang/go-bootstrap; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
-	else
-		eerror "Go cannot be built without go or go-bootstrap installed"
-		die "Should not be here, please report a bug"
-	fi
-
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="$(pwd)"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	if [[ ${ARCH} == arm ]]; then
-		export GOARM=$(go_arm)
-	fi
-
-	cd src
-	bash -x ./make.bash || die "build failed"
-}
-
-src_test()
-{
-	go_cross_compile && return 0
-
-	cd src
-	PATH="${GOBIN}:${PATH}" \
-	./run.bash -no-rebuild || die "tests failed"
-	cd ..
-	rm -fr pkg/*_race || die
-	rm -fr pkg/obj/go-build || die
-}
-
-src_install()
-{
-	local bin_path f x
-
-	dodir /usr/lib/go
-
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# [1] https://golang.org/issue/2775
-	#
-	# deliberately use cp to retain permissions
-	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-	# testdata directories are not needed on the installed system
-	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-	einstalldocs
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_name for test object (binutils_test) on Darwin, it
-		# is never used in real circumstances
-		local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
-		      libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
-		install_name_tool -id "${libmac64}" "${D}${libmac64}"
-	fi
-}
diff --git a/dev-lang/go/go-1.15.4.ebuild b/dev-lang/go/go-1.15.4.ebuild
deleted file mode 100644
index fa07749bdeb3..000000000000
--- a/dev-lang/go/go-1.15.4.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-case ${PV}  in
-*9999*)
-	EGIT_REPO_URI="https://github.com/golang/go.git"
-	inherit git-r3
-	;;
-*)
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-	S="${WORKDIR}"/go
-	case ${PV} in
-	*_beta*|*_rc*) ;;
-	*)
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-		;;
-	esac
-esac
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://golang.org"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-
-BDEPEND="|| (
-		dev-lang/go
-		dev-lang/go-bootstrap )"
-RDEPEND="!<dev-go/go-tools-0_pre20150902"
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-AUTHORS
-CONTRIBUTING.md
-CONTRIBUTORS
-PATENTS
-README.md
-)
-
-go_arch()
-{
-	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
-	esac
-}
-
-go_arm()
-{
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os()
-{
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple()
-{
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile()
-{
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-src_compile()
-{
-	if has_version -b dev-lang/go; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
-	elif has_version -b dev-lang/go-bootstrap; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
-	else
-		eerror "Go cannot be built without go or go-bootstrap installed"
-		die "Should not be here, please report a bug"
-	fi
-
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="$(pwd)"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	if [[ ${ARCH} == arm ]]; then
-		export GOARM=$(go_arm)
-	fi
-
-	cd src
-	bash -x ./make.bash || die "build failed"
-}
-
-src_test()
-{
-	go_cross_compile && return 0
-
-	cd src
-	PATH="${GOBIN}:${PATH}" \
-	./run.bash -no-rebuild || die "tests failed"
-	cd ..
-	rm -fr pkg/*_race || die
-	rm -fr pkg/obj/go-build || die
-}
-
-src_install()
-{
-	local bin_path f x
-
-	dodir /usr/lib/go
-
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# [1] https://golang.org/issue/2775
-	#
-	# deliberately use cp to retain permissions
-	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-	# testdata directories are not needed on the installed system
-	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-	einstalldocs
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_name for test object (binutils_test) on Darwin, it
-		# is never used in real circumstances
-		local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
-		      libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
-		install_name_tool -id "${libmac64}" "${D}${libmac64}"
-	fi
-}
diff --git a/dev-lang/go/go-1.15.5.ebuild b/dev-lang/go/go-1.15.5.ebuild
index 722bf3bbbee6..7c0569dd4b05 100644
--- a/dev-lang/go/go-1.15.5.ebuild
+++ b/dev-lang/go/go-1.15.5.ebuild
@@ -21,7 +21,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 arm arm64 ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index 2505b266f4d4..56014cc9fe1a 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -3,3 +3,4 @@ DIST lua-5.2.2-tests.tar.gz 76629 BLAKE2B 323eaae02ee61cfde2535d606ed704d964461c
 DIST lua-5.2.4.tar.gz 252651 BLAKE2B 6f20308d8413438f8446040e8de16274837cb55e626b98a0ae8cfe279dc8610fa2e032a2ce53ef3acda4b96a7198123cbc18eff16775f952e6dc0355fdf331b0 SHA512 cd77148aba4b707b6c159758b5e8444e04f968092eb98f6b4c405b2fb647e709370d5a8dcf604176101d3407e196a7433b5dcdce4fe9605c76191d3649d61a8c
 DIST lua-5.3.4-tests.tar.gz 103438 BLAKE2B ac82708022e7729039111c3df4fe24302c8d0efb224afb4828871ac085a3d64c41d674a6f9369035de01ed1f7f75a3d2ce16917f37e774e923216aac0be03e09 SHA512 79575d100a2efabc8243f55b55d912443e09ef7e8b0219cb93541d85c2ba802fb9538015e1228703f09ca57bdb28a640a8f1fa0735716ba1e4bca2179c712dfb
 DIST lua-5.3.5.tar.gz 303543 BLAKE2B 8890fa70fcfb869296bc74c754dc30621a3786d4b38dd35ef9e57ca46ee4b3df12dac1b86109be0823847499ff6b0d95de11f446c4c22de440ae3bb704e5068b SHA512 4f9516acc4659dfd0a9e911bfa00c0788f0ad9348e5724fe8fb17aac59e9c0060a64378f82be86f8534e49c6c013e7488ad17321bafcc787831d3d67406bd0f4
+DIST lua-5.3.6.tar.gz 303770 BLAKE2B 07c37c56f43095a4f6ca8eb8b3adf19afd53107c02b62b2bcb3619565cb2100d5f823493eef93092d5e312b30fc28885a6d9e8f0ba5a23b5bed86dc4515a5d61 SHA512 ccc380d5e114d54504de0bfb0321ca25ec325d6ff1bfee44b11870b660762d1a9bf120490c027a0088128b58bb6b5271bbc648400cab84d2dc22b512c4841681
diff --git a/dev-lang/lua/lua-5.1.5-r105.ebuild b/dev-lang/lua/lua-5.1.5-r105.ebuild
new file mode 100644
index 000000000000..abdd584d449f
--- /dev/null
+++ b/dev-lang/lua/lua-5.1.5-r105.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib multilib-minimal portability toolchain-funcs versionator
+
+DESCRIPTION="A powerful light-weight programming language designed for extending applications"
+HOMEPAGE="http://www.lua.org/"
+SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="5.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+deprecated emacs readline static"
+
+RDEPEND="readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )
+	app-eselect/eselect-lua
+	!dev-lang/lua:0"
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+PDEPEND="emacs? ( app-emacs/lua-mode )"
+
+SAN_SLOT="${SLOT//.}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/lua${SLOT}/luaconf.h
+)
+
+src_prepare() {
+	local PATCH_PV=$(get_version_component_range 1-2)
+
+	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r2.patch
+	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
+
+	# use glibtool on Darwin (versus Apple libtool)
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e '/LIBTOOL = /s:libtool:glibtool:' \
+			Makefile src/Makefile || die
+	fi
+
+	#EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
+
+	# correct lua versioning
+	sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:5:1/' src/Makefile
+
+	sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
+
+	if ! use deprecated ; then
+		# patches from 5.1.4 still apply
+		epatch "${FILESDIR}"/${PN}-5.1.4-deprecated.patch
+		epatch "${FILESDIR}"/${PN}-5.1.4-test.patch
+	fi
+
+	if ! use readline ; then
+		epatch "${FILESDIR}"/${PN}-${PATCH_PV}-readline.patch
+	fi
+
+	# Using dynamic linked lua is not recommended for performance
+	# reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
+	# Mainly, this is of concern if your arch is poor with GPRs, like x86
+	# Note that this only affects the interpreter binary (named lua), not the lua
+	# compiler (built statically) nor the lua libraries (both shared and static
+	# are installed)
+	if use static ; then
+		epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make_static-r1.patch
+	fi
+
+	# A slotted Lua uses different directories for headers & names for
+	# libraries, and pkgconfig should reflect that.
+	sed -r -i \
+		-e "/^INSTALL_INC=/s,(/include)$,\1/lua${SLOT}," \
+		-e "/^includedir=/s,(/include)$,\1/lua${SLOT}," \
+		-e "/^Libs:/s,((-llua)($| )),\2${SLOT}\3," \
+		"${S}"/etc/lua.pc
+
+	# custom Makefiles
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# We want packages to find our things...
+	sed -i \
+		-e 's:/usr/local:'${EPREFIX}'/usr:' \
+		-e "s:\([/\"]\)\<lib\>:\1$(get_libdir):g" \
+		etc/lua.pc src/luaconf.h || die
+}
+
+multilib_src_compile() {
+	tc-export CC
+	myflags=
+	# what to link to liblua
+	liblibs="-lm"
+	liblibs="${liblibs} $(dlopen_lib)"
+
+	# what to link to the executables
+	mylibs=
+	if use readline; then
+		mylibs="-lreadline"
+	fi
+
+	cd src
+	emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${CFLAGS}" \
+			RPATH="${EPREFIX}/usr/$(get_libdir)/" \
+			LUA_LIBS="${mylibs}" \
+			LIB_LIBS="${liblibs}" \
+			V=$(get_version_component_range 1-2) \
+			gentoo_all
+
+	mv lua_test ../test/lua.static
+}
+
+multilib_src_install() {
+	emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
+			V=${SLOT} gentoo_install
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	newins etc/lua.pc lua${SLOT}.pc
+}
+
+multilib_src_install_all() {
+	dodoc HISTORY README
+	dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
+
+	doicon etc/lua.ico
+
+	newman doc/lua.1 lua${SLOT}.1
+	newman doc/luac.1 luac${SLOT}.1
+}
+
+multilib_src_test() {
+	local positive="bisect cf echo env factorial fib fibfor hello printf sieve
+	sort trace-calls trace-globals"
+	local negative="readonly"
+	local test
+
+	cd "${BUILD_DIR}" || die
+	for test in ${positive}; do
+		test/lua.static test/${test}.lua || die "test $test failed"
+	done
+
+	for test in ${negative}; do
+		test/lua.static test/${test}.lua && die "test $test failed"
+	done
+}
diff --git a/dev-lang/lua/lua-5.3.6.ebuild b/dev-lang/lua/lua-5.3.6.ebuild
new file mode 100644
index 000000000000..954451da521b
--- /dev/null
+++ b/dev-lang/lua/lua-5.3.6.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils autotools multilib multilib-minimal portability toolchain-funcs versionator
+
+DESCRIPTION="A powerful light-weight programming language designed for extending applications"
+HOMEPAGE="http://www.lua.org/"
+TEST_PV="5.3.4" # no 5.3.5-specific release yet
+TEST_A="${PN}-${TEST_PV}-tests.tar.gz"
+PKG_A="${P}.tar.gz"
+SRC_URI="
+	http://www.lua.org/ftp/${PKG_A}
+	test? ( https://www.lua.org/tests/${TEST_A} )"
+
+LICENSE="MIT"
+SLOT="5.3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+deprecated emacs readline static test test-complete"
+RESTRICT="!test? ( test )"
+
+RDEPEND="readline? ( sys-libs/readline:0= )
+	app-eselect/eselect-lua
+	!dev-lang/lua:0"
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+PDEPEND="emacs? ( app-emacs/lua-mode )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/lua${SLOT}/luaconf.h
+)
+
+src_prepare() {
+	local PATCH_PV=$(get_version_component_range 1-2)
+
+	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
+
+	# use glibtool on Darwin (versus Apple libtool)
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \
+			Makefile src/Makefile || die
+	fi
+
+	[ -d "${FILESDIR}/${PV}" ] && \
+		EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
+
+	# correct lua versioning
+	sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die
+
+	sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
+
+	if ! use readline ; then
+		sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h || die
+	fi
+
+	# Using dynamic linked lua is not recommended for performance
+	# reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
+	# Mainly, this is of concern if your arch is poor with GPRs, like x86
+	# Note that this only affects the interpreter binary (named lua), not the lua
+	# compiler (built statically) nor the lua libraries (both shared and static
+	# are installed)
+	if use static ; then
+		sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile || die
+	fi
+
+	# upstream does not use libtool, but we do (see bug #336167)
+	cp "${FILESDIR}/configure.in" "${S}/configure.ac" || die
+	eautoreconf
+
+	# custom Makefiles
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	sed -i \
+		-e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
+		-e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
+		src/luaconf.h \
+	|| die "failed patching luaconf.h"
+
+	econf
+}
+
+multilib_src_compile() {
+	tc-export CC
+
+	# what to link to liblua
+	liblibs="-lm"
+	liblibs="${liblibs} $(dlopen_lib)"
+
+	# what to link to the executables
+	mylibs=
+	use readline && mylibs="-lreadline"
+
+	cd src
+
+	local myCFLAGS=""
+	use deprecated && myCFLAGS="-DLUA_COMPAT_ALL"
+
+	case "${CHOST}" in
+		*-mingw*) : ;;
+		*) myCFLAGS+=" -DLUA_USE_LINUX" ;;
+	esac
+
+	emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \
+			SYSLDFLAGS="${LDFLAGS}" \
+			RPATH="${EPREFIX}/usr/$(get_libdir)/" \
+			LUA_LIBS="${mylibs}" \
+			LIB_LIBS="${liblibs}" \
+			V=$(get_version_component_range 1-2) \
+			gentoo_all
+}
+
+multilib_src_install() {
+	emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
+			V=${SLOT} gentoo_install
+
+	case $SLOT in
+		0)
+			LIBNAME="lua"
+			INCLUDEDIR_SUFFIX=''
+			;;
+		*)	LIBNAME="lua${SLOT}"
+			INCLUDEDIR_SUFFIX="/lua${SLOT}"
+			;;
+	esac
+
+	# We want packages to find our things...
+	# A slotted Lua uses different directories for headers & names for
+	# libraries, and pkgconfig should reflect that.
+	local PATCH_PV=$(get_version_component_range 1-2)
+	cp "${FILESDIR}/lua.pc" "${WORKDIR}" || die
+	sed -r -i \
+		-e "/^INSTALL_INC=/s,(/include)$,\1/lua${SLOT}," \
+		-e "s:^prefix= :prefix= ${EPREFIX}:" \
+		-e "s:^V=.*:V= ${PATCH_PV}:" \
+		-e "s:^R=.*:R= ${PV}:" \
+		-e "s:/,lib,:/$(get_libdir):g" \
+		-e "/^Libs:/s:( )(-llua)($| ):\1-l${LIBNAME}\3:" \
+		-e "/^includedir=/s:include$:include${INCLUDEDIR_SUFFIX}:" \
+		"${WORKDIR}/lua.pc" || die
+
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc"
+	# Copy Debian's symlink support:
+	# https://salsa.debian.org/lua-team/lua5.3/blob/master/debian/rules#L19
+	# FreeBSD calls the pkgconfig 'lua-5.3.pc'
+	# Older systems called it 'lua53.pc'
+	dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua-${SLOT}.pc"
+	dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua${SLOT/.}.pc"
+}
+
+multilib_src_install_all() {
+	dodoc README
+	dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
+
+	newman doc/lua.1 lua${SLOT}.1
+	newman doc/luac.1 luac${SLOT}.1
+}
+
+# Makefile contains a dummy target that doesn't do tests
+# but causes issues with slotted lua (bug #510360)
+src_test() {
+	debug-print-function ${FUNCNAME} "$@"
+	cd "${WORKDIR}/lua-${TEST_PV}-tests" || die
+	# https://www.lua.org/tests/
+	# There are two sets:
+	# basic
+	# complete.
+	#
+	# The basic subset is selected by passing -e'_U=true'
+	# The complete set is noted to contain tests that may consume too much memory or have non-portable tests.
+	# attrib.lua for example needs some multilib customization (have to compile the stuff in libs/ for each ABI)
+	use test-complete || TEST_OPTS="-e_U=true"
+	TEST_MARKER="${T}/test.failed"
+	rm -f "${TEST_MARKER}"
+
+	# If we are failing, set the marker file, and only check it after done all ABIs
+	abi_src_test() {
+		debug-print-function ${FUNCNAME} "$@"
+		TEST_LOG="${T}/test.${MULTIBUILD_ID}.log"
+		eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die
+		grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL ${MULTIBUILD_ID}" >>"${TEST_MARKER}"
+		return 0
+	}
+
+	multilib_foreach_abi abi_src_test
+
+	if [ -e "${TEST_MARKER}" ]; then
+		cat "${TEST_MARKER}"
+		die "Tests failed"
+	fi
+}
diff --git a/dev-lang/open-cobol/open-cobol-1.1.ebuild b/dev-lang/open-cobol/open-cobol-1.1.ebuild
index 83ba13532f67..d7fd39c417a0 100644
--- a/dev-lang/open-cobol/open-cobol-1.1.ebuild
+++ b/dev-lang/open-cobol/open-cobol-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,6 +29,11 @@ src_configure() {
 	econf \
 		$(use_with berkdb db) \
 		$(use_enable nls) \
-		$(use_with readline)
+		$(use_with readline) \
+		--disable-static
+}
+
+src_install() {
 	default
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-lang/python/python-3.8.6.ebuild b/dev-lang/python/python-3.8.6.ebuild
index cb6c8db09403..615e80cafd64 100644
--- a/dev-lang/python/python-3.8.6.ebuild
+++ b/dev-lang/python/python-3.8.6.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-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"
 IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/rust/rust-1.45.2.ebuild b/dev-lang/rust/rust-1.45.2.ebuild
index 5c87a5c5a60e..767a01b9f91b 100644
--- a/dev-lang/rust/rust-1.45.2.ebuild
+++ b/dev-lang/rust/rust-1.45.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *beta* ]]; then
 	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
 	MY_P="rustc-beta"
 	SLOT="beta/${PV}"
-	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz"
+	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz -> rustc-${PV}-src.tar.xz"
 else
 	ABI_VER="$(ver_cut 1-2)"
 	SLOT="stable/${ABI_VER}"
@@ -27,7 +27,7 @@ DESCRIPTION="Systems programming language from Mozilla"
 HOMEPAGE="https://www.rust-lang.org/"
 
 SRC_URI="
-	https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz
+	https://static.rust-lang.org/dist/${SRC}
 	!system-bootstrap? ( $(rust_all_arch_uris rust-${RUST_STAGE0_VERSION}) )
 "
 
diff --git a/dev-lang/rust/rust-1.46.0.ebuild b/dev-lang/rust/rust-1.46.0.ebuild
index ceaa6d45c121..9bb19adc29f4 100644
--- a/dev-lang/rust/rust-1.46.0.ebuild
+++ b/dev-lang/rust/rust-1.46.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *beta* ]]; then
 	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
 	MY_P="rustc-beta"
 	SLOT="beta/${PV}"
-	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz"
+	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz -> rustc-${PV}-src.tar.xz"
 else
 	ABI_VER="$(ver_cut 1-2)"
 	SLOT="stable/${ABI_VER}"
@@ -27,7 +27,7 @@ DESCRIPTION="Systems programming language from Mozilla"
 HOMEPAGE="https://www.rust-lang.org/"
 
 SRC_URI="
-	https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz
+	https://static.rust-lang.org/dist/${SRC}
 	!system-bootstrap? ( $(rust_all_arch_uris rust-${RUST_STAGE0_VERSION}) )
 "
 
diff --git a/dev-lang/rust/rust-1.47.0-r1.ebuild b/dev-lang/rust/rust-1.47.0-r1.ebuild
index 371a9cd72b54..eb58cb752e8e 100644
--- a/dev-lang/rust/rust-1.47.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.47.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *beta* ]]; then
 	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
 	MY_P="rustc-beta"
 	SLOT="beta/${PV}"
-	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz"
+	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz -> rustc-${PV}-src.tar.xz"
 else
 	ABI_VER="$(ver_cut 1-2)"
 	SLOT="stable/${ABI_VER}"
@@ -27,7 +27,7 @@ DESCRIPTION="Systems programming language from Mozilla"
 HOMEPAGE="https://www.rust-lang.org/"
 
 SRC_URI="
-	https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz
+	https://static.rust-lang.org/dist/${SRC}
 	!system-bootstrap? ( $(rust_all_arch_uris rust-${RUST_STAGE0_VERSION}) )
 "
 
diff --git a/dev-lang/spidermonkey/spidermonkey-78.4.1.ebuild b/dev-lang/spidermonkey/spidermonkey-78.4.1.ebuild
index 065952b5eb42..51c99770b037 100644
--- a/dev-lang/spidermonkey/spidermonkey-78.4.1.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-78.4.1.ebuild
@@ -93,9 +93,9 @@ python_check_deps() {
 
 pkg_pretend() {
 	if use test ; then
-		CHECKREQS_DISK_BUILD="6400M"
+		CHECKREQS_DISK_BUILD="7600M"
 	else
-		CHECKREQS_DISK_BUILD="5600M"
+		CHECKREQS_DISK_BUILD="6400M"
 	fi
 
 	check-reqs_pkg_pretend
@@ -103,9 +103,9 @@ pkg_pretend() {
 
 pkg_setup() {
 	if use test ; then
-		CHECKREQS_DISK_BUILD="6400M"
+		CHECKREQS_DISK_BUILD="7600M"
 	else
-		CHECKREQS_DISK_BUILD="5600M"
+		CHECKREQS_DISK_BUILD="6400M"
 	fi
 
 	check-reqs_pkg_setup
diff --git a/dev-lang/vala/vala-0.46.13.ebuild b/dev-lang/vala/vala-0.46.13.ebuild
index 0fe819d1f8a7..b6264069e4ac 100644
--- a/dev-lang/vala/vala-0.46.13.ebuild
+++ b/dev-lang/vala/vala-0.46.13.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.46"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
 IUSE="test valadoc"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/vala/vala-0.48.9.ebuild b/dev-lang/vala/vala-0.48.9.ebuild
index c0b6968769c9..4aab4255e294 100644
--- a/dev-lang/vala/vala-0.48.9.ebuild
+++ b/dev-lang/vala/vala-0.48.9.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.48"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
 IUSE="test valadoc"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 444befdcd9bc..066034bb2a9f 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/atk/atk-2.36.0.ebuild b/dev-libs/atk/atk-2.36.0.ebuild
index d1a1c2e19d18..46521641412a 100644
--- a/dev-libs/atk/atk-2.36.0.ebuild
+++ b/dev-libs/atk/atk-2.36.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/dev-libs/bareos-fastlzlib/bareos-fastlzlib-0_pre20150524.ebuild b/dev-libs/bareos-fastlzlib/bareos-fastlzlib-0_pre20150524.ebuild
index b748fee355af..e657d1537775 100644
--- a/dev-libs/bareos-fastlzlib/bareos-fastlzlib-0_pre20150524.ebuild
+++ b/dev-libs/bareos-fastlzlib/bareos-fastlzlib-0_pre20150524.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,8 +21,12 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/fastlzlib-master"
 
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
 	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete
+	find "${ED}" -name '*.la' -delete || die
 	find "${D}" -type d -name libfastlz -exec rm -rf {} +
 }
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 3032b74d66d8..f01a64f7cf5c 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,3 +1,3 @@
 DIST Botan-2.15.0.tar.xz 5920688 BLAKE2B 1bbb9cadb0f754194851bddf8b14dbcd291285c5f3fbaad35920277a11c3d9e1b1e5cc484c0d37b1c7999b3084a1c90da56631df0b07e788372b95aff5197031 SHA512 0965a0a6141df44e38bd7da038b89dd2b3808ed9a4ebaafbf089abf60718e62cba78d7b64eaf272b5df8c5a489222e4cad4fb511cde38e76cdaed87f35896c18
 DIST Botan-2.16.0.tar.xz 5938644 BLAKE2B a4b7bb48aee0dbf0f8b81a407b6a39707c3e6040a2bb93f9c34208ab87ea64879b2e56af66f090a73d66b64156e333c89e490d206e666e665a5eb4fbcd98d13e SHA512 12550425c695119d7f448a47b7956565de373e1bc86b8fdfa0a2a5b9fed1ef93a36101b6480e7a2f78e9262c988904c353fa021b681543691d09bf5b00495bd4
-DIST Botan-2.17.1.tar.xz 5970240 BLAKE2B d9c68cb55782bc3b174d5a6382c778dd38255540945404a96e71ff808f65848f4bcffc4c7bf6a61b841fb0225379ffa8dd473aac40af4436eae737ec450428b9 SHA512 05572b744c5d3a6a9dbece7e1dd777a8c44f9800fc90637d3ae5da62818ac826e80835c2a61446a0d16b3b4ad23c95b838422d90300ff7ce7a02fc3902cb058c
+DIST Botan-2.17.2.tar.xz 5940964 BLAKE2B 009df11c9d4379a15a48697554a82df3baffad0fff98af995f9a5b9b3223e4db42837650d41b7081170b07fb70d62ab347c5577ef2480a8f7011b40e1cf1764d SHA512 fa9bd30d02540c4544646971c7b82d3873f32362668d2496b4bc1a92f47d52f75ec9533d5848a7d8e9b9077c7ae2866b55d70d39101c705eec0edf9dbf01d6cf
diff --git a/dev-libs/botan/botan-2.16.0.ebuild b/dev-libs/botan/botan-2.16.0.ebuild
index 5948159b1e9e..571b07ca8cba 100644
--- a/dev-libs/botan/botan-2.16.0.ebuild
+++ b/dev-libs/botan/botan-2.16.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2"
 SLOT="2/$(ver_cut 1-2)" # soname version
-KEYWORDS="~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~ppc-macos"
 IUSE="bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/botan/botan-2.17.1.ebuild b/dev-libs/botan/botan-2.17.2.ebuild
similarity index 100%
rename from dev-libs/botan/botan-2.17.1.ebuild
rename to dev-libs/botan/botan-2.17.2.ebuild
diff --git a/dev-libs/busybee/busybee-0.7.0.ebuild b/dev-libs/busybee/busybee-0.7.0.ebuild
index 165343bc960f..ad936c434700 100644
--- a/dev-libs/busybee/busybee-0.7.0.ebuild
+++ b/dev-libs/busybee/busybee-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,8 +11,15 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 
-IUSE=""
-
 DEPEND=">=dev-libs/libpo6-0.8
 	>=dev-libs/libe-0.11"
 RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/dotconf/dotconf-1.3-r1.ebuild b/dev-libs/dotconf/dotconf-1.3-r1.ebuild
index 7190481f9fab..293fd121585b 100644
--- a/dev-libs/dotconf/dotconf-1.3-r1.ebuild
+++ b/dev-libs/dotconf/dotconf-1.3-r1.ebuild
@@ -17,6 +17,10 @@ IUSE=""
 DEPEND=">=sys-devel/autoconf-2.58"
 RDEPEND=""
 
+src_configure() {
+	econf --disable-static
+}
+
 src_compile() {
 	emake CC=$(tc-getCC)
 }
diff --git a/dev-libs/dqlite/dqlite-1.6.0.ebuild b/dev-libs/dqlite/dqlite-1.6.0.ebuild
index 4d80a538ad5d..6141fc58dc01 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"
+KEYWORDS="~amd64 ~arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/eb/eb-4.4.1-r1.ebuild b/dev-libs/eb/eb-4.4.1-r1.ebuild
index 254ea4b8e9b2..fc59b4ffde58 100644
--- a/dev-libs/eb/eb-4.4.1-r1.ebuild
+++ b/dev-libs/eb/eb-4.4.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="EB is a C library and utilities for accessing CD-ROM books"
 HOMEPAGE="http://www.sra.co.jp/people/m-kasahr/eb/"
@@ -14,12 +14,9 @@ IUSE="ipv6 nls threads"
 
 RDEPEND="
 	sys-libs/zlib
-	nls? ( virtual/libintl )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
 
 DOCS=( AUTHORS ChangeLog{,.0,.1,.2} NEWS README )
 
@@ -28,5 +25,11 @@ src_configure() {
 		$(use_enable ipv6) \
 		$(use_enable nls) \
 		$(use_enable threads pthread) \
-		--with-pkgdocdir=/usr/share/doc/${PF}/html
+		--with-pkgdocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/faxpp/faxpp-0.4-r1.ebuild b/dev-libs/faxpp/faxpp-0.4-r1.ebuild
index 70d50bbaeaaf..60af37fc3cee 100644
--- a/dev-libs/faxpp/faxpp-0.4-r1.ebuild
+++ b/dev-libs/faxpp/faxpp-0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,6 +12,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples"
 
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
 	default
 
@@ -23,4 +27,6 @@ src_install() {
 		insinto /usr/share/doc/${PF}
 		doins -r examples
 	fi
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/glib/glib-2.64.5.ebuild b/dev-libs/glib/glib-2.64.5.ebuild
index 0f764c01d3b6..0f1b0aee616c 100644
--- a/dev-libs/glib/glib-2.64.5.ebuild
+++ b/dev-libs/glib/glib-2.64.5.ebuild
@@ -14,7 +14,7 @@ SLOT="2"
 IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
 RESTRICT="!test? ( 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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # * libelf isn't strictly necessary, but makes gresource tool more useful, and
 # the check is automagic in gio/meson.build. gresource is not a multilib tool
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index eb46a81d00ba..4f1e9ea0825e 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -1,2 +1,3 @@
 DIST gmp-6.2.0.tar.xz 2012444 BLAKE2B 928141cf7b0b70f78b66e7bc52aecd39a5fc30e8865b6de6effb5b061ade05a5a51b4680ef2f36ea0d682b319d54ceb1c6c8ef93bde6c2eef2e8b826a34602c3 SHA512 a066f0456f0314a1359f553c49fc2587e484ff8ac390ff88537266a146ea373f97a1c0ba24608bf6756f4eab11c9056f103c8deb99e5b57741b4f7f0ec44b90c
+DIST gmp-6.2.1.tar.xz 2027316 BLAKE2B c0d85f175392a50cfa01bc6b0a312b235946ad8b4f6f84f6dabd33d7a6f2cc75c9b0e1e33057be07750bfa0145b7c4cf3b6188a5be6ca9d7271ec2276c84ebcb SHA512 c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84
 DIST gmp-man-6.2.0.pdf 828998 BLAKE2B 0bf56bf0a6f1aac0e1fb9a5a37552f846a2d4a01bfd3f5b5c531d42a9afc48c19552e08971785805f59e3f2a5fd89e3f986f841dca2e340813596cfd76574e61 SHA512 25d129efedd329cd2d4535557c6912191f587bfd8ef028618b4ca6199ec7bf7a9ae862e7f5e5b5448c86888452a39fc7bf95cf9c18311858dd1aa9ae1c716239
diff --git a/dev-libs/gmp/gmp-6.2.1.ebuild b/dev-libs/gmp/gmp-6.2.1.ebuild
new file mode 100644
index 000000000000..85f0e1d3160b
--- /dev/null
+++ b/dev-libs/gmp/gmp-6.2.1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic eutils libtool multilib-minimal toolchain-funcs
+
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MANUAL_PV=$MY_PV
+MANUAL_PV=6.2.0 # 6.2.1 manual is not ready yet
+MY_P=${PN}-${MY_PV}
+PLEVEL=${PV/*p}
+DESCRIPTION="Library for arbitrary-precision arithmetic on different type of numbers"
+HOMEPAGE="https://gmplib.org/"
+SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
+	mirror://gnu/${PN}/${MY_P}.tar.xz
+	doc? ( https://gmplib.org/${PN}-man-${MANUAL_PV}.pdf )"
+
+LICENSE="|| ( LGPL-3+ GPL-2+ )"
+# The subslot reflects the C & C++ SONAMEs.
+SLOT="0/10.4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asm doc +cxx pic static-libs"
+
+BDEPEND="sys-devel/m4
+	app-arch/xz-utils"
+
+S=${WORKDIR}/${MY_P%a}
+
+DOCS=( AUTHORS ChangeLog NEWS README doc/configuration doc/isa_abi_headache )
+HTML_DOCS=( doc )
+MULTILIB_WRAPPED_HEADERS=( /usr/include/gmp.h )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.0-noexecstack-detect.patch
+)
+
+src_prepare() {
+	default
+
+	# note: we cannot run autotools here as gcc depends on this package
+	elibtoolize
+
+	# https://bugs.gentoo.org/536894
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		eapply "${FILESDIR}"/${PN}-6.1.2-gcc-apple-4.0.1.patch
+	fi
+
+	# GMP uses the "ABI" env var during configure as does Gentoo (econf).
+	# So, to avoid patching the source constantly, wrap things up.
+	mv configure configure.wrapped || die
+	cat <<-\EOF > configure
+	#!/usr/bin/env sh
+	exec env ABI="${GMPABI}" "$0.wrapped" "$@"
+	EOF
+	# Patches to original configure might have lost the +x bit.
+	chmod a+rx configure{,.wrapped} || die
+}
+
+multilib_src_configure() {
+	# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
+	# https://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
+	if [[ ${CHOST} == hppa2.0-* ]] ; then
+		GMPABI="1.0"
+	fi
+
+	# ABI mappings (needs all architectures supported)
+	case ${ABI} in
+		32|x86)       GMPABI=32;;
+		64|amd64|n64) GMPABI=64;;
+		[onx]32)      GMPABI=${ABI};;
+	esac
+	export GMPABI
+
+	#367719
+	if [[ ${CHOST} == *-mint* ]]; then
+		filter-flags -O?
+	fi
+
+	# --with-pic forces static libraries to be built as PIC
+	# and without TEXTRELs. musl does not support TEXTRELs: bug #707332
+	tc-export CC
+	ECONF_SOURCE="${S}" econf \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
+		--localstatedir="${EPREFIX}"/var/state/gmp \
+		--enable-shared \
+		$(use_enable asm assembly) \
+		$(use_enable cxx) \
+		$(use pic && echo --with-pic) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	# should be a standalone lib
+	rm -f "${ED}"/usr/$(get_libdir)/libgmp.la
+	# this requires libgmp
+	local la="${ED}/usr/$(get_libdir)/libgmpxx.la"
+	use static-libs || rm -f "${la}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	use doc && cp "${DISTDIR}"/gmp-man-${MANUAL_PV}.pdf "${ED}"/usr/share/doc/${PF}/
+}
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild
index 825d2adea5af..2b1f0b3ef7dd 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}"
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild
index f8fe7c83e9a9..1091eb833434 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE="doctool gtk-doc test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 RDEPEND="
diff --git a/dev-libs/gumbo/gumbo-0.10.1.ebuild b/dev-libs/gumbo/gumbo-0.10.1.ebuild
index 5c7a84893a30..d046877829c1 100644
--- a/dev-libs/gumbo/gumbo-0.10.1.ebuild
+++ b/dev-libs/gumbo/gumbo-0.10.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit autotools
 
@@ -12,34 +12,35 @@ SRC_URI="https://github.com/google/gumbo-parser/archive/v${PV}.tar.gz -> ${P}.ta
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
-S="${WORKDIR}/gumbo-parser-${PV}"
+DEPEND="test? ( dev-cpp/gtest )"
+BDEPEND="doc? ( app-doc/doxygen )"
 
-DEPEND="test? ( dev-cpp/gtest )
-	doc? ( app-doc/doxygen )"
+S="${WORKDIR}/gumbo-parser-${PV}"
 
 src_prepare() {
+	default
 	eautoreconf
 }
 
+src_configure() {
+	econf --disable-static
+}
+
 src_compile() {
 	default
 
 	if use doc; then
 		doxygen || die "doxygen failed"
+		HTML_DOCS=( docs/html/. )
 	fi
 }
 
 src_install() {
 	default
+	use doc && doman docs/man/man3/*
 
-	if use doc; then
-		dohtml -r docs/html/.
-		for page in docs/man/man3/* ; do
-			doman ${page}
-		done
-	fi
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/hiredis/hiredis-1.0.0.ebuild b/dev-libs/hiredis/hiredis-1.0.0.ebuild
index ba1df99d97c6..33ae5c527a85 100644
--- a/dev-libs/hiredis/hiredis-1.0.0.ebuild
+++ b/dev-libs/hiredis/hiredis-1.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/redis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/1.0.0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~x64-solaris"
 IUSE="examples ssl static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/http-fetcher/http-fetcher-1.1.0-r1.ebuild b/dev-libs/http-fetcher/http-fetcher-1.1.0-r1.ebuild
index afd0991dade1..0d694ccc9dd4 100644
--- a/dev-libs/http-fetcher/http-fetcher-1.1.0-r1.ebuild
+++ b/dev-libs/http-fetcher/http-fetcher-1.1.0-r1.ebuild
@@ -26,10 +26,13 @@ src_prepare() {
 src_configure() {
 	econf \
 		--disable-strict \
+		--disable-static \
 		$(use_enable debug)
 }
 
 src_install() {
 	default
 	dodoc -r docs/html/*.html docs/index.html README ChangeLog CREDITS INSTALL
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/hyperleveldb/files/snappy.patch b/dev-libs/hyperleveldb/files/snappy.patch
index f926e3f6a38c..db3d2e3885a4 100644
--- a/dev-libs/hyperleveldb/files/snappy.patch
+++ b/dev-libs/hyperleveldb/files/snappy.patch
@@ -1,5 +1,5 @@
---- Makefile.am 2014-07-29 14:44:37.851568232 +0800
-+++ Makefile.am.new     2014-07-29 14:44:54.687855718 +0800
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -196,7 +196,7 @@
  TESTS = $(check_PROGRAMS)
  
diff --git a/dev-libs/hyperleveldb/hyperleveldb-1.2.2-r1.ebuild b/dev-libs/hyperleveldb/hyperleveldb-1.2.2-r1.ebuild
index b9f1cd0e7a48..1a42b9d33f78 100644
--- a/dev-libs/hyperleveldb/hyperleveldb-1.2.2-r1.ebuild
+++ b/dev-libs/hyperleveldb/hyperleveldb-1.2.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WANT_AUTOMAKE="1.11"
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="Hyperdex fork/extension of leveldb"
 HOMEPAGE="http://hyperdex.org/"
@@ -14,14 +14,22 @@ SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="
-	dev-libs/leveldb:=[snappy]
-	"
+DEPEND="dev-libs/leveldb:=[snappy]"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}"/snappy.patch )
+
 src_prepare() {
-	epatch "${FILESDIR}/snappy.patch"
+	default
 	eautoreconf
 }
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/igraph/Manifest b/dev-libs/igraph/Manifest
index f2dcaf5efb1c..bb647bf154d5 100644
--- a/dev-libs/igraph/Manifest
+++ b/dev-libs/igraph/Manifest
@@ -1,2 +1,3 @@
 DIST igraph-0.7.1.tar.gz 2967134 BLAKE2B 27f0a2f51e561a3ea2e2e6d31853fe10ffd66f9f67603d77f2c0449a4c2bcd4d45c98516b526fb0f23a871ebe3db1fcf0c691551714d044124778faa147bd30f SHA512 ac7d7e3fbc6d27ae69079224881ca03db2c7e0b50d016706f3e167c614e2c9332c675d2fcd3cde12874e13a8fc402d42222308c6195afadee15152cec93f94dd
 DIST igraph-0.8.2.tar.gz 3625308 BLAKE2B b3be5a28b6507c98c88a96c4a14e6b9c45645985f5b16aaae0739412a5f26a1ccdbda3180fac5d12525b4da2f5fc3d6caad3928cd1306b151b89104bbbb5f6e8 SHA512 e1035ed22541c7d253c201da5d2f8c5ceb154a6bf4be1b41981a02d6bbe72038647bf011432e2446307e615c27aa8079d4ef2c4447c2eba3764788e26e8f790b
+DIST igraph-0.8.3.tar.gz 3636192 BLAKE2B 1a6636a074182fc859d7c2982546668b221be8a71b9a8a60404764684b7488a41450cedb75f89558f1ffe6f6dbef298057b5294495f2e7992768f5fd4e40fbd9 SHA512 a25126fd5ee7cf823b6728d02d38c8d13c8561e9f6e10372faef15e98f4381c118f3dd9f308d003d7d18ca501e7055b838711a2a62e00afba32ca929c8d765f1
diff --git a/dev-libs/igraph/igraph-0.8.3.ebuild b/dev-libs/igraph/igraph-0.8.3.ebuild
new file mode 100644
index 000000000000..186bd9a51133
--- /dev/null
+++ b/dev-libs/igraph/igraph-0.8.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Creating and manipulating undirected and directed graphs"
+HOMEPAGE="http://www.igraph.org/"
+SRC_URI="https://github.com/igraph/igraph/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	dev-libs/libxml2
+	sci-libs/arpack
+	sci-libs/cxsparse
+	sci-mathematics/glpk:=
+	virtual/blas
+	virtual/lapack"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.8.2-unbundle.patch )
+
+src_prepare() {
+	default
+	rm -r src/lapack optional/glpk src/cs || die
+	eautoreconf
+}
+
+src_configure() {
+	# even with --with-external-f2c
+	# we don't need f2c as none of
+	#    arpack lapack blas
+	# are internal
+	tc-export PKG_CONFIG
+	econf \
+		$(use_enable debug) \
+		--enable-gmp \
+		--disable-static \
+		--disable-tls \
+		--with-external-arpack \
+		--with-external-blas \
+		--with-external-lapack \
+		--with-external-f2c \
+		--with-external-glpk
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/isl/isl-0.23.ebuild b/dev-libs/isl/isl-0.23-r1.ebuild
similarity index 71%
rename from dev-libs/isl/isl-0.23.ebuild
rename to dev-libs/isl/isl-0.23-r1.ebuild
index d5363724d3ab..ee79d99fae15 100644
--- a/dev-libs/isl/isl-0.23.ebuild
+++ b/dev-libs/isl/isl-0.23-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit eutils multilib-minimal preserve-libs
+inherit multilib-minimal preserve-libs toolchain-funcs
 
 DESCRIPTION="A library for manipulating integer points bounded by linear constraints"
 HOMEPAGE="http://isl.gforge.inria.fr/"
@@ -26,7 +26,23 @@ PATCHES=(
 )
 
 multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+	local econf_opts=(
+		$(use_enable static-libs static)
+
+		# AX_PROG_CC_FOR_BUILD deficiency:
+		# https://wiki.gentoo.org/wiki/Project:Toolchain/use_native_symlinks
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+	)
+	if ! tc-is-cross-compiler; then
+		# Incorrect CFLAGS handling as CFLAGS_FOR_BUILD
+		# even for native builds. As a result -O3 is being used
+		# regardless of user's CFLAGS.
+		econf_opts+=(
+			CFLAGS_FOR_BUILD="${CFLAGS}"
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${econf_opts[@]}"
 }
 
 multilib_src_install_all() {
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
index 1d7f0a221b2b..b450d5c2c8fc 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index 163f321decee..dbf079cbb63c 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -2,4 +2,5 @@ DIST leatherman-1.11.0.tar.gz 815946 BLAKE2B 73afb7c517ea93d0c3dc1c88adb3e5041c7
 DIST leatherman-1.12.0.tar.gz 815947 BLAKE2B cc268275f7ef7e9bddca9a2ca25c1a6b0bca64d57f90a485b83103a2477d476a39fe91ccf46798f1885b29c697de6556890131c7aac2a9e61590edab66fd6ea7 SHA512 2ceb16f94bf3d06bfe477a40e15db5a1d3d3999eaa7023245a08ab4e0054179f28308d9bf6ba73a839ca3a68130259894593fc8e77664b672ac5f3d20511a4d2
 DIST leatherman-1.12.1.tar.gz 816002 BLAKE2B 286bbc24971b2769c8fae73a274b05ce34ad5469f8647681869cecf133f2c3d9c9fab75327fd610aa8957c359baed645c221aa0670789a0f75888f624ea473a7 SHA512 d2bb2b9aab2749df61fb29e984a9058165851c0d4dce45efb102673dbb2e7b56d12005db106f967a6e5ad93b37ea7f7ed88337bf41ffb503db8b2152c87151ad
 DIST leatherman-1.12.2.tar.gz 816010 BLAKE2B 4b7b00b88ef0ba5cb01405aa24fd5ff72918a122cc8a1c0a029e374152964f77afa29a1f503ed5863a39bd13aa808dba2a0b351f65756e97c8e2e8408358cbfc SHA512 9be8333b616bd9772f234474ae874c7214fa0c1bc4658ff042233d6e1683cc61b63d666d750297c79a8058490e42c8b2ff8999cb7f04aa329644f52540e43bde
+DIST leatherman-1.12.3.tar.gz 816018 BLAKE2B 6245284856613b99df2ce412e497ba69fe1a016a82ca5ea7f78ba591dc287e2daef051214b303c1cc463efb537354a01ad6c57688f244382b3843b8bfdad6f3e SHA512 83f785ba7c69032e2c9c7f2fb07aa5c100ed9e1a81c88ece19d7a96647b9a46927b99fd7144c08d697863e44553f00adf6bc4964f45e900809827956c0949b36
 DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b
diff --git a/dev-libs/leatherman/leatherman-1.12.2.ebuild b/dev-libs/leatherman/leatherman-1.12.2.ebuild
index 37b42a9bc12b..75314013d9e0 100644
--- a/dev-libs/leatherman/leatherman-1.12.2.ebuild
+++ b/dev-libs/leatherman/leatherman-1.12.2.ebuild
@@ -22,7 +22,7 @@ DEPEND=">=dev-libs/boost-1.73:=[nls]
 	>=sys-devel/gcc-4.8:*"
 
 PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
-PATCHES+=( "${FILESDIR}/${PV}"-shared_nowide.patch )
+PATCHES+=( "${FILESDIR}"/1.12.2-shared_nowide.patch )
 
 src_prepare() {
 	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
diff --git a/dev-libs/leatherman/leatherman-1.12.3.ebuild b/dev-libs/leatherman/leatherman-1.12.3.ebuild
new file mode 100644
index 000000000000..37b42a9bc12b
--- /dev/null
+++ b/dev-libs/leatherman/leatherman-1.12.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils multilib
+
+DESCRIPTION="A C++ toolkit"
+HOMEPAGE="https://github.com/puppetlabs/leatherman"
+SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+IUSE="debug static-libs test"
+#RESTRICT="!test? ( test )"
+RESTRICT="test"  # restricted til we don't need the shared_nowide patch
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0/${PV}"
+
+RDEPEND="net-misc/curl"
+DEPEND=">=dev-libs/boost-1.73:=[nls]
+	net-misc/curl
+	>=sys-devel/gcc-4.8:*"
+
+PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
+PATCHES+=( "${FILESDIR}/${PV}"-shared_nowide.patch )
+
+src_prepare() {
+	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
+	# vendored boost lib conflicts with boost 1.73 and above
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+	)
+	if ! use static-libs; then
+		mycmakeargs+=(
+			-DLEATHERMAN_SHARED=ON
+		)
+	else
+		mycmakeargs+=(
+			-DLEATHERMAN_SHARED=OFF
+		)
+	fi
+	if use debug; then
+		mycmakeargs+=(
+		  -DCMAKE_BUILD_TYPE=Debug
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_test() {
+	"${WORKDIR}/${P}"_build/bin/leatherman_test
+}
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/dev-libs/libcec/files/libcec-4.0.2-no-tinfo.patch b/dev-libs/libcec/files/libcec-4.0.2-no-tinfo.patch
deleted file mode 100644
index 673c6f86c972..000000000000
--- a/dev-libs/libcec/files/libcec-4.0.2-no-tinfo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- libcec-libcec-4.0.2/src/cec-client/CMakeLists.txt
-+++ libcec-libcec-4.0.2/src/cec-client/CMakeLists.txt
-@@ -27,8 +27,12 @@ set(cecclient_SOURCES cec-client.cpp)
- check_library_exists(curses initscr "" HAVE_CURSES_API)
- if (HAVE_CURSES_API)
-   list(APPEND cecclient_SOURCES curses/CursesControl.cpp)
-+
-+  # tinfo
-+  find_library(HAVE_CURSES_TINFO tinfo)
- endif()
- 
-+
- add_executable(cec-client ${cecclient_SOURCES})
- set_target_properties(cec-client PROPERTIES VERSION ${LIBCEC_VERSION_MAJOR}.${LIBCEC_VERSION_MINOR}.${LIBCEC_VERSION_PATCH})
- target_link_libraries(cec-client ${p8-platform_LIBRARIES})
-@@ -44,6 +48,9 @@ if (NOT WIN32)
-   # curses
-   if (HAVE_CURSES_API)
-     target_link_libraries(cec-client curses)
-+    if (HAVE_CURSES_TINFO)
-+      target_link_libraries(cec-client tinfo)
-+    endif()
-   endif()
- 
-   # rt
diff --git a/dev-libs/libclangformat-ide/metadata.xml b/dev-libs/libclangformat-ide/metadata.xml
index d472e560c734..285039a39758 100644
--- a/dev-libs/libclangformat-ide/metadata.xml
+++ b/dev-libs/libclangformat-ide/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>zx2c4@gentoo.org</email>
+		<name>Jason A. Donenfeld</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>pesa@gentoo.org</email>
 		<name>Davide Pesavento</name>
diff --git a/dev-libs/libdbh/libdbh-5.0.19.ebuild b/dev-libs/libdbh/libdbh-5.0.19.ebuild
index d545dd68e5e6..81bdaa952a54 100644
--- a/dev-libs/libdbh/libdbh-5.0.19.ebuild
+++ b/dev-libs/libdbh/libdbh-5.0.19.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit autotools eutils ltprune
+inherit autotools eutils
 
 MY_P=${PN}2-${PV}
 
@@ -31,7 +31,11 @@ src_prepare() {
 	eautoreconf
 }
 
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libdbh/libdbh-5.0.22.ebuild b/dev-libs/libdbh/libdbh-5.0.22.ebuild
index a32cdfb61dfe..e15065a43d35 100644
--- a/dev-libs/libdbh/libdbh-5.0.22.ebuild
+++ b/dev-libs/libdbh/libdbh-5.0.22.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools
 
 MY_P=${PN}2-${PV}
@@ -13,9 +14,9 @@ SRC_URI="mirror://sourceforge/dbh/dbh/${PV}/${MY_P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="dev-util/gtk-doc-am
+BDEPEND="
+	dev-util/gtk-doc-am
 	virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
@@ -28,8 +29,11 @@ src_prepare() {
 	eautoreconf
 }
 
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
 	default
-
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/liblinear/liblinear-241.ebuild b/dev-libs/liblinear/liblinear-241.ebuild
index ede9a159d953..d5be92f8f8d3 100644
--- a/dev-libs/liblinear/liblinear-241.ebuild
+++ b/dev-libs/liblinear/liblinear-241.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 
 src_prepare() {
 	default
diff --git a/dev-libs/liblogging/liblogging-1.0.6.ebuild b/dev-libs/liblogging/liblogging-1.0.6.ebuild
index 920b54472c5a..5974f3ede556 100644
--- a/dev-libs/liblogging/liblogging-1.0.6.ebuild
+++ b/dev-libs/liblogging/liblogging-1.0.6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit autotools
 
@@ -12,20 +12,16 @@ SRC_URI="http://download.rsyslog.com/liblogging/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0/0"
 KEYWORDS="amd64 arm ~arm64 hppa x86"
-IUSE="rfc3195 static-libs +stdlog systemd"
+IUSE="rfc3195 +stdlog systemd"
 
 RDEPEND="systemd? ( sys-apps/systemd )"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 DOCS=( ChangeLog )
 
 src_prepare() {
 	default
-
 	eautoreconf
 }
 
@@ -34,6 +30,7 @@ src_configure() {
 		$(use_enable rfc3195)
 		$(use_enable stdlog)
 		$(use_enable systemd journal)
+		--disable-static
 	)
 
 	econf "${myeconfargs[@]}"
@@ -41,6 +38,5 @@ src_configure() {
 
 src_install() {
 	default
-
-	find "${ED}"usr/lib* -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/liblouis/liblouis-3.10.0.ebuild b/dev-libs/liblouis/liblouis-3.10.0.ebuild
index 0c8cd99301a1..4aa446669163 100644
--- a/dev-libs/liblouis/liblouis-3.10.0.ebuild
+++ b/dev-libs/liblouis/liblouis-3.10.0.ebuild
@@ -33,7 +33,9 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --enable-ucs4
+	econf \
+		--enable-ucs4 \
+		--disable-static
 }
 
 src_compile() {
@@ -64,4 +66,6 @@ src_install() {
 	DOCS=( README AUTHORS NEWS ChangeLog doc/liblouis.txt )
 	HTML_DOCS=( doc/liblouis.html )
 	einstalldocs
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/liblouis/liblouis-3.13.0.ebuild b/dev-libs/liblouis/liblouis-3.13.0.ebuild
index 59d9912bc1d7..752c1cd1a9fe 100644
--- a/dev-libs/liblouis/liblouis-3.13.0.ebuild
+++ b/dev-libs/liblouis/liblouis-3.13.0.ebuild
@@ -38,7 +38,9 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --enable-ucs4
+	econf \
+		--enable-ucs4 \
+		--disable-static
 }
 
 src_compile() {
@@ -68,4 +70,6 @@ src_install() {
 	DOCS=( README AUTHORS NEWS ChangeLog doc/liblouis.txt )
 	HTML_DOCS=( doc/liblouis.html )
 	default
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libpo6/libpo6-0.8.0.ebuild b/dev-libs/libpo6/libpo6-0.8.0.ebuild
index 810e8444c7be..94435303959f 100644
--- a/dev-libs/libpo6/libpo6-0.8.0.ebuild
+++ b/dev-libs/libpo6/libpo6-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,11 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 
-IUSE=""
+src_configure() {
+	econf --disable-static
+}
 
-DEPEND=""
-RDEPEND="${DEPEND}"
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libpreludedb/Manifest b/dev-libs/libpreludedb/Manifest
index 3a04f85d8ad9..7e89a2aceede 100644
--- a/dev-libs/libpreludedb/Manifest
+++ b/dev-libs/libpreludedb/Manifest
@@ -1,4 +1,5 @@
 DIST libpreludedb-4.0.0.tar.gz 1325812 BLAKE2B 7a506f7cd7b51898e26201f2cc640b1f34227f9cf7c5c6e2385480f1fc0ad854b6d747293ab502b641cc65f1ee9ae4a8f225e6a1d4489bcaa59901c6342f1279 SHA512 13f5dbcfa6af965f2075d60c645ebb19cbd6b18807b26f4f13a7a05f1cf552996f9846e856728a4e1dc621efda693016e82623d4a3cbf74849b3e7114f19faca
 DIST libpreludedb-4.1.0.tar.gz 1333638 BLAKE2B 380a6d4ef8836555510f9f9882b6100417f2567520c421355fb7eec8d2cd7e2f3942c4cb90ea21fa1557327026edd5c1e35e338a79e06a21cfb2bd6813a289c2 SHA512 de1fa5106d7f34edb5a23e726c968de84bb8b10257587b6ee36276ed75ddc54f4f9539aecb7836e114eb3bfa90104dd3b5e097be0c3d12347dcbded94f293dc4
+DIST libpreludedb-5.1.0-update_m4_postgresql.patch 20562 BLAKE2B 5db9a213c47296b308a641942e41c82eb9642dc7817ac1134ac52c8f24e38b68e0dacc5adedc30ba0611e84c97bb51f444b75b2b98884c0f21312da58f40b6d8 SHA512 24881cfe0e471e934fc9b1bd64dd901303f68615e1700ce92d6bc7324b28587aef8cc05be9cc7c2545f86666064607d8113c5273381bf9306ef69f569ab9d1bf
 DIST libpreludedb-5.1.0.tar.gz 1374511 BLAKE2B 569324a5ae484b1d13ac729f25a2f7f8924a8dced923859cdc393289acf0c0cf098ae6e0f9f572a707c85aa9af4a27bbaa0927e20d610b423e2aae86718d232b SHA512 9e45e0f7a945eef254f8e59c0c7212c6afca897584ea8f2c88e16478fde448abdeeb991828cc2482373d2c735e1229f1a11fe9780e40da1a8aed867fe158f481
 DIST libpreludedb-5.2.0.tar.gz 1372810 BLAKE2B 5a6bed23eba77591b8e97bb3c6f2b321970c94f88fb86094146a1a3fa64cc0f0c97ca1d1488b2202ab7042207ca2ca4f74029415ef1ca6ea13c84d158a23473f SHA512 357e3ce69927ed405bc757774466631d34cad9b53031be6ce456238dd8aef3781471ecbb36ab4a3131468f4686a635095aaf837d23a0efc9db758322298e7744
diff --git a/dev-libs/libpreludedb/files/libpreludedb-5.1.0-update_m4_postgresql.patch b/dev-libs/libpreludedb/files/libpreludedb-5.1.0-update_m4_postgresql.patch
deleted file mode 100644
index 5bd38a6f4c16..000000000000
--- a/dev-libs/libpreludedb/files/libpreludedb-5.1.0-update_m4_postgresql.patch
+++ /dev/null
@@ -1,544 +0,0 @@
---- a/m4/ax_lib_postgresql.m4
-+++ b/m4/ax_lib_postgresql.m4
-@@ -1,10 +1,10 @@
- # ===========================================================================
--#     http://www.gnu.org/software/autoconf-archive/ax_lib_postgresql.html
-+#    https://www.gnu.org/software/autoconf-archive/ax_lib_postgresql.html
- # ===========================================================================
- #
- # SYNOPSIS
- #
--#   AX_LIB_POSTGRESQL([MINIMUM-VERSION])
-+#   AX_LIB_POSTGRESQL([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
- #
- # DESCRIPTION
- #
-@@ -23,133 +23,225 @@
- #   should be in the PATH)
- #
- #   path - complete path to pg_config utility, use this option if pg_config
--#   can't be found in the PATH
-+#   can't be found in the PATH (You could set also PG_CONFIG variable)
- #
- #   This macro calls:
- #
--#     AC_SUBST(POSTGRESQL_CFLAGS)
-+#     AC_SUBST(POSTGRESQL_CPPFLAGS)
- #     AC_SUBST(POSTGRESQL_LDFLAGS)
-+#     AC_SUBST(POSTGRESQL_LIBS)
- #     AC_SUBST(POSTGRESQL_VERSION)
- #
- #   And sets:
- #
- #     HAVE_POSTGRESQL
- #
-+#   It execute if found ACTION-IF-FOUND (empty by default) and
-+#   ACTION-IF-NOT-FOUND (AC_MSG_FAILURE by default) if not found.
-+#
- # LICENSE
- #
- #   Copyright (c) 2008 Mateusz Loskot <mateusz@loskot.net>
-+#   Copyright (c) 2014 Sree Harsha Totakura <sreeharsha@totakura.in>
-+#   Copyright (c) 2018 Bastien Roucaries <rouca@debian.org>
- #
- #   Copying and distribution of this file, with or without modification, are
- #   permitted in any medium without royalty provided the copyright notice
- #   and this notice are preserved. This file is offered as-is, without any
- #   warranty.
- 
--#serial 9
-+#serial 22
-+
-+AC_DEFUN([_AX_LIB_POSTGRESQL_OLD],[
-+	found_postgresql="no"
-+	_AX_LIB_POSTGRESQL_OLD_fail="no"
-+	while true; do
-+	  AC_CACHE_CHECK([for the pg_config program], [ac_cv_path_PG_CONFIG],
-+	    [AC_PATH_PROGS_FEATURE_CHECK([PG_CONFIG], [pg_config],
-+	      [[ac_cv_path_PG_CONFIG="";$ac_path_PG_CONFIG --includedir > /dev/null \
-+		&& ac_cv_path_PG_CONFIG=$ac_path_PG_CONFIG ac_path_PG_CONFIG_found=:]],
-+	      [ac_cv_path_PG_CONFIG=""])])
-+	  PG_CONFIG=$ac_cv_path_PG_CONFIG
-+	  AS_IF([test "X$PG_CONFIG" = "X"],[break])
-+
-+	  AC_CACHE_CHECK([for the PostgreSQL libraries CPPFLAGS],[ac_cv_POSTGRESQL_CPPFLAGS],
-+		       [ac_cv_POSTGRESQL_CPPFLAGS="-I`$PG_CONFIG --includedir`" || _AX_LIB_POSTGRESQL_OLD_fail=yes])
-+	  AS_IF([test "X$_AX_LIB_POSTGRESQL_OLD_fail" = "Xyes"],[break])
-+	  POSTGRESQL_CPPFLAGS="$ac_cv_POSTGRESQL_CPPFLAGS"
-+
-+	  AC_CACHE_CHECK([for the PostgreSQL libraries LDFLAGS],[ac_cv_POSTGRESQL_LDFLAGS],
-+		       [ac_cv_POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir`" || _AX_LIB_POSTGRESQL_OLD_fail=yes])
-+	  AS_IF([test "X$_AX_LIB_POSTGRESQL_OLD_fail" = "Xyes"],[break])
-+	  POSTGRESQL_LDFLAGS="$ac_cv_POSTGRESQL_LDFLAGS"
-+
-+	  AC_CACHE_CHECK([for the PostgreSQL libraries LIBS],[ac_cv_POSTGRESQL_LIBS],
-+		       [ac_cv_POSTGRESQL_LIBS="-lpq"])
-+	  POSTGRESQL_LIBS="$ac_cv_POSTGRESQL_LIBS"
-+
-+	  AC_CACHE_CHECK([for the PostgreSQL version],[ac_cv_POSTGRESQL_VERSION],
-+		       [
-+			ac_cv_POSTGRESQL_VERSION=`$PG_CONFIG --version | sed "s/^PostgreSQL[[[:space:]]][[[:space:]]]*\([[0-9.]][[0-9.]]*\).*/\1/"` \
-+			      || _AX_LIB_POSTGRESQL_OLD_fail=yes
-+		       ])
-+	  AS_IF([test "X$_AX_LIB_POSTGRESQL_OLD_fail" = "Xyes"],[break])
-+	  POSTGRESQL_VERSION="$ac_cv_POSTGRESQL_VERSION"
-+
-+
-+	  dnl
-+	  dnl Check if required version of PostgreSQL is available
-+	  dnl
-+	  AS_IF([test X"$postgresql_version_req" != "X"],[
-+	     AC_MSG_CHECKING([if PostgreSQL version $POSTGRESQL_VERSION is >= $postgresql_version_req])
-+	     AX_COMPARE_VERSION([$POSTGRESQL_VERSION],[ge],[$postgresql_version_req],
-+				[found_postgresql_req_version=yes],[found_postgresql_req_version=no])
-+	     AC_MSG_RESULT([$found_postgresql_req_version])
-+	  ])
-+	  AS_IF([test "Xfound_postgresql_req_version" = "Xno"],[break])
-+
-+	  found_postgresql="yes"
-+	  break
-+	done
-+])
-+
-+AC_DEFUN([_AX_LIB_POSTGRESQL_PKG_CONFIG],
-+[
-+  AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-+  found_postgresql=no
-+
-+  while true; do
-+    PKG_PROG_PKG_CONFIG
-+    AS_IF([test X$PKG_CONFIG = X],[break])
-+
-+    _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=no;
-+    AS_IF([test "X$postgresql_version_req" = "X"],
-+	  [PKG_CHECK_EXISTS([libpq],[found_postgresql_pkg_config=yes],[found_postgresql=no])],
-+	  [PKG_CHECK_EXISTS([libpq >= "$postgresql_version_req"],
-+			   [found_postgresql=yes],[found_postgresql=no])])
-+    AS_IF([test "X$found_postgresql" = "no"],[break])
-+
-+    AC_CACHE_CHECK([for the PostgreSQL libraries CPPFLAGS],[ac_cv_POSTGRESQL_CPPFLAGS],
-+		   [ac_cv_POSTGRESQL_CPPFLAGS="`$PKG_CONFIG libpq --cflags-only-I`" || _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=yes])
-+    AS_IF([test "X$_AX_LIB_POSTGRESQL_PKG_CONFIG_fail" = "Xyes"],[break])
-+    POSTGRESQL_CPPFLAGS="$ac_cv_POSTGRESQL_CPPFLAGS"
-+
-+
-+    AC_CACHE_CHECK([for the PostgreSQL libraries LDFLAGS],[ac_cv_POSTGRESQL_LDFLAGS],
-+		   [ac_cv_POSTGRESQL_LDFLAGS="`$PKG_CONFIG libpq --libs-only-L --libs-only-other`" || _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=yes])
-+    AS_IF([test "X$_AX_LIB_POSTGRESQL_PKG_CONFIG_fail" = "Xyes"],[break])
-+    POSTGRESQL_LDFLAGS="$ac_cv_POSTGRESQL_LDFLAGS"
-+
-+
-+    AC_CACHE_CHECK([for the PostgreSQL libraries LIBS],[ac_cv_POSTGRESQL_LIBS],
-+		   [ac_cv_POSTGRESQL_LIBS="`$PKG_CONFIG libpq --libs-only-l`" || _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=ye])
-+    AS_IF([test "X$_AX_LIB_POSTGRESQL_PKG_CONFIG_fail" = "Xyes"],[break])
-+    POSTGRESQL_LIBS="$ac_cv_POSTGRESQL_LIBS"
-+
-+    dnl already checked by exist but need to be recovered
-+    AC_CACHE_CHECK([for the PostgreSQL version],[ac_cv_POSTGRESQL_VERSION],
-+		   [ac_cv_POSTGRESQL_VERSION="`$PKG_CONFIG libpq --modversion`" || _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=yes])
-+    AS_IF([test "X$_AX_LIB_POSTGRESQL_PKG_CONFIG_fail" = "Xyes"],[break])
-+    POSTGRESQL_VERSION="$ac_cv_POSTGRESQL_VERSION"
-+
-+    found_postgresql=yes
-+    break;
-+  done
-+
-+])
-+
-+
- 
- AC_DEFUN([AX_LIB_POSTGRESQL],
- [
-     AC_ARG_WITH([postgresql],
--        AS_HELP_STRING([--with-postgresql=@<:@ARG@:>@],
--            [use PostgreSQL library @<:@default=yes@:>@, optionally specify path to pg_config]
--        ),
--        [
--        if test "$withval" = "no"; then
--            want_postgresql="no"
--        elif test "$withval" = "yes"; then
--            want_postgresql="yes"
--        else
--            want_postgresql="yes"
--            PG_CONFIG="$withval"
--        fi
--        ],
--        [want_postgresql="yes"]
-+	AS_HELP_STRING([--with-postgresql=@<:@ARG@:>@],
-+	    [use PostgreSQL library @<:@default=yes@:>@, optionally specify path to pg_config]
-+	),
-+	[
-+	AS_CASE([$withval],
-+		[[[nN]][[oO]]],[want_postgresql="no"],
-+		[[[yY]][[eE]][[sS]]],[want_postgresql="yes"],
-+		[
-+			want_postgresql="yes"
-+			PG_CONFIG="$withval"
-+		])
-+	],
-+	[want_postgresql="yes"]
-     )
- 
--    POSTGRESQL_CFLAGS=""
--    POSTGRESQL_LDFLAGS=""
--    POSTGRESQL_VERSION=""
-+    AC_ARG_VAR([POSTGRESQL_CPPFLAGS],[cpp flags for PostgreSQL overriding detected flags])
-+    AC_ARG_VAR([POSTGRESQL_LIBFLAGS],[libs for PostgreSQL overriding detected flags])
-+    AC_ARG_VAR([POSTGRESQL_LDFLAGS],[linker flags for PostgreSQL overriding detected flags])
-+
-+    # populate cache
-+    AS_IF([test "X$POSTGRESQL_CPPFLAGS" != X],[ac_cv_POSTGRESQL_CPPFLAGS="$POSTGRESQL_CPPFLAGS"])
-+    AS_IF([test "X$POSTGRESQL_LDFLAGS" != X],[ac_cv_POSTGRESQL_LDFLAGS="$POSTGRESQL_LDFLAGS"])
-+    AS_IF([test "X$POSTGRESQL_LIBS" != X],[ac_cv_POSTGRESQL_LIBS="$POSTGRESQL_LIBS"])
- 
--    dnl
--    dnl Check PostgreSQL libraries (libpq)
--    dnl
-+    postgresql_version_req=ifelse([$1], [], [], [$1])
-+    found_postgresql="no"
- 
--    if test "$want_postgresql" = "yes"; then
--        AC_MSG_CHECKING([for $PG_CONFIG])
--        if test -z "$PG_CONFIG" -o test; then
--            AC_PATH_PROG([PG_CONFIG], [pg_config], [])
--        fi
--
--        if test ! -x "$PG_CONFIG"; then
--            AC_MSG_RESULT([$PG_CONFIG does not exist or it is not an exectuable file])
--            PG_CONFIG="no"
--            found_postgresql="no"
--        fi
--
--        if test "$PG_CONFIG" != "no"; then
--            AC_MSG_CHECKING([for PostgreSQL libraries])
--
--            POSTGRESQL_CFLAGS="-I`$PG_CONFIG --includedir`"
--            POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir` -lpq"
--
--            POSTGRESQL_VERSION=`$PG_CONFIG --version | sed -e 's#PostgreSQL ##'`
--
--            AC_DEFINE([HAVE_POSTGRESQL], [1],
--                [Define to 1 if PostgreSQL libraries are available])
--
--            found_postgresql="yes"
--            AC_MSG_RESULT([yes])
--        else
--            found_postgresql="no"
--            AC_MSG_RESULT([no])
--        fi
--    fi
-+    POSTGRESQL_VERSION=""
- 
-     dnl
--    dnl Check if required version of PostgreSQL is available
-+    dnl Check PostgreSQL libraries (libpq)
-     dnl
-+    AS_IF([test X"$want_postgresql" = "Xyes"],[
-+      _AX_LIB_POSTGRESQL_PKG_CONFIG
- 
- 
--    postgresql_version_req=ifelse([$1], [], [], [$1])
--
--    if test "$found_postgresql" = "yes" -a -n "$postgresql_version_req"; then
--
--        AC_MSG_CHECKING([if PostgreSQL version is >= $postgresql_version_req])
-+      AS_IF([test X"$found_postgresql" = "Xno"],
-+	    [_AX_LIB_POSTGRESQL_OLD])
- 
--        dnl Decompose required version string of PostgreSQL
--        dnl and calculate its number representation
--        postgresql_version_req_major=`expr $postgresql_version_req : '\([[0-9]]*\)'`
--        postgresql_version_req_minor=`expr $postgresql_version_req : '[[0-9]]*\.\([[0-9]]*\)'`
--        postgresql_version_req_micro=`expr $postgresql_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
--        if test "x$postgresql_version_req_micro" = "x"; then
--            postgresql_version_req_micro="0"
--        fi
--
--        postgresql_version_req_number=`expr $postgresql_version_req_major \* 1000000 \
--                                   \+ $postgresql_version_req_minor \* 1000 \
--                                   \+ $postgresql_version_req_micro`
--
--        dnl Decompose version string of installed PostgreSQL
--        dnl and calculate its number representation
--        postgresql_version_major=`expr $POSTGRESQL_VERSION : '\([[0-9]]*\)'`
--        postgresql_version_minor=`expr $POSTGRESQL_VERSION : '[[0-9]]*\.\([[0-9]]*\)'`
--        postgresql_version_micro=`expr $POSTGRESQL_VERSION : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
--        if test "x$postgresql_version_micro" = "x"; then
--            postgresql_version_micro="0"
--        fi
--
--        postgresql_version_number=`expr $postgresql_version_major \* 1000000 \
--                                   \+ $postgresql_version_minor \* 1000 \
--                                   \+ $postgresql_version_micro`
--
--        postgresql_version_check=`expr $postgresql_version_number \>\= $postgresql_version_req_number`
--        if test "$postgresql_version_check" = "1"; then
--            AC_MSG_RESULT([yes])
--        else
--            AC_MSG_RESULT([no])
--        fi
--    fi
-+      AS_IF([test X"$found_postgresql" = Xyes],[
-+	  _AX_LIB_POSTGRESQL_OLD_CPPFLAGS="$CPPFLAGS"
-+	  CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS"
-+	  _AX_LIB_POSTGRESQL_OLD_LDFLAGS="$LDFLAGS"
-+	  LDFLAGS="$LDFLAGS $POSTGRESQL_LDFLAGS"
-+	  _AX_LIB_POSTGRESQL_OLD_LIBS="$LIBS"
-+	  LIBS="$LIBS $POSTGRESQL_LIBS"
-+	  while true; do
-+	    dnl try to compile
-+	    AC_CHECK_HEADER([libpq-fe.h],[],[found_postgresql=no])
-+	    AS_IF([test "X$found_postgresql" = "Xno"],[break])
-+	    dnl try now to link
-+	    AC_CACHE_CHECK([for the PostgreSQL library linking is working],[ac_cv_postgresql_found],
-+	    [
-+	      AC_LINK_IFELSE([
-+		AC_LANG_PROGRAM(
-+		  [
-+		   #include <libpq-fe.h>
-+		  ],
-+		  [[
-+		    char conninfo[]="dbname = postgres";
-+		    PGconn     *conn;
-+		    conn = PQconnectdb(conninfo);
-+		  ]]
-+		 )
-+		],[ac_cv_postgresql_found=yes],
-+		  [ac_cv_postgresql_found=no])
-+	     ])
-+	    found_postgresql="$ac_cv_postgresql_found"
-+	    AS_IF([test "X$found_postgresql" = "Xno"],[break])
-+	    break
-+	done
-+	CPPFLAGS="$_AX_LIB_POSTGRESQL_OLD_CPPFLAGS"
-+	LDFLAGS="$_AX_LIB_POSTGRESQL_OLD_LDFLAGS"
-+	LIBS="$_AX_LIB_POSTGRESQL_OLD_LIBS"
-+	])
-+
-+
-+      AS_IF([test "x$found_postgresql" = "xyes"],[
-+		AC_DEFINE([HAVE_POSTGRESQL], [1],
-+			  [Define to 1 if PostgreSQL libraries are available])])
-+    ])
- 
-     AC_SUBST([POSTGRESQL_VERSION])
--    AC_SUBST([POSTGRESQL_CFLAGS])
-+    AC_SUBST([POSTGRESQL_CPPFLAGS])
-     AC_SUBST([POSTGRESQL_LDFLAGS])
-+    AC_SUBST([POSTGRESQL_LIBS])
-+
-+    AS_IF([test "x$found_postgresql" = "xyes"],
-+     [ifelse([$2], , :, [$2])],
-+     [ifelse([$3], , AS_IF([test X"$want_postgresql" = "Xyes"],[AC_MSG_ERROR([Library requirements (PostgreSQL) not met.])],[:]), [$3])])
-+
- ])
---- a/configure.ac
-+++ b/configure.ac
-@@ -158,7 +158,7 @@
- dnl ********************************************************
- dnl * Check for the PostgreSQL library (PostgreSQL plugin) *
- dnl ********************************************************
--AX_LIB_POSTGRESQL()
-+AX_LIB_POSTGRESQL([9.0])
- 
- with_pgsql="no"
- if test x$POSTGRESQL_VERSION != x; then
---- /dev/null
-+++ b/m4/ax_compare_version.m4
-@@ -0,0 +1,177 @@
-+# ===========================================================================
-+#    https://www.gnu.org/software/autoconf-archive/ax_compare_version.html
-+# ===========================================================================
-+#
-+# SYNOPSIS
-+#
-+#   AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
-+#
-+# DESCRIPTION
-+#
-+#   This macro compares two version strings. Due to the various number of
-+#   minor-version numbers that can exist, and the fact that string
-+#   comparisons are not compatible with numeric comparisons, this is not
-+#   necessarily trivial to do in a autoconf script. This macro makes doing
-+#   these comparisons easy.
-+#
-+#   The six basic comparisons are available, as well as checking equality
-+#   limited to a certain number of minor-version levels.
-+#
-+#   The operator OP determines what type of comparison to do, and can be one
-+#   of:
-+#
-+#    eq  - equal (test A == B)
-+#    ne  - not equal (test A != B)
-+#    le  - less than or equal (test A <= B)
-+#    ge  - greater than or equal (test A >= B)
-+#    lt  - less than (test A < B)
-+#    gt  - greater than (test A > B)
-+#
-+#   Additionally, the eq and ne operator can have a number after it to limit
-+#   the test to that number of minor versions.
-+#
-+#    eq0 - equal up to the length of the shorter version
-+#    ne0 - not equal up to the length of the shorter version
-+#    eqN - equal up to N sub-version levels
-+#    neN - not equal up to N sub-version levels
-+#
-+#   When the condition is true, shell commands ACTION-IF-TRUE are run,
-+#   otherwise shell commands ACTION-IF-FALSE are run. The environment
-+#   variable 'ax_compare_version' is always set to either 'true' or 'false'
-+#   as well.
-+#
-+#   Examples:
-+#
-+#     AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8])
-+#     AX_COMPARE_VERSION([3.15],[lt],[3.15.8])
-+#
-+#   would both be true.
-+#
-+#     AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8])
-+#     AX_COMPARE_VERSION([3.15],[gt],[3.15.8])
-+#
-+#   would both be false.
-+#
-+#     AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8])
-+#
-+#   would be true because it is only comparing two minor versions.
-+#
-+#     AX_COMPARE_VERSION([3.15.7],[eq0],[3.15])
-+#
-+#   would be true because it is only comparing the lesser number of minor
-+#   versions of the two values.
-+#
-+#   Note: The characters that separate the version numbers do not matter. An
-+#   empty string is the same as version 0. OP is evaluated by autoconf, not
-+#   configure, so must be a string, not a variable.
-+#
-+#   The author would like to acknowledge Guido Draheim whose advice about
-+#   the m4_case and m4_ifvaln functions make this macro only include the
-+#   portions necessary to perform the specific comparison specified by the
-+#   OP argument in the final configure script.
-+#
-+# LICENSE
-+#
-+#   Copyright (c) 2008 Tim Toolan <toolan@ele.uri.edu>
-+#
-+#   Copying and distribution of this file, with or without modification, are
-+#   permitted in any medium without royalty provided the copyright notice
-+#   and this notice are preserved. This file is offered as-is, without any
-+#   warranty.
-+
-+#serial 13
-+
-+dnl #########################################################################
-+AC_DEFUN([AX_COMPARE_VERSION], [
-+  AC_REQUIRE([AC_PROG_AWK])
-+
-+  # Used to indicate true or false condition
-+  ax_compare_version=false
-+
-+  # Convert the two version strings to be compared into a format that
-+  # allows a simple string comparison.  The end result is that a version
-+  # string of the form 1.12.5-r617 will be converted to the form
-+  # 0001001200050617.  In other words, each number is zero padded to four
-+  # digits, and non digits are removed.
-+  AS_VAR_PUSHDEF([A],[ax_compare_version_A])
-+  A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
-+                     -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
-+                     -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-+                     -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-+                     -e 's/[[^0-9]]//g'`
-+
-+  AS_VAR_PUSHDEF([B],[ax_compare_version_B])
-+  B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
-+                     -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
-+                     -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-+                     -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-+                     -e 's/[[^0-9]]//g'`
-+
-+  dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary
-+  dnl # then the first line is used to determine if the condition is true.
-+  dnl # The sed right after the echo is to remove any indented white space.
-+  m4_case(m4_tolower($2),
-+  [lt],[
-+    ax_compare_version=`echo "x$A
-+x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"`
-+  ],
-+  [gt],[
-+    ax_compare_version=`echo "x$A
-+x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"`
-+  ],
-+  [le],[
-+    ax_compare_version=`echo "x$A
-+x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"`
-+  ],
-+  [ge],[
-+    ax_compare_version=`echo "x$A
-+x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"`
-+  ],[
-+    dnl Split the operator from the subversion count if present.
-+    m4_bmatch(m4_substr($2,2),
-+    [0],[
-+      # A count of zero means use the length of the shorter version.
-+      # Determine the number of characters in A and B.
-+      ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'`
-+      ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'`
-+
-+      # Set A to no more than B's length and B to no more than A's length.
-+      A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"`
-+      B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"`
-+    ],
-+    [[0-9]+],[
-+      # A count greater than zero means use only that many subversions
-+      A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
-+      B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
-+    ],
-+    [.+],[
-+      AC_WARNING(
-+        [invalid OP numeric parameter: $2])
-+    ],[])
-+
-+    # Pad zeros at end of numbers to make same length.
-+    ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`"
-+    B="$B`echo $A | sed 's/./0/g'`"
-+    A="$ax_compare_version_tmp_A"
-+
-+    # Check for equality or inequality as necessary.
-+    m4_case(m4_tolower(m4_substr($2,0,2)),
-+    [eq],[
-+      test "x$A" = "x$B" && ax_compare_version=true
-+    ],
-+    [ne],[
-+      test "x$A" != "x$B" && ax_compare_version=true
-+    ],[
-+      AC_WARNING([invalid OP parameter: $2])
-+    ])
-+  ])
-+
-+  AS_VAR_POPDEF([A])dnl
-+  AS_VAR_POPDEF([B])dnl
-+
-+  dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE.
-+  if test "$ax_compare_version" = "true" ; then
-+    m4_ifvaln([$4],[$4],[:])dnl
-+    m4_ifvaln([$5],[else $5])dnl
-+  fi
-+]) dnl AX_COMPARE_VERSION
---- a/configure.ac
-+++ b/configure.ac
-@@ -170,7 +170,7 @@
-         LIBS=$LIBS_bkp;
- 
-         CPPFLAGS_bkp=$CPPFLAGS
--        CPPFLAGS="$POSTGRESQL_CFLAGS"
-+        CPPFLAGS="$POSTGRESQL_CPPFLAGS"
-         AC_CHECK_HEADER(libpq-fe.h, with_pgsql=yes, with_pgsql=no)
-         CPPFLAGS=$CPPFLAGS_bkp;
- fi
---- a/plugins/sql/pgsql/Makefile.am
-+++ b/plugins/sql/pgsql/Makefile.am
-@@ -1,4 +1,4 @@
--AM_CPPFLAGS=@PCFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/libmissing -I$(top_builddir)/libmissing @LIBPRELUDE_CFLAGS@ @POSTGRESQL_CFLAGS@
-+AM_CPPFLAGS=@PCFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/libmissing -I$(top_builddir)/libmissing @LIBPRELUDE_CFLAGS@ @POSTGRESQL_CPPFLAGS@
- pgsql_la_LDFLAGS = -module -avoid-version @LIBPRELUDE_LDFLAGS@ 
- 
- if HAVE_PGSQL
diff --git a/dev-libs/libpreludedb/libpreludedb-5.1.0.ebuild b/dev-libs/libpreludedb/libpreludedb-5.1.0.ebuild
index 9e2c81a16649..13715fbe4d42 100644
--- a/dev-libs/libpreludedb/libpreludedb-5.1.0.ebuild
+++ b/dev-libs/libpreludedb/libpreludedb-5.1.0.ebuild
@@ -10,7 +10,8 @@ inherit autotools distutils-r1
 
 DESCRIPTION="Framework to easy access to the Prelude database"
 HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
+SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz
+	https://dev.gentoo.org/~juippis/distfiles/tmp/libpreludedb-5.1.0-update_m4_postgresql.patch"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -40,7 +41,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.0.0-fix-python-bindings.patch"
 	"${FILESDIR}/${PN}-5.1.0-fix_gtkdoc_1.32.patch"
 	"${FILESDIR}/${PN}-5.1.0-fix_py38.patch"
-	"${FILESDIR}/${PN}-5.1.0-update_m4_postgresql.patch"
+	"${DISTDIR}/${PN}-5.1.0-update_m4_postgresql.patch"
 )
 
 src_prepare() {
diff --git a/dev-libs/libpreludedb/libpreludedb-5.2.0.ebuild b/dev-libs/libpreludedb/libpreludedb-5.2.0.ebuild
index c60925e967f2..5e73804b50a0 100644
--- a/dev-libs/libpreludedb/libpreludedb-5.2.0.ebuild
+++ b/dev-libs/libpreludedb/libpreludedb-5.2.0.ebuild
@@ -10,7 +10,8 @@ inherit autotools distutils-r1
 
 DESCRIPTION="Framework to easy access to the Prelude database"
 HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
+SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz
+	https://dev.gentoo.org/~juippis/distfiles/tmp/libpreludedb-5.1.0-update_m4_postgresql.patch"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -39,7 +40,7 @@ BDEPEND=">=dev-lang/swig-4.0.0
 PATCHES=(
 	"${FILESDIR}/${PN}-4.0.0-fix-python-bindings.patch"
 	"${FILESDIR}/${PN}-5.1.0-fix_gtkdoc_1.32.patch"
-	"${FILESDIR}/${PN}-5.1.0-update_m4_postgresql.patch"
+	"${DISTDIR}/${PN}-5.1.0-update_m4_postgresql.patch"
 )
 
 src_prepare() {
diff --git a/dev-libs/libstroke/libstroke-0.5.1-r1.ebuild b/dev-libs/libstroke/libstroke-0.5.1-r1.ebuild
index 1eb5fa30dc6c..cb4bde34cb74 100644
--- a/dev-libs/libstroke/libstroke-0.5.1-r1.ebuild
+++ b/dev-libs/libstroke/libstroke-0.5.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="A Stroke and Gesture recognition Library"
 HOMEPAGE="http://www.etla.net/libstroke/"
@@ -12,21 +12,29 @@ SRC_URI="http://www.etla.net/libstroke/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
 
 RDEPEND="x11-libs/libX11"
-DEPEND="x11-base/xorg-proto
-	${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-m4_syntax.patch
+	"${FILESDIR}"/${P}-no_gtk1.patch
+	"${FILESDIR}"/${P}-autotools.patch
+)
 
 src_prepare() {
-	eapply "${FILESDIR}"/${P}-m4_syntax.patch
-	eapply "${FILESDIR}"/${P}-no_gtk1.patch
-	eapply "${FILESDIR}"/${P}-autotools.patch
-	eapply_user
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc CREDITS ChangeLog README
+	default
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libtreadstone/libtreadstone-0.2.0.ebuild b/dev-libs/libtreadstone/libtreadstone-0.2.0.ebuild
index 1ab31ea5b9ff..cb7f1d335b75 100644
--- a/dev-libs/libtreadstone/libtreadstone-0.2.0.ebuild
+++ b/dev-libs/libtreadstone/libtreadstone-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,3 +16,12 @@ IUSE=""
 DEPEND=">=dev-libs/libpo6-0.7.0
 	>=dev-libs/libe-0.10.0"
 RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libtubo/libtubo-5.0.15.ebuild b/dev-libs/libtubo/libtubo-5.0.15.ebuild
index 1cc59cccfbae..c6feb05d374e 100644
--- a/dev-libs/libtubo/libtubo-5.0.15.ebuild
+++ b/dev-libs/libtubo/libtubo-5.0.15.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils ltprune
+EAPI=7
 
 MY_P=${PN}0-${PV}
 
@@ -13,19 +12,16 @@ SRC_URI="mirror://sourceforge/xffm/${PN}/${MY_P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}"/${MY_P}
 
-pkg_setup() {
-	DOCS=( AUTHORS ChangeLog NEWS README TODO )
+src_configure() {
+	econf --disable-static
 }
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libusb/libusb-1.0.23-r1.ebuild b/dev-libs/libusb/libusb-1.0.23-r1.ebuild
index 8236783eb0c3..de58b15aa4ef 100644
--- a/dev-libs/libusb/libusb-1.0.23-r1.ebuild
+++ b/dev-libs/libusb/libusb-1.0.23-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc examples static-libs test udev"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
index 1f2ead9cf756..c7c189fff425 100644
--- a/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt debug examples static-libs elibc_Darwin"
 
diff --git a/dev-libs/log4cxx/log4cxx-0.10.0-r1.ebuild b/dev-libs/log4cxx/log4cxx-0.10.0-r1.ebuild
index a1756aaab0f3..adc8b749d16b 100644
--- a/dev-libs/log4cxx/log4cxx-0.10.0-r1.ebuild
+++ b/dev-libs/log4cxx/log4cxx-0.10.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_P=apache-${P}
 
@@ -13,26 +13,27 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos"
 IUSE="iodbc unicode odbc smtp"
+# test suite fails
+RESTRICT="test"
 
-RDEPEND="dev-libs/apr:1
+RDEPEND="
+	dev-libs/apr:1
 	dev-libs/apr-util:1
 	odbc? (
 		iodbc? ( >=dev-db/libiodbc-3.52.4 )
-		!iodbc? ( dev-db/unixODBC ) )
+		!iodbc? ( dev-db/unixODBC )
+	)
 	smtp? ( net-libs/libesmtp )"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-# test suite fails
-RESTRICT="test"
-
 HTML_DOCS=( site/. )
 PATCHES=(
-	"${FILESDIR}/${PN}-0.10.0-missing_includes.patch"
-	"${FILESDIR}/${PN}-0.10.0-gcc44.patch"
-	"${FILESDIR}/${PN}-0.10.0-unixODBC.patch"
-	"${FILESDIR}/${PN}-0.10.0-fix-c++14.patch"
+	"${FILESDIR}"/${PN}-0.10.0-missing_includes.patch
+	"${FILESDIR}"/${PN}-0.10.0-gcc44.patch
+	"${FILESDIR}"/${PN}-0.10.0-unixODBC.patch
+	"${FILESDIR}"/${PN}-0.10.0-fix-c++14.patch
 )
 
 pkg_setup() {
@@ -43,9 +44,10 @@ pkg_setup() {
 
 src_configure() {
 	econf \
+		--disable-static \
 		--disable-doxygen \
 		--disable-html-docs \
-		--with-apr-util="${SYSROOT}${EPREFIX}/usr" \
+		--with-apr-util="${ESYSROOT}"/usr \
 		$(use_with smtp SMTP libesmtp) \
 		$(use_with odbc ODBC $(usex iodbc iODBC unixODBC)) \
 		--with-charset=$(usex unicode utf-8 auto)
@@ -59,5 +61,5 @@ src_install() {
 	docompress -x /usr/share/doc/${PF}/examples
 
 	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/msgpack/msgpack-3.3.0.ebuild b/dev-libs/msgpack/msgpack-3.3.0.ebuild
index c21dd416d641..532685cbd1c1 100644
--- a/dev-libs/msgpack/msgpack-3.3.0.ebuild
+++ b/dev-libs/msgpack/msgpack-3.3.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
diff --git a/dev-libs/mxml/Manifest b/dev-libs/mxml/Manifest
index ff44384f5f2c..6a17f8cd6e27 100644
--- a/dev-libs/mxml/Manifest
+++ b/dev-libs/mxml/Manifest
@@ -1,2 +1 @@
-DIST mxml-3.1.tar.gz 9267206 BLAKE2B d5cee24804978b474bf5b58c7a5932b50d7197a35e65da20c2517ce7db01d22027449348d6b15ddf0d186219ac81993055deaa4af9f48439273f8d2d74b27edd SHA512 8f8923b394093db5c471c52c17185916bc3c91f66c97de66919bfef2a09f271879a52f285e5fc4ded03484a3f83ba8fdb588d985b06e0c25ee001f1a80ffa586
 DIST mxml-3.2.tar.gz 9267930 BLAKE2B f244dab599233b8a26aba5a11526979bf2f4d20b5fce67858f7759abc5bd2f3e2aac19d512c887248839d130cf1314065687cd1ccf91edbf5533ae2d342f286b SHA512 ed3f2b361394ef225a708b0032976a3d191d5eaea3022e190b29e0ee140e8f998f1d65c64e4898872b169516cee44f4f5f18401c6410c3b5aa1e9680b23e8675
diff --git a/dev-libs/mxml/mxml-3.1.ebuild b/dev-libs/mxml/mxml-3.1.ebuild
deleted file mode 100644
index 588f6e63e67c..000000000000
--- a/dev-libs/mxml/mxml-3.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A small XML parsing library that you can use to read XML data files or strings"
-HOMEPAGE="
-	https://github.com/michaelrsweet/mxml
-	https://www.msweet.org/mxml/
-"
-SRC_URI="https://github.com/michaelrsweet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Mini-XML"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
-IUSE="static-libs threads"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# Respect users CFLAGS
-	sed -e 's/-Os -g//' -i configure.ac || die
-
-	# Don't run always tests
-	# Enable verbose compiling
-	sed -e '/ALLTARGETS/s/testmxml//g' -e '/.SILENT:/d' -i Makefile.in || die
-
-	# Build only static-libs, when requested by user, also build docs without static-libs in that case
-	if ! use static-libs; then
-		local mysedopts=(
-			-e '/^install:/s/install-libmxml.a//g'
-			-e '/^mxml.xml:/s/-static//g'
-			-e '/^mxml.epub:/s/-static//g'
-			-e '/^valgrind/s/-static//g'
-			-e 's/.\/mxmldoc-static/LD_LIBRARY_PATH="." .\/mxmldoc/g'
-		)
-		sed "${mysedopts[@]}" -i Makefile.in || die
-	fi
-
-	eautoconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable threads)
-		--with-docdir=/usr/share/doc/"${PF}"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	emake testmxml
-}
-
-src_install() {
-	emake DSTROOT="${ED}" install
-}
diff --git a/dev-libs/mxml/mxml-3.2.ebuild b/dev-libs/mxml/mxml-3.2.ebuild
index 91587404307a..710eb09a6790 100644
--- a/dev-libs/mxml/mxml-3.2.ebuild
+++ b/dev-libs/mxml/mxml-3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/michaelrsweet/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Mini-XML"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="static-libs threads"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index b0fb6928ac41..2ceff703f43b 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,5 +1,4 @@
-DIST nss-3.55.tar.gz 81759883 BLAKE2B 5b663d2b1861eb74cf070f2711b4db1afbfbc40b08e1f117e6b4a62e9f997de06889de3afc654cf6547c371ab2a1183904a1a014d1dc4b3e94f734107c81e1cf SHA512 acae7b803a3219cd4b78216cb8a6352805741e42eca6a42a5e6289ebbabc6189c7c6bc138cbd8a93d8631d06175c4d34e72957d49fe726adada6aaa2566e399e
 DIST nss-3.56.tar.gz 81706176 BLAKE2B 84c3b9fd649ce38ad843725b180982692dcac34e851734813b959734054f2e9ebfad66496de320f46e861381f6d5f52db0cc4c0953f7504b79f6b529b871f173 SHA512 f2eed8252c13b38a4d80a11203136d22a521205f814b6d954cc119ccf8921fcb8f689d919944bea4739d1575e9bda7e13cf2ad054ac91d51e049abe246efc845
-DIST nss-3.57.tar.gz 81712830 BLAKE2B 998160fe16e13d1997f3d11a054148349b068214afb3c0cd3b9e82ce03999e46ca34b02907dc27e3f253653f6e57a9f1498e6c16f8665350c629f5c3c98ea0bc SHA512 7e312d7539a26f57b968548935a7715cfa895aa61da21d0542ae45b71cb16f63167728534cdfd15f8eca68c75753a0df3d05e87b4c5acaabbda63c736e552ea2
 DIST nss-3.58.tar.gz 81846254 BLAKE2B f8e7d0b231916b197ad21706a057d055f8377059d76d4f09aff523cc4cd071a3184f02dc488259df22109b70be7b8a5d5fa7ea2273a830de825cc9a8c95dcca9 SHA512 03d2ab1517ac07620ea3f02dcf680cf019e0129006ff2559b2d0a047036340c20b98c9679b17a594e5502aa30e158caf309f046901b9ec7c7adeeaa13ec50b80
+DIST nss-3.59.tar.gz 82141516 BLAKE2B 74959b14ec42b4628dfc3365af00420cdbd41d202541e9379f6a4448c4496b76307af48c9ec405b370f8770327ce56742b4382f8cd49724b42732ce5cc5b0779 SHA512 8963e846f2ff7222457ae59f042672cf4e44f7752807226f46c215a772fd1cbd65d0ce634da4afb698eabd4eb1c1e78146cc2a089339ada11da03d259c609a38
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
diff --git a/dev-libs/nss/nss-3.55.ebuild b/dev-libs/nss/nss-3.55.ebuild
deleted file mode 100644
index 827349d454c0..000000000000
--- a/dev-libs/nss/nss-3.55.ebuild
+++ /dev/null
@@ -1,351 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.26"
-RTM_NAME="NSS_${PV//./_}_RTM"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cacert utils"
-# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
-RDEPEND="
-	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nss-config
-)
-
-PATCHES=(
-	# Custom changes for gentoo
-	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
-	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
-	"${FILESDIR}/${PN}-3.53-fix-building-on-ppc.patch"
-)
-
-src_prepare() {
-	if use cacert ; then #521462
-		PATCHES+=(
-			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
-		)
-	fi
-
-	default
-
-	pushd coreconf >/dev/null || die
-	# hack nspr paths
-	echo 'INCLUDES += -I$(DIST)/include/dbm' \
-		>> headers.mk || die "failed to append include"
-
-	# modify install path
-	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-	popd >/dev/null || die
-
-	# Fix pkgconfig file for Prefix
-	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
-		config/Makefile || die
-
-	# use host shlibsign if need be #436216
-	if tc-is-cross-compiler ; then
-		sed -i \
-			-e 's:"${2}"/shlibsign:shlibsign:' \
-			cmd/shlibsign/sign.sh || die
-	fi
-
-	# dirty hack
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
-		lib/ssl/config.mk || die
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
-		cmd/platlibs.mk || die
-
-	multilib_copy_sources
-
-	strip-flags
-}
-
-multilib_src_configure() {
-	# Ensure we stay multilib aware
-	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
-	# Most of the arches are the same as $ARCH
-	local t=${1:-${CHOST}}
-	case ${t} in
-		aarch64*)echo "aarch64";;
-		hppa*)   echo "parisc";;
-		i?86*)   echo "i686";;
-		x86_64*) echo "x86_64";;
-		*)       tc-arch ${t};;
-	esac
-}
-
-nssbits() {
-	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
-	if [[ ${1} == BUILD_ ]]; then
-		cc=$(tc-getBUILD_CC)
-	else
-		cc=$(tc-getCC)
-	fi
-	echo > "${T}"/test.c || die
-	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
-	case $(file "${T}/${1}test.o") in
-		*32-bit*x86-64*) echo USE_X32=1;;
-		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
-		*32-bit*|*ppc*|*i386*) ;;
-		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-}
-
-multilib_src_compile() {
-	# use ABI to determine bit'ness, or fallback if unset
-	local buildbits mybits
-	case "${ABI}" in
-		n32) mybits="USE_N32=1";;
-		x32) mybits="USE_X32=1";;
-		s390x|*64) mybits="USE_64=1";;
-		${DEFAULT_ABI})
-			einfo "Running compilation test to determine bit'ness"
-			mybits=$(nssbits)
-			;;
-	esac
-	# bitness of host may differ from target
-	if tc-is-cross-compiler; then
-		buildbits=$(nssbits BUILD_)
-	fi
-
-	local makeargs=(
-		CC="$(tc-getCC)"
-		CCC="$(tc-getCXX)"
-		AR="$(tc-getAR) rc \$@"
-		RANLIB="$(tc-getRANLIB)"
-		OPTIMIZER=
-		${mybits}
-	)
-
-	# Take care of nspr settings #436216
-	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
-	unset NSPR_INCLUDE_DIR
-
-	export NSS_ALLOW_SSLKEYLOGFILE=1
-	export NSS_ENABLE_WERROR=0 #567158
-	export BUILD_OPT=1
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSDISTMODE=copy
-	export FREEBL_NO_DEPEND=1
-	export FREEBL_LOWHASH=1
-	export NSS_SEED_ONLY_DEV_URANDOM=1
-	export USE_SYSTEM_ZLIB=1
-	export ZLIB_LIBS=-lz
-	export ASFLAGS=""
-
-	local d
-
-	# Build the host tools first.
-	LDFLAGS="${BUILD_LDFLAGS}" \
-	XCFLAGS="${BUILD_CFLAGS}" \
-	NSPR_LIB_DIR="${T}/fakedir" \
-	emake -j1 -C coreconf \
-		CC="$(tc-getBUILD_CC)" \
-		${buildbits-${mybits}}
-	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
-	# Then build the target tools.
-	for d in . lib/dbm ; do
-		CPPFLAGS="${myCPPFLAGS}" \
-		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		NSPR_LIB_DIR="${T}/fakedir" \
-		emake -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
-	done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-#	*/${local_libdir}/libfreebl3.so*
-#	*/${local_libdir}/libnssdbm3.so*
-#	*/${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
-	local shlibsign="$1"
-	local libdir="$2"
-	einfo "Resigning core NSS libraries for FIPS validation"
-	shift 2
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libname=lib${i}.so
-		local chkname=lib${i}.chk
-		"${shlibsign}" \
-			-i "${libdir}"/${libname} \
-			-o "${libdir}"/${chkname}.tmp \
-		&& mv -f \
-			"${libdir}"/${chkname}.tmp \
-			"${libdir}"/${chkname} \
-		|| die "Failed to sign ${libname}"
-	done
-}
-
-cleanup_chk() {
-	local libdir="$1"
-	shift 1
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libfname="${libdir}/lib${i}.so"
-		# If the major version has changed, then we have old chk files.
-		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
-			&& rm -f "${libfname}.chk"
-	done
-}
-
-multilib_src_install() {
-	pushd dist >/dev/null || die
-
-	dodir /usr/$(get_libdir)
-	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
-	local i
-	for i in crmf freebl nssb nssckfw ; do
-		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
-	done
-
-	# Install nss-config and pkgconfig file
-	dodir /usr/bin
-	cp -L */bin/nss-config "${ED}"/usr/bin || die
-	dodir /usr/$(get_libdir)/pkgconfig
-	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
-
-	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
-	# bug 517266
-	sed 	-e 's#Libs:#Libs: -lfreebl#' \
-		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
-		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
-		|| die "could not create nss-softokn.pc"
-
-	# all the include files
-	insinto /usr/include/nss
-	doins public/nss/*.{h,api}
-	insinto /usr/include/nss/private
-	doins private/nss/{blapi,alghmac,cmac}.h
-
-	popd >/dev/null || die
-
-	local f nssutils
-	# Always enabled because we need it for chk generation.
-	nssutils=( shlibsign )
-
-	if multilib_is_native_abi ; then
-		if use utils; then
-			# The tests we do not need to install.
-			#nssutils_test="bltest crmftest dbtest dertimetest
-			#fipstest remtest sdrtest"
-			# checkcert utils has been removed in nss-3.22:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
-			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
-			# certcgi has been removed in nss-3.36:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
-			nssutils+=(
-				addbuiltin
-				atob
-				baddbdir
-				btoa
-				certutil
-				cmsutil
-				conflict
-				crlutil
-				derdump
-				digest
-				makepqg
-				mangle
-				modutil
-				multinit
-				nonspr10
-				ocspclnt
-				oidcalc
-				p7content
-				p7env
-				p7sign
-				p7verify
-				pk11mode
-				pk12util
-				pp
-				rsaperf
-				selfserv
-				signtool
-				signver
-				ssltap
-				strsclnt
-				symkeyutil
-				tstclnt
-				vfychain
-				vfyserv
-			)
-			# install man-pages for utils (bug #516810)
-			doman doc/nroff/*.1
-		fi
-		pushd dist/*/bin >/dev/null || die
-		for f in ${nssutils[@]}; do
-			dobin ${f}
-		done
-		popd >/dev/null || die
-	fi
-
-	# Prelink breaks the CHK files. We don't have any reliable way to run
-	# shlibsign after prelink.
-	dodir /etc/prelink.conf.d
-	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
-		> "${ED}"/etc/prelink.conf.d/nss.conf
-}
-
-pkg_postinst() {
-	multilib_pkg_postinst() {
-		# We must re-sign the libraries AFTER they are stripped.
-		local shlibsign="${EROOT}/usr/bin/shlibsign"
-		# See if we can execute it (cross-compiling & such). #436216
-		"${shlibsign}" -h >&/dev/null
-		if [[ $? -gt 1 ]] ; then
-			shlibsign="shlibsign"
-		fi
-		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	multilib_pkg_postrm() {
-		cleanup_chk "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/nss/nss-3.57.ebuild b/dev-libs/nss/nss-3.59.ebuild
similarity index 100%
rename from dev-libs/nss/nss-3.57.ebuild
rename to dev-libs/nss/nss-3.59.ebuild
diff --git a/dev-libs/pakchois/pakchois-0.4-r2.ebuild b/dev-libs/pakchois/pakchois-0.4-r2.ebuild
index fdfc232a6bfa..fed0ff842a1f 100644
--- a/dev-libs/pakchois/pakchois-0.4-r2.ebuild
+++ b/dev-libs/pakchois/pakchois-0.4-r2.ebuild
@@ -16,5 +16,11 @@ IUSE="nls"
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
-		$(use_enable nls)
+		$(use_enable nls) \
+		--disable-static
+}
+
+multilib_src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/pcl/pcl-1.12-r1.ebuild b/dev-libs/pcl/pcl-1.12-r1.ebuild
index d93b4eb3fb4a..e0413db80e0e 100644
--- a/dev-libs/pcl/pcl-1.12-r1.ebuild
+++ b/dev-libs/pcl/pcl-1.12-r1.ebuild
@@ -10,3 +10,12 @@ SRC_URI="http://xmailserver.org/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/1"
 KEYWORDS="amd64 arm arm64 ppc64 x86"
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/popt/popt-1.18.ebuild b/dev-libs/popt/popt-1.18.ebuild
index 6130f1283417..51c8d3587b92 100644
--- a/dev-libs/popt/popt-1.18.ebuild
+++ b/dev-libs/popt/popt-1.18.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://ftp.rpm.org/${PN}/releases/${PN}-1.x/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
 IUSE="nls static-libs"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/ppl/Manifest b/dev-libs/ppl/Manifest
index 4fbf613da603..1b10f505e69f 100644
--- a/dev-libs/ppl/Manifest
+++ b/dev-libs/ppl/Manifest
@@ -1 +1,2 @@
+DIST ppl-1.2-r3-disable-boeing-tests.patch 21485 BLAKE2B e68bab59710c63726f04a139e84d72b277e85625bc405c594a22c005186a2c3aae3850e17b81d38fa0231dcfd08454d488bbad2474ed810be78ef646d9c92559 SHA512 fc8dc020e493e5726167741d1548c661bac07991a982bf09ff61f593adfd2faf723886cbcb16d741db61e46530c4dddf49b6b61b67fef7d5ac15ca577c7fc46d
 DIST ppl-1.2.tar.xz 14136236 BLAKE2B 060b73384dac558dc8b2b0f1027ed0aa270b0adf0992c2ca1a281fa7bcdf959cba3a9e8ee29e978d12c3eee606b819075c5bcab59f4aed24fbf1c5512b5e2c36 SHA512 b509ed85fa6aedd40119bd4c980b17f33072c56c2acd923da3445b6bc80d48051cfa4c04cce96f6974711f5279c24b31cb3869f87b2eb6a2a1b30a058c809350
diff --git a/dev-libs/ppl/files/disable-boeing-tests.patch b/dev-libs/ppl/files/disable-boeing-tests.patch
deleted file mode 100644
index ca208b8707ff..000000000000
--- a/dev-libs/ppl/files/disable-boeing-tests.patch
+++ /dev/null
@@ -1,1176 +0,0 @@
-From 14ceb43dee3c3a029dd5398d809796011dd3d772 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Tue, 14 Apr 2020 10:52:53 -0400
-Subject: [PATCH 1/1] demos/ppl_lpsol/examples: disable the boeing[12].mps
- tests.
-
-These two tests fail due to numerical noise on 32-bit systems, and
-this commit disables them to prevent build failures on Gentoo. This
-one is a bit trickier than the other test removals because we need to
-hack the expected output out of the expected_mpz file as well.
-
-Warning: this is only half of the solution. The boeing[12].mps files
-must still be deleted by the ebuild. The patch does not do this to
-avoid running afoul of the 20KiB patch size limit in Gentoo.
-
-Upstream-bug: https://www.cs.unipr.it/mantis/view.php?id=1078
-Upstream-bug: https://www.cs.unipr.it/mantis/view.php?id=2113
----
- demos/ppl_lpsol/Makefile.am          |   21 -
- demos/ppl_lpsol/examples/Makefile.am |    2 -
- demos/ppl_lpsol/expected_mpz         | 1070 --------------------------
- 3 files changed, 1093 deletions(-)
-
-diff --git a/demos/ppl_lpsol/Makefile.am b/demos/ppl_lpsol/Makefile.am
-index d6d6a38b2..7c73ba455 100644
---- a/demos/ppl_lpsol/Makefile.am
-+++ b/demos/ppl_lpsol/Makefile.am
-@@ -115,8 +115,6 @@ endif !ASSERTIONS_ENABLED
- TOUGH_EXAMPLES_FOR_ENUM = \
- adlittle.mps \
- blend.mps \
--boeing1.mps \
--boeing2.mps \
- egout.mps \
- kb2.mps \
- lseu.mps \
-@@ -161,8 +159,6 @@ adlittle.mps \
- afiro.mps \
- bgprtr.mps \
- blend.mps \
--boeing1.mps \
--boeing2.mps \
- kb2.mps \
- sample.mps \
- sc105.mps \
-@@ -172,13 +168,9 @@ ship08l.mps
- 
- DO_NOT_OUTPUT_OPTIMUM_LOCATION_PROBLEMS = \
- adlittle.mps \
--boeing1.mps \
--boeing2.mps \
- rout.mps
- 
- INDIVIDUALLY_CHECKED_PROBLEMS = \
--boeing1.mps \
--boeing2.mps \
- ex12.mps \
- mas74.mps \
- modglob.mps
-@@ -291,19 +283,6 @@ check-local: ppl_lpsol$(EXEEXT)
- 	  echo "*** ppl_lpsol -e -r $$m -oobtained $$file" >>obtained; \
- 	  ./ppl_lpsol$(EXEEXT) -e -r $(CHECK_OPTION) $$m -oobtained $$path >/dev/null; \
- 	done
--	$(ECHO_SIMPLEX_NOCHECK) "-r -m -c0.00000000518 boeing1.mps" >>obtained
--	-$(SIMPLEX_NOCHECK) -r -m -c0.00000000518 $(srcdir)/examples/boeing1.mps >/dev/null
--	$(ECHO_SIMPLEX_NOCHECK) "-r -M -c0.0000000105 boeing1.mps" >>obtained
--	-$(SIMPLEX_NOCHECK) -r -M -c0.0000000105 $(srcdir)/examples/boeing1.mps $$m >/dev/null
--	$(ECHO_SIMPLEX) "-n boeing1.mps" >>obtained
--	-$(SIMPLEX) -n $(srcdir)/examples/boeing1.mps >/dev/null
--	$(ECHO_SIMPLEX_NOCHECK) "-r -m -c0.00000000863 boeing2.mps" >>obtained
--	-$(SIMPLEX_NOCHECK) -r -m -c0.00000000863 $(srcdir)/examples/boeing2.mps >/dev/null
--	$(ECHO_SIMPLEX_NOCHECK) "-r -M -c0.00000000213 boeing2.mps" >>obtained
--	-$(SIMPLEX_NOCHECK) -r -M -c0.00000000213 $(srcdir)/examples/boeing2.mps $$m >/dev/null
--	$(ECHO_SIMPLEX) "-n boeing2.mps" >>obtained
--	-$(SIMPLEX) -n $(srcdir)/examples/boeing2.mps >/dev/null
--
- 	$(ECHO_SIMPLEX) "-r -m mas74.mps" >>obtained
- 	-$(SIMPLEX) -r -m $(srcdir)/examples/mas74.mps >/dev/null
- 	$(ECHO_SIMPLEX_NOCHECK) "-r -M -c0.000123 mas74.mps" >>obtained
-diff --git a/demos/ppl_lpsol/examples/Makefile.am b/demos/ppl_lpsol/examples/Makefile.am
-index f621a68d4..ce333c7c5 100644
---- a/demos/ppl_lpsol/examples/Makefile.am
-+++ b/demos/ppl_lpsol/examples/Makefile.am
-@@ -26,8 +26,6 @@ adlittle.mps \
- afiro.mps \
- bgprtr.mps \
- blend.mps \
--boeing1.mps \
--boeing2.mps \
- egout.mps \
- ex12.mps \
- ex1.mps \
-diff --git a/demos/ppl_lpsol/expected_mpz b/demos/ppl_lpsol/expected_mpz
-index 2bb4f1658..5024da1f6 100644
---- a/demos/ppl_lpsol/expected_mpz
-+++ b/demos/ppl_lpsol/expected_mpz
-@@ -3937,1076 +3937,6 @@ Optimum value: 0
- Optimum location:
- x1 = 0
- x2 = 0
--*** ./ppl_lpsol -s -p1 -oobtained -r -m -c0.00000000518 boeing1.mps
--Optimum value: -335.2135675
--Optimum location:
--PBOSHNL0 = 0
--PBOSHNL1 = 12
--PBOSHNL7 = 0
--PBOSHNL8 = 0
--PBOSLAX0 = 14
--PBOSLAX1 = 0
--PBOSLAX7 = 0
--PBOSSEA0 = 0
--PBOSSEA1 = 0
--PBOSSEA2 = 49
--PBOSSFO0 = 60
--PBOSSFO1 = 73
--PBOSTPE1 = 1
--PBOSTPE2 = 0
--PBOSTYO1 = 3
--PBOSTYO2 = 0
--PBOSYUL0 = 28.13380282
--PBOSYUL1 = 347.7678621
--PBOSYUL2 = 0.325
--PBOSYUL3 = 336.7733351
--PBOSYUL4 = 0
--PBOSYVR0 = 0
--PBOSYVR1 = 0
--PBOSYVR2 = 26
--PBOSYWG0 = 0
--PBOSYWG1 = 0
--PBOSYWG7 = 37
--PBOSYYZ0 = 19.03169014
--PBOSYYZ1 = 195.9683099
--PBUROAK0 = 11
--PBUROAK1 = 16
--PBURSEA0 = 83
--PBURSEA1 = 0
--PBURSFO0 = 278
--PHNLLAX0 = 104.0482353
--PHNLLAX1 = 33.04
--PHNLLAX2 = 68.20588235
--PHNLLAX3 = 98
--PHNLLON0 = 0
--PHNLLON6 = 5
--PHNLPAR0 = 0
--PHNLPAR6 = 1
--PHNLSEA0 = 0
--PHNLSEA1 = 157.7943925
--PHNLSEA2 = 0
--PHNLSFO0 = 35
--PHNLSFO1 = 0
--PHNLSFO7 = 0
--PHNLYVR0 = 94.20560748
--PHNLYVR1 = 0
--PHNLYVR7 = 39.79439252
--PLASSEA0 = 70.01327253
--PLASSEA1 = 342.9867275
--PLASYVR0 = 0
--PLASYVR6 = 37
--PLAXOAK0 = 32
--PLAXOAK1 = 0
--PLAXOAK2 = 46
--PLAXSEA0 = 0
--PLAXSEA1 = 0
--PLAXSEA2 = 0
--PLAXSEA3 = 546.0147059
--PLAXSEA4 = 3.720588235
--PLAXSEA5 = 139
--PLAXSEA6 = 66.26744186
--PLAXSEA7 = 0
--PLAXSEA8 = 57
--PLAXSEA9 = 5.415868673
--PLAXSFO0 = 33.04
--PLAXSFO1 = 260.8488372
--PLAXSFO2 = 839.9632721
--PLAXSFO3 = 87.90697674
--PLAXSFO4 = 168
--PLAXSFO5 = 98
--PLAXSFO6 = 1464.240914
--PLAXTPE0 = 8.581395349
--PLAXTPE1 = 0
--PLAXTPE2 = 18
--PLAXTPE8 = 4.418604651
--PLAXTYO0 = 41
--PLAXTYO1 = 0
--PLAXTYO2 = 0
--PLAXTYO8 = 0
--PLAXYVR0 = 0
--PLAXYVR1 = 153.755814
--PLAXYVR2 = 39.24418605
--PLONPAR0 = 0
--PLONPAR1 = 0
--PLONPAR2 = 2
--PLONSEA0 = 0
--PLONSEA1 = 151
--PLONYVR0 = 0
--PLONYVR1 = 0
--PLONYVR7 = 51
--POAKONT0 = 0
--POAKONT1 = 13
--POAKSEA0 = 37.89108456
--POAKSEA1 = 77.15303309
--POAKSEA2 = 6.955882353
--PONTSFO0 = 177
--PONTSEA0 = 23.10431985
--PONTSEA1 = 24.89568015
--PONTSEA2 = 0
--PPARSEA0 = 0
--PPARSEA1 = 68
--PPARYVR0 = 0
--PPARYVR1 = 0
--PPARYVR7 = 24
--PRNOSEA0 = 0
--PRNOSEA1 = 291
--PRNOYVR0 = 67
--PSEASFO0 = 0
--PSEASFO1 = 839.9632721
--PSEASFO2 = 146.6809139
--PSEASFO3 = 236.6
--PSEASFO4 = 0
--PSEASFO5 = 50.75581395
--PSEASFO6 = 168
--PSEATPE0 = 15.81395349
--PSEATPE1 = 0
--PSEATPE2 = 0
--PSEATPE3 = 49.60465116
--PSEATYO0 = 59.98837209
--PSEATYO1 = 0
--PSEATYO2 = 0
--PSEATYO3 = 95.01162791
--PSEAYVR0 = 164.8598131
--PSEAYVR1 = 0
--PSEAYVR2 = 0
--PSEAYVR3 = 392
--PSEAYVR4 = 0
--PSEAYVR5 = 70.01327253
--PSEAYVR6 = 0
--PSEAYVR7 = 50.75581395
--PSEAYVR8 = 47.16549296
--PSFOTPE0 = 0
--PSFOTPE1 = 0
--PSFOTPE2 = 0
--PSFOTPE8 = 6
--PSFOTYO0 = 0
--PSFOTYO1 = 0
--PSFOTYO2 = 0
--PSFOTYO8 = 17
--PSFOYVR0 = 260.8488372
--PSFOYVR1 = 37.15116279
--PTPETYO0 = 111
--PTPETYO1 = 0
--PTPETYO2 = 0
--PTPETYO3 = 0
--PTPEYVR0 = 57
--PTYOYVR0 = 91
--PYULYVR0 = 36.4084507
--PYULYVR1 = 134.1343917
--PYULYVR2 = 139.6904909
--PYULYVR3 = 4.766666667
--PYULYWG0 = 0
--PYULYWG1 = 271.3172923
--PYULYWG2 = 0
--PYULYWG3 = 178.6827077
--PYULYYZ0 = 0
--PYULYYZ1 = 266.6818464
--PYULYYZ2 = 0
--PYULYYZ3 = 431.9057717
--PYULYYZ4 = 1913.412382
--PYVRYWG0 = 14.67957746
--PYVRYWG1 = 271.3172923
--PYVRYWG2 = 138.0031303
--PYVRYYZ0 = 4.352112676
--PYVRYYZ1 = 241.2835753
--PYVRYYZ2 = 126.3643121
--PYWGYYZ0 = 14.67957746
--PYWGYYZ1 = 138.0031303
--PYWGYYZ2 = 0
--PYWGYYZ3 = 125.3172923
--PBOSOAK0 = 11
--PBOSOAK6 = 0
--PBOSBUR1 = 7
--PBOSBUR2 = 0
--PBOSONT1 = 4
--PBOSONT2 = 0
--PBURYVR1 = 26
--PBURTYO1 = 2
--PBURTPE1 = 1
--PBURHNL0 = 11
--PBURHNL6 = 0
--PHNLOAK0 = 0
--PHNLOAK1 = 24
--PHNLOAK2 = 0
--PHNLOAK8 = 0
--PHNLONT0 = 9.705882353
--PHNLONT6 = 6.294117647
--PHNLYWG1 = 3
--PHNLYYZ1 = 24
--PHNLYUL1 = 40
--PLASTYO1 = 5
--PLASTPE1 = 1
--PLAXLON0 = 13
--PLAXLON6 = 0
--PLAXLON7 = 0
--PLAXPAR0 = 8
--PLAXPAR6 = 0
--PLAXPAR7 = 0
--PBURLON1 = 1
--PBURPAR1 = 1
--PLONONT1 = 1
--PLONOAK1 = 1
--POAKPAR1 = 2
--POAKTYO1 = 7
--POAKTPE1 = 2
--PONTPAR1 = 2
--PONTTYO1 = 2
--PONTTPE1 = 1
--PPARSFO1 = 2
--PRNOTYO1 = 5
--PRNOTPE1 = 2
--PTPEYWG1 = 21
--PTPEYYZ1 = 13
--PTPEYUL1 = 6
--PTYOYUL1 = 7
--PTYOYYZ1 = 17
--PTYOYWG1 = 25
--PLAXONT0 = 6.294117647
--GRDTIMO1 = 0
--GRDTIMN1 = -49.01286158
--GRDTIMO2 = 0
--GRDTIMN2 = 0
--GRDTIMO3 = 0
--GRDTIMN3 = -47
--GRDTIMO4 = 0
--GRDTIMN4 = 0
--GRDTIMO5 = 0
--GRDTIMN5 = -47.24353963
--GRDTIMO6 = 0
--GRDTIMN6 = -81
--N1001AC1 = 0
--N1001AC2 = 0
--N1001AC3 = 0
--N1002AC1 = 0
--N1002AC2 = 0
--N1002AC3 = 2.355140187
--N1003AC1 = 0
--N1003AC2 = 0.1603208556
--N1003AC3 = 0.7214438503
--N1004AC1 = 0.28
--N1004AC2 = 0
--N1004AC3 = 0
--N1005AC3 = 0.0859375
--N1105AC3 = 0.8382352941
--N1006AC3 = 0.07582720588
--N1007AC1 = 0
--N1007AC2 = 0
--N1007AC3 = 0
--N1008AC1 = 0
--N1008AC2 = 0
--N1008AC3 = 0
--N1008AC4 = 0
--N1008AC5 = 0
--N1008AC6 = 4.65801495
--N1009AC1 = 0
--N1009AC2 = 0.07488107822
--N1009AC3 = 0
--N1009AC4 = 0
--N1009AC5 = 1.921947674
--N1010AC1 = 0
--N1010AC2 = 0
--N1010AC3 = 0
--N1010AC4 = 0
--N1010AC5 = 0
--N1010AC6 = 7
--N1011AC1 = 0
--N1011AC2 = 3.085065996
--N1011AC3 = 0.6951730236
--N1011AC4 = 0
--N1011AC5 = 3.897217244
--N1011AC6 = 0
--N1012AC1 = 1.510832058
--N1012AC2 = 0
--N1012AC3 = 0
--N1012AC4 = 0
--N1012AC5 = 2.417331293
--N1013AC3 = 0
--N1013AC4 = 0
--N1013AC5 = 0
--N1013AC6 = 0.9241727941
--N1014AC3 = 0
--N1014AC4 = 0
--N1014AC5 = 1.691245404
--N1014AC6 = 0.2228170956
--N1015AC3 = 0
--N1015AC4 = 0.7048194147
--N1015AC5 = 0.1595430366
--N1015AC6 = 2.135637549
--N1016AC3 = 0
--N1016AC4 = 0
--N1016AC5 = 0.7
--N1016AC6 = 3.3
--N1017AC3 = 0
--N1017AC4 = 0
--N1017AC5 = 0
--N1017AC6 = 0.1617647059
--N1018AC1 = 0
--N1018AC2 = 0
--N1018AC3 = 0
--N1018AC4 = 0
--N1018AC5 = 0
--N1018AC6 = 1.196428571
--N1019AC1 = 0
--N1019AC2 = 0
--N1019AC3 = 0
--N1019AC4 = 0.2345133807
--N1019AC5 = 0.7654866193
--N1020AC1 = 0.2228332753
--N1020AC2 = 0
--N1020AC3 = 0
--N1020AC4 = 0
--N1020AC5 = 3.200696136
--N1020AC6 = 0
--N1021AC1 = 0.664202377
--N1021AC2 = 0
--N1021AC3 = 0
--N1021AC4 = 0
--N1021AC5 = 2.453858782
--N1022AC1 = 0
--N1023AC1 = 0
--N1026AC1 = 1
--N1027AC1 = 0.476744186
--N1028AC1 = 0
--N1029AC1 = 0.523255814
--N1030AC1 = 1
--N1032AC1 = 0
--N1032AC2 = 0
--N1032AC3 = 0
--N1032AC4 = 0.8274647887
--N1032AC5 = 0
--N1033AC1 = 0.4860357964
--N1033AC2 = 0.5004769224
--N1033AC3 = 0
--N1033AC4 = 0
--N1033AC5 = 2.061996183
--N1034AC1 = 0
--N1034AC2 = 0
--N1034AC3 = 3.174783885
--N1035AC1 = 0.6827679474
--N1035AC2 = 0
--N1035AC3 = 0
--N1035AC4 = 0.7269371829
--N1035AC5 = 0.2529831862
--N1036AC1 = 0.1083333333
--N1036AC2 = 0
--N1036AC3 = 0
--N1037AC4 = 0
--N1037AC5 = 0
--N1038AC4 = 0.2383968781
--N1038AC5 = 1.271450017
--N1039AC4 = 0
--N1039AC5 = 2.077705904
--N1040AC4 = 0
--N1040AC5 = 0
--N1040AC6 = 9.513243659
--N1041AC4 = 8.856901224
--N1041AC5 = 0
--N1041AC6 = 20
--N1042AC4 = 0
--N1042AC5 = 0
--N1042AC6 = 0
--N1043AC1 = 0.1725352113
--N1043AC2 = 0
--N1043AC3 = 0
--N1044AC1 = 0
--N1044AC2 = 0
--N1044AC3 = 1
--N1046AC3 = 1
--N1047AC1 = 0
--N1047AC2 = 0
--N1047AC3 = 1
--N1050AC3 = 0
--N1050AC4 = 0
--N1050AC5 = 0.0731874145
--N1051AC1 = 0
--N1051AC2 = 0
--N1051AC3 = 0
--N1051AC4 = 0
--N1051AC5 = 4.651904242
--N1051AC6 = 20
--*** ./ppl_lpsol -s -p1 -oobtained -r -M -c0.0000000105 boeing1.mps
--Optimum value: 286.9746573
--Optimum location:
--PBOSHNL0 = 0
--PBOSHNL1 = 10
--PBOSHNL7 = 0
--PBOSHNL8 = 0
--PBOSLAX0 = 0
--PBOSLAX1 = 0
--PBOSLAX7 = 12
--PBOSSEA0 = 0
--PBOSSEA1 = 40
--PBOSSEA2 = 0
--PBOSSFO0 = 48
--PBOSSFO1 = 73
--PBOSTPE1 = 0
--PBOSTPE2 = 0
--PBOSTYO1 = 0
--PBOSTYO2 = 0
--PBOSYUL0 = 372
--PBOSYUL1 = 224.0530973
--PBOSYUL2 = 0
--PBOSYUL3 = 11.94690265
--PBOSYUL4 = 0
--PBOSYVR0 = 0
--PBOSYVR1 = 23
--PBOSYVR2 = 0
--PBOSYWG0 = 33
--PBOSYWG1 = 0
--PBOSYWG7 = 0
--PBOSYYZ0 = 193
--PBOSYYZ1 = 0
--PBUROAK0 = 9
--PBUROAK1 = 15
--PBURSEA0 = 69
--PBURSEA1 = 0
--PBURSFO0 = 243
--PHNLLAX0 = 0
--PHNLLAX1 = 126.296875
--PHNLLAX2 = 100.03125
--PHNLLAX3 = 104.4375
--PHNLLON0 = 0
--PHNLLON6 = 0
--PHNLPAR0 = 0
--PHNLPAR6 = 0
--PHNLSEA0 = 0
--PHNLSEA1 = 135.2523364
--PHNLSEA2 = 0
--PHNLSFO0 = 0
--PHNLSFO1 = 0
--PHNLSFO7 = 31
--PHNLYVR0 = 80.74766355
--PHNLYVR1 = 0
--PHNLYVR7 = 35.25233645
--PLASSEA0 = 365
--PLASSEA1 = 0
--PLASYVR0 = 0
--PLASYVR6 = 33
--PLAXOAK0 = 42.765625
--PLAXOAK1 = 0
--PLAXOAK2 = 46
--PLAXSEA0 = 543.96875
--PLAXSEA1 = 0
--PLAXSEA2 = 0
--PLAXSEA3 = 0
--PLAXSEA4 = 6
--PLAXSEA5 = 139
--PLAXSEA6 = 0
--PLAXSEA7 = 0
--PLAXSEA8 = 66
--PLAXSEA9 = 12.03125
--PLAXSFO0 = 164.828125
--PLAXSFO1 = 842
--PLAXSFO2 = 0
--PLAXSFO3 = 168
--PLAXSFO4 = 168
--PLAXSFO5 = 144
--PLAXSFO6 = 1212.171875
--PLAXTPE0 = 0
--PLAXTPE1 = 18
--PLAXTPE2 = 9
--PLAXTPE8 = 0
--PLAXTYO0 = 0
--PLAXTYO1 = 0
--PLAXTYO2 = 0
--PLAXTYO8 = 36
--PLAXYVR0 = 116
--PLAXYVR1 = 0
--PLAXYVR2 = 57
--PLONPAR0 = 0
--PLONPAR1 = 0
--PLONPAR2 = 0
--PLONSEA0 = 0
--PLONSEA1 = 127
--PLONYVR0 = 0
--PLONYVR1 = 0
--PLONYVR7 = 45
--POAKONT0 = 0
--POAKONT1 = 11
--POAKSEA0 = 41
--POAKSEA1 = 57
--POAKSEA2 = 0
--PONTSFO0 = 155
--PONTSEA0 = 25
--PONTSEA1 = 12
--PONTSEA2 = 0
--PPARSEA0 = 0
--PPARSEA1 = 53
--PPARYVR0 = 0
--PPARYVR1 = 0
--PPARYVR7 = 21
--PRNOSEA0 = 255
--PRNOSEA1 = 0
--PRNOYVR0 = 60
--PSEASFO0 = 574
--PSEASFO1 = 0
--PSEASFO2 = 156
--PSEASFO3 = 224
--PSEASFO4 = 0
--PSEASFO5 = 168
--PSEASFO6 = 168
--PSEATPE0 = 0
--PSEATPE1 = 0
--PSEATPE2 = 42
--PSEATPE3 = 0
--PSEATYO0 = 0
--PSEATYO1 = 0
--PSEATYO2 = 126
--PSEATYO3 = 27
--PSEAYVR0 = 104.2523364
--PSEAYVR1 = 0
--PSEAYVR2 = 0
--PSEAYVR3 = 0
--PSEAYVR4 = 0
--PSEAYVR5 = 0
--PSEAYVR6 = 0
--PSEAYVR7 = 0
--PSEAYVR8 = 545
--PSFOTPE0 = 0
--PSFOTPE1 = 0
--PSFOTPE2 = 0
--PSFOTPE8 = 0
--PSFOTYO0 = 0
--PSFOTYO1 = 0
--PSFOTYO2 = 0
--PSFOTYO8 = 15
--PSFOYVR0 = 268
--PSFOYVR1 = 0
--PTPETYO0 = 0
--PTPETYO1 = 0
--PTPETYO2 = 0
--PTPETYO3 = 99
--PTPEYVR0 = 44
--PTYOYVR0 = 74
--PYULYVR0 = 182
--PYULYVR1 = 88
--PYULYVR2 = 0
--PYULYVR3 = 0
--PYULYWG0 = 161.3018868
--PYULYWG1 = 178
--PYULYWG2 = 31.69811321
--PYULYWG3 = 0
--PYULYYZ0 = 0
--PYULYYZ1 = 0
--PYULYYZ2 = 245.3018868
--PYULYYZ3 = 2104.698113
--PYULYYZ4 = 0
--PYVRYWG0 = 194.3018868
--PYVRYWG1 = 178
--PYVRYWG2 = 4.698113208
--PYVRYYZ0 = 328.6981132
--PYVRYYZ1 = 0
--PYVRYYZ2 = 4.301886792
--PYWGYYZ0 = 0
--PYWGYYZ1 = 4.698113208
--PYWGYYZ2 = 245.3018868
--PYWGYYZ3 = 0
--PBOSOAK0 = 9
--PBOSOAK6 = 0
--PBOSBUR1 = 0
--PBOSBUR2 = 0
--PBOSONT1 = 0
--PBOSONT2 = 0
--PBURYVR1 = 23
--PBURTYO1 = 0
--PBURTPE1 = 0
--PBURHNL0 = 9
--PBURHNL6 = 0
--PHNLOAK0 = 0
--PHNLOAK1 = 2.234375
--PHNLOAK2 = 0
--PHNLOAK8 = 18.765625
--PHNLONT0 = 0
--PHNLONT6 = 14
--PHNLYWG1 = 0
--PHNLYYZ1 = 21
--PHNLYUL1 = 35
--PLASTYO1 = 0
--PLASTPE1 = 0
--PLAXLON0 = 11
--PLAXLON6 = 0
--PLAXLON7 = 0
--PLAXPAR0 = 0
--PLAXPAR6 = 0
--PLAXPAR7 = 0
--PBURLON1 = 0
--PBURPAR1 = 0
--PLONONT1 = 0
--PLONOAK1 = 0
--POAKPAR1 = 0
--POAKTYO1 = 0
--POAKTPE1 = 0
--PONTPAR1 = 0
--PONTTYO1 = 0
--PONTTPE1 = 0
--PPARSFO1 = 0
--PRNOTYO1 = 0
--PRNOTPE1 = 0
--PTPEYWG1 = 18
--PTPEYYZ1 = 11
--PTPEYUL1 = 0
--PTYOYUL1 = 0
--PTYOYYZ1 = 15
--PTYOYWG1 = 22
--PLAXONT0 = 14
--GRDTIMO1 = 0
--GRDTIMN1 = -105
--GRDTIMO2 = 0
--GRDTIMN2 = -91
--GRDTIMO3 = 0
--GRDTIMN3 = -47
--GRDTIMO4 = 0
--GRDTIMN4 = -43.5
--GRDTIMO5 = 0
--GRDTIMN5 = -87
--GRDTIMO6 = 0
--GRDTIMN6 = -81
--N1001AC1 = 0
--N1001AC2 = 0
--N1001AC3 = 0
--N1002AC1 = 0
--N1002AC2 = 2.018691589
--N1002AC3 = 0
--N1003AC1 = 0
--N1003AC2 = 0
--N1003AC3 = 0
--N1004AC1 = 0
--N1004AC2 = 1.0703125
--N1004AC3 = 0
--N1005AC3 = 0.0703125
--N1105AC3 = 0.9296875
--N1006AC3 = 0
--N1007AC1 = 0
--N1007AC2 = 0
--N1007AC3 = 0
--N1008AC1 = 5.28156777
--N1008AC2 = 0
--N1008AC3 = 1.986798016
--N1008AC4 = 0
--N1008AC5 = 0
--N1008AC6 = 0
--N1009AC1 = 0
--N1009AC2 = 0
--N1009AC3 = 0
--N1009AC4 = 0
--N1009AC5 = 0
--N1010AC1 = 7
--N1010AC2 = 7
--N1010AC3 = 7
--N1010AC4 = 7
--N1010AC5 = 7
--N1010AC6 = 7
--N1011AC1 = 0
--N1011AC2 = 0
--N1011AC3 = 0
--N1011AC4 = 0
--N1011AC5 = 0
--N1011AC6 = 0
--N1012AC1 = 0
--N1012AC2 = 0
--N1012AC3 = 0
--N1012AC4 = 0
--N1012AC5 = 0
--N1013AC3 = 0
--N1013AC4 = 0
--N1013AC5 = 0
--N1013AC6 = 1
--N1014AC3 = 0
--N1014AC4 = 0
--N1014AC5 = 0
--N1014AC6 = 1.909090909
--N1015AC3 = 0
--N1015AC4 = 0
--N1015AC5 = 0
--N1015AC6 = 3
--N1016AC3 = 0
--N1016AC4 = 0
--N1016AC5 = 0
--N1016AC6 = 4
--N1017AC3 = 0
--N1017AC4 = 0
--N1017AC5 = 0
--N1017AC6 = 0.09090909091
--N1018AC1 = 3.782713663
--N1018AC2 = 6.749720385
--N1018AC3 = 7
--N1018AC4 = 0
--N1018AC5 = 4.039001305
--N1018AC6 = 0
--N1019AC1 = 0
--N1019AC2 = 1.412371134
--N1019AC3 = 0
--N1019AC4 = 2.587628866
--N1019AC5 = 0
--N1020AC1 = 0
--N1020AC2 = 0
--N1020AC3 = 0
--N1020AC4 = 0
--N1020AC5 = 0
--N1020AC6 = 0
--N1021AC1 = 0
--N1021AC2 = 0
--N1021AC3 = 0
--N1021AC4 = 0
--N1021AC5 = 0
--N1022AC1 = 0
--N1023AC1 = 0
--N1026AC1 = 1
--N1027AC1 = 0
--N1028AC1 = 0
--N1029AC1 = 1
--N1030AC1 = 1
--N1032AC1 = 1
--N1032AC2 = 1
--N1032AC3 = 1
--N1032AC4 = 1
--N1032AC5 = 1
--N1033AC1 = 0
--N1033AC2 = 1.371681416
--N1033AC3 = 0
--N1033AC4 = 0.6283185841
--N1033AC5 = 0
--N1034AC1 = 0
--N1034AC2 = 0
--N1034AC3 = 0
--N1035AC1 = 0
--N1035AC2 = 0.04608448823
--N1035AC3 = 0
--N1035AC4 = 0.01051928536
--N1035AC5 = 0
--N1036AC1 = 0
--N1036AC2 = 0
--N1036AC3 = 0
--N1037AC4 = 0
--N1037AC5 = 3.220930233
--N1038AC4 = 0
--N1038AC5 = 0
--N1039AC4 = 0
--N1039AC5 = 0
--N1040AC4 = 10
--N1040AC5 = 10
--N1040AC6 = 10
--N1041AC4 = 5.79377625
--N1041AC5 = 20
--N1041AC6 = 20
--N1042AC4 = 20
--N1042AC5 = 20
--N1042AC6 = 20
--N1043AC1 = 0
--N1043AC2 = 0
--N1043AC3 = 0
--N1044AC1 = 0
--N1044AC2 = 1
--N1044AC3 = 0
--N1046AC3 = 1
--N1047AC1 = 0
--N1047AC2 = 1
--N1047AC3 = 0
--N1050AC3 = 0.109375
--N1050AC4 = 0
--N1050AC5 = 0
--N1051AC1 = 20
--N1051AC2 = 20
--N1051AC3 = 20
--N1051AC4 = 0
--N1051AC5 = 20
--N1051AC6 = 11.52971853
--*** ./ppl_lpsol -s -p1 -c -oobtained -n boeing1.mps
--Feasible problem.
--*** ./ppl_lpsol -s -p1 -oobtained -r -m -c0.00000000863 boeing2.mps
--Optimum value: -315.018728
--Optimum location:
--PBOSORD0 = 302
--PBOSORD1 = 0
--PBOSORD2 = 0
--PBOSORD3 = 0
--PBOSORD4 = 0
--PBOSLGA0 = 712
--PBOSLGA1 = 268
--PBOSLGA2 = 0
--PBOSLGA3 = 1372
--PBOSCLE0 = 4.108024927
--PBOSCLE1 = 137.8919751
--PBOSCLE2 = 0
--PBOSCLE3 = 0
--PORDBOS0 = 34
--PORDBOS1 = 0
--PORDBOS2 = 0
--PORDBOS3 = 268
--PORDBOS4 = 0
--PORDLGA0 = 0
--PORDLGA1 = 515
--PORDLGA2 = 0
--PORDLGA3 = 0
--PORDCLE0 = 470.294686
--PORDCLE1 = 148.705314
--PORDCLE2 = 0
--PORDCLE3 = 0
--PLGABOS0 = 1162
--PLGABOS1 = 0
--PLGABOS2 = 458
--PLGABOS3 = 0
--PLGABOS4 = 0
--PLGABOS5 = 1123
--PLGAORD0 = 712
--PLGAORD1 = 0
--PLGAORD2 = 0
--PLGAORD3 = 0
--PLGACLE0 = 0
--PLGACLE1 = 249
--PLGACLE2 = 268
--PCLEBOS0 = 131
--PCLEBOS1 = 0
--PCLEBOS2 = 0
--PCLEBOS3 = 0
--PCLEBOS4 = 0
--PCLEORD0 = 178.5972891
--PCLEORD1 = 249
--PCLEORD2 = 16.40271092
--PCLEORD3 = 268
--PCLEORD4 = 0
--PCLELGA0 = 0
--PCLELGA1 = 0
--PCLELGA2 = 409
--PCLELGA3 = 0
--BBOSORD0 = 0
--BBOSORD1 = 0
--BBOSCLE0 = 0.1616272102
--BBOSCLE1 = 7.026778587
--BORDBOS0 = 0
--CBOSORD0 = 12
--CBOSORD1 = 0
--CBOSORD2 = 0
--CBOSORD3 = 0
--CBOSORD4 = 0
--CBOSCLE0 = 0
--CBOSCLE1 = 8.811594203
--CBOSCLE2 = 0
--CBOSCLE3 = 0
--CORDBOS0 = 1.5
--CORDBOS1 = 22.5
--CORDBOS2 = 0
--CORDBOS3 = 0
--CORDBOS4 = 0
--CORDLGA0 = 13
--CORDLGA1 = 0
--CORDLGA2 = 0
--CORDLGA3 = 0
--CLGAORD0 = 22.5
--CLGAORD1 = 22.5
--CLGAORD2 = 0
--CLGAORD3 = 0
--CLGACLE0 = 16
--CLGACLE1 = 0
--CLGACLE2 = 0
--CCLELGA0 = 0
--CCLELGA1 = 5
--CCLELGA2 = 0
--CCLELGA3 = 0
--GRDTIMO1 = 0
--GRDTIMN1 = 0
--GRDTIMO2 = 0
--GRDTIMN2 = -76.79770851
--GRDTIMN3 = -10.27177739
--GRDTIMN4 = -21.60844089
--N1003AC1 = 0
--N1003AC2 = 6.724489796
--N1003AC3 = 0.4
--N1003AC4 = 0
--N1005AC1 = 0.01346893419
--N1005AC2 = 0
--N1005AC3 = 0
--N1005AC4 = 0
--N1011AC1 = 0.5855648822
--N1011AC2 = 0
--N1011AC3 = 0.2937198068
--N1011AC4 = 0
--N1013AC2 = 7.265306122
--N1013AC4 = 2
--N1015AC2 = 0
--N1015AC4 = 1.422222222
--N1017AC2 = 0
--N1017AC4 = 2
--N1019AC2 = 2.540816327
--N1019AC4 = 0
--N1021AC1 = 0.01346893419
--N1021AC2 = 0.1254559795
--N1021AC3 = 0
--N1021AC4 = 0
--N1002AC1 = 0
--N1002AC2 = 4.798925367
--N1002AC3 = 0
--N1002AC4 = 0
--N1004AC2 = 0
--N1004AC4 = 2
--N1006AC1 = 0.5990338164
--N1006AC2 = 0
--N1006AC3 = 0.6937198068
--N1006AC4 = 0
--N1008AC2 = 11.85714286
--N1008AC4 = 2
--N1010AC2 = 0
--N1010AC4 = 0
--N1012AC2 = 0
--N1012AC4 = 1.422222222
--N1014AC2 = 4.673469388
--N1014AC4 = 0
--N1100AC2 = 2.734693878
--N1100AC4 = 0
--N1102AC2 = 0
--N1102AC4 = 0
--N1200AC2 = 14
--N1200AC4 = 0
--N1201AC2 = 11.45918367
--N1201AC4 = 0
--*** ./ppl_lpsol -s -p1 -oobtained -r -M -c0.00000000213 boeing2.mps
--Optimum value: -73.3689691
--Optimum location:
--PBOSORD0 = 28
--PBOSORD1 = 0
--PBOSORD2 = 0
--PBOSORD3 = 0
--PBOSORD4 = 249
--PBOSLGA0 = 258.2518986
--PBOSLGA1 = 686
--PBOSLGA2 = 35.74810145
--PBOSLGA3 = 1372
--PBOSCLE0 = 0
--PBOSCLE1 = 0
--PBOSCLE2 = 0
--PBOSCLE3 = 142
--PORDBOS0 = 302
--PORDBOS1 = 0
--PORDBOS2 = 0
--PORDBOS3 = 0
--PORDBOS4 = 0
--PORDLGA0 = 0
--PORDLGA1 = 0
--PORDLGA2 = 515
--PORDLGA3 = 0
--PORDCLE0 = 0
--PORDCLE1 = 619
--PORDCLE2 = 0
--PORDCLE3 = 0
--PLGABOS0 = 0
--PLGABOS1 = 712
--PLGABOS2 = 0
--PLGABOS3 = 686
--PLGABOS4 = 426.7481014
--PLGABOS5 = 918.2518986
--PLGAORD0 = 258.2518986
--PLGAORD1 = 0
--PLGAORD2 = 453.7481014
--PLGAORD3 = 0
--PLGACLE0 = 517
--PLGACLE1 = 0
--PLGACLE2 = 0
--PCLEBOS0 = 131
--PCLEBOS1 = 0
--PCLEBOS2 = 0
--PCLEBOS3 = 0
--PCLEBOS4 = 0
--PCLEORD0 = 0
--PCLEORD1 = 0
--PCLEORD2 = 712
--PCLEORD3 = 0
--PCLEORD4 = 0
--PCLELGA0 = 197
--PCLELGA1 = 70
--PCLELGA2 = 0
--PCLELGA3 = 142
--BBOSORD0 = 0
--BBOSORD1 = 0
--BBOSCLE0 = 0
--BBOSCLE1 = 0
--BORDBOS0 = 0
--CBOSORD0 = 0
--CBOSORD1 = 0
--CBOSORD2 = 0
--CBOSORD3 = 0
--CBOSORD4 = 0
--CBOSCLE0 = 0
--CBOSCLE1 = 0
--CBOSCLE2 = 12.8
--CBOSCLE3 = 0
--CORDBOS0 = 19.2
--CORDBOS1 = 0
--CORDBOS2 = 0
--CORDBOS3 = 0
--CORDBOS4 = 0
--CORDLGA0 = 0
--CORDLGA1 = 0
--CORDLGA2 = 10.4
--CORDLGA3 = 0
--CLGAORD0 = 0
--CLGAORD1 = 0
--CLGAORD2 = 10.4
--CLGAORD3 = 25.6
--CLGACLE0 = 12.8
--CLGACLE1 = 0
--CLGACLE2 = 0
--CCLELGA0 = 0
--CCLELGA1 = 0
--CCLELGA2 = 0
--CCLELGA3 = 0
--GRDTIMO1 = 73.01076
--GRDTIMN1 = -100
--GRDTIMO2 = 0
--GRDTIMN2 = -90
--GRDTIMN3 = -45
--GRDTIMN4 = -45
--N1003AC1 = 7
--N1003AC2 = 0
--N1003AC3 = 0.6856076556
--N1003AC4 = 0
--N1005AC1 = 0
--N1005AC2 = 0
--N1005AC3 = 0
--N1005AC4 = 0
--N1011AC1 = 0
--N1011AC2 = 0
--N1011AC3 = 1.314392344
--N1011AC4 = 0
--N1013AC2 = 2.635223455
--N1013AC4 = 0
--N1015AC2 = 5.275510204
--N1015AC4 = 2
--N1017AC2 = 0
--N1017AC4 = 0
--N1019AC2 = 4.630082668
--N1019AC4 = 0.9244444444
--N1021AC1 = 7
--N1021AC2 = 0
--N1021AC3 = 2
--N1021AC4 = 2
--N1002AC1 = 7
--N1002AC2 = 0
--N1002AC3 = 2
--N1002AC4 = 2
--N1004AC2 = 0
--N1004AC4 = 0
--N1006AC1 = 7
--N1006AC2 = 0
--N1006AC3 = 2
--N1006AC4 = 0
--N1008AC2 = 0
--N1008AC4 = 0
--N1010AC2 = 7.265306122
--N1010AC4 = 0.9244444444
--N1012AC2 = 5.275510204
--N1012AC4 = 2
--N1014AC2 = 0
--N1014AC4 = 0
--N1100AC2 = 7
--N1100AC4 = 5.274621909
--N1102AC2 = 4.354572464
--N1102AC4 = 0
--N1200AC2 = 14
--N1200AC4 = 0.9244444444
--N1201AC2 = 9.369917332
--N1201AC4 = 0
--*** ./ppl_lpsol -s -p1 -c -oobtained -n boeing2.mps
--Feasible problem.
- *** ./ppl_lpsol -s -p1 -c -oobtained -r -m mas74.mps
- Optimum value: 10482.79528
- Optimum location:
--- 
-2.24.1
-
diff --git a/dev-libs/ppl/ppl-1.2-r3.ebuild b/dev-libs/ppl/ppl-1.2-r3.ebuild
index ea74b3baa507..c3e4bc769be5 100644
--- a/dev-libs/ppl/ppl-1.2-r3.ebuild
+++ b/dev-libs/ppl/ppl-1.2-r3.ebuild
@@ -7,7 +7,8 @@ inherit autotools
 
 DESCRIPTION="The Parma Polyhedra Library for numerical analysis of complex systems"
 HOMEPAGE="http://bugseng.com/products/ppl"
-SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz"
+SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz
+	https://dev.gentoo.org/~juippis/distfiles/tmp/ppl-1.2-r3-disable-boeing-tests.patch"
 
 LICENSE="GPL-3"
 SLOT="0/4.14" # SONAMEs
@@ -25,7 +26,7 @@ RESTRICT="!test? ( test )"
 PATCHES=(
 	"${FILESDIR}/disable-mipproblem2.patch"
 	"${FILESDIR}/disable-containsintegerpoint1.patch"
-	"${FILESDIR}/disable-boeing-tests.patch"
+	"${DISTDIR}/ppl-1.2-r3-disable-boeing-tests.patch"
 	"${FILESDIR}/fix-clang-build.patch"
 )
 
diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild
index 1f273f7d33e0..6e7920922763 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.
 LICENSE="BSD-2"
 # Subslot == SONAME version
 SLOT="0/1.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/raft/raft-0.9.25.ebuild b/dev-libs/raft/raft-0.9.25.ebuild
index e8474529d1cb..fc81de79a010 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"
+KEYWORDS="~amd64 ~arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/rocclr/Manifest b/dev-libs/rocclr/Manifest
index 2081e2da55ee..8872eed5263a 100644
--- a/dev-libs/rocclr/Manifest
+++ b/dev-libs/rocclr/Manifest
@@ -1,2 +1,4 @@
 DIST rocclr-3.8.0.tar.gz 882055 BLAKE2B 12b62d2316f3f2886f656c8fcca946735e262e850d49ef8cdb21dc984eba121d9c37250209696b2945f80be363c8244a66c3da91bc26f8c65405b27625b9538e SHA512 79bbaa628815620824fdf320451d729f630949a0e7cb35e2eca638a93f4788175759f68666a1cae6c1320458692c145a0c577739386681d2299c887420400edb
+DIST rocclr-3.9.0.tar.gz 811081 BLAKE2B 7c3131adcc820a7f331ddd178cd06eb8f3a22dfc85e9634906e60d7cd1b5b1ac3f0ac0327a815139901c8e2d40f74e8b7c84c761a2aecb2c63812559528ebf13 SHA512 211bc0e8008cdaeabe9e9d51f22d939f4f9703d546e6602e59286027c439ee996c44f805154bb31bedc4916ef810e4cffd9b91f054baa76db4a8945b03b07a73
 DIST rocm-opencl-runtime-3.8.0.tar.gz 1004339 BLAKE2B 966a5bd1d4d188004b15fe4263f2c18f6dad6a07f4bc264a5afa010f6035fbf73288966cd624e6e31e1ba584ba322d93343e3482177e6480c4a57a4150546f5a SHA512 bb4e3568e32bf6acc3c4812d7db169396a01bf90d079dc420ffb7df4bd4146d39938e76e9b386548fe64276bbf938a545c898de599113f20cc73ae98268c3d6a
+DIST rocm-opencl-runtime-3.9.0.tar.gz 1004372 BLAKE2B f5485dfbc615826214e1071485636e94bc83d12d4412da912455cb0ddd39ede3429a749a16428cb3c10775e652ffbe31a63ad00b3ea38a7fa43a120776a12bfe SHA512 e8149e99a7116a2c2af0d04dde55290c35dd5c6c26d95da8c8a04fcfccdb23f6617ab8348f9fc201b6d9fde7202de4ede480d7ac547ae2471c6ae10897e1795e
diff --git a/dev-libs/rocclr/rocclr-3.9.0.ebuild b/dev-libs/rocclr/rocclr-3.9.0.ebuild
new file mode 100644
index 000000000000..ffa5203065d2
--- /dev/null
+++ b/dev-libs/rocclr/rocclr-3.9.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Radeon Open Compute Common Language Runtime"
+HOMEPAGE="https://github.com/ROCm-Developer-Tools/ROCclr"
+SRC_URI="https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-libs/rocm-comgr-${PV}
+	>=dev-libs/rocr-runtime-${PV}"
+DEPEND="${RDEPEND}
+	>=dev-libs/rocm-comgr-${PV}
+	virtual/opengl
+	>=dev-util/rocm-cmake-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/rocclr-3.7.0-cmake-install-destination.patch"
+)
+
+S="${WORKDIR}/ROCclr-rocm-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_COMGR_LIBRARY=YES
+		-DOPENCL_DIR="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
+		-DCMAKE_INSTALL_PREFIX="/usr"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# This should be fixed in the CMakeLists.txt
+	sed -e "s:${BUILD_DIR}:${EPREFIX}/usr:" -i "${D}/usr/lib/cmake/rocclr/ROCclrConfig.cmake" || die
+}
diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest
index d2a10637ab89..dd35e19baa70 100644
--- a/dev-libs/rocm-comgr/Manifest
+++ b/dev-libs/rocm-comgr/Manifest
@@ -1,2 +1 @@
-DIST rocm-comgr-3.7.0.tar.gz 94875 BLAKE2B 0d6b01360cbdb4a40aab9dadcc56389a3edc11380fe1c39a29a9f3c0356708ae95ce8918bf9d4d4fa46c1a077a2daf99c5bad65906d24ea4948de93e1d4d0280 SHA512 62a08b286313234c4c3226872a410afe9818c829fb3424f4c2a464f759d8d3c6a701de4a89ea21fe6ac2b9620cec0a44c04dd5a793ba30a0537ed3ddf86fff46
-DIST rocm-comgr-3.8.0.tar.gz 95949 BLAKE2B af6f4f2961e0476be8aedae14fc7b3406cdd63759f456faa9c608c68a0c9578d5ad356b11713c1f5b943374f17ebfa043ee5294d3fb6f1a0047639136bc8b565 SHA512 5855825b24fffb3b503a0e2b6bd66a159b6b75a32902e9a428a3be0fa01d8b0c0b6e658c3f5b1520bf79e0dfd20cd453afb3d83d9946387f0ec636378f5129c6
+DIST rocm-comgr-3.9.0.tar.gz 98316 BLAKE2B 424ff5152d99b1ea001985fbd9a6ca1a0925931579205b487505a6c3733d95fe4ee21d91453c538995b3696984acdf4d45cc77c43e1a7c75db78ad1164e3f9e6 SHA512 f49c91ba0db244a0f0d820edeb60013c8a09220e9e1a6be464c48766ac3322b18ed1d0f009e5b1df58340a6dd324a75717194696214e2bb7455cb85e516f071a
diff --git a/dev-libs/rocm-comgr/rocm-comgr-3.8.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-3.8.0.ebuild
deleted file mode 100644
index 097011983ea2..000000000000
--- a/dev-libs/rocm-comgr/rocm-comgr-3.8.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/lib/comgr"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-CompilerSupport-rocm-${PV}/lib/comgr"
-	KEYWORDS="~amd64"
-fi
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.1.0-dependencies.patch"
-)
-
-DESCRIPTION="Radeon Open Compute Code Object Manager"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocm-device-libs-${PV}
-	>=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
-		-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-comgr/rocm-comgr-3.7.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-3.9.0.ebuild
similarity index 94%
rename from dev-libs/rocm-comgr/rocm-comgr-3.7.0.ebuild
rename to dev-libs/rocm-comgr/rocm-comgr-3.9.0.ebuild
index 097011983ea2..4401982de06b 100644
--- a/dev-libs/rocm-comgr/rocm-comgr-3.7.0.ebuild
+++ b/dev-libs/rocm-comgr/rocm-comgr-3.9.0.ebuild
@@ -34,6 +34,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DLLD_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/lld"
 		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
 		-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang"
 	)
diff --git a/dev-libs/rocm-device-libs/Manifest b/dev-libs/rocm-device-libs/Manifest
index ff2d74896a62..1c5a9c8e36a6 100644
--- a/dev-libs/rocm-device-libs/Manifest
+++ b/dev-libs/rocm-device-libs/Manifest
@@ -1,2 +1,3 @@
 DIST rocm-device-libs-3.7.0.tar.gz 228752 BLAKE2B e7406fd74b9bdfba5c32259c12761b46dee454e73cf1d6cbb0886c4da7bff7bcd13689e91e2715188fa2fe9d61d9dd9c6c481714cd67bdee11b1825a91c47546 SHA512 94b027aa27866257cf239b6951cbff928122fb7dfb23c81edc5957b30ee5aa64e2a25412a13ea33c249b8bd2d026274dcc276ea0908359b5ed14c75b0e59ff1f
 DIST rocm-device-libs-3.8.0.tar.gz 228737 BLAKE2B bf75c3f50960af55cc743d412259789d283fc8357231c31b7590ad81997b5a4ff195bb3e382641e9eed846c9c258174f1e8d27e6e1f0ae9f174c5c22b85ed2ea SHA512 d565c9bfde5f5f2d533cdd0b41e5c73247f9ca15e07b039c340daf3dece120a301c87b69b737af3d230c6c0a3ae1d6fbd5d1f78fee000a06d4ea7bfda3d8d436
+DIST rocm-device-libs-3.9.0.tar.gz 230477 BLAKE2B dba7f2dd57fe39c8c69f2a4de34f06f8347e73c760805cebf8690b11c5c0b4c919d78bc31b05b5d5f283aa5281131b0f7d3fbe9faef525a3117ebdbd4b1b9b35 SHA512 fff70e9426ff2e6b6cf59554c36831b3c24c24a51753ca0f3c9cb4e9961c24e7e7d7714b2e75785622c6dcff92e1cb7fa5d2be0a2a08bb17a157f484845cd276
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-3.9.0-r1.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-3.9.0-r1.ebuild
new file mode 100644
index 000000000000..507a68912932
--- /dev/null
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-3.9.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/src"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCm-Device-Libs-rocm-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Device Libraries"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=sys-devel/llvm-roc-${PV}:="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/OCL.cmake" || die
+	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/Packages.cmake" || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest
index f211cc17aaa4..b18e4bbe1c05 100644
--- a/dev-libs/rocm-opencl-runtime/Manifest
+++ b/dev-libs/rocm-opencl-runtime/Manifest
@@ -1 +1,2 @@
 DIST rocm-opencl-runtime-3.8.0.tar.gz 1004339 BLAKE2B 966a5bd1d4d188004b15fe4263f2c18f6dad6a07f4bc264a5afa010f6035fbf73288966cd624e6e31e1ba584ba322d93343e3482177e6480c4a57a4150546f5a SHA512 bb4e3568e32bf6acc3c4812d7db169396a01bf90d079dc420ffb7df4bd4146d39938e76e9b386548fe64276bbf938a545c898de599113f20cc73ae98268c3d6a
+DIST rocm-opencl-runtime-3.9.0.tar.gz 1004372 BLAKE2B f5485dfbc615826214e1071485636e94bc83d12d4412da912455cb0ddd39ede3429a749a16428cb3c10775e652ffbe31a63ad00b3ea38a7fa43a120776a12bfe SHA512 e8149e99a7116a2c2af0d04dde55290c35dd5c6c26d95da8c8a04fcfccdb23f6617ab8348f9fc201b6d9fde7202de4ede480d7ac547ae2471c6ae10897e1795e
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.9.0-add-rocclr-include-directories.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.9.0-add-rocclr-include-directories.patch
new file mode 100644
index 000000000000..e9341675d890
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.9.0-add-rocclr-include-directories.patch
@@ -0,0 +1,12 @@
+--- a/amdocl/CMakeLists.txt	2020-08-23 10:11:28.227839351 +0200
++++ b/amdocl/CMakeLists.txt	2020-08-23 10:44:34.929831772 +0200
+@@ -23,6 +23,9 @@
+ include_directories(${CMAKE_SOURCE_DIR}/khronos)
+ include_directories(${CMAKE_SOURCE_DIR}/khronos/headers)
+ include_directories(${CMAKE_SOURCE_DIR}/khronos/headers/opencl2.2)
++include_directories(/usr/include/rocclr)
++include_directories(/usr/include/rocclr/compiler/lib/include/)
++include_directories(/usr/include/rocclr/elf/)
+ 
+ if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR
+    (CMAKE_${COMPILER}_COMPILER_ID MATCHES "Clang"))
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.9.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.9.0.ebuild
new file mode 100644
index 000000000000..cd1f935e955a
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.9.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
+fi
+
+DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocr-runtime-${PV}
+	>=dev-libs/rocclr-${PV}
+	>=dev-libs/rocm-comgr-${PV}
+	>=dev-libs/rocm-device-libs-${PV}
+	>=virtual/opencl-3
+	media-libs/mesa"
+DEPEND="${RDEPEND}
+	dev-lang/ocaml
+	dev-ml/findlib"
+BDEPEND=">=dev-util/rocm-cmake-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.7.0-change-install-location.patch"
+	"${FILESDIR}/${PN}-3.5.0-do-not-install-libopencl.patch"
+	"${FILESDIR}/${PN}-3.9.0-add-rocclr-include-directories.patch"
+	"${FILESDIR}/${PN}-3.7.0-amdocl64icd.patch"
+)
+
+src_prepare() {
+	# Remove "clinfo" - use "dev-util/clinfo" instead
+	[ -d tools/clinfo ] && rm -rf tools/clinfo || die
+
+	# Wrong position of a '"' results in a list of strings instead of a single string and the build fails...
+	sed -e "s:set(CMAKE_SHARED_LINKER_FLAGS \${CMAKE_SHARED_LINKER_FLAGS} \":set(CMAKE_SHARED_LINKER_FLAGS \"\${CMAKE_SHARED_LINKER_FLAGS} :" -i "${S}/amdocl/CMakeLists.txt"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120
+	append-cflags -fcommon
+
+	local mycmakeargs=(
+		-DUSE_COMGR_LIBRARY=yes
+		-DROCclr_DIR="${EPREFIX}/usr/include/rocclr"
+		-DLIBROCclr_STATIC_DIR="${EPREFIX}/usr/lib/cmake/rocclr"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cd "${BUILD_DIR}" || die
+	insinto /etc/OpenCL/vendors
+	doins amdocl64.icd
+	insinto /usr/lib64
+	doins lib/libamdocl64.so
+}
diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest
index 0743824564fc..a3180598610b 100644
--- a/dev-libs/rocr-runtime/Manifest
+++ b/dev-libs/rocr-runtime/Manifest
@@ -1 +1,2 @@
 DIST rocr-runtime-3.8.0.tar.gz 691209 BLAKE2B 0664b099a7ea4105e37cf42ee208c31dc58a1900aa35bbc0295df0cabba25e5352b3def0dbc1a8ea889ad4876321f99a73c4c6c9ec042186efda9b3308583825 SHA512 d968e96cabc98951890435a2b9bfc9943df9435848f0c6026a59953c78ad4c1048e7c532a8093e5f633fdc5d32622fb88ba0212f32f317d5473fd7e957e4dc4c
+DIST rocr-runtime-3.9.0.tar.gz 691645 BLAKE2B c90cdba93be510532a65ebfd69322972c61603b23932b95982d9a2bea742979b14acd83728a37ecacd7ec540268311bd313801acece89ec02a234dee66155dbe SHA512 e117536300ad05db27ccd92d2f9fadbdb9711fc724953ef65609c7af1ef369b8cf132c8b0f72d33e7ffd43acc3e59dc5525bacaa1507fd01fab79685f6b8d86e
diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.8.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.8.0.ebuild
index 2a972d7fd3d0..a53ba934d9c8 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-3.8.0.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-3.8.0.ebuild
@@ -29,7 +29,7 @@ COMMON_DEPEND="sys-process/numactl
 RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/roct-thunk-interface-${PV}
-	>=dev-libs/rocm-device-libs-${PV}"
+	~dev-libs/rocm-device-libs-${PV}"
 BDEPEND="app-editors/vim-core"
 	# vim-core is needed for "xxd"
 
diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.9.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.9.0.ebuild
new file mode 100644
index 000000000000..22be187e6afe
--- /dev/null
+++ b/dev-libs/rocr-runtime/rocr-runtime-3.9.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/src"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCR-Runtime-rocm-${PV}/src"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Runtime"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
+PATCHES=(
+	"${FILESDIR}/${PN}-3.7.0-cmake-install-paths.patch"
+)
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+COMMON_DEPEND="sys-process/numactl
+	dev-libs/elfutils:="
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/roct-thunk-interface-${PV}
+	>=dev-libs/rocm-device-libs-${PV}"
+BDEPEND="app-editors/vim-core"
+	# vim-core is needed for "xxd"
+
+src_prepare() {
+	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
+
+	# ... otherwise system llvm/clang is used ...
+	sed -e "s:find_package(Clang REQUIRED HINTS \${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ):find_package(Clang REQUIRED HINTS /usr/lib/llvm/roc ):" -i image/blit_src/CMakeLists.txt || die
+
+	# Gentoo installs "*.bc" to "/usr/lib" instead of a "[path]/bitcode" directory ...
+	sed -e "s:/opt/rocm/amdgcn/bitcode:/usr/lib/amdgcn/bitcode:" -i image/blit_src/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index 0f11bd3ae54b..821791aa2da1 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,2 +1 @@
-DIST serd-0.30.4.tar.bz2 605441 BLAKE2B 6b9b561db04a612d04726f29b1b56f535b9af57b7cbcf521c2a6afdafaf63b2ff4a205015d2f4c20bf48340348edda586dfed4a7cff24c57363b0f218d185609 SHA512 4cc032f826d891213c6db787b10a41ffb8f4b2a3357ffa536e34013755dc34db7109d1b42f550a0d559d8651f56c3a5dfb3654c3e2047ee6e609ff9a5fe803d6
 DIST serd-0.30.6.tar.bz2 609365 BLAKE2B 35a86847642ffe806797ae8dbcd292ce26f08135edfa3b1fd39652f8964c35d73dba8f8627f32dcff399e9cddc332e5484f14a80580a32d52d93977cd9b42912 SHA512 db08d6c67d8627728679d0ed3770b8219a58f3eef82194ef8ba5682d3ff1f1033e2bbc8d6a1115a3fe0e32990f635c707a81ad8b4f457153fa78ff5991c9c30f
diff --git a/dev-libs/serd/serd-0.30.4.ebuild b/dev-libs/serd/serd-0.30.4.ebuild
deleted file mode 100644
index b373d009b2aa..000000000000
--- a/dev-libs/serd/serd-0.30.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE='threads(+)'
-inherit python-any-r1 waf-utils multilib-build multilib-minimal
-
-DESCRIPTION="Library for RDF syntax which supports reading and writing Turtle and NTriples"
-HOMEPAGE="http://drobilla.net/software/serd/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )"
-
-DOCS=( "AUTHORS" "NEWS" "README.md" )
-
-src_prepare() {
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	waf-utils_src_configure \
-		--docdir=/usr/share/doc/${PF} \
-		$(multilib_native_usex doc --docs "") \
-		$(usex test --test "") \
-		$(usex static-libs --static "")
-}
-
-multilib_src_test() {
-	./waf test || die
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-	default
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-	default
-}
diff --git a/dev-libs/starpu/starpu-1.2.6-r1.ebuild b/dev-libs/starpu/starpu-1.2.6-r1.ebuild
index 171c28305eb8..4465f97133e1 100644
--- a/dev-libs/starpu/starpu-1.2.6-r1.ebuild
+++ b/dev-libs/starpu/starpu-1.2.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/file/37744/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/8"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="
 	blas cuda doc examples fftw fortran gcc-plugin mpi opencl opengl
diff --git a/dev-libs/ustr/files/ustr-1.0.4-inline-check.patch b/dev-libs/ustr/files/ustr-1.0.4-inline-check.patch
new file mode 100644
index 000000000000..b38cf7829c9f
--- /dev/null
+++ b/dev-libs/ustr/files/ustr-1.0.4-inline-check.patch
@@ -0,0 +1,27 @@
+--- a/ustr-conf.h.in	2007-10-22 08:00:55.000000000 +0200
++++ b/ustr-conf.h.in	2015-09-10 12:24:34.998796842 +0200
+@@ -4,13 +4,23 @@
+ /* this is the custom version for the library itself, for everyone else
+  * ustr-import generates one depending on the options. */
+ 
++/* Ustr relies on GCC's traditional handling of inline functions, not
++ * the version that was actually standardized in C99. GCC-compatible
++ * compilers define __GNUC_STDC_INLINE__ when using the standard
++ * behavior. When this is set we must restore the old inline behavior:
++ */
++#if defined(__GNUC__) \
++ && defined(__GNUC_STDC_INLINE__)
++#  define inline inline __attribute__ ((gnu_inline))
++#endif
++
+ /* The default is now to link against libc. */
+ #ifndef USTR_CONF_INCLUDE_CODEONLY_HEADERS
+ #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 0
+ #endif
+ 
+ /* We can't: if defined(__GLIBC__) && (!defined(_GNU_SOURCE) || !_GNU_SOURCE)
+- *  because by the time we've included a libc header it's too late. */ 
++ *  because by the time we've included a libc header it's too late. */
+ #ifndef _GNU_SOURCE
+ #define _GNU_SOURCE 1
+ #endif
diff --git a/dev-libs/ustr/metadata.xml b/dev-libs/ustr/metadata.xml
index 0fb02e2df52a..97b72ca3a65d 100644
--- a/dev-libs/ustr/metadata.xml
+++ b/dev-libs/ustr/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sven.eden@prydeworx.com</email>
+		<name>Sven Eden</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 <use>
 	<flag name="ustr-import">Install ustr-import developer program and source code for bundling.</flag>
 </use>
diff --git a/dev-libs/ustr/ustr-1.0.4-r5.ebuild b/dev-libs/ustr/ustr-1.0.4-r5.ebuild
deleted file mode 100644
index dc3c5bb1983d..000000000000
--- a/dev-libs/ustr/ustr-1.0.4-r5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="Low-overhead managed string library for C"
-HOMEPAGE="http://www.and.org/ustr/"
-SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"
-
-LICENSE="|| ( BSD-2 MIT LGPL-2 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/ustr-conf.h
-	/usr/include/ustr-conf-debug.h
-)
-
-src_prepare() {
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		prefix="${EPREFIX}/usr" \
-		SHRDIR="/usr/share/${P}" \
-		HIDE= \
-		all-shared
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		prefix="${EPREFIX}/usr" \
-		libdir="${EPREFIX}/usr/$(get_libdir)" \
-		mandir="/usr/share/man" \
-		SHRDIR="/usr/share/${P}" \
-		DOCSHRDIR="/usr/share/doc/${PF}" \
-		HIDE= \
-		install
-}
-
-multilib_src_test() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		prefix="${EPREFIX}/usr" \
-		SHRDIR="/usr/share/${P}" \
-		HIDE= \
-		check
-}
diff --git a/dev-libs/ustr/ustr-1.0.4-r8.ebuild b/dev-libs/ustr/ustr-1.0.4-r8.ebuild
index 6fb52670f3b5..e625d492455c 100644
--- a/dev-libs/ustr/ustr-1.0.4-r8.ebuild
+++ b/dev-libs/ustr/ustr-1.0.4-r8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"
 LICENSE="|| ( BSD-2 MIT LGPL-2 )"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
-IUSE="static-libs ustr-import"
+IUSE="ustr-import"
 
 DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO)
 
@@ -29,7 +29,7 @@ src_prepare() {
 
 _emake() {
 	emake \
-		USE_STATIC=$(usex static-libs) \
+		USE_STATIC="no" \
 		AR="$(tc-getAR)" \
 		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
diff --git a/dev-libs/ustr/ustr-1.0.4-r7.ebuild b/dev-libs/ustr/ustr-1.0.4-r9.ebuild
similarity index 81%
rename from dev-libs/ustr/ustr-1.0.4-r7.ebuild
rename to dev-libs/ustr/ustr-1.0.4-r9.ebuild
index 0d4f3ece9d89..184372af56b2 100644
--- a/dev-libs/ustr/ustr-1.0.4-r7.ebuild
+++ b/dev-libs/ustr/ustr-1.0.4-r9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs multilib-minimal
 
@@ -11,7 +11,8 @@ SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD-2 MIT LGPL-2 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+IUSE="ustr-import"
 
 DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO)
 
@@ -20,13 +21,19 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/ustr-conf-debug.h
 )
 
+PATCHES=(
+	"${FILESDIR}/${P}-inline-check.patch"
+	"${FILESDIR}/${PN}-1.0.4-build-libs.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${P}-gcc_5-check.patch"
+	default
 	multilib_copy_sources
 }
 
 _emake() {
 	emake \
+		USE_STATIC="no" \
 		AR="$(tc-getAR)" \
 		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
@@ -66,6 +73,13 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	_emake DESTDIR="${D}" install
+
+	if ! use ustr-import ; then
+		rm -r \
+			"${ED}/usr/bin/ustr-import" \
+			"${ED}/usr/share/man/man1/ustr-import.1" \
+			"${ED}/usr/share/${P}" || die
+	fi
 }
 
 multilib_src_test() {
diff --git a/dev-libs/vala-common/vala-common-0.48.9.ebuild b/dev-libs/vala-common/vala-common-0.48.9.ebuild
index 56a9d29770cf..51429ad4aeb1 100644
--- a/dev-libs/vala-common/vala-common-0.48.9.ebuild
+++ b/dev-libs/vala-common/vala-common-0.48.9.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index 51b28cd065e1..df3adb6a7209 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -1,2 +1,3 @@
+DIST xerces-c-3.2.2-fix-XERCESC-2161.patch 42804 BLAKE2B c55aa5ff9d0ca8b716aaffb25435b0a1fbfc8684dc601dc009e3e44f3608c9c21ca3190a25d4813f7e34d75f070ca5de5554e35a2408d65f168b6a8715a156e1 SHA512 04d8cf6e220b7a7dc09a8dba4ff763dd8ccb133a81a5338d64a5cdf2c039f2d51958ec7eeea8ca04eeed8433c3239df8d74e6c697ac8c2c3476e8917d02507a5
 DIST xerces-c-3.2.2.tar.gz 7100953 BLAKE2B d167299797189ef181c384ac49095e8bc4cf4e0c7d646e72840a19f56c6eea060168d2c2d29c29ce6cc76dd44e403bea4c3dcde67f964b87f3abc807ad0b14ad SHA512 13709b47b61d957d736f34b774dbc7fbd85171eedebd0cada41fd1d17929e6c42904c882b1e1d4f9b4fd464938b62e5ebb127187b4974dfade6a593e31471e80
 DIST xerces-c-3.2.3.tar.gz 7120270 BLAKE2B d622621657f33ada75a9ef330e77772b8f9cff717d8efc06f2a1fffea77360596e5192b48a6a015403a1045aa2492c626ba05f1de15eb5b997a80ca19b032db8 SHA512 206c5c31510224b8f6963b051f27968e4fe70374a0adb2c2990ac1f865b3bac41f63e6bfb7279faa21477f8878a3b9671ba70726fc75a84e51f037ef158639ad
diff --git a/dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2161.patch b/dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2161.patch
deleted file mode 100644
index f1a847c55699..000000000000
--- a/dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2161.patch
+++ /dev/null
@@ -1,770 +0,0 @@
---- /dev/null	2018-12-04 16:29:46.857790926 -0500
-+++ b/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg	2018-12-07 14:18:19.183422991 -0500
-@@ -0,0 +1,767 @@
-+$quote "
-+$set 1
-+2  notation '{0}' has already been declared
-+3  attribute '{0}' has already been declared for element '{1}'
-+4  encoding '{0}' from XML declaration or manually set contradicts the auto-sensed encoding; ignoring
-+5  element '{0}' is referenced in a content model but was never declared
-+6  element '{0}' is referenced in an ATTLIST but was never declared
-+7  {0}
-+8  unable to include document '{0}'
-+9  unable to open text file target '{0}'
-+10  unable to include resource '{0}'
-+13  '{0}' is not allowed for the content of simpleType; only list, union, and restriction are allowed
-+14  globally-defined complex type must have a name
-+15  globally-declared attribute must have a name
-+16  attribute declaration must have name or 'ref' attribute
-+17  element declaration must have name or 'ref' attribute
-+18  group declaration must have name or a 'ref' attribute
-+19  attributeGroup declaration must have name or 'ref' attribute
-+20  anonymous complexType in element '{0}' has name
-+21  anonymous simpleType in element '{0}' has name
-+22  content of element declaration must match (annotation?, (simpleType | complexType)?, (unique | key | keyref)*)
-+23  invalid content in simple type '{0}'; only list, union, and restriction are allowed
-+24  expected simpleType in list definition for type '{0}'
-+25  list, union, or restriction content is invalid for type '{0}'
-+26  invalid content in list definition for type '{0}'
-+27  expected simpleType in restriction definition for type '{0}'
-+28  facet '{0}' is already defined
-+29  expected simpleType in union definition for type '{0}'
-+30  content in simpleType definition is empty
-+31  expected restriction or extension in simpleContent definition
-+32  base attribute must be specified for restriction or extension definition
-+33  expected restriction or extension in complexContent definition
-+34  invalid content in 'schema' element
-+35  invalid content for type '{0}'
-+36  unknown simpleType '{0}'
-+37  unknown complexType '{0}'
-+38  prefix '{0}' can not be resolved to namespace URI
-+39  referenced element '{0}' not found
-+40  type '{0}:{1}' not found
-+41  attribute '{0}' not found
-+42  invalid element '{0}' in complex type definition
-+43  base type '{0}' not found
-+44  unable to create validator for '{0}'
-+45  invalid element following simpleContent definition in complexType
-+46  invalid element following complexContent definition in complexType
-+47  attribute '{0}' cannot have both fixed and default values
-+48  attribute '{0}' with default value must be optional
-+49  attribute '{0}' declared more than once in the same scope
-+50  attribute '{0}' cannot have both 'type' attribute and simpleType definition
-+51  simpleType '{0}:{1}' for attribute '{2}' not found
-+52  element '{0}' cannot have both fixed and default values
-+53  invalid {0} name '{1}'
-+54  element '{0}' cannot have both 'type' attribute and simpleType/complexType definition
-+55  element '{0}' has fixed or default value and must have mixed simple or simple content model
-+56  simpleType '{0}' that '{1}' extends has a value of the final attribute that does not permit extension
-+57  type '{0}' specified as the base in simpleContent definition must not have complex content
-+58  type '{0}' is a simple type and cannot be used in derivation by restriction in complexType definition
-+59  invalid element following restriction or extension definition in simpleContent
-+60  invalid element following restriction or extension definition in complexContent
-+61  duplicate annotation in type '{0}'
-+62  type '{0}' cannot be used in its own union, list, or restriction definition
-+63  block value '{0}' is invalid
-+64  final value '{0}' is invalid
-+65  element '{0}' cannot be part of the substitution group headed by '{1}'
-+66  element '{0}' has a type which does not derive from the type of the element at the head of the substitution group
-+67  element '{0}' declared more than once in the same scope
-+68  value '{0}' invalid for attribute '{1}'
-+69  attribute '{0}' has both 'ref' attribute and inline simpleType definition or 'form' or 'type' attribute
-+70  duplicate reference attribute '{0}:{1}' in complexType definition
-+71  derivation by restriction is forbidden by either base type '{0}' or globally
-+72  derivation by extension is forbidden by either base type '{0}' or globally
-+73  base type specified in complexContent definition must be a complex type
-+74  imported schema '{0}' has different target namespace '{1}'; expected '{2}'
-+75  'schemaLocation' attribute must be specified in element '{0}'
-+76  included schema '{0}' has different target namespace '{1}'
-+77  at most one annotation is allowed
-+78  content of attribute '{0}' must match (annotation?, simpleType?)
-+79  attribute '{0}' must appear in global {1} declarations
-+80  attribute '{0}' must appear in local {1} declarations
-+81  attribute '{0}' cannot appear in global {1} declarations
-+82  attribute '{0}' cannot appear in local {1} declarations
-+83  minOccurs value '{0}' must not be greater than maxOccurs value '{1}'
-+84  duplicate annotation in anyAttribute declaration
-+85  global {0} declaration must have name
-+86  circular definition in '{0}'
-+87  global type '{0}:{1}' declared more than once or also declared as {2}
-+88  global {0} '{1}' declared more than once
-+89  invalid value '{0}' for whiteSpace facet; expected 'collapse'
-+90  namespace of import declaration must be different from target namespace of importing schema
-+91  importing schema must have target namespace if namespace in import declaration is not present
-+92  element '{0}' cannot have value constraint '{1}' if its type is derived from ID
-+93  element/attribute '{0}' is of NOTATION type
-+94  element '{0}' has mixed content type and the content type's particle must be emptiable
-+95  complexType definition has empty content but base type is not empty or does not have emptiable particle
-+96  content types of base type '{0}' and derived type '{1}' must both be mixed or element-only
-+97  derived content type is not a valid restriction of base content type
-+98  derivation by extension or restriction is forbidden by either base type '{0}' or globally
-+99  item type definition must have variety of atomic or union where all member types must be atomic
-+100  group '{0}' must contain all, choice, or sequence compositor
-+101  content of attributeGroup '{0}' must match (annotation?, ((attribute | attributeGroup)*, anyAttribute?))
-+102  top-level compositor in a group must not have 'minOccurs' or 'maxOccurs' attribute
-+103  {0} '{1}:{2}' not found
-+104  group with the all compositor must only appear as content type of a complex type
-+105  group with the all compositor constituting the content type of a complex type must have both minOccurs and maxOccurs equal 1
-+106  element declaration in the all compositor must have minOccurs and maxOccurs equal 0 or 1
-+107  attribute '{0}' is already defined in base
-+108  intensional intersection of attribute wildcards must be expressible
-+109  base type does not have any attributes
-+110  attribute '{0}' has incompatible use value in the base
-+111  type of attribute '{0}' must be derived by restriction from type of the corresponding attribute in the base
-+112  attribute '{0}' does not have a fixed value or has a different fixed value from that of the base
-+113  attribute '{0}' has invalid target namespace with respect to the base wildcard constraint or base has no wildcard
-+114  attribute wildcard is present in the derived type but not in the base
-+115  attribute wildcard in the derived type is not a valid subset of that in the base
-+116  attribute '{0}' cannot have different use value in the derived type if the base attribute use value is 'prohibited'
-+117  attribute wildcard in the derived type must be identical to or stricter than the one in the base
-+118  unexpected '{0}' in the content of the all compositor; only elements are allowed
-+119  redefined schema '{0}' has a different target namespace '{1}'
-+120  simpleType in redefine must have a restriction definition
-+121  simpleType base attribute in redefine must reference the original type with the same name
-+122  complexType in redefine must have a restriction or extension definition
-+123  complexType base attribute in redefine must reference the original type with the same name
-+124  group '{0}' must have minOccurs and maxOccurs equal 1
-+125  unable to find declaration in the schema being redefined corresponding to '{0}'
-+126  group declaration in redefine may only contain one reference to itself
-+127  attributeGroup declaration in redefine may only contain one reference to itself
-+128  redefine declaration cannot contain '{0}'
-+129  notation declaration '{0}:{1}' not found
-+130  more than one identity constraint has name '{0}'
-+131  identity constraint declaration must match (annotation?, selector, field+)
-+132  key reference declaration '{0}' refers to unknown key '{1}'
-+133  field cardinalities for keyref '{0}' and key '{1}' must match
-+134  XPath expression is missing or empty
-+135  fixed value in attribute reference is not set or differs from the fixed value of '{0}'
-+136  attribute '{0}' is of ID type or type derived from ID and cannot have default/fixed value constraint
-+137  attribute '{0}' is a subsequent attribute in this complex type with a type derived from ID
-+138  attribute '{0}' is a subsequent attribute in this attribute group with a type derived from ID
-+139  empty value illegal for 'targetNamespace' attribute; target namespace must be absent or contain non-empty value
-+140  {0}
-+141  '{0}' has already been included or redefined
-+142  namespace '{0}' is referenced without import declaration
-+143  all compositor that is part of a complex type definition must constitute the entire content of the definition
-+144  annotation can only contain appinfo and documentation declarations
-+145  invalid facet name '{0}'
-+146  root element name of XML Schema document must be 'schema'
-+147  circular substitution group in element '{0}'
-+148  element '{0}' must be from the XML Schema namespace
-+149  target namespace of attribute '{0}' cannot be http://www.w3.org/2001/XMLSchema-instance
-+150  invalid namespace declaration
-+151  namespace fix-up cannot be performed on DOM Level 1 node
-+152  more than one anyAttribute declaration found in complex type declaration
-+153  anyAttribute must not be followed by other declarations
-+156  parser has encountered more than '{0}' entity expansions in the document; this is the limit imposed by the application
-+157  expected comment or CDATA section
-+158  attribute name expected
-+159  notation name expected
-+160  illegal repetition of elements in mixed content model
-+161  default attribute declaration expected
-+162  equal sign expected
-+163  element name expected
-+164  comment must start with <!--
-+165  invalid document structure
-+166  expected version, encoding, or standalone declaration
-+167  invalid XML version declaration
-+168  unsupported XML version '{0}'
-+169  unterminated XML declaration
-+170  invalid XML encoding declaration '{0}'
-+171  invalid standalone declaration
-+172  unterminated comment
-+173  processing instruction name expected
-+174  unterminated processing instruction
-+175  invalid character 0x{0}
-+176  unterminated start tag '{0}'
-+177  attribute value expected
-+178  unterminated end tag '{0}'
-+179  expected type for attribute '{0}' of element '{1}'
-+180  expected end of tag '{0}'
-+181  expected tag name, comment, PI, or other markup
-+182  invalid content after root element's end tag
-+183  comment expected
-+184  comment or processing instruction expected
-+185  whitespace expected
-+186  expected root element in DOCTYPE declaration
-+187  quoted string expected
-+188  public id expected
-+189  invalid character 0x{0} in public id
-+190  unterminated DOCTYPE declaration
-+191  invalid character 0x{0} in internal subset
-+192  unexpected whitespace
-+193  invalid character 0x{1} in attribute value '{0}'
-+194  markup declaration expected
-+195  TEXT declaration is illegal at this point
-+196  conditional section in internal subset
-+197  parameter entity name expected
-+198  unterminated entity declaration '{0}'
-+199  invalid character reference
-+200  unterminated character reference
-+201  expected entity name for reference
-+202  entity '{0}' not found
-+203  unparsed entity reference '{0}' is invalid at this point
-+204  unterminated entity reference '{0}'
-+205  recursive entity expansion '{0}'
-+206  partial markup in entity value
-+207  unterminated element declaration '{0}'
-+208  expected content specification for element '{0}'
-+209  '*' expected
-+210  mixed content model '{0}' not terminated properly
-+211  system or public id expected
-+212  unterminated notation declaration
-+213  expected ',', '|', or ')'
-+214  expected '|' or ')'
-+215  expected ',', '|', or ')' in content model of element '{0}'
-+216  expected enumeration value for attribute '{0}'
-+217  expected '|' or ')'
-+218  unterminated entity literal
-+219  unmatched end tag detected
-+220  '(' expected
-+221  attribute '{0}' is already specified for element '{1}'
-+222  '<' character cannot be used in attribute value '{0}'; use &lt; instead
-+223  leading surrogate character is not followed by a legal second character
-+224  expected ']]>' sequence to end conditional section
-+225  expected INCLUDE or IGNORE at this point
-+226  expected '[' to follow INCLUDE or IGNORE
-+227  unexpected end of entity '{0}'
-+228  parameter entity propagated out of internal/external subset
-+229  unmatched ']' character detected
-+230  parameter entity references are not allowed inside markup in internal subset
-+231  entity propagated out of the content section into miscellaneous
-+232  expected &# to be followed by a numeric character value
-+233  '[' expected
-+234  ']]>' sequence is not allowed in character data
-+235  '--' sequence is illegal in comment
-+236  unterminated CDATA section
-+237  NDATA expected
-+238  NDATA is illegal for parameter entities
-+239  hex radix character references must use 'x', not 'X'
-+240  {0} declaration already seen
-+241  XML declarations must be in this order: version, encoding, standalone
-+242  external entity cannot be referred to from attribute value
-+243  XML or TEXT declaration must start with '<?xml ', not '<?XML '
-+244  expected literal entity value or public/system id
-+245  '{0}' is not a valid digit for the specified radix
-+246  input ended before all started tags were ended; last tag started is '{0}'
-+247  nested CDATA section illegal
-+248  prefix '{0}' can not be resolved to namespace URI
-+249  start and the end tags are in different entities
-+250  XML document cannot be empty
-+251  CDATA section is illegal outside the root element
-+252  unexpected trailing surrogate character
-+253  processing instruction cannot start with 'xml'
-+254  XML or TEXT declaration must start at line 1, column 1
-+255  version declaration is required in XML declaration
-+256  standalone declaration is only legal in the main XML entity
-+257  encoding declaration is required in TEXT declaration
-+258  colon is illegal in names when namespaces are enabled
-+259  {0}
-+260  schemaLocation does not contain namespace-location pairs
-+261  fatal error during schema scan
-+262  reference to external entity declaration '{0}' is illegal in standalone document
-+263  partial markup in parameter entity replacement text in complete declaration
-+264  invalid namespace value in prefix-namespace mapping '{0}'
-+265  prefix 'xmlns' cannot be explicitly bound to namespace
-+266  namespace for 'xmlns' cannot be explicitly bound to prefix
-+267  prefix 'xml' cannot be bound to namespace other than its canonical namespace
-+268  namespace for 'xml' cannot be bound to prefix other than 'xml'
-+269  element '{0}' cannot have 'xmlns' as its prefix
-+270  restriction must contain simpleType definition
-+271  invalid root element '{0}' in DOCTYPE declaration
-+272  invalid element name '{0}'
-+273  invalid attribute name '{0}'
-+274  invalid entity reference name '{0}'
-+275  DOCTYPE declaration already seen
-+276  fallback element is not a direct child of include element
-+277  include element without 'href' attribute
-+278  include element with XPointer specification; XPointer is not yet supported
-+279  invalid 'parse' attribute value '{0}'; expected 'text' or 'xml'
-+280  multiple fallback elements in document '{0}'
-+281  include failed and no fallback element found in document '{0}'
-+282  circular inclusion in document '{0}'
-+283  self-inclusion in document '{0}'
-+284  element '{0}' is not allowed as a child of include element
-+285  included notation '{0}' conflicts with notation already defined
-+286  included entity '{0}' conflicts with entity already defined
-+
-+
-+$set 2
-+2  no declaration found for element '{0}'
-+3  no declaration found for attribute '{0}'
-+4  notation '{0}' is referenced but was never declared
-+5  root element differs from that declared in DOCTYPE
-+6  missing required attribute '{0}'
-+7  element '{0}' is not allowed for content model '{1}'
-+8  ID attribute must be #IMPLIED or #REQUIRED
-+9  attribute cannot have empty value
-+10  element '{0}' has already been declared
-+11  element '{0}' has more than one ID attribute
-+12  ID value '{0}' has already been used
-+13  ID attribute '{0}' is referenced but was never declared
-+14  attribute '{0}' refers to undeclared notation '{1}'
-+15  element '{0}' is specified in DOCTYPE but was never declared
-+16  empty content is not valid for content model '{0}'
-+17  attribute '{0}' is not declared for element '{1}'
-+18  value '{0}' for attribute '{1}' of type ENTITY/ENTITIES must refer to external, unparsed entity
-+19  attribute '{0}' refers to unknown entity '{1}'
-+20  attribute of type ID/IDREF/IDREFS/ENTITY/ENTITIES/NOTATION cannot contain colon when namespaces are enabled
-+21  missing elements in content model '{0}'
-+22  no character data is allowed by content model
-+23  value '{0}' for attribute '{1}' does not match its type's defined enumeration or notation list
-+24  value '{0}' for attribute '{1}' is invalid Name or NMTOKEN value
-+25  attribute '{0}' does not allow multiple values
-+26  attribute '{0}' has value '{1}' that does not match its #FIXED value '{2}'
-+27  element types cannot be duplicated in mixed content model
-+28  {0} is not supported
-+29  '{0}' is not allowed in the {1} compositor; only element, group, choice, sequence, and any are allowed
-+30  base type '{0}' not found in '{1}' definition
-+31  {0} declaration with 'ref' attribute cannot have content
-+32  {0}
-+33  prohibited attribute '{0}' is present
-+34  illegal 'xml:space' declaration
-+35  schema document '{0}' has different target namespace from the one specified in instance document '{1}'
-+36  element '{0}' is of simple type and cannot have elements in its content
-+37  unable to find validator for simple type of element '{0}'
-+38  grammar not found for namespace '{0}'
-+39  {0}
-+40  'xsi:nil' specified for non-nillable element '{0}'
-+41  element '{0}' is nil and must be empty
-+42  content of element '{0}' differs from its declared fixed value
-+43  unable to find validator for simple type of attribute '{0}'
-+44  error during schema scan
-+45  element '{0}' must be qualified
-+46  element '{0}' must be unqualified
-+47  reference to external entity declaration '{0}' is not allowed in standalone document
-+48  attribute '{0}' in element '{1}' has default value and must be specified in standalone document
-+49  attribute '{0}' must not be changed by normalization in standalone document
-+50  whitespace must not occur between externally declared elements with element content in standalone document
-+51  entity '{0}' not found
-+52  partial markup in parameter entity replacement text
-+53  failed to validate '{0}'
-+54  complex type '{0}' violates the unique particle attribution rule in its components '{1}' and '{2}'
-+55  abstract type '{0}' cannot be used in 'xsi:type'
-+56  element '{0}' is abstract; use non-abstract member of its substitution group instead
-+57  type of element '{0}' is abstract; use 'xsi:type' to specify non-abstract type instead
-+58  type '{0}' specified in 'xsi:type' cannot be resolved
-+59  type '{0}' specified in 'xsi:type' does not derive from type of element '{1}'
-+60  element '{0}' does not permit substitution
-+61  complex type '{0}' does not permit substitution
-+62  attribute '{0}' must be qualified
-+63  attribute '{0}' must be unqualified
-+64  identity constraint field matches more than one value within the scope of its selector; field must match unique value
-+65  unknown identity constraint field
-+66  element '{0}' has identity constraint key with no value
-+67  element '{0}' does not have enough values for identity constraint key '{1}'
-+68  element '{0}' declares identity constraint key that matches nillable element
-+69  element '{0}' declares duplicate identity constraint unique values
-+70  element '{0}' declares duplicate identity constraint key values
-+71  keyref '{0}' refers to out of scope key/unique
-+72  identity constraint key for element '{0}' not found
-+73  non-whitespace characters are not allowed in schema declarations other than appinfo and documentation
-+74  element '{0}' declared EMPTY but has attribute '{1}' of type NOTATION
-+75  element '{0}' declared EMPTY and cannot have content, not even entity references, comments, PIs, or whitespaces
-+76  element '{0}' has more than one attribute of type NOTATION
-+77  attribute '{0}' has non-distinct token '{1}'
-+78  content model of element '{0}' does not allow escaped whitespaces
-+
-+
-+$set 3
-+2  unable to open primary document entity '{0}'
-+5  index is beyond array bounds
-+6  new array size is less than the old
-+7  index is beyond maximum attribute index
-+8  invalid AttType value
-+9  invalid DefAttType value
-+10  bit index is beyond set size
-+11  bit sets have different sizes
-+12  no more buffers available
-+13  buffer is not found in the manager's pool
-+14  NULL pointer
-+15  binary operation node has unary node type
-+16  content type must be mixed or children
-+17  PCDATA node is illegal at this point
-+18  unary operation node has binary node type
-+19  unknown content model type
-+20  unknown content spec type
-+21  parent element has no content spec node
-+22  invalid spec type for '{0}'
-+23  unknown creation reason value
-+24  element stack is empty
-+25  pop operation requested on empty stack
-+26  parent operation requested with only one element in stack
-+27  no more elements in enumerator
-+28  unable to open file '{0}'
-+29  unable to query file position
-+30  unable to close file
-+31  unable to seek to the end of file
-+32  unable to seek to the required position in file
-+33  unable to duplicate handle
-+34  unable to read data from file
-+35  unable to write data to file
-+36  unable to reset file position to the beginning
-+37  unable to get file size
-+38  unable to determine file base pathname
-+39  parsing in progress
-+40  DOCTYPE declaration was seen but installed validator does not support DTD
-+41  unable to open DTD document '{0}'
-+42  unable to open external entity '{0}'
-+43  unexpected end of input
-+44  zero hash modulus
-+45  hashing key produced invalid hash
-+46  no such key in hash table
-+47  unable to destroy mutex
-+48  internal error in NetAccessor
-+49  NetAccessor is unable to determine length of remote file
-+50  unable to initialize NetAccessor
-+51  unable to resolve host/address '{0}'
-+52  unable to create socket for URL '{0}'
-+53  unable to connect socket for URL '{0}'
-+54  unable to write to socket for URL '{0}'
-+55  unable to read from socket for URL '{0}'
-+56  specified HTTP method is not supported by NetAccessor
-+57  element '{0}' is already in pool
-+58  invalid pool element id
-+59  zero hash modulus
-+60  reader id not found
-+61  invalid auto encoding value
-+62  unable to decode first line in entity '{0}'
-+63  XML or TEXT declaration '{0}' cannot have NEL or lsep
-+64  current transcoding service does not support source offset information
-+65  EBCDIC file must provide encoding declaration
-+66  unable to open primary document entity '{0}'
-+67  unbalanced start/end tags
-+68  call to scanNext is illegal at this point
-+69  index is past top of stack
-+70  empty stack
-+71  target buffer cannot have zero max size
-+72  unsupported radix; expected 2, 8, 10, or 16
-+73  target buffer is too small
-+74  start index is past the end of string
-+75  string representation overflows output binary result
-+76  illegal string pool id
-+77  char 0x{0} is not representable in '{1}' encoding
-+78  invalid multi-byte sequence
-+79  code point 0x{0} is invalid for '{1}' encoding
-+80  leading surrogate followed by invalid trailing surrogate
-+81  unable to create converter for '{0}' encoding
-+82  malformed URL
-+83  unsupported protocol in URL
-+84  URL protocol '{0}' is unsupported
-+85  missing protocol prefix
-+86  expected '//' after protocol
-+87  base part of URL cannot be relative
-+88  port field must be 16-bit decimal number
-+89  invalid byte '{1}' at position {0} of a {2}-byte sequence
-+90  invalid bytes '{0}' and '{1}' of a 3-byte sequence
-+91  irregular bytes '{0}' and '{1}' of a 3-byte sequence
-+92  invalid bytes '{0}' and '{1}' of a 4-byte sequence
-+93  exceeded byte limit at byte '{0}' in a {1}-byte sequence
-+94  index is beyond vector bounds
-+95  invalid element id
-+96  internal subset is not allowed when reusing the grammar
-+97  unknown recognizer encoding
-+98  illegal character at offset {0} in regular expression '{1}'
-+99  invalid reference number
-+100  character expected after backslash
-+101  unexpected '?'; '(?:', '(?=', '(?!', '(?<', '(?#', or '(?>' expected
-+102  '(?<=' or '(?<!' expected
-+103  unterminated comment
-+104  ')' expected
-+105  unexpected end of pattern in modifier group
-+106  ':' expected
-+107  unexpected end of pattern in conditional group
-+108  back reference, anchor, lookahead, or lookbehind expected in conditional pattern
-+109  more than three choices in conditional group
-+110  character in the U+0040-U+005f range must follow '\c'
-+111  '{' expected before category character
-+112  property name must be closed with '}'
-+113  unexpected meta character
-+114  unknown property
-+115  POSIX character class must be closed with ':]'
-+116  unexpected end of pattern in character class
-+117  unknown name for POSIX character class
-+118  ']' expected
-+119  '{0}' is invalid character range; use '\{1}' instead
-+120  '[' expected
-+121  ')', '-[', '+[', or '&[' expected
-+122  range end code point '{0}' is less than start code point '{1}'
-+123  invalid Unicode hex notation
-+124  '\ x{' must be closed with '}'
-+125  invalid Unicode code point
-+126  anchor cannot be present at this point
-+127  '{0}' is invalid character escape sequence
-+128  invalid quantifier in '{0}'; digit expected
-+129  invalid quantifier in '{0}'; invalid quantity or missing  '}'
-+130  invalid quantifier in '{0}'; digit or '}' expected
-+131  invalid quantifier in '{0}'; min quantity must be less than or equal max quantity
-+132  invalid quantifier in '{0}'; quantity value overflow
-+133  XML Schema was seen but installed validator does not support XML Schema
-+134  SubstitutionGroupComparator has no grammar resolver
-+135  invalid length value '{0}'
-+136  invalid maxLength value '{0}'
-+137  invalid minLength value '{0}'
-+138  length value '{0}' must be a non-negative integer
-+139  maxLength value '{0}' must be a non-negative integer
-+140  minLength value '{0}' must be a non-negative integer
-+141  both length and maxLength cannot be present at the same time
-+142  both length and minLength cannot be present at the same time
-+143  maxLength value '{0}' must be greater than minLength value '{1}'
-+144  invalid facet tag '{0}'
-+145  length value '{0}' must be equal to length value '{1}' in the base
-+146  minLength value '{0}' must be greater than or equal to minLength value '{1}' in the base
-+147  minLength value '{0}' must be less than or equal to maxLength value '{1}' in the base
-+148  maxLength value '{0}' must be less than or equal to maxLength value '{1}' in the base
-+149  maxLength value '{0}' must be greater than or equal to minLength value '{1}' in the base
-+150  length value '{0}' must be greater than or equal to minLength value '{1}' in the base
-+151  length value '{0}' must be less than or equal to maxLength value '{1}' in the base
-+152  minLength value '{0}' must be less than or equal to length value '{1}' in the base
-+153  maxLength value '{0}' must be greater than or equal to length value '{1}' in the base
-+154  enumeration value '{0}' must be from the value space of the base
-+155  whiteSpace value '{0}' must be one of 'preserve', 'replace', or 'collapse'
-+156  whiteSpace value is 'preserve' or 'replace' while base type whiteSpace value is 'collapse'
-+157  whiteSpace value is 'preserve' while base type whiteSpace value is 'replace'
-+158  invalid maxInclusive value '{0}'
-+159  invalid maxExclusive value '{0}'
-+160  invalid minInclusive value '{0}'
-+161  invalid minExclusive value '{0}'
-+162  invalid totalDigits value '{0}'
-+163  invalid fractionDigits value '{0}'
-+164  totalDigits value '{0}' must be a positive integer
-+165  fractionDigits value '{0}' must be a non-negative integer
-+166  both maxInclusive and maxExclusive cannot be present at the same time
-+167  both minInclusive and minExclusive cannot be present at the same time
-+168  maxExclusive value '{0}' must be greater than minExclusive value '{1}'
-+169  maxExclusive value '{0}' must be greater than minInclusive value '{1}'
-+170  maxInclusive value '{0}' must be greater than minExclusive value '{1}'
-+171  maxInclusive value '{0}' must be greater than minInclusive value '{1}'
-+172  totalDigits value '{0}' must be greater than fractionDigits value '{1}'
-+173  maxInclusive value '{0}' must be less than maxExclusive value '{1}' in the base
-+174  maxInclusive value '{0}' must be less than or equal to maxInclusive value '{1}' in the base
-+175  maxInclusive value '{0}' must be greater than or equal to minInclusive value '{1}' in the base
-+176  maxInclusive value '{0}' must be greater than minExclusive value '{1}' in the base
-+177  maxExclusive value '{0}' must be less than or equal to maxExclusive value '{1}' in the base
-+178  maxExclusive value '{0}' must be less than or equal to maxInclusive value '{1}' in the base
-+179  maxExclusive value '{0}' must be greater than minInclusive value '{1}' in the base
-+180  maxExclusive value '{0}' must be greater than minExclusive value '{1}' in the base
-+181  minExclusive value '{0}' must be less than maxExclusive value '{1}' in the base
-+182  minExclusive value '{0}' must be less than or equal to maxInclusive value '{1}' in the base
-+183  minExclusive value '{0}' must be greater than minInclusive value '{1}' in the base
-+184  minExclusive value '{0}' must be greater than minExclusive value '{1}' in the base
-+185  minInclusive value '{0}' must be less than maxExclusive value '{1}' in the base
-+186  minInclusive value '{0}' must be less than or equal to maxInclusive value '{1}' in the base
-+187  minInclusive value '{0}' must be greater than or equal to minInclusive value '{1}' in the base
-+188  minInclusive value '{0}' must be greater than minExclusive value '{1}' in the base
-+189  maxInclusive value '{0}' must be from the base type value space
-+190  maxExclusive value '{0}' must be from the base type value space
-+191  minInclusive value '{0}' must be from the base type value space
-+192  minExclusive value '{0}' must be from the base type value space
-+193  totalDigits value '{0}' must be less than or equal to totalDigits value '{1}' in the base
-+194  fractionDigits value '{0}' must be less than or equal to totalDigits value '{1}' in the base
-+195  fractionDigits value '{0}' must be less than or equal to fractionDigits value '{1}' in the base
-+196  maxInclusive value '{0}' must be equal to fixed maxInclusive value '{1}' in the base
-+197  maxExclusive value '{0}' must be equal to fixed maxExclusive value '{1}' in the base
-+198  minInclusive value '{0}' must be equal to fixed minInclusive value '{1}' in the base
-+199  minExclusive value '{0}' must be equal to fixed minExclusive value '{1}' in the base
-+200  totalDigits value '{0}' must be equal to fixed totalDigits value '{1}' in the base
-+201  fractionDigits value '{0}' must be equal to fixed fractionDigits value '{1}' in the base
-+202  maxLength value '{0}' must be equal to fixed maxLength value '{1}' in the base
-+203  minLength value '{0}' must be equal to fixed minLength value '{1}' in the base
-+204  whiteSpace value '{0}' must be equal to fixed whiteSpace value '{1}' in the base
-+205  internal error while processing fixed facet
-+206  list itemType is empty
-+207  union memberTypes is empty
-+208  restriction union base is empty
-+209  restriction union base is '{0}' instead of union
-+210  value '{0}' does not match regular expression facet '{1}'
-+211  value '{0}' is invalid Base64-encoded binary
-+212  value '{0}' is invalid Hex-encoded binary
-+213  value '{0}' has length '{1}' which exceeds maxLength facet value '{2}'
-+214  value '{0}' has length '{1}' which is less than minLength facet value '{2}'
-+215  value '{0}' has length '{1}' which is not equal to length facet value '{2}'
-+216  value '{0}' not in enumeration
-+217  value '{0}' has '{1}' total digits which exceeds totalDigits facet value '{2}'
-+218  value '{0}' has '{1}' fraction digits which exceeds fractionDigits facet value '{2}'
-+219  value '{0}' must be less than or equal to maxInclusive facet value '{1}'
-+220  value '{0}' must be less than maxExclusive facet value '{1}'
-+221  value '{0}' must be greater than or equal to minInclusive facet value '{1}'
-+222  value '{0}' must be greater than or equal to minExclusive facet value '{1}'
-+223  value '{0}' is not whitespace replaced
-+224  value '{0}' is not whitespace collapsed
-+225  value '{0}' is invalid NCName
-+226  value '{0}' is invalid {1}
-+227  ID value '{0}' is not unique
-+228  value '{0}' is invalid ENTITY
-+229  value '{0}' is invalid QName
-+230  NOTATION '{0}' must be valid QName
-+231  value '{0}' does not match any member types of the union
-+232  value '{0}' is invalid anyURI
-+233  empty string encountered
-+234  string contains only whitespaces
-+235  more than one decimal point encountered
-+236  invalid character encountered
-+237  NULL pointer encountered
-+238  unable to construct URI with NULL/empty {0}
-+239  {0} '{1}' can only be set for a generic URI
-+240  {0} contains invalid escape sequence '{1}'
-+241  {0} contains invalid character '{1}'
-+242  {0} cannot be NULL
-+243  '{1}' is not conformant to {0}
-+244  no scheme found in URI
-+245  {0} '{1}' may not be specified if host is not specified
-+246  {0} '{1}' may not be specified if path is not specified
-+247  port number '{0}' must be in the (0,65535) range
-+248  internal error while validating '{0}'
-+249  result not set
-+250  internal error in CompactRanges
-+251  mismatched type in MergeRanges
-+252  internal error in SubtractRanges
-+253  internal error in IntersectRanges
-+254  argument must be RangeToken
-+255  invalid category name '{0}'
-+256  keyword '{0}' not found
-+257  reference number must be greater than zero
-+258  option '{0}' unknown
-+259  unknown token type
-+260  unable to get RangeToken for '{0}'
-+261  not supported
-+262  invalid child index
-+263  replace pattern cannot match zero-length string
-+264  invalid replace pattern
-+265  enabling NEL option can only be done once per process
-+266  out of memory
-+267  operation is not allowed
-+268  selector cannot select attribute
-+269  '|' at the beginning of XPath expression is illegal
-+270  '||' in XPath expression is illegal
-+271  missing attribute name in XPath expression
-+272  unexpected XPath token; expected qname, any, or namespace test
-+273  prefix '{0}' used in XPath expression can not be resolved to namespace URI
-+274  '::' in XPath expression is illegal
-+275  expected step following 'child' token in XPath expression
-+276  expected step following '//' in XPath expression
-+277  expected step following '/' in XPath expression
-+278  '/' not allowed after '//' in XPath expression
-+279  '//' only allowed after '.' at the beginning of XPath expression
-+280  '/' at the beginning of XPath expression is illegal
-+281  root element selection is illegal in XPath expression
-+282  empty XPath expression
-+283  XPath expression cannot end with '|'
-+284  invalid character '{0}' in XPath expression
-+285  unsupported XPath token
-+286  fractional values not supported in XPath expression
-+287  invalid dateTime value '{0}'
-+288  missing 'T' separator in dateTime value '{0}'
-+289  invalid gDay value '{0}'
-+290  invalid gMonth value '{0}'
-+291  invalid gMonthDay value '{0}'
-+292  invalid duration value '{0}'
-+293  duration value '{0}' must start with '-' or 'P'
-+294  duration value '{0}' must contain 'P'
-+295  duration value '{0}' can contain '-' only as the first character
-+296  duration value '{0}' contains invalid text before 'T'
-+297  duration value '{0}' has no time component after 'T'
-+298  duration value '{0}' must have at least one component
-+299  duration value '{0}' must have at least one digit after '.'
-+300  incomplete date value '{0}'
-+301  invalid date value '{0}'
-+302  incomplete time value '{0}'
-+303  invalid time value '{0}'
-+304  expected fractional seconds after '.' in time value '{0}'
-+305  incomplete gYearMonth value '{0}'
-+306  invalid gYearMonth value '{0}'
-+307  invalid gYear value '{0}'
-+308  year value '{0}' must follow 'CCYY' format
-+309  invalid leading zero in gYear value '{0}'
-+310  month component missing in gYearMonth value '{0}'
-+311  time zone expected in '{0}'
-+312  unexpected text after 'Z' in time zone value '{0}'
-+313  invalid time zone value '{0}'
-+314  illegal year value '{0}'
-+315  month value '{0}' must be between 1 and 12
-+316  day value '{0}' must be between 1 and {1}
-+317  hours value '{0}' must be between 0 and 23
-+318  minutes value '{0}' must be between 0 and 59
-+319  seconds value '{0}' must be between 0 and 60
-+320  minutes value '{0}' must be between 0 and 59
-+321  derived by restriction complex type has content while base type is empty
-+322  namespace of element '{0}' is not allowed by wildcard in the base
-+323  occurrence range of element '{0}' is not a valid restriction of base element's range
-+324  element name/namespace in restriction does not match that of corresponding element in the base
-+325  element '{0}' is nillable in the restriction while it is non-nillable in the base
-+326  element '{0}' is either not fixed or is fixed to a different value compared to corresponding element in the base
-+327  disallowed substitutions for element '{0}' are not a superset of those for corresponding element in the base
-+328  element '{0}' has type that does not derive from type of corresponding element in the base
-+329  element '{0}' has fewer identity constraints compared to corresponding element '{1}' in the base
-+330  element '{0}' has identity constraint that does not appear in corresponding element '{1}' in the base
-+331  occurrence range of group is not a valid restriction of occurrence range of base group
-+332  no complete functional mapping between particles
-+333  forbidden restriction of any particle
-+334  forbidden restriction of all compositor
-+335  forbidden restriction of choice compositor
-+336  forbidden restriction of sequence compositor
-+337  occurrence range of wildcard is not a valid restriction of base wildcard's range
-+338  wildcard is not a subset of corresponding wildcard in the base
-+339  occurrence range of group is not a restriction of base wildcard's range
-+340  no complete functional mapping between particles
-+341  no complete functional mapping between particles
-+342  invalid content spec node type
-+343  NodeIDMap exceeds largest available size
-+344  ProtoType has NULL class name
-+345  ProtoType name length '{0}' differs from expected '{1}'
-+346  ProtoType name '{0}' differs from expected '{1}'
-+347  InputStream read '{0}' is less than required '{1}'
-+348  InputStream read '{0}' is beyond available buffer size '{1}'
-+349  storing violation
-+350  store buffer violation '{0}', '{1}'
-+351  object tag '{0}' exceeds load pool upper boundary '{1}'
-+352  load pool size '{0}' does not tally with object count '{1}'
-+353  loading violation
-+354  load buffer violation '{0}', '{1}'
-+355  invalid class index '{0}', '{1}'
-+356  invalid checkFillBuffer size '{0}'
-+357  invalid checkFlushBuffer size '{0}'
-+358  invalid NULL pointer encountered '{0}'
-+359  createObject fails
-+360  object count '{0}' exceeds upper boundary '{1}'
-+361  grammar pool is empty
-+362  grammar pool is not empty
-+363  string pool is not empty
-+364  storer level '{0}' does not match loader level '{1}'
-+365  undefined prefix in QName value '{0}'
-+
-+
-+$set 4
-+2  dummy
-+3  index or size is negative, or greater than the allowed value
-+4  specified range of text does not fit into DOMString
-+5  attempt is made to insert a node where it is not permitted
-+6  node is used in a different document than the one that created it
-+7  invalid or illegal XML character
-+8  node does not support storing data
-+9  attempt is made to modify an object where modifications are not allowed
-+10  attempt is made to reference a node in a context where it does not exist
-+11  implementation does not support the requested type of object or operation
-+12  attempt is made to add an attribute that is already in use elsewhere
-+13  attempt is made to use an object that is not or is no longer usable
-+14  invalid or illegal string
-+15  attempt is made to modify the type of the underlying object
-+16  attempt is made to create or change an object in a way which is incorrect with respect to namespaces
-+17  parameter or requested operation is not supported by the underlying object
-+18  call to a method such as insertBefore or removeChild would make the node invalid with respect to document grammar
-+19  type of an object is incompatible with the expected type of the parameter associated with the object
-+20  dummy
-+21  boundary points of a range do not meet specific requirements
-+22  container of a range boundary point is set to a node of an invalid type or to a node with an ancestor of an invalid type
-+23  dummy
-+24  failed to load a document or an XML fragment using DOMLSParser
-+25  failed to serialize a DOM node using DOMLSSerializer
-+26  dummy
-+27  expression has incorrect syntax or contains XPath features not supported by the XML Schema XPath subset
-+28  requested result type not supported
-+29  no current result in the result object
-+30  nested CDATA sections
-+31  unrepresentable character
-+32  unrecognized node type
-+33  parsing in progress
-+34  parsing aborted by the user
-+35  parsing failed
-+
-+
diff --git a/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild b/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
index 135f708ab29d..65f5851feb4f 100644
--- a/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
@@ -13,7 +13,8 @@ if [[ ${PV} == *9999 ]] ; then
 	ESVN_REPO_URI="https://svn.apache.org/repos/asf/xerces/c/trunk"
 	inherit subversion
 else
-	SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz"
+	SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz
+	https://dev.gentoo.org/~juippis/distfiles/tmp/xerces-c-3.2.2-fix-XERCESC-2161.patch"
 	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
@@ -32,7 +33,7 @@ DEPEND="${RDEPEND}
 
 DOCS=( CREDITS KEYS NOTICE README )
 PATCHES=(
-	"${FILESDIR}/${P}-fix-XERCESC-2161.patch"
+	"${DISTDIR}/${P}-fix-XERCESC-2161.patch"
 	"${FILESDIR}/${P}-fix-XERCESC-2163.patch"
 )
 
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 4e7354798e46..23a5172f24c9 100644
Binary files a/dev-lua/Manifest.gz and b/dev-lua/Manifest.gz differ
diff --git a/dev-lua/lua-bit32/lua-bit32-5.3.5-r100.ebuild b/dev-lua/lua-bit32/lua-bit32-5.3.5-r100.ebuild
new file mode 100644
index 000000000000..ab3e7d6036c5
--- /dev/null
+++ b/dev-lua/lua-bit32/lua-bit32-5.3.5-r100.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 luajit )
+
+MY_PN="lua-compat-5.3"
+MY_PV="0.10"
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="Backported Lua bit manipulation library"
+HOMEPAGE="https://github.com/keplerproject/lua-compat-5.3"
+SRC_URI="https://github.com/keplerproject/${MY_PN}/archive/v${MY_PV}.tar.gz -> lua-compat53-${MY_PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="${LUA_DEPS}"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	compiler="$(tc-getCC) ${CFLAGS} -fPIC ${LDFLAGS} -DLUA_COMPAT_BITLIB -Ic-api -c lbitlib.c -o lbitlib.o"
+	einfo "${compiler}"
+	eval "${compiler}" || die
+
+	linker="$(tc-getCC) -shared ${LDFLAGS} -o bit32.so lbitlib.o"
+	einfo "${linker}"
+	eval "${linker}" || die
+}
+
+lua_src_test() {
+	LUA_CPATH="./?.so" "${ELUA}" "tests/test-bit32.lua" || die
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	exeinto "$(lua_get_cmod_dir)"
+	doexe bit32.so
+}
+
+src_install() {
+	default
+
+	lua_foreach_impl lua_src_install
+}
diff --git a/dev-lua/lua-bit32/metadata.xml b/dev-lua/lua-bit32/metadata.xml
index 32feba463055..5ff7bd4eab78 100644
--- a/dev-lua/lua-bit32/metadata.xml
+++ b/dev-lua/lua-bit32/metadata.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>azamat.hackimov@gmail.com</email>
-    <name>Azamat H. Hackimov</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">keplerproject/lua-compat-5.3</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>azamat.hackimov@gmail.com</email>
+		<name>Azamat H. Hackimov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">keplerproject/lua-compat-5.3</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-lua/lua-zlib/lua-zlib-1.2-r100.ebuild b/dev-lua/lua-zlib/lua-zlib-1.2-r100.ebuild
new file mode 100644
index 000000000000..1fbf98752889
--- /dev/null
+++ b/dev-lua/lua-zlib/lua-zlib-1.2-r100.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit cmake lua
+
+DESCRIPTION="Simple streaming interface to zlib for Lua"
+HOMEPAGE="https://github.com/brimworks/lua-zlib"
+SRC_URI="https://github.com/brimworks/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	sys-libs/zlib
+	${LUA_DEPS}
+
+"
+DEPEND="${RDEPEND}"
+
+lua_src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_CMOD="$(lua_get_cmod_dir)"
+		-DUSE_LUA_VERSION="$(lua_get_version)"
+	)
+
+	if [[ ${ELUA} == luajit ]]; then
+		mycmakeargs+=( -DUSE_LUAJIT="ON" )
+	fi
+
+	cmake_src_configure
+}
+
+src_configure() {
+	lua_foreach_impl lua_src_configure
+}
+
+src_compile() {
+	lua_foreach_impl cmake_src_compile
+}
+
+src_install() {
+	lua_foreach_impl cmake_src_install
+}
diff --git a/dev-lua/luadbi/Manifest b/dev-lua/luadbi/Manifest
index b80720a85656..ad160c1bf206 100644
--- a/dev-lua/luadbi/Manifest
+++ b/dev-lua/luadbi/Manifest
@@ -1,2 +1 @@
 DIST luadbi-0.7.2.tar.gz 36462 BLAKE2B 581c7353bfa36b3f6cabed2df78372f8810300bf4525bf8d370e61d469f9daa5a5c40c58916164a8d0a621a61e983e85c67b23ef03f51212be79f09ad8512047 SHA512 891f99cbc8f1b5327ef820641a1608abf41410f2f28584b975cc3cf65154b9bebf6f1b9ca7d1818b9c965738ad700dd17ae042dfd2a7146cf755871ebae535b9
-DIST luadbi.0.5.tar.gz 22454 BLAKE2B 538fa935ece2a8e0f852cef33716570a6e85100ec26892d7a76c5b00a7fceb82411e2ebe29d25de42cf6ee6bdbfdf5102875bb4d04d65f86dfdc9d79fecef359 SHA512 4ed641e113e90acc8a4f6b3b2d0f5d5044c0fbbef3b2fdfb84d15e17115e45c553a33b19bfb165e5af11a2adce501d66859963e3363d3ab1c6a39b0b2ae92e62
diff --git a/dev-lua/luadbi/files/luadbi-0.5-makefile.patch b/dev-lua/luadbi/files/luadbi-0.5-makefile.patch
deleted file mode 100644
index 98e4988b281b..000000000000
--- a/dev-lua/luadbi/files/luadbi-0.5-makefile.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/Makefile	2013-02-01 13:34:54.490898002 +0400
-+++ b/Makefile	2013-02-01 13:44:25.927772130 +0400
-@@ -1,5 +1,6 @@
- CC=gcc
--CFLAGS=-g -pedantic -Wall -O2 -shared -fpic -I /usr/include/lua5.1 -I /usr/include/mysql -I /usr/include/postgresql/ -I /opt/ibm/db2exc/V9.5/include/ -I /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/rdbms/public/ -I .
-+INCLUDES=-I /usr/include/lua5.1 -I /usr/include/mysql -I /usr/include/postgresql/ -I /opt/ibm/db2exc/V9.5/include/ -I /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/rdbms/public/ -I .
-+CFLAGS+=-pedantic -shared -fpic $(INCLUDES)
- AR=ar rcu
- RANLIB=ranlib
- RM=rm -rf
-@@ -27,6 +27,14 @@
- DB2_OBJS=$(OBJS) build/dbd_db2_main.o build/dbd_db2_connection.o build/dbd_db2_statement.o
- ORACLE_OBJS=$(OBJS) build/dbd_oracle_main.o build/dbd_oracle_connection.o build/dbd_oracle_statement.o
- 
-+INSTALL = install
-+INSTALL_PROGRAM = $(INSTALL)
-+INSTALL_DATA = $(INSTALL) -m 644
-+LUA_INC_DIR=/usr/include/lua5.1
-+LUA_LIB_DIR=/usr/lib
-+INSTALL_DIR_LUA=/usr/share/lua/5.1
-+INSTALL_DIR_BIN=/usr/lib/lua/5.1
-+
- free: mysql psql sqlite3
- 
- all:  mysql psql sqlite3 db2 oracle
-@@ -90,3 +98,21 @@
- build:
- 	$(MKDIR) ${BUILDDIR}
- 
-+install_lua:
-+	$(INSTALL_DATA) -D DBI.lua $(DESTDIR)$(INSTALL_DIR_LUA)/DBI.lua
-+
-+install_mysql: install_lua
-+	$(INSTALL_PROGRAM) -D $(DBDMYSQL) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDMYSQL)
-+
-+install_psql: install_lua
-+	$(INSTALL_PROGRAM) -D $(DBDPSQL) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDPSQL)
-+
-+install_sqlite3: install_lua
-+	$(INSTALL_PROGRAM) -D $(DBDSQLITE3) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDSQLITE3)
-+
-+install_db2: install_lua
-+	$(INSTALL_PROGRAM) -D $(DBDDB2) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDDB2)
-+
-+install_oracle: install_lua
-+	$(INSTALL_PROGRAM) -D $(DBDORACLE) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDORACLE)
-+
diff --git a/dev-lua/luadbi/files/luadbi-0.5-mysql-8.patch b/dev-lua/luadbi/files/luadbi-0.5-mysql-8.patch
deleted file mode 100644
index a75c9d46d07d..000000000000
--- a/dev-lua/luadbi/files/luadbi-0.5-mysql-8.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- a/dbd/mysql/statement.c	2020-03-09 15:55:43.212010825 +0100
-+++ b/dbd/mysql/statement.c	2020-03-09 15:57:37.703464570 +0100
-@@ -200,7 +200,10 @@
- 	switch(type) {
- 	    case LUA_TNIL:
- 		bind[i].buffer_type = MYSQL_TYPE_NULL;
-+#if MYSQL_VERSION_ID >= 80000
-+#else
- 		bind[i].is_null = (my_bool*)1;
-+#endif
- 		break;
- 
- 	    case LUA_TBOOLEAN:
-@@ -209,7 +213,11 @@
- 		*boolean = lua_toboolean(L, p);
- 
- 		bind[i].buffer_type = MYSQL_TYPE_LONG;
--		bind[i].is_null = (my_bool*)0;
-+#if MYSQL_VERSION_ID >= 80000
-+                bind[i].is_null = (bool*) 0;
-+#else
-+                bind[i].is_null = (my_bool*)0;
-+#endif
- 		bind[i].buffer = (char *)boolean;
- 		bind[i].length = 0;
- 		break;
-@@ -224,7 +232,11 @@
- 		*num = lua_tonumber(L, p);
- 
- 		bind[i].buffer_type = MYSQL_TYPE_DOUBLE;
--		bind[i].is_null = (my_bool*)0;
-+#if MYSQL_VERSION_ID >= 80000
-+                bind[i].is_null = (bool*) 0;
-+#else
-+                bind[i].is_null = (my_bool*)0;
-+#endif
- 		bind[i].buffer = (char *)num;
- 		bind[i].length = 0;
- 		break;
-@@ -235,7 +247,11 @@
- 		str = lua_tolstring(L, p, str_len);
- 
- 		bind[i].buffer_type = MYSQL_TYPE_STRING;
--		bind[i].is_null = (my_bool*)0;
-+#if MYSQL_VERSION_ID >= 80000
-+                bind[i].is_null = (bool*) 0;
-+#else
-+                bind[i].is_null = (my_bool*)0;
-+#endif
- 		bind[i].buffer = (char *)str;
- 		bind[i].length = str_len;
- 		break;
-@@ -385,7 +385,7 @@
- 
- 		    if (fields[i].type == MYSQL_TYPE_TIMESTAMP || fields[i].type == MYSQL_TYPE_DATETIME) {
- 			char str[20];
--			struct st_mysql_time *t = bind[i].buffer;
-+			MYSQL_TIME *t = bind[i].buffer;
- 
- 			snprintf(str, 20, "%d-%02d-%02d %02d:%02d:%02d", t->year, t->month, t->day, t->hour, t->minute, t->second);
- 
-@@ -396,7 +396,7 @@
- 			}
- 		    } else if (fields[i].type == MYSQL_TYPE_TIME) {
- 			char str[9];
--			struct st_mysql_time *t = bind[i].buffer;
-+			MYSQL_TIME *t = bind[i].buffer;
- 
- 			snprintf(str, 9, "%02d:%02d:%02d", t->hour, t->minute, t->second);
- 
-@@ -407,7 +407,7 @@
- 			}
- 		    } else if (fields[i].type == MYSQL_TYPE_DATE) {
- 			char str[20];
--			struct st_mysql_time *t = bind[i].buffer;
-+			MYSQL_TIME *t = bind[i].buffer;
- 
- 			snprintf(str, 11, "%d-%02d-%02d", t->year, t->month, t->day);
diff --git a/dev-lua/luadbi/luadbi-0.5-r6.ebuild b/dev-lua/luadbi/luadbi-0.5-r6.ebuild
deleted file mode 100644
index f4d024e8ba3f..000000000000
--- a/dev-lua/luadbi/luadbi-0.5-r6.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="DBI module for Lua"
-HOMEPAGE="https://code.google.com/p/luadbi/"
-SRC_URI="https://luadbi.googlecode.com/files/${PN}.${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND=">=dev-lang/lua-5.1
-		mysql? ( dev-db/mysql-connector-c:0= )
-		postgres? ( dev-db/postgresql )
-		sqlite? ( >=dev-db/sqlite-3 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-makefile.patch
-	"${FILESDIR}"/${P}-mysql-8.patch
-)
-
-src_prepare() {
-	default
-	local pkgconf=$(tc-getPKG_CONFIG)
-	sed -i -e "s#^INSTALL_DIR_LUA=.*#INSTALL_DIR_LUA=$(${pkgconf} --variable INSTALL_LMOD lua)#" \
-		-e "s#^INSTALL_DIR_BIN=.*#INSTALL_DIR_BIN=$(${pkgconf} --variable INSTALL_CMOD lua)#" \
-		-e "s#^LUA_INC_DIR=.*#LUA_INC_DIR=$(${pkgconf} --variable INSTALL_INC lua)#" \
-		-e "s#^LUA_LIB_DIR=.*#LUA_LIB_DIR=$(${pkgconf} --variable INSTALL_LIB lua)#" \
-		-e "s#^LUA_LIB =.*#LUA_LIB=lua#" Makefile || die
-
-	drivers=""
-
-	if use mysql; then
-		drivers+="mysql "
-		sed -i -e "s#^\(INCLUDES.*\)#\1 $(mysql_config --include)#" \
-			-e "s#^\(MYSQL_LDFLAGS=\$(COMMON_LDFLAGS)\).*#\1 $(mysql_config --libs)#" Makefile || die
-	fi
-
-	if use postgres; then
-		drivers+="psql "
-		sed -i -e "s#^\(INCLUDES.*\)#\1 -I$(pg_config --includedir) -I$(pg_config --includedir-server)#" \
-			-e "s#^\(PSQL_LDFLAGS=\$(COMMON_LDFLAGS)\).*#\1 -L$(pg_config --libdir) -lpq#" Makefile || die
-	fi
-
-	use sqlite && drivers+="sqlite3"
-}
-
-src_compile() {
-	append-flags -fPIC
-	for driver in ${drivers}; do
-		emake CC="$(tc-getCC)" COMMON_LDFLAGS="${LDFLAGS}" ${driver}
-	done
-}
-
-src_install() {
-	for driver in ${drivers}; do
-		emake DESTDIR="${D}" "install_${driver// /}"
-	done
-}
diff --git a/dev-lua/luadbi/luadbi-0.7.2.ebuild b/dev-lua/luadbi/luadbi-0.7.2.ebuild
index be0d0803b560..338881effc6e 100644
--- a/dev-lua/luadbi/luadbi-0.7.2.ebuild
+++ b/dev-lua/luadbi/luadbi-0.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mwild1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="mysql postgres +sqlite test"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 RESTRICT="test"
diff --git a/dev-lua/luaevent/luaevent-0.4.6-r100.ebuild b/dev-lua/luaevent/luaevent-0.4.6-r100.ebuild
new file mode 100644
index 000000000000..3ada51666ed5
--- /dev/null
+++ b/dev-lua/luaevent/luaevent-0.4.6-r100.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="Binding of libevent for Lua"
+HOMEPAGE="http://luaforge.net/projects/luaevent"
+SRC_URI="https://github.com/harningt/luaevent/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	${LUA_DEPS}
+	dev-libs/libevent:0=
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	local mysedargs=(
+		-e "'s/CFLAGS =/CFLAGS +=/'"
+		-e "'s/LDFLAGS =/LDFLAGS +=/'"
+		-e "'s:-I\$(LUA_INC_DIR):\$(LUA_INC_DIR):'"
+		-i Makefile
+	)
+
+	eval sed ${mysedargs[@]} || die
+}
+
+lua_src_compile() {
+	tc-export CC
+
+	emake LUA_INC_DIR="$(lua_get_CFLAGS)"
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_install() {
+	local myemakeargs=(
+		DESTDIR="${ED}"
+		INSTALL_DIR_BIN="$(lua_get_cmod_dir)"
+		INSTALL_DIR_LUA="$(lua_get_lmod_dir)"
+		LUA_INC_DIR="$(lua_get_CFLAGS)"
+	)
+
+	emake ${myemakeargs[@]} install
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+}
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild
deleted file mode 100644
index edede5c979ef..000000000000
--- a/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib multilib-minimal flag-o-matic toolchain-funcs
-
-DESCRIPTION="Networking support library for the Lua language"
-HOMEPAGE="http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/
-	https://github.com/diegonehab/luasocket"
-SRC_URI="https://github.com/diegonehab/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86"
-IUSE="debug"
-
-RDEPEND=">=dev-lang/lua-5.1.5-r2:0[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}-${PV/_/-}
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/proxy-fix.patch
-)
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake \
-		CC="$(tc-getCC) ${CFLAGS}" \
-		LD="$(tc-getCC) ${LDFLAGS}"\
-		$(usex debug DEBUG="DEBUG" "")
-}
-
-multilib_src_install() {
-	local luav=$($(tc-getPKG_CONFIG) --variable V lua)
-	emake \
-		DESTDIR="${D}" \
-		LUAPREFIX_linux=/usr \
-		LUAV=${luav} \
-		CDIR_linux=$(get_libdir)/lua/${luav} \
-		install-unix
-}
-
-multilib_src_install_all() {
-	dodoc NEW README
-	docinto html
-	dodoc -r doc/.
-}
diff --git a/dev-lua/luv/luv-1.32.0.0-r100.ebuild b/dev-lua/luv/luv-1.32.0.0-r100.ebuild
deleted file mode 100644
index 793fb2104a09..000000000000
--- a/dev-lua/luv/luv-1.32.0.0-r100.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} luajit )
-
-inherit cmake lua-single unpacker
-
-# e.g. MY_PV = a.b.c-d
-MY_PV="$(ver_rs 3 -)"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Bare libuv bindings for lua"
-HOMEPAGE="https://github.com/luvit/luv"
-
-LUA_COMPAT_PV="0.7"
-SRC_URI="
-	https://github.com/luvit/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/keplerproject/lua-compat-5.3/archive/v${LUA_COMPAT_PV}.tar.gz -> ${PN}-lua-compat-${LUA_COMPAT_PV}.tar.gz
-"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="${LUA_DEPS}
-	>=dev-libs/libuv-1.32.0:="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.32.0.0-cmake_lua_version.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Fix libdir
-	# Match '/lib/' and '/lib"' without capturing / or ", replacing with libdir
-	sed -i -r "s/\/lib(\"|\/)/\/$(get_libdir)\1/g" CMakeLists.txt || die "Failed to sed CMakeLists.txt"
-	cmake_src_prepare
-}
-
-# TODO: try to make this multi-impl. Will need at least:
-#  - per-implementation install dirs for headers and the library
-#  - versioned .pc files (which may or may not break revdeps)
-src_configure() {
-	lua_compat_dir="${WORKDIR}/lua-compat-5.3-${LUA_COMPAT_PV}"
-
-	local mycmakeargs=(
-		-DBUILD_MODULE=OFF
-		-DLUA_BUILD_TYPE=System
-		-DLUA_COMPAT53_DIR="${lua_compat_dir}"
-		-DWITH_SHARED_LIBUV=ON
-	)
-	if [[ ${ELUA} == luajit ]]; then
-		mycmakeargs+=(
-			-DWITH_LUA_ENGINE=LuaJIT
-		)
-	else
-		mycmakeargs+=(
-			-DWITH_LUA_ENGINE=Lua
-			-DLUA_VERSION=$(ver_cut 1-2 $(lua_get_version))
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	# We need to copy the library back so that the tests see it
-	ln -s "${BUILD_DIR}/libluv.so" "./luv.so" || die "Failed to symlink library for tests"
-	${ELUA} "tests/run.lua" || die "Tests failed"
-}
diff --git a/dev-perl/DBD-SQLite/DBD-SQLite-1.660.0.ebuild b/dev-perl/DBD-SQLite/DBD-SQLite-1.660.0.ebuild
index 796f42ffefb6..3dd40d5d76c4 100644
--- a/dev-perl/DBD-SQLite/DBD-SQLite-1.660.0.ebuild
+++ b/dev-perl/DBD-SQLite/DBD-SQLite-1.660.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Self Contained RDBMS in a DBI Driver"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="test system-sqlite"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 183b36e2a475..dc1f0a91e7b0 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/X11-XCB/X11-XCB-0.180.0.ebuild b/dev-perl/X11-XCB/X11-XCB-0.180.0.ebuild
index 0a8765f49562..b4d4e4ef44b0 100644
--- a/dev-perl/X11-XCB/X11-XCB-0.180.0.ebuild
+++ b/dev-perl/X11-XCB/X11-XCB-0.180.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module virtualx
 
 DESCRIPTION="Perl bindings for libxcb"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 2db35d4feaf7..035b0d45dbc5 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/jsonlint/jsonlint-1.8.2.ebuild b/dev-php/jsonlint/jsonlint-1.8.2.ebuild
index aee6c195dba0..222fedc3e9da 100644
--- a/dev-php/jsonlint/jsonlint-1.8.2.ebuild
+++ b/dev-php/jsonlint/jsonlint-1.8.2.ebuild
@@ -11,6 +11,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-lang/php:*
diff --git a/dev-php/pecl-ssh2/Manifest b/dev-php/pecl-ssh2/Manifest
index b87e771ebe29..9c1db73d6927 100644
--- a/dev-php/pecl-ssh2/Manifest
+++ b/dev-php/pecl-ssh2/Manifest
@@ -1,2 +1,3 @@
+DIST pecl-ssh2-1.1.2-fix-php7-port.patch 27860 BLAKE2B 23054187608bdcf79f53ce638e37c646f44297aa7d1e8f7a7c85fd922977ab835b915d541fbae327a30d2e863b503ed4822a82c1b242346290ceb94d49c97020 SHA512 1c2ecc990323a77fb2b69be0d6649f96dd7ad2d06c62f4fcb79a9ef4f89e066d463301668a044d37d717c99837c5d7d3f621f61119543445bd05c3229d9270e9
 DIST pecl-ssh2-1.2.tar.gz 32447 BLAKE2B 3a9d0f205097a381d07fb9dd5ab4dcb8e361f555dbc633abb8fa895c83024b70e85cd87602da1ceeb1018a7b07c474720b02810ef0689e9294fc33b129b6c738 SHA512 7b7d311cd5f88835e124d70a0295468f75d0fa6936a58808c936d1a185bb630b9e02c21f49b4bd777194a7b104aa3ff85c4fbf480f43d5906787e532ba2d3e04
 DIST ssh2-1.1.2.tgz 32057 BLAKE2B 88ffb3fb608687a086bbe345677982e944210791acc100312ba56ac7c35188a52cde5529d78caf473d19710e9965fba853ea9ff046715413a0b488ae2d8b690c SHA512 36793191448745b8a9b3cc628fe9fb431480792c7a2ff0bf2eccd58cda1cf944933be1d301c455d4a6f3dabf7e04ffef248bc402a8ff99bfafcba0deddb25c36
diff --git a/dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php7-port.patch b/dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php7-port.patch
deleted file mode 100644
index 9d4f9bd166ec..000000000000
--- a/dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php7-port.patch
+++ /dev/null
@@ -1,746 +0,0 @@
-From 073067ba96ac99ed5696d27f13ca6c8124986e74 Mon Sep 17 00:00:00 2001
-From: Jan-E <github@ehrhardt.nl>
-Date: Thu, 28 Jun 2018 08:43:48 +0200
-Subject: [PATCH] @dstogov Fixed PHP7 port. Restored commented reference
- counting.
-
----
- php_ssh2.h            |  14 +++---
- ssh2.c                |  26 +++++-----
- ssh2_fopen_wrappers.c | 129 ++++++++++++++++++++++----------------------------
- ssh2_sftp.c           |  59 ++++++++++-------------
- 4 files changed, 102 insertions(+), 126 deletions(-)
-
-diff --git a/php_ssh2.h b/php_ssh2.h
-index d010ff9..2bbaa26 100644
---- a/php_ssh2.h
-+++ b/php_ssh2.h
-@@ -73,14 +73,14 @@ typedef struct _php_ssh2_sftp_data {
- 	LIBSSH2_SESSION *session;
- 	LIBSSH2_SFTP *sftp;
- 
--	int session_rsrcid;
-+	zend_resource *session_rsrc;
- } php_ssh2_sftp_data;
- 
- typedef struct _php_ssh2_listener_data {
- 	LIBSSH2_SESSION *session;
- 	LIBSSH2_LISTENER *listener;
- 
--	int session_rsrcid;
-+	zend_resource *session_rsrc;
- } php_ssh2_listener_data;
- 
- #include "libssh2_publickey.h"
-@@ -89,7 +89,7 @@ typedef struct _php_ssh2_pkey_subsys_data {
- 	LIBSSH2_SESSION *session;
- 	LIBSSH2_PUBLICKEY *pkey;
- 
--	int session_rsrcid;
-+	zend_resource *session_rsrc;
- } php_ssh2_pkey_subsys_data;
- 
- #define SSH2_FETCH_NONAUTHENTICATED_SESSION(session, zsession) \
-@@ -118,8 +118,8 @@ typedef struct _php_ssh2_channel_data {
- 	char is_blocking;
- 	long timeout;
- 
--	/* Resource ID */
--	int session_rsrcid;
-+	/* Resource */
-+	zend_resource *session_rsrc;
- 
- 	/* Allow one stream to be closed while the other is kept open */
- 	unsigned char *refcount;
-@@ -151,8 +151,8 @@ PHP_FUNCTION(ssh2_sftp_realpath);
- LIBSSH2_SESSION *php_ssh2_session_connect(char *host, int port, zval *methods, zval *callbacks);
- void php_ssh2_sftp_dtor(zend_resource *rsrc);
- php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stream_context *context,
--											LIBSSH2_SESSION **psession, int *presource_id,
--											LIBSSH2_SFTP **psftp, int *psftp_rsrcid);
-+											LIBSSH2_SESSION **psession, zend_resource **presource,
-+											LIBSSH2_SFTP **psftp, zend_resource **psftp_rsrc);
- 
- extern php_stream_ops php_ssh2_channel_stream_ops;
- 
-diff --git a/ssh2.c b/ssh2.c
-index e73867e..849766b 100644
---- a/ssh2.c
-+++ b/ssh2.c
-@@ -772,9 +772,8 @@ PHP_FUNCTION(ssh2_forward_listen)
- 
- 	data = emalloc(sizeof(php_ssh2_listener_data));
- 	data->session = session;
--	data->session_rsrcid = Z_LVAL_P(zsession);
--	//TODO Sean-Der
--	//zend_list_addref(data->session_rsrcid);
-+	data->session_rsrc = Z_RES_P(zsession);
-+	Z_ADDREF_P(zsession);
- 	data->listener = listener;
- 
- 	RETURN_RES(zend_register_resource(data, le_ssh2_listener));
-@@ -810,7 +809,7 @@ PHP_FUNCTION(ssh2_forward_accept)
- 	channel_data->channel = channel;
- 	channel_data->streamid = 0;
- 	channel_data->is_blocking = 0;
--	channel_data->session_rsrcid = data->session_rsrcid;
-+	channel_data->session_rsrc = data->session_rsrc;
- 	channel_data->refcount = NULL;
- 
- 	stream = php_stream_alloc(&php_ssh2_channel_stream_ops, channel_data, 0, "r+");
-@@ -820,8 +819,12 @@ PHP_FUNCTION(ssh2_forward_accept)
- 		libssh2_channel_free(channel);
- 		RETURN_FALSE;
- 	}
--	//TODO Sean-Der
--	//zend_list_addref(channel_data->session_rsrcid);
-+
-+#if PHP_VERSION_ID < 70300
-+	GC_REFCOUNT(channel_data->session_rsrc)++;
-+#else
-+	GC_ADDREF(channel_data->session_rsrc);
-+#endif
- 
- 	php_stream_to_zval(stream, return_value);
- }
-@@ -975,9 +978,8 @@ PHP_FUNCTION(ssh2_publickey_init)
- 
- 	data = emalloc(sizeof(php_ssh2_pkey_subsys_data));
- 	data->session = session;
--	data->session_rsrcid = Z_RES_P(zsession)->handle;
--	//TODO Sean-Der
--	//zend_list_addref(data->session_rsrcid);
-+	data->session_rsrc = Z_RES_P(zsession);
-+	Z_ADDREF_P(zsession);
- 	data->pkey = pkey;
- 
- 	RETURN_RES(zend_register_resource(data, le_ssh2_pkey_subsys));
-@@ -1280,8 +1282,7 @@ static void php_ssh2_listener_dtor(zend_resource *rsrc)
- 	LIBSSH2_LISTENER *listener = data->listener;
- 
- 	libssh2_channel_forward_cancel(listener);
--	// TODO Sean-Der
--	//zend_list_delete(data->session_rsrcid);
-+	zend_list_delete(data->session_rsrc);
- 	efree(data);
- }
- 
-@@ -1291,8 +1292,7 @@ static void php_ssh2_pkey_subsys_dtor(zend_resource *rsrc)
- 	LIBSSH2_PUBLICKEY *pkey = data->pkey;
- 
- 	libssh2_publickey_shutdown(pkey);
--	// TODO Sean-Der
--	//zend_list_delete(data->session_rsrcid);
-+	zend_list_delete(data->session_rsrc);
- 	efree(data);
- }
- 
-diff --git a/ssh2_fopen_wrappers.c b/ssh2_fopen_wrappers.c
-index f2f3475..c4eb9dc 100644
---- a/ssh2_fopen_wrappers.c
-+++ b/ssh2_fopen_wrappers.c
-@@ -47,11 +47,9 @@ static size_t php_ssh2_channel_stream_write(php_stream *stream, const char *buf,
- 	php_ssh2_channel_data *abstract = (php_ssh2_channel_data*)stream->abstract;
- 	size_t writestate;
- 	LIBSSH2_SESSION *session;
--	zval *zresource;
- 
- 	libssh2_channel_set_blocking(abstract->channel, abstract->is_blocking);
--	zresource = php_ssh2_zval_from_resource_handle(abstract->session_rsrcid);
--	session = (LIBSSH2_SESSION *)zend_fetch_resource(Z_RES_P(zresource), PHP_SSH2_SESSION_RES_NAME, le_ssh2_session);
-+	session = (LIBSSH2_SESSION *)zend_fetch_resource(abstract->session_rsrc, PHP_SSH2_SESSION_RES_NAME, le_ssh2_session);
- 
- 
- 
-@@ -90,12 +88,10 @@ static size_t php_ssh2_channel_stream_read(php_stream *stream, char *buf, size_t
- 	php_ssh2_channel_data *abstract = (php_ssh2_channel_data*)stream->abstract;
- 	ssize_t readstate;
- 	LIBSSH2_SESSION *session;
--	zval *zresource;
- 
- 	stream->eof = libssh2_channel_eof(abstract->channel);
- 	libssh2_channel_set_blocking(abstract->channel, abstract->is_blocking);
--	zresource = php_ssh2_zval_from_resource_handle(abstract->session_rsrcid);
--	session = (LIBSSH2_SESSION *)zend_fetch_resource(Z_RES_P(zresource), PHP_SSH2_SESSION_RES_NAME, le_ssh2_session);
-+	session = (LIBSSH2_SESSION *)zend_fetch_resource(abstract->session_rsrc, PHP_SSH2_SESSION_RES_NAME, le_ssh2_session);
- 
- #ifdef PHP_SSH2_SESSION_TIMEOUT
- 	if (abstract->is_blocking) {
-@@ -137,8 +133,7 @@ static int php_ssh2_channel_stream_close(php_stream *stream, int close_handle)
- 		}
- 		libssh2_channel_eof(abstract->channel);
- 		libssh2_channel_free(abstract->channel);
--		//TODO Sean-Der
--		//zend_list_delete(abstract->session_rsrcid);
-+		zend_list_delete(abstract->session_rsrc);
- 	}
- 	efree(abstract);
- 
-@@ -207,8 +202,8 @@ php_stream_ops php_ssh2_channel_stream_ops = {
-  * Parse an ssh2.*:// path
-  */
- php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stream_context *context,
--											LIBSSH2_SESSION **psession, int *presource_id,
--											LIBSSH2_SFTP **psftp, int *psftp_rsrcid)
-+											LIBSSH2_SESSION **psession, zend_resource **presource,
-+											LIBSSH2_SFTP **psftp, zend_resource **psftp_rsrc)
- {
- 	php_ssh2_sftp_data *sftp_data = NULL;
- 	LIBSSH2_SESSION *session;
-@@ -283,11 +278,10 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
- 			sftp_data = (php_ssh2_sftp_data *)zend_fetch_resource(Z_RES_P(zresource), PHP_SSH2_SFTP_RES_NAME, le_ssh2_sftp);
- 			if (sftp_data) {
- 				/* Want the sftp layer */
--				//TODO Sean-Der
--				//zend_list_addref(resource_id);
--				*psftp_rsrcid = resource_id;
-+				Z_ADDREF_P(zresource);
-+				*psftp_rsrc = Z_RES_P(zresource);
- 				*psftp = sftp_data->sftp;
--				*presource_id = sftp_data->session_rsrcid;
-+				*presource = sftp_data->session_rsrc;
- 				*psession = sftp_data->session;
- 				return resource;
- 			}
-@@ -305,18 +299,16 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
- 				sftp_data = emalloc(sizeof(php_ssh2_sftp_data));
- 				sftp_data->sftp = sftp;
- 				sftp_data->session = session;
--				sftp_data->session_rsrcid = resource_id;
--				//TODO Sean-Der
--				//zend_list_addref(resource_id);
--				*psftp_rsrcid = zend_register_resource(sftp_data, le_ssh2_sftp)->handle;
-+				sftp_data->session_rsrc = Z_RES_P(zresource);
-+				Z_ADDREF_P(zresource);
-+				*psftp_rsrc = zend_register_resource(sftp_data, le_ssh2_sftp);
- 				*psftp = sftp;
--				*presource_id = resource_id;
-+				*presource = Z_RES_P(zresource);
- 				*psession = session;
- 				return resource;
- 			}
--			//TODO Sean-Der
--			//zend_list_addref(resource_id);
--			*presource_id = resource_id;
-+			Z_ADDREF_P(zresource);
-+			*presource = Z_RES_P(zresource);
- 			*psession = session;
- 			return resource;
- 		}
-@@ -330,9 +322,9 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
- 		sftp_data = (php_ssh2_sftp_data *)zend_fetch_resource(Z_RES_P(tmpzval), PHP_SSH2_SFTP_RES_NAME, le_ssh2_sftp);
- 		if (sftp_data) {
- 			Z_ADDREF_P(tmpzval);
--			*psftp_rsrcid = Z_LVAL_P(tmpzval);
-+			*psftp_rsrc = Z_RES_P(tmpzval);
- 			*psftp = sftp_data->sftp;
--			*presource_id = sftp_data->session_rsrcid;
-+			*presource = sftp_data->session_rsrc;
- 			*psession = sftp_data->session;
- 			return resource;
- 		}
-@@ -354,17 +346,17 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
- 				sftp_data = emalloc(sizeof(php_ssh2_sftp_data));
- 				sftp_data->sftp = sftp;
- 				sftp_data->session = session;
--				sftp_data->session_rsrcid = Z_LVAL_P(tmpzval);
-+				sftp_data->session_rsrc = Z_RES_P(tmpzval);
- 				Z_ADDREF_P(tmpzval);
--				*psftp_rsrcid = zend_register_resource(sftp_data, le_ssh2_sftp)->handle;
-+				*psftp_rsrc = zend_register_resource(sftp_data, le_ssh2_sftp);
- 				*psftp = sftp;
--				*presource_id = Z_RES_P(tmpzval)->handle;
-+				*presource = Z_RES_P(tmpzval);
- 				*psession = session;
- 				return resource;
- 			}
- 			Z_ADDREF_P(tmpzval);
- 			*psession = session;
--			*presource_id = Z_LVAL_P(tmpzval);
-+			*presource = Z_RES_P(tmpzval);
- 			return resource;
- 		}
- 	}
-@@ -465,8 +457,7 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
- 
- 	/* Auth failure */
- 	php_url_free(resource);
--	//TODO Sean-Der
--	//zend_list_delete(Z_LVAL(zsession));
-+	zend_list_delete(Z_RES(zsession));
- 	return NULL;
- 
- session_authed:
-@@ -480,24 +471,22 @@ session_authed:
- 		sftp = libssh2_sftp_init(session);
- 		if (!sftp) {
- 			php_url_free(resource);
--			//TODO Sean-Der
--			//zend_list_delete(Z_LVAL(zsession));
-+			zend_list_delete(Z_RES(zsession));
- 			return NULL;
- 		}
- 
- 		sftp_data = emalloc(sizeof(php_ssh2_sftp_data));
- 		sftp_data->session = session;
- 		sftp_data->sftp = sftp;
--		sftp_data->session_rsrcid = Z_LVAL(zsession);
-+		sftp_data->session_rsrc = Z_RES(zsession);
- 
- 		//TODO Sean-Der
- 		//ZEND_REGISTER_RESOURCE(sftp_data, le_ssh2_sftp);
--		*psftp_rsrcid = Z_LVAL(zsftp);
-+		*psftp_rsrc = Z_RES(zsftp);
- 		*psftp = sftp;
- 	}
- 
--	//TODO may be undefined
--	*presource_id = Z_LVAL(zsession);
-+	*presource = Z_RES(zsession);
- 	*psession = session;
- 
- 	return resource;
-@@ -511,7 +500,7 @@ session_authed:
- /* {{{ php_ssh2_shell_open
-  * Make a stream from a session
-  */
--static php_stream *php_ssh2_shell_open(LIBSSH2_SESSION *session, int resource_id, char *term, int term_len, zval *environment, long width, long height, long type)
-+static php_stream *php_ssh2_shell_open(LIBSSH2_SESSION *session, zend_resource *resource, char *term, int term_len, zval *environment, long width, long height, long type)
- {
- 	LIBSSH2_CHANNEL *channel;
- 	php_ssh2_channel_data *channel_data;
-@@ -578,7 +567,7 @@ static php_stream *php_ssh2_shell_open(LIBSSH2_SESSION *session, int resource_id
- 	channel_data->streamid = 0;
- 	channel_data->is_blocking = 0;
- 	channel_data->timeout = 0;
--	channel_data->session_rsrcid = resource_id;
-+	channel_data->session_rsrc = resource;
- 	channel_data->refcount = NULL;
- 
- 	stream = php_stream_alloc(&php_ssh2_channel_stream_ops, channel_data, 0, "r+");
-@@ -599,11 +588,12 @@ static php_stream *php_ssh2_fopen_wrapper_shell(php_stream_wrapper *wrapper, con
- 	zend_long width = PHP_SSH2_DEFAULT_TERM_WIDTH;
- 	zend_long height = PHP_SSH2_DEFAULT_TERM_HEIGHT;
- 	zend_long type = PHP_SSH2_DEFAULT_TERM_UNIT;
--	int resource_id = 0, terminal_len = sizeof(PHP_SSH2_DEFAULT_TERMINAL) - 1;
-+	zend_resource *rsrc = NULL;
-+	int terminal_len = sizeof(PHP_SSH2_DEFAULT_TERMINAL) - 1;
- 	php_url *resource;
- 	char *s;
- 
--	resource = php_ssh2_fopen_wraper_parse_path(path, "shell", context, &session, &resource_id, NULL, NULL);
-+	resource = php_ssh2_fopen_wraper_parse_path(path, "shell", context, &session, &rsrc, NULL, NULL);
- 	if (!resource || !session) {
- 		return NULL;
- 	}
-@@ -677,10 +667,9 @@ static php_stream *php_ssh2_fopen_wrapper_shell(php_stream_wrapper *wrapper, con
- 	/* TODO: Accept resolution and environment vars as URL style parameters
- 	 * ssh2.shell://hostorresource/terminal/99x99c?envvar=envval&envvar=envval....
- 	 */
--	stream = php_ssh2_shell_open(session, resource_id, terminal, terminal_len, environment, width, height, type);
-+	stream = php_ssh2_shell_open(session, rsrc, terminal, terminal_len, environment, width, height, type);
- 	if (!stream) {
--		//TODO Sean-Der
--		//zend_list_delete(resource_id);
-+		zend_list_delete(rsrc);
- 	}
- 	php_url_free(resource);
- 
-@@ -730,7 +719,7 @@ PHP_FUNCTION(ssh2_shell)
- 
- 	SSH2_FETCH_AUTHENTICATED_SESSION(session, zsession);
- 
--	stream = php_ssh2_shell_open(session, Z_RES_P(zsession)->handle, term, term_len, environment, width, height, type);
-+	stream = php_ssh2_shell_open(session, Z_RES_P(zsession), term, term_len, environment, width, height, type);
- 	if (!stream) {
- 		RETURN_FALSE;
- 	}
-@@ -749,7 +738,7 @@ PHP_FUNCTION(ssh2_shell)
- /* {{{ php_ssh2_exec_command
-  * Make a stream from a session
-  */
--static php_stream *php_ssh2_exec_command(LIBSSH2_SESSION *session, int resource_id, char *command, char *term, int term_len, zval *environment, long width, long height, long type)
-+static php_stream *php_ssh2_exec_command(LIBSSH2_SESSION *session, zend_resource *rsrc, char *command, char *term, int term_len, zval *environment, long width, long height, long type)
- {
- 	LIBSSH2_CHANNEL *channel;
- 	php_ssh2_channel_data *channel_data;
-@@ -819,7 +808,7 @@ static php_stream *php_ssh2_exec_command(LIBSSH2_SESSION *session, int resource_
- 	channel_data->streamid = 0;
- 	channel_data->is_blocking = 0;
- 	channel_data->timeout = 0;
--	channel_data->session_rsrcid = resource_id;
-+	channel_data->session_rsrc = rsrc;
- 	channel_data->refcount = NULL;
- 
- 	stream = php_stream_alloc(&php_ssh2_channel_stream_ops, channel_data, 0, "r+");
-@@ -836,7 +825,7 @@ static php_stream *php_ssh2_fopen_wrapper_exec(php_stream_wrapper *wrapper, cons
- 	LIBSSH2_SESSION *session = NULL;
- 	php_stream *stream;
- 	zval *tmpzval, *environment = NULL;
--	int resource_id = 0;
-+	zend_resource *rsrc = NULL;
- 	php_url *resource;
- 	char *terminal = NULL;
- 	int terminal_len = 0;
-@@ -844,14 +833,13 @@ static php_stream *php_ssh2_fopen_wrapper_exec(php_stream_wrapper *wrapper, cons
- 	long height = PHP_SSH2_DEFAULT_TERM_HEIGHT;
- 	long type = PHP_SSH2_DEFAULT_TERM_UNIT;
- 
--	resource = php_ssh2_fopen_wraper_parse_path(path, "exec", context, &session, &resource_id, NULL, NULL);
-+	resource = php_ssh2_fopen_wraper_parse_path(path, "exec", context, &session, &rsrc, NULL, NULL);
- 	if (!resource || !session) {
- 		return NULL;
- 	}
- 	if (!resource->path) {
- 		php_url_free(resource);
--		//TODO Sean-Der
--		//zend_list_delete(resource_id);
-+		zend_list_delete(rsrc);
- 		return NULL;
- 	}
- 
-@@ -893,10 +881,9 @@ static php_stream *php_ssh2_fopen_wrapper_exec(php_stream_wrapper *wrapper, cons
- 		zval_ptr_dtor(copyval);
- 	}
- 
--	stream = php_ssh2_exec_command(session, resource_id, SSH2_URL_STR(resource->path) + 1, terminal, terminal_len, environment, width, height, type);
-+	stream = php_ssh2_exec_command(session, rsrc, SSH2_URL_STR(resource->path) + 1, terminal, terminal_len, environment, width, height, type);
- 	if (!stream) {
--		// TODO Sean-Der
--		//zend_list_delete(resource_id);
-+		zend_list_delete(rsrc);
- 	}
- 	php_url_free(resource);
- 
-@@ -963,7 +950,7 @@ PHP_FUNCTION(ssh2_exec)
- 
- 	SSH2_FETCH_AUTHENTICATED_SESSION(session, zsession);
- 
--	stream = php_ssh2_exec_command(session, Z_RES_P(zsession)->handle, command, term, term_len, environment, width, height, type);
-+	stream = php_ssh2_exec_command(session, Z_RES_P(zsession), command, term, term_len, environment, width, height, type);
- 	if (!stream) {
- 		RETURN_FALSE;
- 	}
-@@ -982,7 +969,7 @@ PHP_FUNCTION(ssh2_exec)
- /* {{{ php_ssh2_scp_xfer
-  * Make a stream from a session
-  */
--static php_stream *php_ssh2_scp_xfer(LIBSSH2_SESSION *session, int resource_id, char *filename)
-+static php_stream *php_ssh2_scp_xfer(LIBSSH2_SESSION *session, zend_resource *rsrc, char *filename)
- {
- 	LIBSSH2_CHANNEL *channel;
- 	php_ssh2_channel_data *channel_data;
-@@ -1002,7 +989,7 @@ static php_stream *php_ssh2_scp_xfer(LIBSSH2_SESSION *session, int resource_id,
- 	channel_data->streamid = 0;
- 	channel_data->is_blocking = 0;
- 	channel_data->timeout = 0;
--	channel_data->session_rsrcid = resource_id;
-+	channel_data->session_rsrc = rsrc;
- 	channel_data->refcount = NULL;
- 
- 	stream = php_stream_alloc(&php_ssh2_channel_stream_ops, channel_data, 0, "r");
-@@ -1018,28 +1005,26 @@ static php_stream *php_ssh2_fopen_wrapper_scp(php_stream_wrapper *wrapper, const
- {
- 	LIBSSH2_SESSION *session = NULL;
- 	php_stream *stream;
--	int resource_id = 0;
-+	zend_resource *rsrc = NULL;
- 	php_url *resource;
- 
- 	if (strchr(mode, '+') || strchr(mode, 'a') || strchr(mode, 'w')) {
- 		return NULL;
- 	}
- 
--	resource = php_ssh2_fopen_wraper_parse_path(path, "scp", context, &session, &resource_id, NULL, NULL);
-+	resource = php_ssh2_fopen_wraper_parse_path(path, "scp", context, &session, &rsrc, NULL, NULL);
- 	if (!resource || !session) {
- 		return NULL;
- 	}
- 	if (!resource->path) {
- 		php_url_free(resource);
--		//TODO Sean-Der
--		//zend_list_delete(resource_id);
-+		zend_list_delete(rsrc);
- 		return NULL;
- 	}
- 
--	stream = php_ssh2_scp_xfer(session, resource_id, SSH2_URL_STR(resource->path));
-+	stream = php_ssh2_scp_xfer(session, rsrc, SSH2_URL_STR(resource->path));
- 	if (!stream) {
--		//TODO Sean-Der
--		//zend_list_delete(resource_id);
-+		zend_list_delete(rsrc);
- 	}
- 	php_url_free(resource);
- 
-@@ -1231,7 +1216,7 @@ PHP_FUNCTION(ssh2_scp_send)
- /* {{{ php_ssh2_direct_tcpip
-  * Make a stream from a session
-  */
--static php_stream *php_ssh2_direct_tcpip(LIBSSH2_SESSION *session, int resource_id, char *host, int port)
-+static php_stream *php_ssh2_direct_tcpip(LIBSSH2_SESSION *session, zend_resource *rsrc, char *host, int port)
- {
- 	LIBSSH2_CHANNEL *channel;
- 	php_ssh2_channel_data *channel_data;
-@@ -1251,7 +1236,7 @@ static php_stream *php_ssh2_direct_tcpip(LIBSSH2_SESSION *session, int resource_
- 	channel_data->streamid = 0;
- 	channel_data->is_blocking = 0;
- 	channel_data->timeout = 0;
--	channel_data->session_rsrcid = resource_id;
-+	channel_data->session_rsrc = rsrc;
- 	channel_data->refcount = NULL;
- 
- 	stream = php_stream_alloc(&php_ssh2_channel_stream_ops, channel_data, 0, "r+");
-@@ -1270,9 +1255,9 @@ static php_stream *php_ssh2_fopen_wrapper_tunnel(php_stream_wrapper *wrapper, co
- 	php_url *resource;
- 	char *host = NULL;
- 	int port = 0;
--	int resource_id = 0;
-+	zend_resource *rsrc;
- 
--	resource = php_ssh2_fopen_wraper_parse_path(path, "tunnel", context, &session, &resource_id, NULL, NULL);
-+	resource = php_ssh2_fopen_wraper_parse_path(path, "tunnel", context, &session, &rsrc, NULL, NULL);
- 	if (!resource || !session) {
- 		return NULL;
- 	}
-@@ -1303,15 +1288,13 @@ static php_stream *php_ssh2_fopen_wrapper_tunnel(php_stream_wrapper *wrapper, co
- 	if ((port <= 0) || (port > 65535) || !host || (strlen(host) == 0)) {
- 		/* Invalid connection criteria */
- 		php_url_free(resource);
--		//TODO Sean-Der
--		//zend_list_delete(resource_id);
-+		zend_list_delete(rsrc);
- 		return NULL;
- 	}
- 
--	stream = php_ssh2_direct_tcpip(session, resource_id, host, port);
-+	stream = php_ssh2_direct_tcpip(session, rsrc, host, port);
- 	if (!stream) {
--		// TODO Sean-Der
--		//zend_list_delete(resource_id);
-+		zend_list_delete(rsrc);
- 	}
- 	php_url_free(resource);
- 
-@@ -1352,7 +1335,7 @@ PHP_FUNCTION(ssh2_tunnel)
- 
- 	SSH2_FETCH_AUTHENTICATED_SESSION(session, zsession);
- 
--	stream = php_ssh2_direct_tcpip(session, Z_RES_P(zsession)->handle, host, port);
-+	stream = php_ssh2_direct_tcpip(session, Z_RES_P(zsession), host, port);
- 	if (!stream) {
- 		RETURN_FALSE;
- 	}
-diff --git a/ssh2_sftp.c b/ssh2_sftp.c
-index 6332be8..256fc70 100644
---- a/ssh2_sftp.c
-+++ b/ssh2_sftp.c
-@@ -40,8 +40,7 @@ void php_ssh2_sftp_dtor(zend_resource *rsrc)
- 
- 	libssh2_sftp_shutdown(data->sftp);
- 
--	// TODO Sean-Der
--	//zend_list_delete(data->session_rsrcid);
-+	zend_list_delete(data->session_rsrc);
- 
- 	efree(data);
- }
-@@ -50,7 +49,7 @@ void php_ssh2_sftp_dtor(zend_resource *rsrc)
-    * SFTP File Ops *
-    ***************** */
- 
--inline unsigned long php_ssh2_parse_fopen_modes(char *openmode) {
-+unsigned long php_ssh2_parse_fopen_modes(char *openmode) {
- 	unsigned long flags = 0;
- 
- 	if (strchr(openmode, 'a')) {
-@@ -101,7 +100,7 @@ inline int php_ssh2_sftp_attr2ssb(php_stream_statbuf *ssb, LIBSSH2_SFTP_ATTRIBUT
- typedef struct _php_ssh2_sftp_handle_data {
- 	LIBSSH2_SFTP_HANDLE *handle;
- 
--	long sftp_rsrcid;
-+	zend_resource *sftp_rsrc;
- } php_ssh2_sftp_handle_data;
- 
- /* {{{ php_ssh2_sftp_stream_write
-@@ -139,8 +138,7 @@ static int php_ssh2_sftp_stream_close(php_stream *stream, int close_handle)
- 	php_ssh2_sftp_handle_data *data = (php_ssh2_sftp_handle_data*)stream->abstract;
- 
- 	libssh2_sftp_close(data->handle);
--	//TODO Sean-Der
--	//zend_list_delete(data->sftp_rsrcid);
-+	zend_list_delete(data->sftp_rsrc);
- 	efree(data);
- 
- 	return 0;
-@@ -226,12 +224,12 @@ static php_stream *php_ssh2_sftp_stream_opener(php_stream_wrapper *wrapper, cons
- 	LIBSSH2_SFTP *sftp = NULL;
- 	LIBSSH2_SFTP_HANDLE *handle;
- 	php_stream *stream;
--	int resource_id = 0, sftp_rsrcid = 0;
-+	zend_resource *rsrc = NULL, *sftp_rsrc = NULL;
- 	php_url *resource;
- 	unsigned long flags;
- 	long perms = 0644;
- 
--	resource = php_ssh2_fopen_wraper_parse_path(filename, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid);
-+	resource = php_ssh2_fopen_wraper_parse_path(filename, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc);
- 	if (!resource || !session || !sftp) {
- 		return NULL;
- 	}
-@@ -242,20 +240,18 @@ static php_stream *php_ssh2_sftp_stream_opener(php_stream_wrapper *wrapper, cons
- 	if (!handle) {
- 		php_error_docref(NULL, E_WARNING, "Unable to open %s on remote host", filename);
- 		php_url_free(resource);
--		//TODO Sean-Der
--		//zend_list_delete(sftp_rsrcid);
-+		zend_list_delete(sftp_rsrc);
- 		return NULL;
- 	}
- 
- 	data = emalloc(sizeof(php_ssh2_sftp_handle_data));
- 	data->handle = handle;
--	data->sftp_rsrcid = sftp_rsrcid;
-+	data->sftp_rsrc = sftp_rsrc;
- 
- 	stream = php_stream_alloc(&php_ssh2_sftp_stream_ops, data, 0, mode);
- 	if (!stream) {
- 		libssh2_sftp_close(handle);
--		// TODO Sean-Der
--		//zend_list_delete(sftp_rsrcid);
-+		zend_list_delete(sftp_rsrc);
- 		efree(data);
- 	}
- 	php_url_free(resource);
-@@ -303,8 +299,7 @@ static int php_ssh2_sftp_dirstream_close(php_stream *stream, int close_handle)
- 	php_ssh2_sftp_handle_data *data = (php_ssh2_sftp_handle_data*)stream->abstract;
- 
- 	libssh2_sftp_close(data->handle);
--	//TODO Sean_der
--	//zend_list_delete(data->sftp_rsrcid);
-+	zend_list_delete(data->sftp_rsrc);
- 	efree(data);
- 
- 	return 0;
-@@ -333,10 +328,10 @@ static php_stream *php_ssh2_sftp_dirstream_opener(php_stream_wrapper *wrapper, c
- 	LIBSSH2_SFTP *sftp = NULL;
- 	LIBSSH2_SFTP_HANDLE *handle;
- 	php_stream *stream;
--	int resource_id = 0, sftp_rsrcid = 0;
-+	zend_resource *rsrc = NULL, *sftp_rsrc = NULL;
- 	php_url *resource;
- 
--	resource = php_ssh2_fopen_wraper_parse_path(filename, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid);
-+	resource = php_ssh2_fopen_wraper_parse_path(filename, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc);
- 	if (!resource || !session || !sftp) {
- 		return NULL;
- 	}
-@@ -345,20 +340,18 @@ static php_stream *php_ssh2_sftp_dirstream_opener(php_stream_wrapper *wrapper, c
- 	if (!handle) {
- 		php_error_docref(NULL, E_WARNING, "Unable to open %s on remote host", filename);
- 		php_url_free(resource);
--		//TODO Sean-Der
--		//zend_list_delete(sftp_rsrcid);
-+		zend_list_delete(sftp_rsrc);
- 		return NULL;
- 	}
- 
- 	data = emalloc(sizeof(php_ssh2_sftp_handle_data));
- 	data->handle = handle;
--	data->sftp_rsrcid = sftp_rsrcid;
-+	data->sftp_rsrc = sftp_rsrc;
- 
- 	stream = php_stream_alloc(&php_ssh2_sftp_dirstream_ops, data, 0, mode);
- 	if (!stream) {
- 		libssh2_sftp_close(handle);
--		//TODO Sean-Der
--		//zend_list_delete(sftp_rsrcid);
-+		zend_list_delete(sftp_rsrc);
- 		efree(data);
- 	}
- 	php_url_free(resource);
-@@ -378,10 +371,10 @@ static int php_ssh2_sftp_urlstat(php_stream_wrapper *wrapper, const char *url, i
- 	LIBSSH2_SFTP_ATTRIBUTES attrs;
- 	LIBSSH2_SESSION *session = NULL;
- 	LIBSSH2_SFTP *sftp = NULL;
--	int resource_id = 0, sftp_rsrcid = 0;
-+	zend_resource *rsrc = NULL, *sftp_rsrc = NULL;
- 	php_url *resource;
- 
--	resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid);
-+	resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc);
- 	if (!resource || !session || !sftp || !resource->path) {
- 		return -1;
- 	}
-@@ -408,11 +401,11 @@ static int php_ssh2_sftp_unlink(php_stream_wrapper *wrapper, const char *url, in
- {
- 	LIBSSH2_SESSION *session = NULL;
- 	LIBSSH2_SFTP *sftp = NULL;
--	int resource_id = 0, sftp_rsrcid = 0;
-+	zend_resource *rsrc = NULL, *sftp_rsrc = NULL;
- 	php_url *resource;
- 	int result;
- 
--	resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid);
-+	resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc);
- 	if (!resource || !session || !sftp || !resource->path) {
- 		if (resource) {
- 			php_url_free(resource);
-@@ -436,7 +429,7 @@ static int php_ssh2_sftp_rename(php_stream_wrapper *wrapper, const char *url_fro
- {
- 	LIBSSH2_SESSION *session = NULL;
- 	LIBSSH2_SFTP *sftp = NULL;
--	int resource_id = 0, sftp_rsrcid = 0;
-+	zend_resource *rsrc = NULL, *sftp_rsrc = NULL;
- 	php_url *resource, *resource_to;
- 	int result;
- 
-@@ -453,7 +446,7 @@ static int php_ssh2_sftp_rename(php_stream_wrapper *wrapper, const char *url_fro
- 		return 0;
- 	}
- 
--	resource = php_ssh2_fopen_wraper_parse_path(url_from, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid);
-+	resource = php_ssh2_fopen_wraper_parse_path(url_from, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc);
- 	if (!resource || !session || !sftp || !resource->path) {
- 		if (resource) {
- 			php_url_free(resource);
-@@ -479,11 +472,11 @@ static int php_ssh2_sftp_mkdir(php_stream_wrapper *wrapper, const char *url, int
- {
- 	LIBSSH2_SESSION *session = NULL;
- 	LIBSSH2_SFTP *sftp = NULL;
--	int resource_id = 0, sftp_rsrcid = 0;
-+	zend_resource *rsrc = NULL, *sftp_rsrc = NULL;
- 	php_url *resource;
- 	int result;
- 
--	resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid);
-+	resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc);
- 	if (!resource || !session || !sftp || !resource->path) {
- 		if (resource) {
- 			php_url_free(resource);
-@@ -515,11 +508,11 @@ static int php_ssh2_sftp_rmdir(php_stream_wrapper *wrapper, const char *url, int
- {
- 	LIBSSH2_SESSION *session = NULL;
- 	LIBSSH2_SFTP *sftp = NULL;
--	int resource_id = 0, sftp_rsrcid = 0;
-+	zend_resource *rsrc = NULL, *sftp_rsrc = NULL;
- 	php_url *resource;
- 	int result;
- 
--	resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid);
-+	resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc);
- 	if (!resource || !session || !sftp || !resource->path) {
- 		if (resource) {
- 			php_url_free(resource);
-@@ -591,7 +584,7 @@ PHP_FUNCTION(ssh2_sftp)
- 	data = emalloc(sizeof(php_ssh2_sftp_data));
- 	data->session = session;
- 	data->sftp = sftp;
--	data->session_rsrcid = Z_RES_P(zsession)->handle;
-+	data->session_rsrc = Z_RES_P(zsession);
- 	Z_ADDREF_P(zsession);
- 
- 	RETURN_RES(zend_register_resource(data, le_ssh2_sftp));
--- 
-2.1.4
-
diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild
index 7001e2010d53..a27f6970b153 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -14,7 +14,8 @@ USE_PHP="php7-1 php7-2 php7-3"
 DESCRIPTION="PHP bindings for the libssh2 library"
 LICENSE="PHP-3.01"
 SLOT="7"
-IUSE=""
+
+SRC_URI+=" https://dev.gentoo.org/~juippis/distfiles/tmp/pecl-ssh2-1.1.2-fix-php7-port.patch"
 KEYWORDS="amd64 x86"
 # Upstream notes say there are errors with gcrypt backend
 DEPEND=">=net-libs/libssh2-1.2[-gcrypt]"
@@ -23,7 +24,7 @@ RDEPEND="${DEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${P}-fix-php_url-fields-usage-for-php7-3.patch
-	"${FILESDIR}"/${P}-fix-php7-port.patch
+	"${DISTDIR}"/${P}-fix-php7-port.patch
 )
 
 src_prepare() {
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 67d4221f6d6c..0036c838eae3 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/aiocontextvars/aiocontextvars-0.2.2.ebuild b/dev-python/aiocontextvars/aiocontextvars-0.2.2.ebuild
index 2154cc783087..da3437400ab9 100644
--- a/dev-python/aiocontextvars/aiocontextvars-0.2.2.ebuild
+++ b/dev-python/aiocontextvars/aiocontextvars-0.2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fantix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~x86"
 
 DEPEND="test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
 RDEPEND="dev-python/contextvars[${PYTHON_USEDEP}]"
diff --git a/dev-python/aiohttp-socks/Manifest b/dev-python/aiohttp-socks/Manifest
index ef6a3f2caaeb..3d6454f443ff 100644
--- a/dev-python/aiohttp-socks/Manifest
+++ b/dev-python/aiohttp-socks/Manifest
@@ -1,3 +1 @@
-DIST aiohttp-socks-0.5.3.tar.gz 1360418 BLAKE2B 7282a4952d5f0301b14291a1892db5ec058af91cf553e4a17ab0e933bb327d1fae9c015d25ff7405ef69cdf56637140fefa9bd1ab1e6f2e224cdc94b9e279159 SHA512 2999f850081d05c31535c24c0fcf0948dbaaec5e421c28ed4ca68b4bfb122f881942e7e829cefc01377212b4579547aafcf273fe5a999acb3d158ee1c3f0a888
-DIST aiohttp-socks-0.5.4.tar.gz 1349276 BLAKE2B 17cfc9a326d45e6af4044ccd0ce56dff3adaddf619118a5a98a6e82c778f5e397780d51924e11ff50d059a60df22cbb1c03b27165042f78d06b242ed95f5f254 SHA512 30ac5544b935f021fbd40aac9df682970a1ed39295dcd64909dce270e66f61fd92933a81a25c79b5063a5b382d412ba7b26def67e1e8c059e8daa2a771342a77
 DIST aiohttp-socks-0.5.5.tar.gz 1349283 BLAKE2B 85cd19fdc8c549a1c8ed66a71a9ccb61093fa6febfc2b2e93e26e47be9fc4d319f0ceecc0d6f70739e861fe5f7cd8c78615dfe67ed0669049d38da1f89da33f2 SHA512 94b9d5fc5a5eb04ce16302ca4a1abdaf8ec2b31811a6156aa3667aeb5bd284fc1757a65dc8dc7b77450017a04aa315a908a52a4d38b0657c41bcd64b9b1605b9
diff --git a/dev-python/aiohttp-socks/aiohttp-socks-0.5.3.ebuild b/dev-python/aiohttp-socks/aiohttp-socks-0.5.3.ebuild
deleted file mode 100644
index 4aa9106f7924..000000000000
--- a/dev-python/aiohttp-socks/aiohttp-socks-0.5.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="SOCKS proxy connector for aiohttp"
-HOMEPAGE="https://pypi.org/project/aiohttp-socks/"
-SRC_URI="https://github.com/romis2012/aiohttp-socks/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-# Tests require Internet access, also they started failing when run
-# via ebuild (but work fine externally)
-RESTRICT="test"
-
-# TODO: optional dep on trio
-RDEPEND="
-	>=dev-python/aiohttp-2.3.2[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		net-proxy/3proxy
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# TODO: reenable when trio is packaged
-	rm tests/test_core_socks_async_trio.py || die
-	distutils-r1_src_prepare
-}
-
-python_configure_all() {
-	rm tests/3proxy/bin/*/* || die
-	if use test; then
-		ln -s "$(type -P 3proxy)" tests/3proxy/bin/linux/ || die
-	fi
-}
diff --git a/dev-python/aiohttp-socks/aiohttp-socks-0.5.4.ebuild b/dev-python/aiohttp-socks/aiohttp-socks-0.5.4.ebuild
deleted file mode 100644
index 371241cfb5e7..000000000000
--- a/dev-python/aiohttp-socks/aiohttp-socks-0.5.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="SOCKS proxy connector for aiohttp"
-HOMEPAGE="https://pypi.org/project/aiohttp-socks/"
-SRC_URI="https://github.com/romis2012/aiohttp-socks/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-# tests require Internet
-RESTRICT="test"
-
-# TODO: optional dep on trio
-# TODO: is attrs actually used?
-RDEPEND="
-	>=dev-python/aiohttp-2.3.2[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/python-socks[${PYTHON_USEDEP}]
-"
-#DEPEND="
-#	test? (
-#		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-#	)"
-
-#distutils_enable_tests pytest
diff --git a/dev-python/aiohttp-socks/aiohttp-socks-0.5.5.ebuild b/dev-python/aiohttp-socks/aiohttp-socks-0.5.5.ebuild
index f3037d2bdf71..aff80d73b196 100644
--- a/dev-python/aiohttp-socks/aiohttp-socks-0.5.5.ebuild
+++ b/dev-python/aiohttp-socks/aiohttp-socks-0.5.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/romis2012/aiohttp-socks/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 # tests require Internet
 RESTRICT="test"
 
diff --git a/dev-python/arrow/Manifest b/dev-python/arrow/Manifest
index 7f321fa831af..39d740f5dcd8 100644
--- a/dev-python/arrow/Manifest
+++ b/dev-python/arrow/Manifest
@@ -1,2 +1 @@
-DIST arrow-0.16.0.tar.gz 94403 BLAKE2B 9d2ad18732cce5bafdb628a2e9b825e6d1ebd94f7848391c0a0752a802a7e2e8a34afe0da7474df0265c4a83016530a1c070f4f1629c8fee8172812a53a3a7af SHA512 e48316bd31a86d640e50987010bd56c6859e972522e753c00d83730f1ce4764716eb9a22c4aa9aa0d64949f25acb7e1a3479ce0e1c62058fcb887a442f2247d6
 DIST arrow-0.17.0.tar.gz 97411 BLAKE2B d908f9e98b4046aa8afbde992e108106e0cb81d5d37a556ace06585b7d354fa75338e5c4e4263ece0d8d043f29f3909e3c200b2c79c744a4bd13319764667998 SHA512 30ab01c66ef1dfb7fb35dc8609ca19039fa3e37638ff0df681d0ffc9dbc832e9d3a577d9a45fc70ff3e74aacb6198b37e61ada22854572c57c27d7ecbef09caa
diff --git a/dev-python/arrow/arrow-0.16.0.ebuild b/dev-python/arrow/arrow-0.16.0.ebuild
deleted file mode 100644
index 1cc6a3c1c47a..000000000000
--- a/dev-python/arrow/arrow-0.16.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Better dates and times for Python"
-HOMEPAGE="https://github.com/crsmithdev/arrow/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/d' tox.ini || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/arrow/arrow-0.17.0.ebuild b/dev-python/arrow/arrow-0.17.0.ebuild
index 1056296f2129..1cc6a3c1c47a 100644
--- a/dev-python/arrow/arrow-0.17.0.ebuild
+++ b/dev-python/arrow/arrow-0.17.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/asgiref/Manifest b/dev-python/asgiref/Manifest
index 60328e9da03e..1275dc91eb5c 100644
--- a/dev-python/asgiref/Manifest
+++ b/dev-python/asgiref/Manifest
@@ -1,2 +1 @@
-DIST asgiref-3.2.10.tar.gz 25669 BLAKE2B 2cd0328054b218ae8abf840f85c7da6d9183dd5a52cef78176756020eb1f565fded9717fced3bc7fc4b85f9f1ff34b46ea95231b74afec0cbcc5000f9468c28b SHA512 8688d71103dfe569978712481161a88cce9aa6587eacbf29ea42d585817c813625360724d1d561d12456a6580647f9d4a098f194bd780f3c9f7e52a1e0aa8c88
 DIST asgiref-3.3.0.tar.gz 26945 BLAKE2B bdb1154175f95fc068fd1841a69ec9c5e782c212d9649aef0b9ca7592987f88d23311149f573febd76e5ab6fea4e6087a8c5e6e9e2edb4dab37d34ff3d180845 SHA512 fbb66af8f0e2bbeed31ae6ac358f045c0eef6cdeec6edbaf358f7551ff24e69233cfbc898b60ac9d16d747a9fb7e10a8b203065602140c025b2ae7d4d7229def
diff --git a/dev-python/asgiref/asgiref-3.2.10.ebuild b/dev-python/asgiref/asgiref-3.2.10.ebuild
deleted file mode 100644
index 1990cf757f75..000000000000
--- a/dev-python/asgiref/asgiref-3.2.10.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-inherit distutils-r1
-
-DESCRIPTION="ASGI utilities (successor to WSGI)"
-HOMEPAGE="
-	https://asgi.readthedocs.io/en/latest/
-	https://github.com/django/asgiref/
-	https://pypi.org/project/asgiref/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-
-BDEPEND="
-	test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/asgiref/asgiref-3.3.0.ebuild b/dev-python/asgiref/asgiref-3.3.0.ebuild
index 2a8bf860303e..1990cf757f75 100644
--- a/dev-python/asgiref/asgiref-3.3.0.ebuild
+++ b/dev-python/asgiref/asgiref-3.3.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 BDEPEND="
 	test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
diff --git a/dev-python/asttokens/asttokens-2.0.4.ebuild b/dev-python/asttokens/asttokens-2.0.4.ebuild
index 4af899f825ce..087484b3c4b2 100644
--- a/dev-python/asttokens/asttokens-2.0.4.ebuild
+++ b/dev-python/asttokens/asttokens-2.0.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/bandit/bandit-1.6.2-r1.ebuild b/dev-python/bandit/bandit-1.6.2-r1.ebuild
index d9cc3c10f03a..6665e6f7533a 100644
--- a/dev-python/bandit/bandit-1.6.2-r1.ebuild
+++ b/dev-python/bandit/bandit-1.6.2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~s390 ~x86"
+KEYWORDS="~amd64 ~arm64 ~s390 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index 83941fe5ce5a..cdf9f99d4a48 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1 +1,2 @@
 DIST bitarray-0.8.3.tar.gz 36292 BLAKE2B a9e55e5f8e8257759ae8b6fb5e817c76ab9da6cd73699d492e111a9237e08718b4de22f20d97d1f633075228c503697e6faf032cceee01aaaeb4ef041fe39a4c SHA512 67e634fba3672faf986117534e9260566b7596c7fddc67d7195fce4c9cc13bf491f94b6d25005143aee1cbbfbce168be0c7a833bc1f293cdbb30149b29855372
+DIST bitarray-1.6.1.tar.gz 55299 BLAKE2B 14bee64a133fdf3d23bd557244fb25c54a223a786108d9f1bdab25d5d0942c1eba01f6997d7d6392b9885ef6be702dc73bb3b00c9c668480b74d7415c77767a2 SHA512 ad0ce244dfeaa571821b704968ddc08bea16dac94428a4571a599153704a4bdda5d7135c42c81ede655d48455378bfff7292a91fe49724bd5a6f48bb436a9fba
diff --git a/dev-python/bitarray/bitarray-0.8.3.ebuild b/dev-python/bitarray/bitarray-0.8.3.ebuild
index 43f4112ed502..d48bb41085ce 100644
--- a/dev-python/bitarray/bitarray-0.8.3.ebuild
+++ b/dev-python/bitarray/bitarray-0.8.3.ebuild
@@ -4,6 +4,7 @@
 EAPI=6
 
 PYTHON_COMPAT=( python{3_6,3_7} )
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
 
diff --git a/dev-python/bitarray/bitarray-1.6.1.ebuild b/dev-python/bitarray/bitarray-1.6.1.ebuild
new file mode 100644
index 000000000000..978daa9ae578
--- /dev/null
+++ b/dev-python/bitarray/bitarray-1.6.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="efficient arrays of booleans -- C extension"
+HOMEPAGE="https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/"
+SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+python_test() {
+	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 404cf201a185..376c964f91c9 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -9,4 +9,5 @@ DIST boto3-1.16.14.tar.gz 338870 BLAKE2B 71ee68c7d4dce99a6534dffa1f65717f6d68460
 DIST boto3-1.16.15.tar.gz 338877 BLAKE2B 817fab1f721419cf061b833f1e3e531a0480747fc7879ed048a62b481048f762bd78271832a85e782b91ffc6eebd7bb21550715c0c2cf7bfcea1f3d7ed8d3f8e SHA512 7b5bcbacfa733a81a2dbbaff89e244a37dee280e10263871bfda1e844760584ac350b4fafa721bd2ef39696e80bf317011a1d39f9baa29197b4a224ef74bfa53
 DIST boto3-1.16.16.tar.gz 338959 BLAKE2B e34c14b89ddd402e4ca7037e1fdbb5121ff9eb2c7fefb67eabadb378cc4f8e5f5ddc3c933d366d086155b4b16319ed9e7d85af21bca1da0f17be3c2171dc9c1a SHA512 b0d0cf8877ac66e28f925c3eda6e02c845c8753c96ebb8684d7eb3a3e82ac6323ae8775715bcf7c70889921e53b0224561460cbc0c95ae56a17d606c75245971
 DIST boto3-1.16.17.tar.gz 339112 BLAKE2B e5db626fd2a3b1b8a12fbf5f4113c482d4ae0e04eb0b7090ebe75e417c4a3a9a762129a8cfc342fb8550d67b36750de6f5fceccc8a653f27a2201c9be85de466 SHA512 5842cb056ef4b418628778cf0e7c362c6d1175565060008c2ff5fa3b726fccaec96bb1133c8e82788d8f1a2e527fb154a234eb606804f97463e04f0f64c57a1c
+DIST boto3-1.16.18.tar.gz 339220 BLAKE2B 795ed9b7f201c36bb12ff8d10484abd92ff36d821817a8fa0be2c8f8a16d352367e9c03a465ce0d27a346121a6974710c42450bb97fe5d844fab57d1fb44b817 SHA512 fdc2e994a3c73d521e88706886f2d5170281e4d83db2804da1aaf3afb1c14a7bf443ec17d15708e6227ca6b069909f89a9ed790c68aec15e35f9b4a9951b2d63
 DIST boto3-1.16.9.tar.gz 337905 BLAKE2B ed01e28fd7e62e5e5028307c93f92004bfbecffa77bc2ba1d6574b92ec2c515d910eb5107ac5ee03e0aca909f97f379aa65b5f839c8067634fa69266c58de33f SHA512 7343b8432788ef981819f91fe2ba27c4ec3947d01ff55914f7c89607250ecf60db2da8d25c8a2c7001ef546a9abed4cb744c5937ca09497aa1a983049648bd5e
diff --git a/dev-python/boto3/boto3-1.16.18.ebuild b/dev-python/boto3/boto3-1.16.18.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.16.18.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index da0d0dcbd14b..5643e5b9093b 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -9,5 +9,6 @@ DIST botocore-1.19.14.tar.gz 6996482 BLAKE2B ff5b977254fad5af2ec5129e0bb3ceafc07
 DIST botocore-1.19.15.tar.gz 6996595 BLAKE2B 562bb257f481a5668d25c99a4a6d27bff6f50e3fda68cbc09ef40bc6a86fafa95de1206828f0903aba3042b8bd5ab7c8a5ebde4c93ee3be54d3175ab5bf588b7 SHA512 d0d63edae759dd865d54ffb635c79fededbdba9a4147b3008f2aa41a19dd674a5d780d9a6006db33b0ec53a5278fd393dbe483a4a491d96e1fada5cf26be0c53
 DIST botocore-1.19.16.tar.gz 7009239 BLAKE2B d582538f25c500297ab8a5ce3f054a5ba2f94d0d5f37d0aeee934943854bb5fc429e33040b56d1e06cfd93a51bd917c96dac9432c5b84d59513b47af52285ac1 SHA512 d36b580e0ad56143b9b36679d17910fcdb49ec132143441d6a078797f79bec1fd6f06b2afb8542e16e844fb892c2902aeab1cfcf66a8ddb9ecbcc92be4ced29d
 DIST botocore-1.19.17.tar.gz 7021338 BLAKE2B f03ba2d6db87bf5ce11a778bdc0f9a3adba54b4b245a106cbf20aec6ac2ebc4a09d57e6e93518c142552782cba380d5c195a4efc68a49be5709d7c014b58172d SHA512 2ed07ed3e4f6b43b24e1766cc0c74950bdce3e88d3ff9c10798bd99361c6314b45bed3c6fd74467b5c05470f9d6baf122c241dfb5a5a4aaab6c39fd9aa689b96
+DIST botocore-1.19.18.tar.gz 7024457 BLAKE2B 98adb675219f13b38b0a219eaa0437a2f81623f57433907d6615e49f36c580eabf3352f9f6a53b7a261262d8f164f2a019888cc31947c16ef69cc54536067f0e SHA512 bf247c773415cc2aa672c0d5ee2258ec2d5c77909d72c24f2190f962f7d3546427c2008f22cdb13534cb1bd1e3c249cbf268629316ddee50bde22643d720c330
 DIST botocore-1.19.8.tar.gz 6970481 BLAKE2B 52d3f8ee7dc38feddb3f7799959624b4baf4b75ebcf3ad8257c25ad13b8a8c3cf526ee187681b6d8f5f6ee874071a02c59bd106cb4b4e23ad9cf13b9aa74deef SHA512 845dfec33f63deee44bfffe81801995bfcc2014880c2d520b927421219279107b0fe44dc84425c0a55ddec73d5ad8aeb34f2b84178e1365d137240a2e94370c7
 DIST botocore-1.19.9.tar.gz 6972834 BLAKE2B 3407c056c7995cc1ccb1b5b4c5b3a6254e38672b52e7889a7a022520283416e4dfcabd05c8ca0ed78e4624c7a20c9f43bfde87a76d7a72660b4c95256e4f9ca4 SHA512 8433f22ae7652e524a82da8d2ccda48da9eef44788333898b7526335d57a7757b80754f0d5c6a2c84ec3bde2ec9fc7da5cf872cbda7286f620b4f4878fe9a583
diff --git a/dev-python/botocore/botocore-1.19.18.ebuild b/dev-python/botocore/botocore-1.19.18.ebuild
new file mode 100644
index 000000000000..ca40b64d111f
--- /dev/null
+++ b/dev-python/botocore/botocore-1.19.18.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/bpython/Manifest b/dev-python/bpython/Manifest
index 30ca93759793..34828df66cd2 100644
--- a/dev-python/bpython/Manifest
+++ b/dev-python/bpython/Manifest
@@ -1,2 +1 @@
-DIST bpython-0.19.tar.gz 216564 BLAKE2B a0b469ae28965e7926838b2d520aed0199a39ad5d9d5650e34446601e6e5f023a6c09cbdd85a30b2873dc72b5ef5774c483d5f627accaf29dce7e6f8628cc1df SHA512 7c746848671d5de0b63f0284d2af87c12480fa1ae3e89eb10093ab5dfd42f926171f29bd8bcc19fe173fc58f7eff7276da4639d580836f0d112dc5e85000dc55
 DIST bpython-0.20.tar.gz 224127 BLAKE2B 6b7334f6657e27eff3f48468ee4eed64b69f9ba9ce92881a28ff57a5d5e60948b30fca689adc7a3aac088d2aa1316bfd43509f4f8d80b4822e8990f2753a2059 SHA512 13c04bd9b9ce0bd1b3775295e249e0505abe3be6c601dc9d90455863fd8bc178abb3fe98b05586c6298ea9308a6b062907abf2979b37b08e4341439b0311a565
diff --git a/dev-python/bpython/bpython-0.19.ebuild b/dev-python/bpython/bpython-0.19.ebuild
deleted file mode 100644
index 9e264fef8f6c..000000000000
--- a/dev-python/bpython/bpython-0.19.ebuild
+++ /dev/null
@@ -1,45 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
-HOMEPAGE="https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/curtsies-0.2.11[${PYTHON_USEDEP}]
-	dev-python/greenlet[${PYTHON_USEDEP}]
-	dev-python/jedi[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/watchdog[${PYTHON_USEDEP}]
-	"
-# sphinx is used implicitly to build manpages
-BDEPEND="
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-DOCS=( AUTHORS CHANGELOG sample.theme light.theme )
-
-distutils_enable_sphinx doc/sphinx/source --no-autodoc
-distutils_enable_tests unittest
-
-src_prepare() {
-	sed -e 's:test_exec_dunder_file:_&:' \
-		-e 's:test_exec_nonascii_file_linenums:_&:' \
-		-i bpython/test/test_args.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/bpython/bpython-0.20.ebuild b/dev-python/bpython/bpython-0.20.ebuild
index a23dafa3128f..9e264fef8f6c 100644
--- a/dev-python/bpython/bpython-0.20.ebuild
+++ b/dev-python/bpython/bpython-0.20.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/bpython/metadata.xml b/dev-python/bpython/metadata.xml
index b454c517c2fc..28921a2f3141 100644
--- a/dev-python/bpython/metadata.xml
+++ b/dev-python/bpython/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">bpython</remote-id>
 		<remote-id type="bitbucket">bobf/bpython</remote-id>
diff --git a/dev-python/cbor2/cbor2-5.2.0.ebuild b/dev-python/cbor2/cbor2-5.2.0.ebuild
index 3af7eadeeba0..4b171f8d1a39 100644
--- a/dev-python/cbor2/cbor2-5.2.0.ebuild
+++ b/dev-python/cbor2/cbor2-5.2.0.ebuild
@@ -16,7 +16,7 @@ RESTRICT="!test? ( test )"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.38.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.38.0.ebuild
index c96b0418260f..a58bc0e1ea24 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.38.0.ebuild
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.38.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
@@ -27,6 +27,13 @@ RDEPEND="
 	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.11[${PYTHON_USEDEP}]
 "
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
 
 PATCHES=(
 	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.39.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.39.0.ebuild
index c96b0418260f..8fdc39d88ec2 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.39.0.ebuild
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.39.0.ebuild
@@ -27,6 +27,13 @@ RDEPEND="
 	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.11[${PYTHON_USEDEP}]
 "
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
 
 PATCHES=(
 	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index 23da91a52108..dd7113cef16a 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1 +1,2 @@
 DIST cheroot-8.4.4.tar.gz 107753 BLAKE2B 4e5d9c3a101876d76696a2e6e3c191f199810e734e25cdc07aac69c102eb28b90033c6fa749569e140c01dbd08a4b06f067b4f47d34ef483d48731c6372ee5eb SHA512 18e2c198a537abd740a868fc4055c1e1e0501392c5518ec345669d02511dac2d59aa2abe2670ffb1800c5aae7032b11445488ecf7fd63d02d5923ed08b82f216
+DIST cheroot-8.4.5.tar.gz 109443 BLAKE2B f8dd7a053304c6be559862028ef306c742c015e98c236f3e154f863c3abbf7d261f85b9a7e880ba9f51e6a8bf25cdf96ed6f45f7758657ecbdc4d6b7dde7f6a9 SHA512 2e8c84a67e24772dfeea7fbb397807e6553912d32392c393ec85181ccb381b1f4d3e38cc2366710a5c789869cbc6d15a79bd1b20b6d3845e5c08496b4f4b0e9e
diff --git a/dev-python/cheroot/cheroot-8.4.5.ebuild b/dev-python/cheroot/cheroot-8.4.5.ebuild
new file mode 100644
index 000000000000..467ee0e31e3f
--- /dev/null
+++ b/dev-python/cheroot/cheroot-8.4.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Cheroot is the high-performance, pure-Python HTTP server used by CherryPy."
+HOMEPAGE="https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot"
+SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]
+	dev-python/jaraco-functools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/jaraco-context[${PYTHON_USEDEP}]
+		dev-python/jaraco-text[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-1.11.0[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
+	sed -e '/setuptools_scm/d' -i setup.cfg || die
+	sed -e '/--cov/d' \
+		-e '/--testmon/d' \
+		-e '/--numproc/d' \
+		-i pytest.ini || die
+
+	# broken
+	sed -e '/False.*localhost/d' \
+		-i cheroot/test/test_ssl.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/collective-checkdocs/collective-checkdocs-0.2-r1.ebuild b/dev-python/collective-checkdocs/collective-checkdocs-0.2-r1.ebuild
index 9631a340958a..572a6dc6a1a1 100644
--- a/dev-python/collective-checkdocs/collective-checkdocs-0.2-r1.ebuild
+++ b/dev-python/collective-checkdocs/collective-checkdocs-0.2-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="GPL-2"  # until https://github.com/collective/collective.checkdocs/issues/8 is fixed
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/collective-checkdocs/collective-checkdocs-0.2.ebuild b/dev-python/collective-checkdocs/collective-checkdocs-0.2.ebuild
deleted file mode 100644
index b31c1919910f..000000000000
--- a/dev-python/collective-checkdocs/collective-checkdocs-0.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 python3_7 )
-inherit distutils-r1
-
-DESCRIPTION="Distutils command to view/validate packages's rst text long_descriptions."
-HOMEPAGE="https://github.com/collective/collective.checkdocs"
-SRC_URI="mirror://pypi/${PN:0:1}/collective.checkdocs/collective.checkdocs-${PV}.zip"
-S="${WORKDIR}/collective.checkdocs-${PV}"
-
-LICENSE="GPL-2"  # until https://github.com/collective/collective.checkdocs/issues/8 is fixed
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/docutils[${PYTHON_USEDEP}]"
diff --git a/dev-python/collective-checkdocs/metadata.xml b/dev-python/collective-checkdocs/metadata.xml
index b3409eaec2aa..bba9c09c9aed 100644
--- a/dev-python/collective-checkdocs/metadata.xml
+++ b/dev-python/collective-checkdocs/metadata.xml
@@ -11,6 +11,7 @@
 	<longdescription lang="en">
 		collective.checkdocs adds new distutils commands checkdocs and showdocs to validate restructured text in long_description field of Python eggs. This package aims to make Python egg help page publishing and editing easier.
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">collective.checkdocs</remote-id>
 		<remote-id type="github">collective/collective.checkdocs</remote-id>
diff --git a/dev-python/colorama/colorama-0.4.4.ebuild b/dev-python/colorama/colorama-0.4.4.ebuild
index f36db2e209c3..b68e32c85110 100644
--- a/dev-python/colorama/colorama-0.4.4.ebuild
+++ b/dev-python/colorama/colorama-0.4.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/tartley/${PN}/archive/${PV}.tar.gz -> ${P}.github.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/construct/construct-2.10.56.ebuild b/dev-python/construct/construct-2.10.56.ebuild
index 9daf482d3c21..f8b0e77516dc 100644
--- a/dev-python/construct/construct-2.10.56.ebuild
+++ b/dev-python/construct/construct-2.10.56.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/construct/construct/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests pytest
 BDEPEND+="
diff --git a/dev-python/contextvars/contextvars-2.4.ebuild b/dev-python/contextvars/contextvars-2.4.ebuild
index e80294878b1e..3f1d6a86eb6b 100644
--- a/dev-python/contextvars/contextvars-2.4.ebuild
+++ b/dev-python/contextvars/contextvars-2.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 
 RDEPEND="dev-python/immutables[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 44154323ab07..b9fedc023188 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,2 +1 @@
-DIST dask-2.28.0.tar.gz 2858331 BLAKE2B 9adbae83559a1a5a218aacb575ec6e4007cc0bcebf4f2ddac4a2bc23de2be74887ee41ff341c05e0e1612a42d4b3bd5d7ca072b58f7cbc9fa516d8c45f7f0ae2 SHA512 f36b1cc843b0ef7efdae0af1ffdc91ac251cfcbd63160379f479f55005b93e111818f782db2a7ecf8e6bbd63ea48661a178d1c2ca74473a4d477025bb955cbcd
 DIST dask-2.30.0.tar.gz 2858866 BLAKE2B ea5e1e50f9bef2ca81765ee1228ea661ea01355f4c2a495e916388cb757dc089c519eb83372abc2ece16c8ec27e3b7f7fe56a302eddfdc6c0e79247db9c1b65e SHA512 d410fcfc7e30f510bc42e9547bac912609420919489e161408d436fb26c3998eba6bfc9e4845d90b3e8589ecc317ee4bf141e2740108840f2e5a420eb20655ef
diff --git a/dev-python/dask/dask-2.28.0.ebuild b/dev-python/dask/dask-2.28.0.ebuild
deleted file mode 100644
index fdf3cb11121e..000000000000
--- a/dev-python/dask/dask-2.28.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="https://dask.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.13.0[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.23.4[${PYTHON_USEDEP}]
-	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/toolz[${PYTHON_USEDEP}]
-	test? (
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/numexpr[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/s3fs-0.0.8[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	pytest -vv -m "not network" ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/dask/dask-2.30.0.ebuild b/dev-python/dask/dask-2.30.0.ebuild
index f0f21e67dc47..fdf3cb11121e 100644
--- a/dev-python/dask/dask-2.30.0.ebuild
+++ b/dev-python/dask/dask-2.30.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
diff --git a/dev-python/debtcollector/Manifest b/dev-python/debtcollector/Manifest
index 7040aeb438af..dbd8f1273768 100644
--- a/dev-python/debtcollector/Manifest
+++ b/dev-python/debtcollector/Manifest
@@ -1,2 +1 @@
-DIST debtcollector-1.21.0.tar.gz 28472 BLAKE2B a7c4a2d41ff6df1df1bfc2b775d888c1f9839ddb76bc80ff6b9bb9d1fb8e14eb225006021a0889d2a49c317c48f65cec024ff1d3c4e9c9bee1c0139a7cd1fc71 SHA512 a5a4f66a4d65134e84164de6953d4c6d5b2b9d36974055d26263b6d8505c4a131d693c371287ccd9c76220a9b59d6c3d1f0015db1d0f2bd8eafcb79c0bef0822
 DIST debtcollector-2.2.0.tar.gz 28833 BLAKE2B 33361daaba12c52a1cc0bac168199ef3dbb959279def29ef782fa421f0aa106038de02217f6321c64e02845abd0573e69f5638b384411e7fbfd194dd3f6b3356 SHA512 6e5fdf38a25406a7a56d18e9b900471e3e4ce513ef62619c9eafa153ea08ff6b4b9bd90c524cfa16e04ff0c9c324e90d4fdd75212fced0b202245cdddae02137
diff --git a/dev-python/debtcollector/debtcollector-1.21.0.ebuild b/dev-python/debtcollector/debtcollector-1.21.0.ebuild
deleted file mode 100644
index da6094e14af8..000000000000
--- a/dev-python/debtcollector/debtcollector-1.21.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python deprecation patterns and strategies that collect technical debt"
-HOMEPAGE="https://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-		!~dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/doc8-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || di
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/debtcollector/debtcollector-2.2.0.ebuild b/dev-python/debtcollector/debtcollector-2.2.0.ebuild
index e76434a9b879..d2a96a533654 100644
--- a/dev-python/debtcollector/debtcollector-2.2.0.ebuild
+++ b/dev-python/debtcollector/debtcollector-2.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/debtcollector/metadata.xml b/dev-python/debtcollector/metadata.xml
index ba8168cba2de..d8d731b45bb9 100644
--- a/dev-python/debtcollector/metadata.xml
+++ b/dev-python/debtcollector/metadata.xml
@@ -5,6 +5,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">debtcollector</remote-id>
 	</upstream>
diff --git a/dev-python/distlib/distlib-0.3.1-r1.ebuild b/dev-python/distlib/distlib-0.3.1-r1.ebuild
index 246cc4442866..9491e12acf2e 100644
--- a/dev-python/distlib/distlib-0.3.1-r1.ebuild
+++ b/dev-python/distlib/distlib-0.3.1-r1.ebuild
@@ -19,7 +19,9 @@ LICENSE="PSF-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
-RESTRICT="!test? ( test )"
+# This package's tests are extremely fragile and tend to break or hang
+# when it doesn't like metadata of packages installed on the system.
+RESTRICT="test"
 
 # pypiserver is called as external executable
 # openpyxl installs invalid metadata that breaks distlib
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index def0d0d60d28..8c49b16b89b0 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1 +1,2 @@
 DIST dogpile.cache-1.0.2.tar.gz 351221 BLAKE2B 7cca7e0c260ca68fb26c0db5b736de1e3586f22a14558b8b294dfd12452cd55d70eb75b7a01041001d1d8f5300d4b7d5b5c9ff9e52dc066514d908ae188a6f97 SHA512 b49e9005916636aff0a25b9158923ea9362b3edf1f42704d06e65b14892d0cdb6b1da7d620f10d752efb1ae1987a9187b0f642cc30d07de3fc961921e1794a87
+DIST dogpile.cache-1.1.0.tar.gz 365988 BLAKE2B c21b52d23566a9d1b607374a77e2b7cc0ff0705d02cd3fddee1f6110555cf082fc9e516ba37e8ddaf7c70253dd28301cc89c3d3ef5405728859263e2a763608c SHA512 48627e4124bd25678059985c49ffde75d49d987c429d1e9a02ddd60a77b20e41899da30ae78e0f2891ff76a9c3d72a6ec782e829d659c3048cdbc921022ebb55
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.1.0.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.1.0.ebuild
new file mode 100644
index 000000000000..b7c24a92cab6
--- /dev/null
+++ b/dev-python/dogpile-cache/dogpile-cache-1.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A locking API for expiring values while a single thread generates a new value."
+HOMEPAGE="https://github.com/sqlalchemy/dogpile.cache"
+SRC_URI="mirror://pypi/${PN:0:1}/dogpile.cache/dogpile.cache-${PV}.tar.gz"
+S="${WORKDIR}/dogpile.cache-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/easyprocess/easyprocess-0.3.ebuild b/dev-python/easyprocess/easyprocess-0.3.ebuild
index 5741930f1257..cb3c5b741ddd 100644
--- a/dev-python/easyprocess/easyprocess-0.3.ebuild
+++ b/dev-python/easyprocess/easyprocess-0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ponty/EasyProcess/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="test? (
 	dev-python/pytest-timeout[${PYTHON_USEDEP}]
diff --git a/dev-python/empy/Manifest b/dev-python/empy/Manifest
index 648458fd5618..251da5dae65f 100644
--- a/dev-python/empy/Manifest
+++ b/dev-python/empy/Manifest
@@ -1,2 +1 @@
-DIST empy-3.3.3.tar.gz 138429 BLAKE2B ed2ea352161bcd141620253e059255c6d6437d72d8e72075e1abc01efc496715ff07eb1e9baef70a631e752761f828f2f4750087da154c0a6df1434e47a8f0b7 SHA512 74c091d6dac39ad9ddb6f46963066dab1f8846565f77b1b0ad4352eda3534d4312b0e95d3682387d75c2f5553d678c6d3112471eec032e2bdea0e891dd8217b1
 DIST empy-3.3.4.tar.gz 138495 BLAKE2B 0040b26966d3d6c7911cc7957159084ddb610085affaa5cf214121fdb292c43b071df8990749e02c0c3ef46cba131188e0907b8ab7c28a0834498b505bec0a2e SHA512 5de8de26484468d180a2575bfc8302cb3d32004ed4d70768310b7564a9ed1bb880b8c1d862f419588b2b5baa8c3da8bc707eac41f3921e6136cc5bc3f47f1a3d
diff --git a/dev-python/empy/empy-3.3.3.ebuild b/dev-python/empy/empy-3.3.3.ebuild
deleted file mode 100644
index 24d0274fa10b..000000000000
--- a/dev-python/empy/empy-3.3.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A powerful and robust templating system for Python"
-HOMEPAGE="http://www.alcyone.com/software/empy/"
-SRC_URI="http://www.alcyone.com/software/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc x86"
-IUSE="doc"
-
-python_test() {
-	"${PYTHON}" em.py sample.em | diff sample.bench -
-	if [[ ${PIPESTATUS[0]} -ne 0 || ${PIPESTATUS[1]} -ne 0 ]]; then
-		die "Testing failed with ${EPYTHON}"
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use doc; then
-		dodir /usr/share/doc/"${PF}"/examples
-		insinto /usr/share/doc/"${PF}"/examples
-		doins sample.em sample.bench
-		#3.3 has the html in this funny place. Fix in later version:
-		dohtml doc/home/max/projects/empy/doc/em/*
-		dohtml doc/home/max/projects/empy/doc/em.html
-		dohtml doc/index.html
-	fi
-}
diff --git a/dev-python/empy/empy-3.3.4.ebuild b/dev-python/empy/empy-3.3.4.ebuild
index fa463ba9b70d..6f45d2d2f36d 100644
--- a/dev-python/empy/empy-3.3.4.ebuild
+++ b/dev-python/empy/empy-3.3.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.alcyone.com/software/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ppc x86"
 IUSE="doc"
 
 python_test() {
diff --git a/dev-python/entrypoint2/entrypoint2-0.2.1.ebuild b/dev-python/entrypoint2/entrypoint2-0.2.1.ebuild
index 0bf3c6badc90..51a72e233eff 100644
--- a/dev-python/entrypoint2/entrypoint2-0.2.1.ebuild
+++ b/dev-python/entrypoint2/entrypoint2-0.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ponty/entrypoint2/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="test? (
 	dev-python/easyprocess[${PYTHON_USEDEP}]
diff --git a/dev-python/executing/executing-0.5.3.ebuild b/dev-python/executing/executing-0.5.3.ebuild
index 1bc12ea1137d..06fa00c58a42 100644
--- a/dev-python/executing/executing-0.5.3.ebuild
+++ b/dev-python/executing/executing-0.5.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~x86"
 
 # asttokens is optional runtime dep
 BDEPEND="
diff --git a/dev-python/fakeredis/fakeredis-1.4.3.ebuild b/dev-python/fakeredis/fakeredis-1.4.3.ebuild
index 749e4a33aa5c..dc6eaa978823 100644
--- a/dev-python/fakeredis/fakeredis-1.4.3.ebuild
+++ b/dev-python/fakeredis/fakeredis-1.4.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
 	dev-python/redis-py[${PYTHON_USEDEP}]
diff --git a/dev-python/fastjsonschema/fastjsonschema-2.14.5.ebuild b/dev-python/fastjsonschema/fastjsonschema-2.14.5.ebuild
index b6cd18b90bad..dc0986d62192 100644
--- a/dev-python/fastjsonschema/fastjsonschema-2.14.5.ebuild
+++ b/dev-python/fastjsonschema/fastjsonschema-2.14.5.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 arm64 ~x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/flask-login/flask-login-0.5.0.ebuild b/dev-python/flask-login/flask-login-0.5.0.ebuild
index 7084eab5e05e..446da2629472 100644
--- a/dev-python/flask-login/flask-login-0.5.0.ebuild
+++ b/dev-python/flask-login/flask-login-0.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/maxcountryman/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/flask-0.10[${PYTHON_USEDEP}]
diff --git a/dev-python/graphviz/Manifest b/dev-python/graphviz/Manifest
index ab9aba84810d..92fee8679bd4 100644
--- a/dev-python/graphviz/Manifest
+++ b/dev-python/graphviz/Manifest
@@ -1,2 +1,2 @@
-DIST graphviz-0.14.1.zip 183737 BLAKE2B f4dd100d6fcdfcfc266a7dc77f89b8647ac16d4d56629555ec94b54347b0d91b531ec25ac7ed9c13b0470f6bc49c68a9101791e5fe8b815ab0cd18a9c6f93e7d SHA512 ce2731acecee823afaf086955b316aba956a666b5d528c1ecdee388bf26ee02f502d48d650ed3a8aebcb75ecbff750049c1ca50e27644f74f57fb34b65e42c9a
 DIST graphviz-0.14.2.zip 184157 BLAKE2B 668c200964867f416e2b15454793fdd0673a110461a85764699727b0430c812e18fb4285e031f5f611ff86bd205cbf927c695015d55ac169a594e616ab74067a SHA512 a8bcf395ebed7c43f5355bc167aae157c6eddb127860a6fb58eba0d882235e04a33a5bcf589245f484e3af9dce5eff8a5893ced73203901c92afd92c4f5b05be
+DIST graphviz-0.15.zip 183103 BLAKE2B 81d4a121ca2654e6c08570ede7a1f5ef580b6a281358bf32f4178898fc12cfae21b10ce8f4f6fba4644e3275162cc09dbf5ae287a114fb8503be98d6a2fbf728 SHA512 c2a77f0d52595a70b4f8ccd906907453b59622560f0ff84e267e874f5a1dc9a4b721192d236b0519ee7ec85bae9b225b9919ae51bcf599c93bd5816934afd6cc
diff --git a/dev-python/graphviz/graphviz-0.14.2.ebuild b/dev-python/graphviz/graphviz-0.14.2.ebuild
index 3700d1003cf8..92f9f2c7bf0c 100644
--- a/dev-python/graphviz/graphviz-0.14.2.ebuild
+++ b/dev-python/graphviz/graphviz-0.14.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://graphviz.readthedocs.io/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 RDEPEND="media-gfx/graphviz"
diff --git a/dev-python/graphviz/graphviz-0.14.1.ebuild b/dev-python/graphviz/graphviz-0.15.ebuild
similarity index 93%
rename from dev-python/graphviz/graphviz-0.14.1.ebuild
rename to dev-python/graphviz/graphviz-0.15.ebuild
index 92f9f2c7bf0c..3700d1003cf8 100644
--- a/dev-python/graphviz/graphviz-0.14.1.ebuild
+++ b/dev-python/graphviz/graphviz-0.15.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://graphviz.readthedocs.io/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 RDEPEND="media-gfx/graphviz"
diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest
index 6803a04b8649..d60dee5ddaf6 100644
--- a/dev-python/hiredis/Manifest
+++ b/dev-python/hiredis/Manifest
@@ -1 +1,2 @@
 DIST hiredis-1.0.1.tar.gz 54460 BLAKE2B 90bdbd99f47b0765636dbeee9fc3cbb9c71fd7ba752a0d58ab9c2c9d2ee93bfc1a343465618d1127703ae09a4870d6691d7d5b52f59150849a448eae73c6a1d3 SHA512 8aa5e29b09f42826d746857d55b8042b40ffa3977386b0f8b2ea1b2ede0c28337f3df4bbd177192d8873570810bc9d0987f1f2b29f094f27adaa4aaf409c3a6b
+DIST hiredis-1.1.0.tar.gz 54620 BLAKE2B 9991745d277e87efe836c1c8eabb2016ce401e2be52c7e1b3a154350776fae6fd3c49e3096da57231e42c57bf36ba692ce26bc993d0923b5246376d8694ad058 SHA512 ad37868376de91303c15ffe6109dc7fadb4f458efdd44b7ddc0a410937a389b8e062ab7d36b1aec3fe324ecafe6b1e5e6b92f547cbf619251dad22a28e02ee9c
diff --git a/dev-python/hiredis/hiredis-1.0.1-r1.ebuild b/dev-python/hiredis/hiredis-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..8e84e217d314
--- /dev/null
+++ b/dev-python/hiredis/hiredis-1.0.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python extension that wraps hiredis"
+HOMEPAGE="https://github.com/pietern/hiredis-py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="system-libs"
+
+DEPEND="system-libs? ( dev-libs/hiredis:0/0.14 )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	use system-libs && PATCHES+=(
+		"${FILESDIR}"/${P}-system-libs.patch
+		"${FILESDIR}"/${P}-api-0.14.patch
+	)
+	default
+}
+
+python_test() {
+	cd test
+	"${EPYTHON}" -m unittest reader.ReaderTest || die "tests failed"
+}
diff --git a/dev-python/hiredis/hiredis-1.0.1.ebuild b/dev-python/hiredis/hiredis-1.0.1.ebuild
index 34d712deb6de..bde16f819154 100644
--- a/dev-python/hiredis/hiredis-1.0.1.ebuild
+++ b/dev-python/hiredis/hiredis-1.0.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
-DEPEND=">=dev-libs/hiredis-0.14:="
+DEPEND="dev-libs/hiredis:0/0.14"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
diff --git a/dev-python/hiredis/hiredis-1.1.0.ebuild b/dev-python/hiredis/hiredis-1.1.0.ebuild
new file mode 100644
index 000000000000..a909b3a56dd7
--- /dev/null
+++ b/dev-python/hiredis/hiredis-1.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python extension that wraps hiredis"
+HOMEPAGE="https://github.com/pietern/hiredis-py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="system-libs"
+
+DEPEND="system-libs? ( dev-libs/hiredis:0/0.14 )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	use system-libs && PATCHES+=(
+		"${FILESDIR}"/${PN}-1.0.1-system-libs.patch
+		"${FILESDIR}"/${PN}-1.0.1-api-0.14.patch
+	)
+	default
+}
+
+python_test() {
+	cd test
+	"${EPYTHON}" -m unittest reader.ReaderTest || die "tests failed"
+}
diff --git a/dev-python/hiredis/metadata.xml b/dev-python/hiredis/metadata.xml
index d5da8f0733c4..2bf5fbd7ca5f 100644
--- a/dev-python/hiredis/metadata.xml
+++ b/dev-python/hiredis/metadata.xml
@@ -13,4 +13,7 @@
     <remote-id type="pypi">hiredis</remote-id>
     <remote-id type="github">pietern/hiredis-py</remote-id>
   </upstream>
+  <use>
+    <flag name="system-libs">Use dev-libs/hiredis from system</flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-python/imagesize/Manifest b/dev-python/imagesize/Manifest
index 34d3a6ef9892..fd1395e88db9 100644
--- a/dev-python/imagesize/Manifest
+++ b/dev-python/imagesize/Manifest
@@ -1 +1,2 @@
 DIST imagesize-1.1.0.tar.gz 1275201 BLAKE2B 32169ccbfee5080d98b7304a2eb7c437d223a9e538281bd0a9ae1e35f5defb71d1abb7e6307057f7e41d199eda402ee91a2a91eb3d9f74cb8fb1df5c4c966072 SHA512 11af71a5120decb88450d1bc7609e25e560e448fcaef72c273690ffe3ad06856e6a172e20738a8dd5650efe1ba8d599e797692eb5cae2b7d74a71f1f55438a03
+DIST imagesize-1.2.0.tar.gz 1274955 BLAKE2B 20293418635362f7360d2f02299f9392a96ca09773c97dd8eed38ca424008fa9d71139bbaf8d61e0daf5dbc90f3c46af9ee60d26e9fb1c2479eb8875ebcb7305 SHA512 c82a7fe433064c3a60ed664bad8ce4e602c527bcf2f7c9ab9be6ed650654626d9e0907028b2b0c5a484712bc989335b2b4f66494c8d445f5043ed4c2bc519700
diff --git a/dev-python/imagesize/imagesize-1.2.0.ebuild b/dev-python/imagesize/imagesize-1.2.0.ebuild
new file mode 100644
index 000000000000..68932c9e9297
--- /dev/null
+++ b/dev-python/imagesize/imagesize-1.2.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure Python module for getting image size from png/jpeg/jpeg2000/gif files"
+HOMEPAGE="https://github.com/shibukawa/imagesize_py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
+
+distutils_enable_tests pytest
diff --git a/dev-python/immutables/immutables-0.14.ebuild b/dev-python/immutables/immutables-0.14.ebuild
index 6f72553c02ac..93fb96290715 100644
--- a/dev-python/immutables/immutables-0.14.ebuild
+++ b/dev-python/immutables/immutables-0.14.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index 36ee7fb3e271..c25924b8c25c 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -1 +1,2 @@
 DIST inflect-4.1.0.tar.gz 72200 BLAKE2B c15f6b0d5d93050283dfc4d691e9fdbc26bb2f71573d6b397834e87af62f3afb8f5cdb0448c531de37e84729c0c6ae0cf4ea7a7b081a9dd784f7c06b962d7def SHA512 9a2ba4777f01475390976f3ac28f046d39d1f86cfdafd161cc7c8d33526aca35d44e6598ccf2a0b68d3511a64b67ed0991b51c78bda8f279cd706fd29a3fa514
+DIST inflect-5.0.2.tar.gz 71323 BLAKE2B 42b2524b00a8b71aca6f164de9b57708be172ce63bc62480e951d082bd68f082ad2fadb502321a5fc97ffa3af95f26935d0de855144863b9bd1dfbdf3bdae516 SHA512 ea97ec4a4a1a94a6218e60c20d63e483026beb1901abe2fa69f186a823f8a786b9a82af231fc42bf705146f650fdbfa5ff660cfbe821eceb53891ef2e91eaec3
diff --git a/dev-python/inflect/inflect-5.0.2.ebuild b/dev-python/inflect/inflect-5.0.2.ebuild
new file mode 100644
index 000000000000..3edb82bfc627
--- /dev/null
+++ b/dev-python/inflect/inflect-5.0.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Correctly inflect words and numbers"
+HOMEPAGE="https://github.com/jaraco/inflect"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
+	'>=dev-python/rst-linker-1.9' dev-python/alabaster
+distutils_enable_tests pytest
+
+python_test() {
+	# Override pytest options to skip flake8
+	pytest -vv tests --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/inflect/metadata.xml b/dev-python/inflect/metadata.xml
index a25053c52f44..96bd609280d9 100644
--- a/dev-python/inflect/metadata.xml
+++ b/dev-python/inflect/metadata.xml
@@ -12,6 +12,7 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">inflect</remote-id>
-		<remote-id type="github">jazzband/inflect</remote-id>
+		<remote-id type="github">jaraco/inflect</remote-id>
+		<bugs-to>https://github.com/jaraco/inflect/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
index 71b6a8da32a3..d5650595b552 100644
--- a/dev-python/keystoneauth/Manifest
+++ b/dev-python/keystoneauth/Manifest
@@ -1,2 +1 @@
-DIST keystoneauth1-4.0.1.tar.gz 257456 BLAKE2B 0903e782fcd291ba4c15ddbbec684c8f5c898062fdad0b34e8da892fb501a412108affd1d3ed7b9dc4e259b67bbe90dd361ab623da07f7ab97c32c1da6f5a1ad SHA512 b20e02dd521bb45406586f7ebdcbfe48ff22f4820950bbfa280a5fc969bc9cdacaff69678958412cd5880b732642cdd2079c228c9679e372ad76bef625e85c35
 DIST keystoneauth1-4.2.1.tar.gz 258328 BLAKE2B 62f8b065a77d4150c9491f4352a3a2d37d42cc54df8db6a1eabdbe93f18714838ebed2dec0d6188e91f2dc3708b0c3cfbcf17a96411df05dd96c409a1b6c8beb SHA512 cb137d259dba7cab31fa39293d40d6654c6b36157f088948995d55755fb4dc8c29df1f978a58fbc0881516f11db840f0a25c7621bb092ab95d901dde6bd210ca
diff --git a/dev-python/keystoneauth/keystoneauth-4.0.1.ebuild b/dev-python/keystoneauth/keystoneauth-4.0.1.ebuild
deleted file mode 100644
index 8e061d534fec..000000000000
--- a/dev-python/keystoneauth/keystoneauth-4.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud."
-HOMEPAGE="https://github.com/openstack/keystoneauth"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
-S="${WORKDIR}/${PN}1-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/keystoneauth/keystoneauth-4.2.1.ebuild b/dev-python/keystoneauth/keystoneauth-4.2.1.ebuild
index e3d33b772a08..fde0ffb53f52 100644
--- a/dev-python/keystoneauth/keystoneauth-4.2.1.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-4.2.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}1-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/keystoneauth/metadata.xml b/dev-python/keystoneauth/metadata.xml
index 649f2c12e07f..3f6772bf4141 100644
--- a/dev-python/keystoneauth/metadata.xml
+++ b/dev-python/keystoneauth/metadata.xml
@@ -5,6 +5,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">openstack/keystoneauth</remote-id>
 		<remote-id type="pypi">keystoneauth1</remote-id>
diff --git a/dev-python/lmdb/lmdb-1.0.0.ebuild b/dev-python/lmdb/lmdb-1.0.0.ebuild
index 8801f1e82357..be41cf5a5080 100644
--- a/dev-python/lmdb/lmdb-1.0.0.ebuild
+++ b/dev-python/lmdb/lmdb-1.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="OPENLDAP"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-db/lmdb:="
 DEPEND="${RDEPEND}"
diff --git a/dev-python/loky/loky-2.9.0.ebuild b/dev-python/loky/loky-2.9.0.ebuild
index dd2b48641bc5..5d4a3524b53e 100644
--- a/dev-python/loky/loky-2.9.0.ebuild
+++ b/dev-python/loky/loky-2.9.0.ebuild
@@ -25,10 +25,14 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
-src_prepare() {
-	# docker, seriously?
-	sed -e 's:test_cpu_count_cfs_limit:_&:' \
-		-i tests/test_loky_module.py || die
-
-	distutils-r1_src_prepare
+python_test() {
+	local args=(
+		# docker, seriously?
+		--deselect 'tests/test_loky_module.py::test_cpu_count_cfs_limit'
+		# one test that uses a lot of memory, also broken on 32-bit
+		# platforms
+		--skip-high-memory
+	)
+
+	pytest -vv "${args[@]}" || die "Tests failed on ${EPYTHON}"
 }
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index 6937abd709dc..ee30d63b065e 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,7 +1,3 @@
 DIST Markdown-2.6.11.tar.gz 274132 BLAKE2B 0d14d308c97d925db83d71f3b9be5622e77ee4a159fced15c811390b39950e81bff9ffc567f32e878cbc44014640ab0a2f596258cfd0dce6b66029105cec7370 SHA512 4e7dd3e04f181fa2751a359aede301fb29a23b9af74867ff9d1d0fdd051dcd16d04a5891e37aff0b309649c5fd13363802ec7e10fc33896e9453991efcab4a66
-DIST Markdown-3.1.1.tar.gz 294136 BLAKE2B 9fd024f64f7aaa774a49f60e312e47bbc2ff0f368f083e4dfd0c38d1f12839dfcf3455f1d0c8cb0b9c851fe0d3a779c70784859f1682703bd6022d57b6548235 SHA512 78f089f2eef5c73d683ac96fd20c87145e243d12b0f230b9b0228b995035fbb084dde40be788679c63637f05956487ad520cc9dd61d133926bf13521aa600090
-DIST Markdown-3.2.2.tar.gz 299658 BLAKE2B c5a0337b6633ac3d795885d138ee3c078e36fdcacee659d8908ecdb839e0496c06ac8c721efd16183f03026ebf681e8382cdadd28d910abf5c021fdef9237e2a SHA512 72ce79b0daed4df2d09a458dad24da3e303143307640fb15d15cb10edc6c641d422dcf5043380c1572c4b9ed8f5fc11ec52e28928d8215d687309e4ce9ae3d7c
 DIST Markdown-3.3.1.tar.gz 317115 BLAKE2B 8c46dec8717cfdd03bd32b48071af042ca25508ca39d2a747a85d8c3044889d374b2f37ba6eba577c776c415d74c2f832810842faa19ff2febe596405a0a9157 SHA512 b1e53fe903612f8defbaf31f1f40a5ba4c58670ffb49cce8cf39fbe3a6445072520b7fe23eff594a8583a030b12d6295f124a13e4b58cad311d5d11ec699b4c6
-DIST Markdown-3.3.2.tar.gz 318351 BLAKE2B bfab4d9ef98b691311949e842ab0550625d6e97a8006207c44746dd45e42ac58fa22a1efcc25c0e74f110046edeb3e61e1321af3dc359ae1f703e78915d64f20 SHA512 9c486d1816196d96cd4c5fcf0e128002b7fd8e2ab1b0ffce0d9c4aaf616a7acc044044d6932b2005ae508f760f7112c81acb3cf1315e8e9d51e36058582989ca
 DIST Markdown-3.3.3.tar.gz 319531 BLAKE2B b7a527a7d202ee955106ecddb75541285589cb006a0cb3e587f06bb06aa3be8bdf8e976a35cc2ca63b2f085a8b462f8e8d5fad84710561dc105e533939c04204 SHA512 b8e42c1471d155be6cc9aa0b6ce649454b09d36df1de51ef7e45043ae3c1c87b9b09e1fae4c680a771bee52e7fa8ea82548b78b2ffb1d38e85785f0b0de25b36
-DIST Markdown-3.3.tar.gz 315253 BLAKE2B 35fbe7f03b9261e1506bb5b2ebb19cfd37e6f1ad2ad6f5464b90c850bec642a5518a6470db640bbf6ded8b589bdfbd83bd0482724b6be6e89dba133d0122d721 SHA512 3f6e29b917135638fba703c3711c8f7baec544293a93bcf3554cad7dbd6a9678a49408c202e70f2cd41813f6a7ec0ff856e1c3888355b1321eb2801eb9552a1c
diff --git a/dev-python/markdown/markdown-3.1.1-r1.ebuild b/dev-python/markdown/markdown-3.1.1-r1.ebuild
deleted file mode 100644
index 1fa671b5d9a8..000000000000
--- a/dev-python/markdown/markdown-3.1.1-r1.ebuild
+++ /dev/null
@@ -1,32 +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} pypy3 )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the markdown markup language"
-HOMEPAGE="
-	https://python-markdown.github.io/
-	https://pypi.org/project/Markdown/
-	https://github.com/Python-Markdown/markdown"
-SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
-
-IUSE="doc"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-RESTRICT="test"
-
-S="${WORKDIR}/${P^}"
-
-python_install_all() {
-	use doc && dodoc -r docs/
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/markdown/markdown-3.2.2.ebuild b/dev-python/markdown/markdown-3.2.2.ebuild
deleted file mode 100644
index 10513178f132..000000000000
--- a/dev-python/markdown/markdown-3.2.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the markdown markup language"
-HOMEPAGE="
-	https://python-markdown.github.io/
-	https://pypi.org/project/Markdown/
-	https://github.com/Python-Markdown/markdown"
-SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
-S="${WORKDIR}/${P^}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc"
-
-# importlib_metadata is only necessary for <python:3.8 according to setup.py
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_{6,7} pypy3)
-"
-BDEPEND="
-	test? (
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pytidylib[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	use doc && dodoc -r docs/
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/markdown/markdown-3.3.1.ebuild b/dev-python/markdown/markdown-3.3.1.ebuild
index be8ae2476b58..195831f69fce 100644
--- a/dev-python/markdown/markdown-3.3.1.ebuild
+++ b/dev-python/markdown/markdown-3.3.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P^}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc"
 
 # importlib_metadata is only necessary for <python:3.8 according to setup.py
diff --git a/dev-python/markdown/markdown-3.3.2.ebuild b/dev-python/markdown/markdown-3.3.2.ebuild
deleted file mode 100644
index be8ae2476b58..000000000000
--- a/dev-python/markdown/markdown-3.3.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the markdown markup language"
-HOMEPAGE="
-	https://python-markdown.github.io/
-	https://pypi.org/project/Markdown/
-	https://github.com/Python-Markdown/markdown"
-SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
-S="${WORKDIR}/${P^}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc"
-
-# importlib_metadata is only necessary for <python:3.8 according to setup.py
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_{6,7} pypy3)
-"
-BDEPEND="
-	test? (
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pytidylib[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	use doc && dodoc -r docs/
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/markdown/markdown-3.3.ebuild b/dev-python/markdown/markdown-3.3.ebuild
deleted file mode 100644
index 4d10f26b4526..000000000000
--- a/dev-python/markdown/markdown-3.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the markdown markup language"
-HOMEPAGE="
-	https://python-markdown.github.io/
-	https://pypi.org/project/Markdown/
-	https://github.com/Python-Markdown/markdown"
-SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
-S="${WORKDIR}/${P^}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc"
-
-# importlib_metadata is only necessary for <python:3.8 according to setup.py
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_{6,7} pypy3)
-"
-BDEPEND="
-	test? (
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pytidylib[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/markdown-3.3-pygments-2.7.patch
-)
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	use doc && dodoc -r docs/
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/matplotlib/matplotlib-3.3.3.ebuild b/dev-python/matplotlib/matplotlib-3.3.3.ebuild
index f3c2b26d36e1..d3fa270b2d58 100644
--- a/dev-python/matplotlib/matplotlib-3.3.3.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.3.3.ebuild
@@ -24,7 +24,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="cairo doc excel examples gtk3 latex qt5 tk wxwidgets"
+IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
 
 # internal copy of pycxx highly patched
 #	dev-python/pycxx
@@ -44,7 +44,6 @@ RDEPEND="
 	media-libs/freetype:2
 	media-libs/libpng:0
 	>=media-libs/qhull-2013
-	>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
 	cairo? (
 		dev-python/cairocffi[${PYTHON_USEDEP}]
 	)
@@ -67,6 +66,9 @@ RDEPEND="
 	qt5? (
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 	)
+	webagg? (
+		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+	)
 	wxwidgets? (
 		$(python_gen_cond_dep '
 			dev-python/wxpython:*[${PYTHON_USEDEP}]
@@ -95,6 +97,7 @@ BDEPEND="
 		dev-python/flaky[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pygobject:3[cairo?,${PYTHON_USEDEP}]
+		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
 		x11-libs/gtk+:3[introspection]
 	)
 "
diff --git a/dev-python/matplotlib/metadata.xml b/dev-python/matplotlib/metadata.xml
index f024fad13338..fab586495d40 100644
--- a/dev-python/matplotlib/metadata.xml
+++ b/dev-python/matplotlib/metadata.xml
@@ -18,6 +18,7 @@
 	<use>
 		<flag name="excel">Pull <pkg>dev-python/xlwt</pkg> for the exceltools toolkit</flag>
 		<flag name="gtk3">Enable <pkg>x11-libs/gtk+</pkg>:3 support</flag>
+		<flag name="webagg">Enable webagg backend that uses <pkg>www-servers/tornado</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="pypi">matplotlib</remote-id>
diff --git a/dev-python/multidict/multidict-5.0.0.ebuild b/dev-python/multidict/multidict-5.0.0.ebuild
index b46d589ff001..77f5241a8073 100644
--- a/dev-python/multidict/multidict-5.0.0.ebuild
+++ b/dev-python/multidict/multidict-5.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 BDEPEND="
 	>=dev-python/cython-0.28.4[${PYTHON_USEDEP}]
diff --git a/dev-python/nbformat/nbformat-5.0.8.ebuild b/dev-python/nbformat/nbformat-5.0.8.ebuild
index 9fc3918c11bf..c16418733e00 100644
--- a/dev-python/nbformat/nbformat-5.0.8.ebuild
+++ b/dev-python/nbformat/nbformat-5.0.8.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/nltk/nltk-3.5.ebuild b/dev-python/nltk/nltk-3.5.ebuild
index 3cf78bba0f11..523700571ee2 100644
--- a/dev-python/nltk/nltk-3.5.ebuild
+++ b/dev-python/nltk/nltk-3.5.ebuild
@@ -31,7 +31,7 @@ BDEPEND="
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pyparsing[${PYTHON_USEDEP}]
 		dev-python/twython[${PYTHON_USEDEP}]
-		sci-libs/scikits_learn[${PYTHON_USEDEP}]
+		sci-libs/scikit-learn[${PYTHON_USEDEP}]
 		dev-python/scipy[${PYTHON_USEDEP}]
 	)"
 PDEPEND="dev-python/nltk-data"
diff --git a/dev-python/objgraph/Manifest b/dev-python/objgraph/Manifest
index 9074170ea254..bb3f46dbadb4 100644
--- a/dev-python/objgraph/Manifest
+++ b/dev-python/objgraph/Manifest
@@ -1,2 +1 @@
-DIST objgraph-3.4.1.tar.gz 634602 BLAKE2B 17424fa5b6b079e9b0dabdfb5facc88fef67bb3742252fd986b19cb0b674c40f335e0372cb08a86e89d42cce0d504830c24471e0d34483925b33d44f45859445 SHA512 174e097cd9f9b5bd2e83a389d2ce3bd05a1754c1535923cc75f59a3281a292b50014501f093ccf1b2350fdbb34757af950636819227e39cdad2f64cb7de5ebb8
 DIST objgraph-3.5.0.tar.gz 638591 BLAKE2B 7a0ee6c9ee1d8417f7b322f19a397ea2452ed592ebbc07afc1378e86b5bad3895ed2e4a20d92a5f4b0215f68fc7440f85852303585a3161497a85d41d4c4e550 SHA512 da29202871bad06f2caa9cc297e7bf9a15af4c89e23baf9c271764e0ce93ff9557cd5c21d0bf39b425713460dbe2dbc8468d70c6bfcc1c3ff8b1b4d4a7923858
diff --git a/dev-python/objgraph/metadata.xml b/dev-python/objgraph/metadata.xml
index 028d3d594db6..9df4b1ddaa98 100644
--- a/dev-python/objgraph/metadata.xml
+++ b/dev-python/objgraph/metadata.xml
@@ -5,6 +5,7 @@
     <email>heroxbd@gentoo.org</email>
     <name>Benda Xu</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">objgraph</remote-id>
   </upstream>
diff --git a/dev-python/objgraph/objgraph-3.4.1.ebuild b/dev-python/objgraph/objgraph-3.4.1.ebuild
deleted file mode 100644
index 52a0b40de5d0..000000000000
--- a/dev-python/objgraph/objgraph-3.4.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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="Draws Python object reference graphs with graphviz"
-HOMEPAGE="https://mg.pov.lt/objgraph/"
-SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND="media-gfx/graphviz"
-BDEPEND="test? ( media-gfx/xdot )"
-
-PATCHES=(
-	"${FILESDIR}/objgraph-3.4.1-tests.patch"
-)
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/* )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/objgraph/objgraph-3.5.0.ebuild b/dev-python/objgraph/objgraph-3.5.0.ebuild
index 86764006685e..52a0b40de5d0 100644
--- a/dev-python/objgraph/objgraph-3.5.0.ebuild
+++ b/dev-python/objgraph/objgraph-3.5.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://mg.pov.lt/objgraph/"
 SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="doc"
 
diff --git a/dev-python/openstacksdk/metadata.xml b/dev-python/openstacksdk/metadata.xml
index d71eef683605..d8907f230220 100644
--- a/dev-python/openstacksdk/metadata.xml
+++ b/dev-python/openstacksdk/metadata.xml
@@ -5,6 +5,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">openstack/python-openstacksdk</remote-id>
 		<remote-id type="pypi">openstacksdk</remote-id>
diff --git a/dev-python/os-client-config/metadata.xml b/dev-python/os-client-config/metadata.xml
index c7a8e2e83975..281e7a00da2e 100644
--- a/dev-python/os-client-config/metadata.xml
+++ b/dev-python/os-client-config/metadata.xml
@@ -9,6 +9,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">os-client-config</remote-id>
   </upstream>
diff --git a/dev-python/os-ken/metadata.xml b/dev-python/os-ken/metadata.xml
index ebb9be04bc89..ae4a94616661 100644
--- a/dev-python/os-ken/metadata.xml
+++ b/dev-python/os-ken/metadata.xml
@@ -5,6 +5,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">openstack/os-ken</remote-id>
 		<remote-id type="pypi">os-ken</remote-id>
diff --git a/dev-python/os-testr/metadata.xml b/dev-python/os-testr/metadata.xml
index 4118c7a742e9..47721b633ef1 100644
--- a/dev-python/os-testr/metadata.xml
+++ b/dev-python/os-testr/metadata.xml
@@ -5,6 +5,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">os-testr</remote-id>
 		<remote-id type="github">openstack/os-testr</remote-id>
diff --git a/dev-python/osc-lib/metadata.xml b/dev-python/osc-lib/metadata.xml
index 39d1bf4db6f8..9aad6e438c24 100644
--- a/dev-python/osc-lib/metadata.xml
+++ b/dev-python/osc-lib/metadata.xml
@@ -13,6 +13,7 @@
     OpenStackClient (aka OSC) is a command-line client for OpenStack. osc-lib
     is a package of common support modules for writing OSC plugins.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">osc-lib</remote-id>
     <remote-id type="github">openstack/osc-lib</remote-id>
diff --git a/dev-python/oslo-concurrency/metadata.xml b/dev-python/oslo-concurrency/metadata.xml
index 0913509187b3..e464c80bdee7 100644
--- a/dev-python/oslo-concurrency/metadata.xml
+++ b/dev-python/oslo-concurrency/metadata.xml
@@ -12,6 +12,7 @@
   <longdescription lang="en">
     Oslo concurrency library has utilities for safely running multi-thread, multi-process applications using locking mechanisms and for running external processes.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">oslo.concurrency</remote-id>
   </upstream>
diff --git a/dev-python/oslo-config/metadata.xml b/dev-python/oslo-config/metadata.xml
index 7248bf25a18a..dfc17cc2eed5 100644
--- a/dev-python/oslo-config/metadata.xml
+++ b/dev-python/oslo-config/metadata.xml
@@ -13,6 +13,7 @@
     The Oslo configuration API supports parsing command line arguments.
   Oslo also supports .ini style configuration files.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">oslo.config</remote-id>
     <remote-id type="launchpad">oslo</remote-id>
diff --git a/dev-python/oslo-context/metadata.xml b/dev-python/oslo-context/metadata.xml
index b621cf95e226..1126ed1837f2 100644
--- a/dev-python/oslo-context/metadata.xml
+++ b/dev-python/oslo-context/metadata.xml
@@ -12,6 +12,7 @@
   <longdescription lang="en">
     The Oslo context library has helpers to maintain useful information about a request context. The request context is usually populated in the WSGI pipeline and used by various modules such as logging
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">oslo.context</remote-id>
   </upstream>
diff --git a/dev-python/oslo-i18n/Manifest b/dev-python/oslo-i18n/Manifest
index f5fc0a8e29b4..218743fbaa7d 100644
--- a/dev-python/oslo-i18n/Manifest
+++ b/dev-python/oslo-i18n/Manifest
@@ -1,2 +1 @@
-DIST oslo-i18n-3.23.1.tar.gz 44731 BLAKE2B 2205d5f27640fe15c7143df2e18d27b01a3f90c30b04b838643d33cc490cc4257cde77925d76fefd0add0d3159ee4976281608b6e43288f0c0cd4fc4c7959b47 SHA512 82ebcf54d7edbd7c3e7c1d7e13b223ca9cf88aae717ee6fa0c2fb9b423ef88403b42b3360cfd7b8dd3b6d973a077a1458fc9c879efbb6006a1cedc6ade35397b
 DIST oslo-i18n-5.0.1.tar.gz 44636 BLAKE2B 69df723bff7a279ace2a8bb2ea795e6beaa626ffc4bb364c513d16d2ce3cb07f6e9957a98d1b633f95154672d118de6fbb71ef5c1a3a53520f4d1f4b8f72748f SHA512 d55238616dc90f85ff458fc6680b3a3b2493d2a640bf5849c19cd7271e7127b535a301ed3085b5e0131b46a635b5a09423f6cba60f9f1b9b0352a0e7115a8057
diff --git a/dev-python/oslo-i18n/metadata.xml b/dev-python/oslo-i18n/metadata.xml
index e141cde0e1c0..d912facf3701 100644
--- a/dev-python/oslo-i18n/metadata.xml
+++ b/dev-python/oslo-i18n/metadata.xml
@@ -5,6 +5,7 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">oslo.i18n</remote-id>
 		<remote-id type="launchpad">oslo</remote-id>
diff --git a/dev-python/oslo-i18n/oslo-i18n-3.23.1.ebuild b/dev-python/oslo-i18n/oslo-i18n-3.23.1.ebuild
deleted file mode 100644
index aaa558a19924..000000000000
--- a/dev-python/oslo-i18n/oslo-i18n-3.23.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo i18n library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.7[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-i18n/oslo-i18n-5.0.1.ebuild b/dev-python/oslo-i18n/oslo-i18n-5.0.1.ebuild
index 43a19397e95f..ce6ed7140c4a 100644
--- a/dev-python/oslo-i18n/oslo-i18n-5.0.1.ebuild
+++ b/dev-python/oslo-i18n/oslo-i18n-5.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-log/metadata.xml b/dev-python/oslo-log/metadata.xml
index e7a9ec1dea2b..6d537ee8fbc7 100644
--- a/dev-python/oslo-log/metadata.xml
+++ b/dev-python/oslo-log/metadata.xml
@@ -17,6 +17,7 @@
 OpenStack logging configuration library provides standardized configuration for all openstack projects.
 It also provides custom formatters, handlers and support for context specific logging (like resource id’s etc).
 </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">oslo.log</remote-id>
     <remote-id type="github">openstack/oslo.log</remote-id>
diff --git a/dev-python/oslo-serialization/metadata.xml b/dev-python/oslo-serialization/metadata.xml
index 817f36756bbe..56c3dc08940f 100644
--- a/dev-python/oslo-serialization/metadata.xml
+++ b/dev-python/oslo-serialization/metadata.xml
@@ -5,6 +5,7 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">oslo.serialization</remote-id>
 		<remote-id type="launchpad">oslo</remote-id>
diff --git a/dev-python/oslo-utils/metadata.xml b/dev-python/oslo-utils/metadata.xml
index dae196bf5de7..10f43e26e551 100644
--- a/dev-python/oslo-utils/metadata.xml
+++ b/dev-python/oslo-utils/metadata.xml
@@ -5,6 +5,7 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">oslo.utils</remote-id>
 		<remote-id type="launchpad">oslo</remote-id>
diff --git a/dev-python/oslotest/Manifest b/dev-python/oslotest/Manifest
index cff8ef02abee..21137af14904 100644
--- a/dev-python/oslotest/Manifest
+++ b/dev-python/oslotest/Manifest
@@ -1,2 +1 @@
-DIST oslotest-3.7.1.tar.gz 38176 BLAKE2B 94924dca8384dcc8ba9e4f62220eb6d29b27b38966ffce7dddbd23d5c5e66493141ce4170565325a0516648db186a0171cd33de6d536bb8ed5cdef76161d4f94 SHA512 dfc55bc91ebd8ef448d4c69b2af51b8f2a9f2068b2ef2ec1cfbcfffc27eff7ccafb00dc2a3059730427aecbcd815f9dee2f00b8c74df154c8dbb95793aff7e78
 DIST oslotest-4.4.1.tar.gz 34879 BLAKE2B dd7241793f88f31c9427e07b07c015a0f8fe39f65c59341be0874fd4f9b735d1da3b105213d77bfc8cec3ea0d7587cd770a88c2a4b59902c595e9fefa5dc4730 SHA512 e4d60ab399b4eee02d1798948f62ad3acec0d9a81e6ec3b6a8d3dca7035dec0d79a5164c05e8ca4615b0489f44b6ff0c06e6420bf3d96131d15f3458e751896d
diff --git a/dev-python/oslotest/metadata.xml b/dev-python/oslotest/metadata.xml
index 666623fd6560..9a4fa610064b 100644
--- a/dev-python/oslotest/metadata.xml
+++ b/dev-python/oslotest/metadata.xml
@@ -18,6 +18,7 @@
 		The oslotest package is cross-tested against its consuming projects to
 		ensure that no changes to the library break the tests in those other projects.
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">oslotest</remote-id>
 		<remote-id type="launchpad">oslo</remote-id>
diff --git a/dev-python/oslotest/oslotest-3.7.1.ebuild b/dev-python/oslotest/oslotest-3.7.1.ebuild
deleted file mode 100644
index 27baf64502ea..000000000000
--- a/dev-python/oslotest/oslotest-3.7.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Oslo test framework"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.7[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/mox3-0.20.0[${PYTHON_USEDEP}]
-	>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx -b man
-	fi
-}
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		doman doc/build/man/oslotest.1
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslotest/oslotest-4.4.1.ebuild b/dev-python/oslotest/oslotest-4.4.1.ebuild
index c8c648f4aab9..908a175034ef 100644
--- a/dev-python/oslotest/oslotest-4.4.1.ebuild
+++ b/dev-python/oslotest/oslotest-4.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 DEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
 RDEPEND="
diff --git a/dev-python/osprofiler/metadata.xml b/dev-python/osprofiler/metadata.xml
index 06e5479cd1f9..b87a4f9f395b 100644
--- a/dev-python/osprofiler/metadata.xml
+++ b/dev-python/osprofiler/metadata.xml
@@ -9,6 +9,7 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">osprofiler</remote-id>
 		<remote-id type="launchpad">osprofiler</remote-id>
diff --git a/dev-python/passlib/passlib-1.7.4.ebuild b/dev-python/passlib/passlib-1.7.4.ebuild
index d1db1aa27998..965a55dc84f2 100644
--- a/dev-python/passlib/passlib-1.7.4.ebuild
+++ b/dev-python/passlib/passlib-1.7.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://foss.heptapod.net/python-libs/passlib/wikis/home"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 IUSE="+bcrypt doc +scrypt +totp"
 
diff --git a/dev-python/paste/Manifest b/dev-python/paste/Manifest
index 551b78b77e5b..ffb588bfb63d 100644
--- a/dev-python/paste/Manifest
+++ b/dev-python/paste/Manifest
@@ -1,2 +1 @@
-DIST Paste-3.4.6.tar.gz 630593 BLAKE2B c1bfa58be8bc182878f0e67c89b09896152e1be993f301bc3ff1fd2673439146f3e95b0e2247d6c3cf43c346f67c7fdaf8a7721dfd0967f71d6346fbf62bab4a SHA512 64cf2abdd40850704060b3a07d1999dcfd05e19bf27270f7918c5c8683a4b1638d04da13d09f9f671b8acf069e26872d5932d5f0ed7022fd5cdc6bbda7602433
 DIST Paste-3.5.0.tar.gz 638021 BLAKE2B 6c8d856733245a7eef5782f8d6c1fe35093f5247cc76e86ab308f2d98a99ebaaef5309a9c402f1334707e042b52e52d7801723e9404ad0ae454b756b9df31dfb SHA512 a9f596d6fcd95f915990c16830caeb9c9a03412447597258c67a003fd485e2efd27798f2eb2de9978ac529292af4b55136de554bfb501e90f6185f55a6b0531b
diff --git a/dev-python/paste/paste-3.4.6.ebuild b/dev-python/paste/paste-3.4.6.ebuild
deleted file mode 100644
index ceb33d7884b9..000000000000
--- a/dev-python/paste/paste-3.4.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-
-inherit distutils-r1
-
-MY_P="Paste-${PV}"
-DESCRIPTION="Tools for using a Web Server Gateway Interface stack"
-HOMEPAGE="https://pypi.org/project/Paste/"
-SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
-
-RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
-
-python_prepare_all() {
-	# TODO: 'Address already in use'
-	sed -e 's:test_address_family_v4:_&:' \
-		-i tests/test_httpserver.py || die
-
-	# Remove a test that runs against the paste website.
-	rm -f tests/test_proxy.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/paste/paste-3.5.0.ebuild b/dev-python/paste/paste-3.5.0.ebuild
index 87576606a344..ceb33d7884b9 100644
--- a/dev-python/paste/paste-3.5.0.ebuild
+++ b/dev-python/paste/paste-3.5.0.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
 
 RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pastedeploy/Manifest b/dev-python/pastedeploy/Manifest
index 8c886f14f1dc..a05022e30e5e 100644
--- a/dev-python/pastedeploy/Manifest
+++ b/dev-python/pastedeploy/Manifest
@@ -1,2 +1 @@
-DIST pastedeploy-2.1.0.tar.gz 32240 BLAKE2B 1672e3b48a287f57e9e7fca082e4cd07cea770db1c2ae0012a83dc8ec927d83bf94461a69c7afdbed082c72506eb46c0c5db15e5f0bc24ad7a4212efb9f6696e SHA512 2c639b5ad07faee013ff3fe37d0e3c6ca7b56ed0960dbcaf133c05d51a7f29d6a2f35118bd8faea4d9aca90438c43d8046a340833878e4b925f32142df169c97
 DIST pastedeploy-2.1.1.tar.gz 32339 BLAKE2B d11affa480e5c9b7be53d0431090e4ec9d66f8862b1aadf6a993a09f9c952380d7698eaa7442614936a8316e2ac50404a096bf64bb3ef31f55cbee35b5982166 SHA512 0109e30cb5ae9bdd7f06a79f6236c90f96c3bcfe507258572b1329796a1821486d9762d954673ccbac76ee63c6a69e64fe5e2cae5402fecf4a5affe88cf46930
diff --git a/dev-python/pastedeploy/pastedeploy-2.1.0.ebuild b/dev-python/pastedeploy/pastedeploy-2.1.0.ebuild
deleted file mode 100644
index b3184cd1dd90..000000000000
--- a/dev-python/pastedeploy/pastedeploy-2.1.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="PasteDeploy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Load, configure, and compose WSGI applications and servers"
-HOMEPAGE="https://pypi.org/project/PasteDeploy/"
-# pypi tarball does not include tests
-SRC_URI="https://github.com/Pylons/${PN}/archive/${PV}.tar.gz ->  ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i 's:"pytest-runner"::' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	use doc && dodoc docs/*.txt
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/pastedeploy/pastedeploy-2.1.1.ebuild b/dev-python/pastedeploy/pastedeploy-2.1.1.ebuild
index 0096412f88fe..b3184cd1dd90 100644
--- a/dev-python/pastedeploy/pastedeploy-2.1.1.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-2.1.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/Pylons/${PN}/archive/${PV}.tar.gz ->  ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]"
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 6f94c4a5fb11..426c4680857f 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,2 +1,3 @@
 DIST phonenumbers-8.12.11.tar.gz 2254319 BLAKE2B 2a33978ab0e4e575aefe2f3ed4f5a89ea87f1b38881fa2f4b7a4a38d16c107c62f4e079521d579b8a5419c8b174cf51ae8c530a450b8a8f9ad200b13938f4039 SHA512 e9008086f9cbb13a5772f164b12d3446cd0122556d90522f1e49d0a0155355401f2348a44396c7c26b235e543135471b64c97d67f82406356787c3c636dd181c
 DIST phonenumbers-8.12.12.tar.gz 2257073 BLAKE2B c8e4d20962d53470bfa701ff59ad0d4ddfa5f4913ae2ad2bea83c5b0c3274bddc7ff1c57e555e3b7f877d9230c0fdab5d866e52f9285fdafd773afc2c840f42f SHA512 625746bcf08f4bb5849fda1accf1229a05406439c97228b3f0f38b6fd56a4cd53e719738bed305a9dd89ab94f5f60ff0d9d0dcd3e57d5055daad99cfb94982ac
+DIST phonenumbers-8.12.13.tar.gz 2257015 BLAKE2B 93986ed663b4f78d0b48ff45bf6b5e2b3d360d9efd5a349f05cf24d5a6113d87334be2d72eb03a6925eabd5cd2dafdf51ffc16fe95c73bd164fcfc5bc07d171f SHA512 397eb41e17c0a49c5750bc909fef70d8e2844f872f317a74f306c406fc7d459fe7dc48615dbc82b0144781a89ad376e76fe390688fd227705a016adf19c848be
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.13.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.13.ebuild
new file mode 100644
index 000000000000..4d3183b1591b
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.13.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=(README.md)
+
+distutils_enable_tests setup.py
diff --git a/dev-python/pid/Manifest b/dev-python/pid/Manifest
index cd36f02f6f4d..24b80bb18291 100644
--- a/dev-python/pid/Manifest
+++ b/dev-python/pid/Manifest
@@ -1 +1,2 @@
 DIST pid-2.2.5.tar.gz 12151 BLAKE2B e681ad7e1d92ca1468f02dc258f12f6ae4899c775108e39c85488d8427132050d34ee79cad979a65d1bbee4cdb3d12b1a851d313547caf28c1f06dec4d0a81b6 SHA512 01cb6af9a81b216af3b2e02c336589f4f1fb29b12dbdbefb817b78255157e175b16862c2bc01412460f9f754f2c7a073c9ec2a907e3290569af8bd9a2ee7081f
+DIST pid-3.0.4.tar.gz 16228 BLAKE2B 386565071646ff5b5152c52a8a0881f54369540abaf34a82be399d5e579c763df81553393a6d9a9659beeec5f6b531c74eef7cd13f6dc6f56ee76783863c52e9 SHA512 71656511a12a27fe0c7106cd82459484071fd7a0d34f187bfd2f59dc484b6a86f2ae840eb04609c5ffb2c1f18dafd831b02c0fee5015cf840e6a1f26f95ec495
diff --git a/dev-python/pid/pid-3.0.4.ebuild b/dev-python/pid/pid-3.0.4.ebuild
new file mode 100644
index 000000000000..ad484405ebbd
--- /dev/null
+++ b/dev-python/pid/pid-3.0.4.ebuild
@@ -0,0 +1,18 @@
+# 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="Pidfile featuring stale detection and file-locking"
+HOMEPAGE="https://pypi.org/project/pid/ https://github.com/trbs/pid/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/progress/Manifest b/dev-python/progress/Manifest
index 63bae424c88b..82e49f6b0223 100644
--- a/dev-python/progress/Manifest
+++ b/dev-python/progress/Manifest
@@ -1,2 +1 @@
-DIST progress-1.3.tar.gz 5300 BLAKE2B db7683550ac19e2e11832c8be19971fe07fd58d6077e5fbf585178e1353aca1bf873affdcb528182e7856cdb2f9c342c7caed74e7914fbebde2d803479258ac8 SHA512 e94ac3b86ab5391a348130fe97a1bed9c42ed3625b4436b84080f677351a2d64b56e9ebafc65ac6c598ffed825413d30bb0d57210a7835c5e5fec82278b37076
 DIST progress-1.5.tar.gz 5842 BLAKE2B 235f02edf0f010b4460d36b868be2df0cf4685f360de491f1649f14defffd3f1789c6c036c05b91007efac49cacbed3de5cb38fda3e21d0fd633279b2066c4f9 SHA512 a9bee3498746233f874da2d6509d052882d9592df69c223637279a1fae40174a4dc279b56a7558e95ed173b0d357ae07752501c577a3cb9c79e0f87095838896
diff --git a/dev-python/progress/progress-1.3.ebuild b/dev-python/progress/progress-1.3.ebuild
deleted file mode 100644
index 29716dcfc7da..000000000000
--- a/dev-python/progress/progress-1.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Easy to use progress bars"
-HOMEPAGE="https://pypi.org/project/progress/ https://github.com/verigak/progress/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="ISC"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Not bundled
-RESTRICT="test"
-
-python_test() {
-	"${PYTHON}" test_progress.py || die
-}
diff --git a/dev-python/progress/progress-1.5.ebuild b/dev-python/progress/progress-1.5.ebuild
index d9ef31eeef8a..f58e067415e3 100644
--- a/dev-python/progress/progress-1.5.ebuild
+++ b/dev-python/progress/progress-1.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="ISC"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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"
 
 python_test() {
 	"${EPYTHON}" test_progress.py || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/pycairo/pycairo-1.20.0.ebuild b/dev-python/pycairo/pycairo-1.20.0.ebuild
index 01000a3ce9a2..eb71fb216016 100644
--- a/dev-python/pycairo/pycairo-1.20.0.ebuild
+++ b/dev-python/pycairo/pycairo-1.20.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/pygobject/pygobject-3.36.1-r1.ebuild b/dev-python/pygobject/pygobject-3.36.1-r1.ebuild
index 774991e0a087..7ee50565c94b 100644
--- a/dev-python/pygobject/pygobject-3.36.1-r1.ebuild
+++ b/dev-python/pygobject/pygobject-3.36.1-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pygobject.readthedocs.io/"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index 92f5bf29dd8a..14990f7926ab 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,2 +1 @@
-DIST pylast-3.3.0.tar.gz 40209 BLAKE2B 45725d8424a54ac03b53a6c7fe79febb0038c07ee6c2685d7b66f29933f91fb4ea55818be1d02f8fb1126758acd1d9ce3366e8a7d84fe3082b9b3003a9b948b3 SHA512 8b0c089896d7efb37bdf3a701d150b0f94f386715eb73122a4a7618f5b1a514f9f7577e8c7c84eacb36b18e69aa064220403a578d0544344ab11e87e1b46695a
 DIST pylast-4.0.0.tar.gz 40044 BLAKE2B 89402027494d608bffc4738857d8a7728175cf29a68af259aec1d6ab3755c5e02268bbacac2ff9bd8d8c6490b86ae200aeed59f34c764a4c2f90ea59cb732070 SHA512 093845c718269ed5a0b5223182e60192a71e2fed9270fec453b96b0b2a5488a0c5a8f6386edb42ed183b97cb7ea00397b4491ff72cbf72f9e7d42dc90fae66e7
diff --git a/dev-python/pylast/metadata.xml b/dev-python/pylast/metadata.xml
index d92c10f33e69..a79e6a5cd38d 100644
--- a/dev-python/pylast/metadata.xml
+++ b/dev-python/pylast/metadata.xml
@@ -1,24 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!--maintainer-needed-->
-  <longdescription lang="en">
-    Python interface to last.fm and other api-compatible websites
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		Python interface to last.fm and other api-compatible websites
 
-    Features:
-    * Simple public interface.
-    * Access to all the data exposed by the Last.fm webservices.
-    * Scrobbling support.
-    * Full object-oriented design.
-    * Proxy support.
-    * Internal caching support for some webservices calls (disabled by default).
-    * No extra dependencies but python itself.
-    * Support for other API-compatible networks like Libre.fm
-    * Python3-friendly (Starting from 0.5).
-  </longdescription>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">pylast</remote-id>
-    <remote-id type="github">pylast/pylast</remote-id>
-  </upstream>
+		Features:
+		* Simple public interface.
+		* Access to all the data exposed by the Last.fm webservices.
+		* Scrobbling support.
+		* Full object-oriented design.
+		* Proxy support.
+		* Internal caching support for some webservices calls (disabled by default).
+		* No extra dependencies but python itself.
+		* Support for other API-compatible networks like Libre.fm
+		* Python3-friendly (Starting from 0.5).
+	</longdescription>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">pylast</remote-id>
+		<remote-id type="github">pylast/pylast</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pylast/pylast-3.3.0.ebuild b/dev-python/pylast/pylast-3.3.0.ebuild
deleted file mode 100644
index 1e4b885f9d02..000000000000
--- a/dev-python/pylast/pylast-3.3.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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="Python interface to last.fm and other api-compatible websites"
-HOMEPAGE="https://github.com/pylast/pylast"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/flaky[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pylast/pylast-4.0.0.ebuild b/dev-python/pylast/pylast-4.0.0.ebuild
index 8f31add792e1..1e4b885f9d02 100644
--- a/dev-python/pylast/pylast-4.0.0.ebuild
+++ b/dev-python/pylast/pylast-4.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 099f297e9dee..a3ca45b1d138 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,2 +1 @@
-DIST pylint-2.5.3.tar.gz 684449 BLAKE2B 7b494f5334376ff571fd8971851198d037e87c5be83d0123fcb108701489769785164bb077eb10b4851c89b82dadc40c510186eaf03be1621c4d78c79dffbceb SHA512 03fcd893d361b66794f17433e90df108099fee2eccb35507c7f61befb8db846f0242e5ce2b4ee63727c9cc780a376c3b93d5af3186f884a4fdaad68b224ed7d2
 DIST pylint-2.6.0.tar.gz 680289 BLAKE2B f7d4159478f667a3234beefd148857f26c8f7ea3aae3bfa70fa06fe2a8d86fcf22a0727a9fa5d8fc3de4aa0bb7a4d6e13bf68029f359122762d1e0d24a0b715b SHA512 02881fe14401bbe946618ef947c8db320a6c8dd93626402260d60468538ce67b61d1e8b921bfb1a6020514dd392e9b0021c97ddb60b45866c2d2241224f93f08
diff --git a/dev-python/pylint/files/pylint-2.5.3-no-pytest-runner.patch b/dev-python/pylint/files/pylint-2.5.3-no-pytest-runner.patch
deleted file mode 100644
index f4cc6be360de..000000000000
--- a/dev-python/pylint/files/pylint-2.5.3-no-pytest-runner.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 92d059ff..cbc5b881 100644
---- a/setup.py
-+++ b/setup.py
-@@ -67,7 +67,6 @@ else:
- 
- 
- needs_pytest = {"pytest", "test", "ptr"}.intersection(sys.argv)
--pytest_runner = ["pytest-runner"] if needs_pytest else []
- 
- 
- def ensure_scripts(linux_scripts):
-@@ -151,7 +150,6 @@ def install(**kwargs):
-         extras_require=extras_require,
-         test_suite="test",
-         python_requires=">=3.5.*",
--        setup_requires=pytest_runner,
-         tests_require=["pytest"],
-         **kwargs
-     )
diff --git a/dev-python/pylint/pylint-2.5.3.ebuild b/dev-python/pylint/pylint-2.5.3.ebuild
deleted file mode 100644
index 8cae6d66c8b7..000000000000
--- a/dev-python/pylint/pylint-2.5.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-# entry_points is added via **kwargs in a dict
-_DISTUTILS_SETUPTOOLS_WARNED=1
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="https://www.logilab.org/project/pylint
-	https://pypi.org/project/pylint/
-	https://github.com/pycqa/pylint"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/astroid-2.3.3[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	dev-python/mccabe[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/six[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-	"${FILESDIR}/${PN}-2.5.3-no-pytest-runner.patch"
-	"${FILESDIR}/${PN}-2.5.3-tests.patch"
-)
-
-distutils_enable_sphinx doc
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# we don't want to run the benchmarking tests
-	rm -f tests/benchmark/test_baseline_benchmarks.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	doman man/{pylint,pyreverse}.1
-	if use examples ; then
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	# Optional dependency on "tk" USE flag would break support for Jython.
-	optfeature "pylint-gui script requires dev-lang/python with \"tk\" USE flag enabled." 'dev-lang/python[tk]'
-}
diff --git a/dev-python/pylint/pylint-2.6.0.ebuild b/dev-python/pylint/pylint-2.6.0.ebuild
index 3f3e19709ba7..861ac0ae8765 100644
--- a/dev-python/pylint/pylint-2.6.0.ebuild
+++ b/dev-python/pylint/pylint-2.6.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="examples"
 
 # Mirror requirements from pylint/__pkginfo__.py
@@ -62,8 +62,3 @@ python_install_all() {
 
 	distutils-r1_python_install_all
 }
-
-pkg_postinst() {
-	# Optional dependency on "tk" USE flag would break support for Jython.
-	optfeature "pylint-gui script requires dev-lang/python with \"tk\" USE flag enabled." 'dev-lang/python[tk]'
-}
diff --git a/dev-python/pypiserver/Manifest b/dev-python/pypiserver/Manifest
index 2625c26febc1..bb98457d43ed 100644
--- a/dev-python/pypiserver/Manifest
+++ b/dev-python/pypiserver/Manifest
@@ -1,2 +1 @@
-DIST pypiserver-1.3.2.tar.gz 505905 BLAKE2B 4e62d11cf280524d532e793d3ffc4dc59f1e72c6aba2ed6bd0d70f86104162dc60377b56e08676ab03326c33885acae698dc60b435426b195f13bf9f60bb7b8c SHA512 de823376f7711bfdaff3a1acefae37e1d7528802203929b8aeb8790c2b1c466badaf5a1d5084100bc37f41636d2cdfc2038cd3ad9805d15ca42c80834760b4da
 DIST pypiserver-1.4.2.tar.gz 511019 BLAKE2B fe9a41c35d601ee20f2cfe0773ce341b8c8fe387a2b825d1e6d669d5f358846b436158beb8a1222fa33cf1841cad5aceacc0f5063f899445ad15ca9eb5b8efd7 SHA512 8597a6a7e83cb3f5ead3418ee91167e1764c123b244c05397fa892c8ebe84b58569f27ce85cd9849d6a41d20342de21cf9cc46e00b233d9d94d0540470e1c49b
diff --git a/dev-python/pypiserver/metadata.xml b/dev-python/pypiserver/metadata.xml
index e3205b37b69e..0d519d2171f2 100644
--- a/dev-python/pypiserver/metadata.xml
+++ b/dev-python/pypiserver/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pytest-services</remote-id>
 		<remote-id type="github">pytest-dev/pytest-services</remote-id>
diff --git a/dev-python/pypiserver/pypiserver-1.3.2.ebuild b/dev-python/pypiserver/pypiserver-1.3.2.ebuild
deleted file mode 100644
index 13964332829d..000000000000
--- a/dev-python/pypiserver/pypiserver-1.3.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Minimal PyPI server"
-HOMEPAGE="https://github.com/pypiserver/pypiserver"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/pip[${PYTHON_USEDEP}]
-	>=dev-python/wheel-0.25.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/passlib[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.3[${PYTHON_USEDEP}]
-		dev-python/twine[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e "/tox/d" setup.py || die
-
-	# https://github.com/pypiserver/pypiserver/issues/312
-	sed -e 's:test_root_count:_&:' \
-		-i tests/test_app.py || die
-	sed -e 's:test_hash_algos:_&:' \
-		-e 's:test_pipInstall_openOk:_&:' \
-		-e 's:test_pipInstall_authedOk:_&:' \
-		-i tests/test_server.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pypiserver/pypiserver-1.4.2.ebuild b/dev-python/pypiserver/pypiserver-1.4.2.ebuild
index c86e71e5c09e..13964332829d 100644
--- a/dev-python/pypiserver/pypiserver-1.4.2.ebuild
+++ b/dev-python/pypiserver/pypiserver-1.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index 77f4de3e85ff..fc2b38b03da2 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -2,3 +2,5 @@ DIST pypy-exe-7.3.1-1.amd64.xpak 13578971 BLAKE2B 6ff3c64ec88813ef68d325cff5e2da
 DIST pypy-exe-7.3.1-1.x86.xpak 10239654 BLAKE2B 2588e879e2bd3ea41938ec21f55167d118cb493680f8e7aded6d6c01bed6499efd65f7d7f56e305a4ebc2aab02adf9d58fceccb503dd0ff41e93c642baf2191c SHA512 110b202c805729bcd6789ea0f6c7bffe62ab23cbd33fcff572254f56f4da82e25f9f7f617c5a4b3911044c07ea33ae8d17bd8547bb7779ca517b973b553e6b1d
 DIST pypy-exe-7.3.2-1.amd64.xpak 13541084 BLAKE2B 8af5c35d99275a2131d4b6c51f505a9bf3015a144387030c78a490c331f1fb34b69106ad6ed961247b4de6a39d2fde47a1ebad204e3a3569f269ed7ee32559de SHA512 82d99e896954aec8749154e19d42636608403e4c4bece34e72b5804208cb42ed26bfdf4506ab2579a3b74d7cede97ef66b313ae9feeddabbfd79045090dc3035
 DIST pypy-exe-7.3.2-1.x86.xpak 10216001 BLAKE2B 934be623ce1afa9d0bfb1b3725e89d994352c9d57b9807c6fa135a0aabe3c50633566425b25ebf98f1cec8160eadf5305033ac3f3ba4cfff5fb7b39e5d19f9c6 SHA512 9d25f1d82af3ed1c4d046e5f3434d12ed4c02eee4cc8adb64a03159bb48cf114f393bd60c67223447796726f59b622f8462ac439446eb14dcf2e76983da635e8
+DIST pypy-exe-7.3.3_rc1-1.amd64.xpak 13533939 BLAKE2B 9b959a51e5e896d68d5321ac27f661900eda5407e6682883cea00e6d7363c4a1287044da47a7e750ae93fe9801a8ca3ee4fc9846b679998f3fbddefc19a62593 SHA512 a0c73ec6e300f0f52ac8f8305e92670eec8aacb11f7cb345804f042ae40d514ea1be2b14511422791e46b758437af49e43d409a27fb0087bf881143f6b265f17
+DIST pypy-exe-7.3.3_rc1-1.x86.xpak 10254396 BLAKE2B e3fa75dc753cc64baca69f802f2f52557b4b374801df7ede216c10f485130b2beb321d404e592e5de49d048de89f1a4496e946ebc8e7a831b1de7806d32e99a7 SHA512 6fae90183fea72dd913342fb230aca09091d0ef94f81a62750f39885bbaec78e227eb282372fe9f869ade1abdaac0ee7c93900311d495dc10735fb4573aaf52b
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3_rc1.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3_rc1.ebuild
new file mode 100644
index 000000000000..d6efaa6215d5
--- /dev/null
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3_rc1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils
+
+MY_P=pypy-exe-${PV}-1
+DESCRIPTION="PyPy executable (pre-built version)"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${PV}"
+KEYWORDS=""
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0/1
+	dev-libs/libffi:0/7
+	virtual/libintl:0/0
+	dev-libs/expat:0/0
+	app-arch/bzip2:0/1
+	sys-libs/ncurses:0/6
+	!dev-python/pypy-exe:${PV}"
+
+QA_PREBUILT="
+	usr/lib/pypy2.7/pypy-c-${SLOT}"
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_install() {
+	insinto /
+	doins -r usr
+	fperms +x "/usr/lib/pypy2.7/pypy-c-${SLOT}"
+	pax-mark m "${ED}/usr/lib/pypy2.7/pypy-c-${SLOT}"
+}
diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest
index 7ae8a9113a1d..3624fd594118 100644
--- a/dev-python/pypy-exe/Manifest
+++ b/dev-python/pypy-exe/Manifest
@@ -1,2 +1,3 @@
 DIST pypy2.7-v7.3.1-src.tar.bz2 21053306 BLAKE2B 071d59b7978c98e9ed9243d9a64d93d21b524351cb9a45e0f7d48828f919c84585a1164e7c38739fdd8828ab4b1eedade96dff7d64d0d9cbfe00c74d88d532bb SHA512 1bec44fa0fc4b1186e25f69303f9e332df32184be990d86fba41c40152664a93bd65eabf4dded133371271402cea9b150b60c13bce89d1004b276f0908c0b8f1
 DIST pypy2.7-v7.3.2-src.tar.bz2 21142873 BLAKE2B e6bcd2dc28ef740962d053753ccd172e3895fc83fe23a319c003248e0986f9805839daddd13a0f480f1e9ee813979742699cb0bc8c42b6b05c193fedf67aea4f SHA512 b40d93d615a27e3a035007307a8ab2b49ff90f3047af914b268a80feb8219d372eca14c04a8b0dea91efb992653457b7c6d088c784de32c414cc48879f2d15fc
+DIST pypy2.7-v7.3.3rc1-src.tar.bz2 20933100 BLAKE2B afbf3c15924e6a215b6323fe97e9782912f09ba1e1db6652b37897ead07deaaa97f591a91f3695e958e8e2dee2626bbda94c4043c025b3f52a12279dc66e483c SHA512 0ddbdcf7ef825888ff748ebdd84cb501653e3a4a0e506e35810f9693b5d3b388c2f636396616f0c8fcc96dc806fa02d74830c1f37ca11fdcfdfd32c3bcd1fdd0
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.3_rc1.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.3_rc1.ebuild
new file mode 100644
index 000000000000..b3cba7450ed2
--- /dev/null
+++ b/dev-python/pypy-exe/pypy-exe-7.3.3_rc1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs
+
+MY_P=pypy2.7-v${PV/_/}
+DESCRIPTION="PyPy executable (build from source)"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PV}"
+KEYWORDS=""
+IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	dev-libs/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	bzip2? ( app-arch/bzip2:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	!dev-python/pypy-exe-bin:${PV}"
+# don't enforce the dep on pypy with USE=low-memory since it's going
+# to cause either collisions or circular dep on itself
+DEPEND="${RDEPEND}"
+BDEPEND="
+	!low-memory? (
+		|| (
+			dev-python/pypy
+			dev-lang/python:2.7
+		)
+	)"
+
+check_env() {
+	if use low-memory; then
+		if ! has_version -b dev-python/pypy &&
+				! has_version -b dev-python/pypy-bin
+		then
+			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+			eerror "being installed. Please install it using e.g.:"
+			eerror
+			eerror "  $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin"
+			eerror
+			eerror "before attempting to build dev-python/pypy-exe[low-memory]."
+			die "dev-python/pypy needs to be installed for USE=low-memory"
+		fi
+
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check_env
+
+		use low-memory && EPYTHON=
+		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
+				{ has_version -b dev-python/pypy ||
+				has_version -b dev-python/pypy-bin; }
+		then
+			einfo "Using already-installed PyPy to perform the translation."
+			EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please unset"
+			einfo "the EPYTHON variable."
+			python-any-r1_pkg_setup
+		fi
+	fi
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${EPYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${EPYTHON}" --jit loop_longevity=300 )
+	fi
+
+	if [[ ${EPYTHON} != pypy ]]; then
+		# reuse bundled pycparser to avoid external dep
+		mkdir -p "${T}"/pymod/cffi || die
+		: > "${T}"/pymod/cffi/__init__.py || die
+		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
+		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
+	fi
+
+	# translate into the C sources
+	# we're going to build them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	exeinto "${dest}"
+	newexe "${T}"/usession*-0/testing_1/pypy-c pypy-c-${PV}
+	insinto "${dest}"/include/${PV}
+	doins include/pypy_*
+	pax-mark m "${ED}${dest}/pypy-c-${PV}"
+}
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 0030cac3508d..72d575304bde 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,4 +1,5 @@
 DIST pypy2.7-v7.3.1-src.tar.bz2 21053306 BLAKE2B 071d59b7978c98e9ed9243d9a64d93d21b524351cb9a45e0f7d48828f919c84585a1164e7c38739fdd8828ab4b1eedade96dff7d64d0d9cbfe00c74d88d532bb SHA512 1bec44fa0fc4b1186e25f69303f9e332df32184be990d86fba41c40152664a93bd65eabf4dded133371271402cea9b150b60c13bce89d1004b276f0908c0b8f1
 DIST pypy2.7-v7.3.2-src.tar.bz2 21142873 BLAKE2B e6bcd2dc28ef740962d053753ccd172e3895fc83fe23a319c003248e0986f9805839daddd13a0f480f1e9ee813979742699cb0bc8c42b6b05c193fedf67aea4f SHA512 b40d93d615a27e3a035007307a8ab2b49ff90f3047af914b268a80feb8219d372eca14c04a8b0dea91efb992653457b7c6d088c784de32c414cc48879f2d15fc
+DIST pypy2.7-v7.3.3rc1-src.tar.bz2 20933100 BLAKE2B afbf3c15924e6a215b6323fe97e9782912f09ba1e1db6652b37897ead07deaaa97f591a91f3695e958e8e2dee2626bbda94c4043c025b3f52a12279dc66e483c SHA512 0ddbdcf7ef825888ff748ebdd84cb501653e3a4a0e506e35810f9693b5d3b388c2f636396616f0c8fcc96dc806fa02d74830c1f37ca11fdcfdfd32c3bcd1fdd0
 DIST python-gentoo-patches-2.7.17-r1.tar.xz 14708 BLAKE2B f6e25236a471649de122d0f29506f7a4f34044a568ead47a68980411d9722b761fe1f9d653d5edccb6978b65c8c1eecbef55f403b94f32b37c0ad68e061505a8 SHA512 ecdde5e38c6fe5e69691fb3a68c8f4f43da7857d4abaff763d3cf6ad864ba43c769c03b186b60f2736a1ffb1e3e4c9982715d1b8a99ff3f5740096153bb8a90f
 DIST python-gentoo-patches-2.7.18-r1.tar.xz 15500 BLAKE2B 7008b29827dbbd80d4ab8f010ccf9efced99c6b4b9109e4430c0ba269ce53529cb6fedd832502c8d2d3aa21938749cc3591c2545b21c0a59a6e60f8598e84ccc SHA512 e656ab07281fd932b92165674619bbf55ecf410d2937ae4ae771d490b4532540498cc731d30d19c1e8aafd1f64df8a406bbfbb46ea985b3dcd8edb89a0b7f20f
diff --git a/dev-python/pypy/files/7.3.3-distutils-cxx.patch b/dev-python/pypy/files/7.3.3-distutils-cxx.patch
new file mode 100644
index 000000000000..d5939d7417f2
--- /dev/null
+++ b/dev-python/pypy/files/7.3.3-distutils-cxx.patch
@@ -0,0 +1,387 @@
+From 5ca45626481778f12654cd2ea8c45b5eeb2363c6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 13 Nov 2020 01:02:28 +0100
+Subject: [PATCH] Fancy patch for distutils C++ support, rebased for
+ pypy7.3.3rc1
+
+---
+ lib-python/2.7/_osx_support.py                | 10 ++--
+ lib-python/2.7/distutils/cygwinccompiler.py   | 21 ++++++-
+ lib-python/2.7/distutils/emxccompiler.py      | 14 ++++-
+ lib-python/2.7/distutils/sysconfig_cpython.py | 26 +++++++--
+ lib-python/2.7/distutils/sysconfig_pypy.py    | 37 ++++++++++---
+ lib-python/2.7/distutils/unixccompiler.py     | 55 ++++++++++---------
+ 6 files changed, 112 insertions(+), 51 deletions(-)
+
+diff --git a/lib-python/2.7/_osx_support.py b/lib-python/2.7/_osx_support.py
+index d2aaae7..8bcdb05 100644
+--- a/lib-python/2.7/_osx_support.py
++++ b/lib-python/2.7/_osx_support.py
+@@ -14,13 +14,13 @@ __all__ = [
+ # configuration variables that may contain universal build flags,
+ # like "-arch" or "-isdkroot", that may need customization for
+ # the user environment
+-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
+-                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
+-                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
+-                            'PY_CORE_CFLAGS')
++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
++                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
++                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
++                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
+ 
+ # configuration variables that may contain compiler calls
+-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
+ 
+ # prefix added to original configuration variable names
+ _INITPRE = '_OSX_SUPPORT_INITIAL_'
+diff --git a/lib-python/2.7/distutils/cygwinccompiler.py b/lib-python/2.7/distutils/cygwinccompiler.py
+index 767400c..7133097 100644
+--- a/lib-python/2.7/distutils/cygwinccompiler.py
++++ b/lib-python/2.7/distutils/cygwinccompiler.py
+@@ -120,8 +120,10 @@ class CygwinCCompiler (UnixCCompiler):
+         # dllwrap 2.10.90 is buggy
+         if self.ld_version >= "2.10.90":
+             self.linker_dll = "gcc"
++            self.linker_dll_cxx = "g++"
+         else:
+             self.linker_dll = "dllwrap"
++            self.linker_dll_cxx = "dllwrap"
+ 
+         # ld_version >= "2.13" support -shared so use it instead of
+         # -mdll -static
+@@ -135,9 +137,13 @@ class CygwinCCompiler (UnixCCompiler):
+         self.set_executables(compiler='gcc -mcygwin -O -Wall',
+                              compiler_so='gcc -mcygwin -mdll -O -Wall',
+                              compiler_cxx='g++ -mcygwin -O -Wall',
++                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
+                              linker_exe='gcc -mcygwin',
+                              linker_so=('%s -mcygwin %s' %
+-                                        (self.linker_dll, shared_option)))
++                                        (self.linker_dll, shared_option)),
++                             linker_exe_cxx='g++ -mcygwin',
++                             linker_so_cxx=('%s -mcygwin %s' %
++                                            (self.linker_dll_cxx, shared_option)))
+ 
+         # cygwin and mingw32 need different sets of libraries
+         if self.gcc_version == "2.91.57":
+@@ -163,8 +169,12 @@ class CygwinCCompiler (UnixCCompiler):
+                 raise CompileError, msg
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError, msg:
+                 raise CompileError, msg
+ 
+@@ -330,9 +340,14 @@ class Mingw32CCompiler (CygwinCCompiler):
+         self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin,
+                              compiler_so='gcc%s -mdll -O -Wall' % no_cygwin,
+                              compiler_cxx='g++%s -O -Wall' % no_cygwin,
++                             compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin,
+                              linker_exe='gcc%s' % no_cygwin,
+                              linker_so='%s%s %s %s'
+                                     % (self.linker_dll, no_cygwin,
++                                       shared_option, entry_point),
++                             linker_exe_cxx='g++%s' % no_cygwin,
++                             linker_so_cxx='%s%s %s %s'
++                                    % (self.linker_dll_cxx, no_cygwin,
+                                        shared_option, entry_point))
+         # Maybe we should also append -mthreads, but then the finished
+         # dlls need another dll (mingwm10.dll see Mingw32 docs)
+diff --git a/lib-python/2.7/distutils/emxccompiler.py b/lib-python/2.7/distutils/emxccompiler.py
+index a017205..bdc532c 100644
+--- a/lib-python/2.7/distutils/emxccompiler.py
++++ b/lib-python/2.7/distutils/emxccompiler.py
+@@ -65,8 +65,12 @@ class EMXCCompiler (UnixCCompiler):
+         # XXX optimization, warnings etc. should be customizable.
+         self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              linker_exe='gcc -Zomf -Zmt -Zcrtdll',
+-                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
++                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll',
++                             linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll',
++                             linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll')
+ 
+         # want the gcc library statically linked (so that we don't have
+         # to distribute a version dependent on the compiler we have)
+@@ -83,8 +87,12 @@ class EMXCCompiler (UnixCCompiler):
+                 raise CompileError, msg
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError, msg:
+                 raise CompileError, msg
+ 
+diff --git a/lib-python/2.7/distutils/sysconfig_cpython.py b/lib-python/2.7/distutils/sysconfig_cpython.py
+index 6a14f70..2cce5bc 100644
+--- a/lib-python/2.7/distutils/sysconfig_cpython.py
++++ b/lib-python/2.7/distutils/sysconfig_cpython.py
+@@ -181,10 +181,12 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
+-                            'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SO', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+@@ -199,19 +201,27 @@ def customize_compiler(compiler):
+             cxx = os.environ['CXX']
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = cflags + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -220,13 +230,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = so_ext
+diff --git a/lib-python/2.7/distutils/sysconfig_pypy.py b/lib-python/2.7/distutils/sysconfig_pypy.py
+index ec9f5a3..192974d 100644
+--- a/lib-python/2.7/distutils/sysconfig_pypy.py
++++ b/lib-python/2.7/distutils/sysconfig_pypy.py
+@@ -67,6 +67,7 @@ def _init_posix():
+     g['CFLAGS'] = "-DNDEBUG -O2"
+     g['CCSHARED'] = "-fPIC"
+     g['LDSHARED'] = "cc -pthread -shared"
++    g['LDCXXSHARED'] = "c++ -pthread -shared"
+     g['SO'] = [s[0] for s in imp.get_suffixes() if s[2] == imp.C_EXTENSION][0]
+     g['AR'] = "ar"
+     g['ARFLAGS'] = "rc"
+@@ -85,6 +86,7 @@ def _init_posix():
+             # just a guess
+             arch = platform.machine()
+         g['LDSHARED'] += ' -undefined dynamic_lookup'
++        g['LDCXXSHARED'] += ' -undefined dynamic_lookup'
+         g['CC'] += ' -arch %s' % (arch,)
+         g['MACOSX_DEPLOYMENT_TARGET'] = '10.7'
+ 
+@@ -183,37 +185,52 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
+-                            'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SO', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+-            if (sys.platform == 'darwin'
++            if (True
+                     and 'LDSHARED' not in os.environ
+                     and ldshared.startswith(cc)):
+                 # On OS X, if CC is overridden, use that as the default
+                 #       command for LDSHARED as well
++                # Gentoo: s/OS X/every system/
+                 ldshared = newcc + ldshared[len(cc):]
+             cc = newcc
+         if 'CXX' in os.environ:
+-            cxx = os.environ['CXX']
++            newcxx = os.environ['CXX']
++            if ('LDCXXSHARED' not in os.environ
++                    and ldcxxshared.startswith(cxx)):
++                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
++            cxx = newcxx
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -222,13 +239,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = so_ext
+diff --git a/lib-python/2.7/distutils/unixccompiler.py b/lib-python/2.7/distutils/unixccompiler.py
+index 250ff12..7e64543 100644
+--- a/lib-python/2.7/distutils/unixccompiler.py
++++ b/lib-python/2.7/distutils/unixccompiler.py
+@@ -55,14 +55,17 @@ class UnixCCompiler(CCompiler):
+     # are pretty generic; they will probably have to be set by an outsider
+     # (eg. using information discovered by the sysconfig about building
+     # Python extensions).
+-    executables = {'preprocessor' : None,
+-                   'compiler'     : ["cc"],
+-                   'compiler_so'  : ["cc"],
+-                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
+-                   'linker_so'    : ["cc", "-shared"],
+-                   'linker_exe'   : ["cc"],
+-                   'archiver'     : ["ar", "-cr"],
+-                   'ranlib'       : None,
++    executables = {'preprocessor'    : None,
++                   'compiler'        : ["cc"],
++                   'compiler_so'     : ["cc"],
++                   'compiler_cxx'    : ["c++"],
++                   'compiler_so_cxx' : ["c++"],
++                   'linker_so'       : ["cc", "-shared"],
++                   'linker_exe'      : ["cc"],
++                   'linker_so_cxx'   : ["c++", "-shared"],
++                   'linker_exe_cxx'  : ["c++"],
++                   'archiver'        : ["ar", "-cr"],
++                   'ranlib'          : None,
+                   }
+ 
+     if sys.platform[:6] == "darwin":
+@@ -129,12 +132,19 @@ class UnixCCompiler(CCompiler):
+ 
+     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+         compiler_so = self.compiler_so
++        compiler_so_cxx = self.compiler_so_cxx
+         if sys.platform == 'darwin':
+             compiler_so = _osx_support.compiler_fixup(compiler_so,
+                                                     cc_args + extra_postargs)
++            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
++                                                    cc_args + extra_postargs)
+         try:
+-            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+-                       extra_postargs)
++            if self.detect_language(src) == 'c++':
++                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
++                           extra_postargs)
++            else:
++                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
++                           extra_postargs)
+         except DistutilsExecError, msg:
+             raise CompileError, msg
+ 
+@@ -191,23 +201,16 @@ class UnixCCompiler(CCompiler):
+                 ld_args.extend(extra_postargs)
+             self.mkpath(os.path.dirname(output_filename))
+             try:
+-                if target_desc == CCompiler.EXECUTABLE:
+-                    linker = self.linker_exe[:]
++                if target_lang == "c++":
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe_cxx[:]
++                    else:
++                        linker = self.linker_so_cxx[:]
+                 else:
+-                    linker = self.linker_so[:]
+-                if target_lang == "c++" and self.compiler_cxx:
+-                    # skip over environment variable settings if /usr/bin/env
+-                    # is used to set up the linker's environment.
+-                    # This is needed on OSX. Note: this assumes that the
+-                    # normal and C++ compiler have the same environment
+-                    # settings.
+-                    i = 0
+-                    if os.path.basename(linker[0]) == "env":
+-                        i = 1
+-                        while '=' in linker[i]:
+-                            i = i + 1
+-
+-                    linker[i] = self.compiler_cxx[i]
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe[:]
++                    else:
++                        linker = self.linker_so[:]
+ 
+                 if sys.platform == 'darwin':
+                     linker = _osx_support.compiler_fixup(linker, ld_args)
+-- 
+2.29.2
+
diff --git a/dev-python/pypy/pypy-7.3.3_rc1.ebuild b/dev-python/pypy/pypy-7.3.3_rc1.ebuild
new file mode 100644
index 000000000000..74c92f4c6828
--- /dev/null
+++ b/dev-python/pypy/pypy-7.3.3_rc1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils python-utils-r1
+
+MY_P=pypy2.7-v${PV/_/}
+# note: remember to update this to newest dev-lang/python:2.7 on bump
+PATCHSET="python-gentoo-patches-2.7.18-r1"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/73"
+KEYWORDS=""
+IUSE="bzip2 gdbm +jit libressl ncurses sqlite tk"
+
+RDEPEND="
+	|| (
+		dev-python/pypy-exe:${PV}[bzip2?,ncurses?]
+		dev-python/pypy-exe-bin:${PV}
+	)
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy-bin-7.3.0:0"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	eapply "${FILESDIR}/7.3.1-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+	eapply "${FILESDIR}/7.3.3-distutils-cxx.patch"
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-i lib-python/2.7/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/2.7 > /dev/null || die
+	# TODO: cpy turkish locale patch now fixes C code
+	# probably needs better port to pypy, if it is broken there
+	eapply -p2 "${WORKDIR}/${PATCHSET}"/0010-use_pyxml.patch
+	popd > /dev/null || die
+
+	# this test relies on pypy-c hardcoding correct build time paths
+	sed -i -e 's:test_executable_without_cwd:_&:' \
+		lib-python/2.7/test/test_subprocess.py || die
+	# requires Internet
+	sed -i -e '/class NetworkedTests/i@unittest.skip("Requires networking")' \
+		lib-python/2.7/test/test_ssl.py || die
+
+	eapply_user
+}
+
+src_compile() {
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PV} pypy-c || die
+	cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PV}/* include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+	pax-mark m pypy-c
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "_ssl": "_ssl_build.py",
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( ssl audioop syslog pwdgrp resource )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x COLUMNS=80
+
+	local ignored_tests=(
+		# network
+		--ignore=lib-python/2.7/test/test_urllibnet.py
+		--ignore=lib-python/2.7/test/test_urllib2net.py
+		# lots of free space
+		--ignore=lib-python/2.7/test/test_zipfile64.py
+	)
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
+		"${ignored_tests[@]}" lib-python || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	einfo "Installing PyPy ..."
+	dosym pypy-c-${PV} "${dest}/pypy-c"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/lib/pypy2.7/include/${PV}/*; do
+		dosym "${PV}/${x##*/}" "${dest}/include/${x##*/}"
+	done
+
+	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
+			"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
+			"${ED}${dest}"/lib_pypy/_sqlite3.py \
+			"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+			"${ED}${dest}"/lib_pypy/_tkinter \
+			"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	local -x EPYTHON=pypy
+	local -x PYTHON=${ED}${dest}/pypy-c-${PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}${dest}/pypy-c-${PV}" "${PYTHON}" || die
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_moduleinto /usr/lib/pypy2.7/site-packages
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pypy3-exe-bin/Manifest b/dev-python/pypy3-exe-bin/Manifest
index 0a31df41925d..4a104ddd471e 100644
--- a/dev-python/pypy3-exe-bin/Manifest
+++ b/dev-python/pypy3-exe-bin/Manifest
@@ -4,3 +4,7 @@ DIST pypy3-exe-7.3.2-r1-1.amd64.xpak 11745754 BLAKE2B 16b6b078609b6c6fb9f87c8d6f
 DIST pypy3-exe-7.3.2-r1-1.x86.xpak 9030835 BLAKE2B 8fe13acd6bb93a60ed3f4268c1c53e7bb0101c7f68a58ddda4f7cec8fc5d4b3df463de2fbb585adbfb04349a96807a6c34246ceab76e001bfedabaddba90750b SHA512 ab463d5df575b1b8a01fa129f96b1317de37d2a0de83d124d411be63add0a241700a918885ed7128221cadfbb0d3b0d49d32d57ec25c59ec45e26e5bb1c4c0c0
 DIST pypy3-exe-7.3.2_p37-r1-1.amd64.xpak 11864985 BLAKE2B 69fe7b080ec4fe6cf3d0e06c0d7c00c17627259d57ff02a1dc0629374f92f425889a3e40b075f48687af47e97b2504252369bd106011961337fe1708d6e35561 SHA512 673de3083be18d9f62e9586eb0daae3e1a041f245ffb17fabb0b88ee6262cdd3ffd7dc723e6b72eb42057d0bbffbcc82a5c2864e585c5a1b184983445269500e
 DIST pypy3-exe-7.3.2_p37-r1-1.x86.xpak 9126391 BLAKE2B e8b68a1ce9ada6cf9a27dfcac78564d8a3020575ce9d1db7460c8aec8097abb6624bbce594d84556525253de8c620cb8acaf7e381af48d71b97bfdcfc5759a05 SHA512 29172e3d99775af10507167cd84f120677bfa752747b8d11f5434b16aea7eac9aa06bc820949cac132a2bd6e3c69df4da8a8a6bbba9cf4fe01db6cf1b0f725c6
+DIST pypy3-exe-7.3.3_rc1-1.amd64.xpak 11732062 BLAKE2B 8e2a6fbfdf3a4ada68a3f7f4993b82ca93e254ab74c3ffe581dd8e813d96663fc172bed75019c1058e48af8b6b0cd6146847e21e854d26d1e54744cc69341d22 SHA512 673765c986b78a6a00ff913c624d9d0868f6471e1f942dfab19c61c027ea459608c76c3c5a88c8a19444e958a6b882839ab10eadc0ee0b5f02df0f6ff203518b
+DIST pypy3-exe-7.3.3_rc1-1.x86.xpak 9036319 BLAKE2B d681c12cd496c9be7aea29bc9b6fbdbe1b30c38cfa511b39eae5ffb1a9b6ff06a5a728685ea8d0c0d2083dc153bd2a0c2d934381d60a1c89ba605abc629bd11c SHA512 f15f267b0e6f6edfee8aa501f9ce486612ccbbe6b60969247b81d1d0ada014704fb383d80fd93f875f2336268131884c513c02cf7396d5388019222edf41bbd1
+DIST pypy3-exe-7.3.3_rc1_p37-1.amd64.xpak 11847540 BLAKE2B b817aac3c6a74295b4ee4c034b17600bb4400b9a50d61ff0dee1a969b68430d9121d92842435cd1e7e97b7540f343a78be95a4d857e0d8ee07c8cb4fe6388b13 SHA512 b6e1d6bbdb9092322e12e6edc190f588aef24dc90b6e332b23b9678cb68b149f4b029bf5f181b076907e9ce50b1114c4965e7636fc8e2077179c0a10e1376e7c
+DIST pypy3-exe-7.3.3_rc1_p37-1.x86.xpak 9131518 BLAKE2B 8ee4b2f2daefa62fa05e4aa1942d9241df7d983dde7200947d28aff584d71ef72be0e20dedcbf830089df20e06408dd4cd70ffc5ac5afa09631f874510e2dce5 SHA512 335bbed2c2ef109513a4f633361fe9e5e8ac5bd3302ddf03095c0692dd4332b61e0b95dad411414daa6c1b5a87ce67c98fa41b4860cfe2b3832bbf5460c4a547
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_rc1.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_rc1.ebuild
new file mode 100644
index 000000000000..42a9408164ef
--- /dev/null
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_rc1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils
+
+MY_P=pypy3-exe-${PV}-1
+DESCRIPTION="PyPy3 executable (pre-built version)"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${PV}"
+KEYWORDS=""
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0/1
+	dev-libs/libffi:0/7
+	virtual/libintl:0/0
+	dev-libs/expat:0/0
+	app-arch/bzip2:0/1
+	sys-libs/ncurses:0/6
+	!dev-python/pypy-exe:${PV}"
+
+QA_PREBUILT="
+	usr/lib/pypy3.6/pypy3-c-${SLOT}"
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_install() {
+	insinto /
+	doins -r usr
+	fperms +x "/usr/lib/pypy3.6/pypy3-c-${SLOT}"
+	pax-mark m "${ED}/usr/lib/pypy3.6/pypy3-c-${SLOT}"
+}
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_rc1_p37.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_rc1_p37.ebuild
new file mode 100644
index 000000000000..f314389ade4a
--- /dev/null
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_rc1_p37.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils
+
+MY_P=pypy3-exe-${PV}-1
+DESCRIPTION="PyPy3 executable (pre-built version)"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${PV}"
+KEYWORDS=""
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0/1
+	dev-libs/libffi:0/7
+	virtual/libintl:0/0
+	dev-libs/expat:0/0
+	app-arch/bzip2:0/1
+	sys-libs/ncurses:0/6
+	!dev-python/pypy-exe:${PV}"
+
+PYPY_PV=${SLOT%_p*}
+QA_PREBUILT="
+	usr/lib/pypy3.7/pypy3-c-${PYPY_PV}"
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_install() {
+	insinto /
+	doins -r usr
+	fperms +x "/usr/lib/pypy3.7/pypy3-c-${PYPY_PV}"
+	pax-mark m "${ED}/usr/lib/pypy3.7/pypy3-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy3-exe/Manifest b/dev-python/pypy3-exe/Manifest
index 18cd2160f098..09c8da41a5db 100644
--- a/dev-python/pypy3-exe/Manifest
+++ b/dev-python/pypy3-exe/Manifest
@@ -1,3 +1,5 @@
 DIST pypy3.6-v7.3.1-src.tar.bz2 22712809 BLAKE2B 4250b3fe98c611b9635319c106b80e88ab469eab5f883babb738e175e7b7adc22c85f8ef3fdce1cdc127b521beef8d6c7862e188d8c8889c39f90136d6bbe374 SHA512 f8e32aae7f01225e0e4d6763eaac40fc02dffc3d0b6a30f22d422147f9be4f3290ea78160a912ffae311dea3d503eb31a7a4f3999d3b541fbccd93d1cef4ca56
 DIST pypy3.6-v7.3.2-src.tar.bz2 22736022 BLAKE2B e2338ac3f7af06b987c43e93eab9ff14d46262143472b0393b30b011fff67d33add45d8198cee7109354e09c52a2540938abeef364b0cf12f2891ca9c7aac2a4 SHA512 ed861a57d6edf1548c061d10295313a05d0ac54fe68a8755211ff76fa2dc78d7b1479c6152dc5d0d1cdce4e247c240c1a2edf59ec8a53d0004ec7713514c9c35
+DIST pypy3.6-v7.3.3rc1-src.tar.bz2 22401663 BLAKE2B 278b71a3b608999ee20b6558598eda453f3a87645965b8b705a11d05784722106c04b405375f62bd8e7ce2968df311314ee1672a2ddecb0f6afc49a3cbe8e670 SHA512 d865125925603e74412be7e750ab403670f05e76f2dfe6280c8b0ef123ed3e2f463d9457b65aa4f84c47a3529b2d3bca84b84307623bf995f60b549c85dcce2d
 DIST pypy3.7-v7.3.2-src.tar.bz2 25060911 BLAKE2B 35ecfee4c64e13539827c65a61e0cd359de4046f77553629cdf63479327c6ad86afd1443caa7a911a6271f496f0f3caf1b919ce91de717d0a71d008927b7f77b SHA512 563a9cf63e818b95aeb14c25b55bb5fb0bf8283f0b9f2bdd9a8833989beb651681f53f52368fb9db2c75fb60be0456eec87d48b557740b57847c4104003cb288
+DIST pypy3.7-v7.3.3rc1-src.tar.bz2 24511164 BLAKE2B 7fba1fde1bb248006f95fbb52dd9f237086f7221b99d6a288c1a32188a76ed76b1908e7f2054fd969b597c422c566214dd1e9ec409e243a776e8fa466fbf2039 SHA512 f98e7d209f75c4fa5645db16e1cc721ba80d44ad76030bd1c412800bb723ba528a83da89c8793a7e105d8391e72eeef7cb0198f9b30041178e90b628f14e5a3e
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.3_rc1.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.3_rc1.ebuild
new file mode 100644
index 000000000000..8a08b429432f
--- /dev/null
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.3_rc1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# pypy3 needs to be built using python 2
+PYTHON_COMPAT=( python2_7 )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs
+
+MY_P=pypy3.6-v${PV/_/}
+DESCRIPTION="PyPy3 executable (build from source)"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PV}"
+KEYWORDS=""
+IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	dev-libs/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	bzip2? ( app-arch/bzip2:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	!dev-python/pypy3-exe-bin:${PV}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	low-memory? ( dev-python/pypy )
+	!low-memory? (
+		|| (
+			dev-python/pypy
+			dev-lang/python:2.7
+		)
+	)"
+
+check_env() {
+	if use low-memory; then
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check_env
+
+		# unset to allow forcing pypy below :)
+		use low-memory && EPYTHON=
+		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
+				{ has_version -b dev-python/pypy ||
+				has_version -b dev-python/pypy-bin; }
+		then
+			einfo "Using PyPy to perform the translation."
+			EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please install"
+			einfo "dev-python/pypy and ensure that EPYTHON variable is unset."
+			python-any-r1_pkg_setup
+		fi
+	fi
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${EPYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${EPYTHON}" --jit loop_longevity=300 )
+	fi
+
+	if [[ ${EPYTHON} != pypy ]]; then
+		# reuse bundled pycparser to avoid external dep
+		mkdir -p "${T}"/pymod/cffi || die
+		: > "${T}"/pymod/cffi/__init__.py || die
+		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
+		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
+	fi
+
+	# translate into the C sources
+	# we're going to build them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	local dest=/usr/lib/pypy3.6
+	exeinto "${dest}"
+	newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PV}
+	insinto "${dest}"/include/${PV}
+	doins include/pypy_*
+	pax-mark m "${ED}${dest}/pypy3-c-${PV}"
+}
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.3_rc1_p37.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.3_rc1_p37.ebuild
new file mode 100644
index 000000000000..ab01a0805456
--- /dev/null
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.3_rc1_p37.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# pypy3 needs to be built using python 2
+PYTHON_COMPAT=( python2_7 )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs
+
+PYPY_PV=${PV%_p37}
+MY_P=pypy3.7-v${PYPY_PV/_/}
+DESCRIPTION="PyPy3 executable (build from source)"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PV}"
+KEYWORDS=""
+IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	dev-libs/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	bzip2? ( app-arch/bzip2:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	!dev-python/pypy3-exe-bin:${PV}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	low-memory? ( dev-python/pypy )
+	!low-memory? (
+		|| (
+			dev-python/pypy
+			dev-lang/python:2.7
+		)
+	)"
+
+check_env() {
+	if use low-memory; then
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check_env
+
+		# unset to allow forcing pypy below :)
+		use low-memory && EPYTHON=
+		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
+				{ has_version -b dev-python/pypy ||
+				has_version -b dev-python/pypy-bin; }
+		then
+			einfo "Using PyPy to perform the translation."
+			EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please install"
+			einfo "dev-python/pypy and ensure that EPYTHON variable is unset."
+			python-any-r1_pkg_setup
+		fi
+	fi
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${EPYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${EPYTHON}" --jit loop_longevity=300 )
+	fi
+
+	if [[ ${EPYTHON} != pypy ]]; then
+		# reuse bundled pycparser to avoid external dep
+		mkdir -p "${T}"/pymod/cffi || die
+		: > "${T}"/pymod/cffi/__init__.py || die
+		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
+		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
+	fi
+
+	# translate into the C sources
+	# we're going to build them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	local dest=/usr/lib/pypy3.7
+	exeinto "${dest}"
+	newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PYPY_PV}
+	insinto "${dest}"/include/${PYPY_PV}
+	doins include/pypy_*
+	pax-mark m "${ED}${dest}/pypy3-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 18cd2160f098..09c8da41a5db 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,3 +1,5 @@
 DIST pypy3.6-v7.3.1-src.tar.bz2 22712809 BLAKE2B 4250b3fe98c611b9635319c106b80e88ab469eab5f883babb738e175e7b7adc22c85f8ef3fdce1cdc127b521beef8d6c7862e188d8c8889c39f90136d6bbe374 SHA512 f8e32aae7f01225e0e4d6763eaac40fc02dffc3d0b6a30f22d422147f9be4f3290ea78160a912ffae311dea3d503eb31a7a4f3999d3b541fbccd93d1cef4ca56
 DIST pypy3.6-v7.3.2-src.tar.bz2 22736022 BLAKE2B e2338ac3f7af06b987c43e93eab9ff14d46262143472b0393b30b011fff67d33add45d8198cee7109354e09c52a2540938abeef364b0cf12f2891ca9c7aac2a4 SHA512 ed861a57d6edf1548c061d10295313a05d0ac54fe68a8755211ff76fa2dc78d7b1479c6152dc5d0d1cdce4e247c240c1a2edf59ec8a53d0004ec7713514c9c35
+DIST pypy3.6-v7.3.3rc1-src.tar.bz2 22401663 BLAKE2B 278b71a3b608999ee20b6558598eda453f3a87645965b8b705a11d05784722106c04b405375f62bd8e7ce2968df311314ee1672a2ddecb0f6afc49a3cbe8e670 SHA512 d865125925603e74412be7e750ab403670f05e76f2dfe6280c8b0ef123ed3e2f463d9457b65aa4f84c47a3529b2d3bca84b84307623bf995f60b549c85dcce2d
 DIST pypy3.7-v7.3.2-src.tar.bz2 25060911 BLAKE2B 35ecfee4c64e13539827c65a61e0cd359de4046f77553629cdf63479327c6ad86afd1443caa7a911a6271f496f0f3caf1b919ce91de717d0a71d008927b7f77b SHA512 563a9cf63e818b95aeb14c25b55bb5fb0bf8283f0b9f2bdd9a8833989beb651681f53f52368fb9db2c75fb60be0456eec87d48b557740b57847c4104003cb288
+DIST pypy3.7-v7.3.3rc1-src.tar.bz2 24511164 BLAKE2B 7fba1fde1bb248006f95fbb52dd9f237086f7221b99d6a288c1a32188a76ed76b1908e7f2054fd969b597c422c566214dd1e9ec409e243a776e8fa466fbf2039 SHA512 f98e7d209f75c4fa5645db16e1cc721ba80d44ad76030bd1c412800bb723ba528a83da89c8793a7e105d8391e72eeef7cb0198f9b30041178e90b628f14e5a3e
diff --git a/dev-python/pypy3/pypy3-7.3.3_rc1.ebuild b/dev-python/pypy3/pypy3-7.3.3_rc1.ebuild
new file mode 100644
index 000000000000..87a53e5f5c2f
--- /dev/null
+++ b/dev-python/pypy3/pypy3-7.3.3_rc1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit pax-utils python-any-r1 toolchain-funcs
+
+MY_P=pypy3.6-v${PV/_/}
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.6) language"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+SLOT="0/pypy36-pp73"
+KEYWORDS=""
+IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	|| (
+		dev-python/pypy3-exe:${PV}[bzip2?,ncurses?]
+		dev-python/pypy3-exe-bin:${PV}
+	)
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy3-bin-7.3.0:0"
+DEPEND="${RDEPEND}
+	test? (
+		${PYTHON_DEPS}
+		!!dev-python/pytest-forked
+	)"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/7.3.1-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+	eapply "${FILESDIR}"/7.2.0-distutils-cxx.patch
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-i lib-python/3/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/3 > /dev/null || die
+	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
+	popd > /dev/null || die
+
+	# see http://buildbot.pypy.org/summary?branch=py3.6&builder=pypy-c-jit-linux-x86-64
+	sed -i -e 's:test_jumpy:_&:' \
+		lib-python/3/test/test_dis.py || die
+	sed -i -e 's:test_get_and_set_scheduler_and_param:_&:' \
+		lib-python/3/test/test_posix.py || die
+	sed -i -e 's:test_auto_history:_&:' \
+		-e 's:test_history_size:_&:' \
+		lib-python/3/test/test_readline.py || die
+	sed -i -e 's:test_eval_bytes_invalid_escape:_&:' \
+		-e 's:test_eval_str_invalid_escape:_&:' \
+		lib-python/3/test/test_string_literals.py || die
+	sed -i -e 's:test_jump_out_of_async_for_block:_&:' \
+		-e 's:test_jump_over_async_for_block_before_else:_&:' \
+		-e 's:test_no_jump_.*wards_into_async_for_block:_&:' \
+		-e 's:test_no_jump_into_async_for_block_before_else:_&:' \
+		-e 's:test_no_jump_from_yield:_&:' \
+		lib-python/3/test/test_sys_settrace.py || die
+	sed -i -e 's:test_circular_imports:_&:' \
+		lib-python/3/test/test_threaded_import.py || die
+
+	# the first one's broken by sandbox, the second by our env
+	sed -i -e 's:test_empty_env:_&:' \
+		-e 's:test_executable(:_&:' \
+		-e 's:test_executable_without_cwd:_&:' \
+		lib-python/3/test/test_subprocess.py || die
+
+	# XXX
+	sed -i -e 's:test_locale:_&:' \
+		lib-python/3/test/test_format.py || die
+	sed -i -e 's:test_decompressor_bug_28275:_&:' \
+		lib-python/3/test/test_lzma.py || die
+
+	eapply_user
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_compile() {
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/lib/pypy3.6/pypy3-c-${PV} pypy3-c || die
+	cp -p "${BROOT}"/usr/lib/pypy3.6/include/${PV}/* include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+	pax-mark m pypy3-c
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "_blake2": "_blake2/_blake2_build.py",
+#    "_ssl": "_ssl_build.py",
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+#    "lzma": "_lzma_build.py",
+#    "_decimal": "_decimal_build.py",
+#    "_sha3": "_sha3/_sha3_build.py",
+	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
+		audioop syslog pwdgrp resource lzma decimal )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x COLUMNS=80
+
+	# Test runner requires Python 2 too. However, it spawns PyPy3
+	# internally so that we end up testing the correct interpreter.
+	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy3.6
+	einfo "Installing PyPy ..."
+	dosym pypy3-c-${PV} "${dest}/pypy3-c"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/lib/pypy3.6/include/${PV}/*; do
+		dosym "${PV}/${x##*/}" "${dest}/include/${x##*/}"
+	done
+
+	dosym ../lib/pypy3.6/pypy3-c /usr/bin/pypy3
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \
+			"${ED}${dest}"/lib_pypy/_sqlite3* \
+			"${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \
+			"${ED}${dest}"/lib_pypy/_tkinter \
+			"${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	local -x EPYTHON=pypy3
+	local -x PYTHON=${ED}${dest}/pypy3-c-${PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}${dest}/pypy3-c-${PV}" "${PYTHON}" || die
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_moduleinto /usr/lib/pypy3.6/site-packages
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pypy3/pypy3-7.3.3_rc1_p37.ebuild b/dev-python/pypy3/pypy3-7.3.3_rc1_p37.ebuild
new file mode 100644
index 000000000000..9197988f2d9a
--- /dev/null
+++ b/dev-python/pypy3/pypy3-7.3.3_rc1_p37.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=( python2_7 )
+inherit pax-utils python-any-r1 toolchain-funcs
+
+PYPY_PV=${PV%_p37}
+MY_P=pypy3.7-v${PYPY_PV/_/}
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.7) language"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+SLOT="0/pypy37-pp73"
+KEYWORDS=""
+IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
+# pypy3.7 is in alpha state and a lot of tests are failing
+RESTRICT="test"
+
+RDEPEND="
+	|| (
+		dev-python/pypy3-exe:${PV}[bzip2?,ncurses?]
+		dev-python/pypy3-exe-bin:${PV}
+	)
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy3-bin-7.3.0:0"
+DEPEND="${RDEPEND}
+	test? (
+		${PYTHON_DEPS}
+		!!dev-python/pytest-forked
+	)"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/7.3.1-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+	eapply "${FILESDIR}/7.3.2-py37-distutils-cxx.patch"
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-i lib-python/3/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/3 > /dev/null || die
+	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_compile() {
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/lib/pypy3.7/pypy3-c-${PYPY_PV} pypy3-c || die
+	cp -p "${BROOT}"/usr/lib/pypy3.7/include/${PYPY_PV}/* include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+	pax-mark m pypy3-c
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "_blake2": "_blake2/_blake2_build.py",
+#    "_ssl": "_ssl_build.py",
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+#    "lzma": "_lzma_build.py",
+#    "_decimal": "_decimal_build.py",
+#    "_sha3": "_sha3/_sha3_build.py",
+	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
+		audioop syslog pwdgrp resource lzma decimal )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x COLUMNS=80
+
+	# Test runner requires Python 2 too. However, it spawns PyPy3
+	# internally so that we end up testing the correct interpreter.
+	# (--deselect for failing doctests)
+	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy3.7
+	einfo "Installing PyPy ..."
+	dosym pypy3-c-${PYPY_PV} "${dest}/pypy3-c"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/lib/pypy3.7/include/${PYPY_PV}/*; do
+		dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
+	done
+
+	dosym ../lib/pypy3.7/pypy3-c /usr/bin/pypy3
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \
+			"${ED}${dest}"/lib_pypy/_sqlite3* \
+			"${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \
+			"${ED}${dest}"/lib_pypy/_tkinter \
+			"${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	local -x EPYTHON=pypy3
+	local -x PYTHON=${ED}${dest}/pypy3-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}${dest}/pypy3-c-${PYPY_PV}" "${PYTHON}" || die
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_moduleinto /usr/lib/pypy3.7/site-packages
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pyroute2/Manifest b/dev-python/pyroute2/Manifest
index 1f7845b9dae4..e997e6d6e5c2 100644
--- a/dev-python/pyroute2/Manifest
+++ b/dev-python/pyroute2/Manifest
@@ -1,2 +1 @@
-DIST pyroute2-0.5.12.tar.gz 425500 BLAKE2B 2b8f919bc7fc9caea9f4dd41b110e8a321406de998598408bbd12d6d62fcae009d01511271e462a4118311f12c54bf51696c0334da2ce9cb185688e35994b0a8 SHA512 6115826a43f6392a727fe2dde0dd24317f35c3a7af5e45459766c3fbe9853540c68f9a9a2233c266e866f3decd22dab0032117f687758f69b962ac6606d4cbdf
 DIST pyroute2-0.5.14.tar.gz 436853 BLAKE2B 9febcd6563d89b5ffd71342d8d83a3251494f978ad4449532b568cf0929c9f3d8d8d36e1a0b0f6733013e12f6322aea46d991a22f5c3fa93e47dfa08376ddd13 SHA512 9601cf8133b703c55770b6292cca1e907a029689aaeb350b6eee40406b56de5563ee0ba37b4814540c365a5974be78a024dcb27bc7ee00eac74676f4013cf277
diff --git a/dev-python/pyroute2/metadata.xml b/dev-python/pyroute2/metadata.xml
index 883f1278953b..864688f6fe8a 100644
--- a/dev-python/pyroute2/metadata.xml
+++ b/dev-python/pyroute2/metadata.xml
@@ -9,6 +9,7 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pyroute2</remote-id>
 		<remote-id type="github">svinota/pyroute2</remote-id>
diff --git a/dev-python/pyroute2/pyroute2-0.5.12-r1.ebuild b/dev-python/pyroute2/pyroute2-0.5.12-r1.ebuild
deleted file mode 100644
index e4c7dab8008c..000000000000
--- a/dev-python/pyroute2/pyroute2-0.5.12-r1.ebuild
+++ /dev/null
@@ -1,41 +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} pypy3 )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="A pure Python netlink and Linux network configuration library."
-HOMEPAGE="https://github.com/svinota/pyroute2"
-SRC_URI="https://github.com/svinota/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-RESTRICT="!test? ( test )"
-
-# tests need root access
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}/pyroute2-0.5.12-readme-filename.patch"
-)
-
-distutils_enable_tests nose
-
-python_prepare_all() {
-	sed -i "s/^release.*/release := ${PV}/" Makefile || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pyroute2/pyroute2-0.5.14.ebuild b/dev-python/pyroute2/pyroute2-0.5.14.ebuild
index 2c8bef309349..655607284ed0 100644
--- a/dev-python/pyroute2/pyroute2-0.5.14.ebuild
+++ b/dev-python/pyroute2/pyroute2-0.5.14.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/svinota/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 BDEPEND="test? ( dev-python/psutil[${PYTHON_USEDEP}] )"
diff --git a/dev-python/pyscreenshot/pyscreenshot-2.2.ebuild b/dev-python/pyscreenshot/pyscreenshot-2.2.ebuild
index 6dbcc4552570..67e2ca1a19be 100644
--- a/dev-python/pyscreenshot/pyscreenshot-2.2.ebuild
+++ b/dev-python/pyscreenshot/pyscreenshot-2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ponty/pyscreenshot/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="test? (
 	dev-python/path-py[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-mock/files/pytest-mock-2.0.0-warnings.patch b/dev-python/pytest-mock/files/pytest-mock-2.0.0-warnings.patch
deleted file mode 100644
index bea2bb14b15d..000000000000
--- a/dev-python/pytest-mock/files/pytest-mock-2.0.0-warnings.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 09477f0d28f3b6b9fa36b861d701c9d1a937e553 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 26 May 2020 10:56:27 +0200
-Subject: [PATCH] Permit warnings in *_stale_pyc tests
-
-The *_stale_pyc test is repeatedly failing on production systems
-due to additional pytest plugins being installed and triggering
-PytestAssertRewriteWarnings.  This causes 'passed *' string not to match
-because of the ',' after 'passed'.  Match just 'passed*' instead
-to solve this.
----
- tests/test_pytest_mock.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_pytest_mock.py b/tests/test_pytest_mock.py
-index d1635f5..e85f392 100644
---- a/tests/test_pytest_mock.py
-+++ b/tests/test_pytest_mock.py
-@@ -801,7 +801,7 @@ def test_abort_patch_context_manager_with_stale_pyc(testdir):
-     """
-     )
-     result = testdir.runpytest()
--    result.stdout.fnmatch_lines("* 1 passed *")
-+    result.stdout.fnmatch_lines("* 1 passed*")
- 
-     kwargs = {"legacy": True} if sys.version_info[0] >= 3 else {}
-     assert compileall.compile_file(str(py_fn), **kwargs)
-@@ -811,4 +811,4 @@ def test_abort_patch_context_manager_with_stale_pyc(testdir):
- 
-     py_fn.remove()
-     result = testdir.runpytest()
--    result.stdout.fnmatch_lines("* 1 passed *")
-+    result.stdout.fnmatch_lines("* 1 passed*")
--- 
-2.26.2
-
diff --git a/dev-python/pytest-rerunfailures/metadata.xml b/dev-python/pytest-rerunfailures/metadata.xml
index 22f4da14655a..ddaefd86cfaf 100644
--- a/dev-python/pytest-rerunfailures/metadata.xml
+++ b/dev-python/pytest-rerunfailures/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pytest-rerunfailures</remote-id>
   </upstream>
diff --git a/dev-python/pytest-xprocess/Manifest b/dev-python/pytest-xprocess/Manifest
index 766993d5d430..4d67ee2f3808 100644
--- a/dev-python/pytest-xprocess/Manifest
+++ b/dev-python/pytest-xprocess/Manifest
@@ -1,3 +1,2 @@
-DIST pytest-xprocess-0.13.1.tar.gz 10273 BLAKE2B 0c2a8bdf5e31543b32ada50f2bb5e1a09b45de820064807bf41321638d11d6b6fea28fd2a8c795e7bc6f7ac7370a3e78988e8aee318fad9df194fd3b06cce7cd SHA512 e0ab9e13d7f90ffca1bb3646e5789582806519ff5e665e13ed0db00896d799a7828b39e7657e947783d15ec1a961b33c1c981e39069dd298bf352826dbdc496f
 DIST pytest-xprocess-0.15.0.tar.gz 13512 BLAKE2B 97ffef1e63f50ad2a1651f1791663f99e39c8fd8fc63427534efa5d60c9a4d856b7e036cd03faed73a1ba609716595ceeefe63604403a2bbd8a13407612a6402 SHA512 d2c7f6859b1696a8cb4445396376ce36bdcfdc8677fd97def716f240ae243c954f4110a3e500315a7f0c7f7ab7c337bf6749cbd1df3485db9fb95f42c2ffd181
 DIST pytest-xprocess-0.16.0.tar.gz 17218 BLAKE2B 60411ed5af2add7f7c7f6b6e2074f9703cdae8a450c65eda483635a1cf8f60a3dbd84218d9e99bb3783ae00ba50b3449335df92397dab0fc7281ea72d3f5696b SHA512 3cf5d05c6693ebddc91fb2ad62eacd5b8f231e78ee82908b20268367649d6d73f0c1fbbf93a31f97feabe8bddf02cb176b2ffb9f6de4387b46cd0b97ad3c3eea
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.13.1-r1.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.13.1-r1.ebuild
deleted file mode 100644
index 63ce134ecb3e..000000000000
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.13.1-r1.ebuild
+++ /dev/null
@@ -1,23 +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,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage external processes across test runs"
-HOMEPAGE="https://pypi.org/project/pytest-xprocess/ https://github.com/pytest-dev/pytest-xprocess"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.15.0.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.15.0.ebuild
index d9f406cc465b..63ce134ecb3e 100644
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.15.0.ebuild
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.15.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/python-blazarclient/metadata.xml b/dev-python/python-blazarclient/metadata.xml
index 3ee70120def4..631e40d11e7e 100644
--- a/dev-python/python-blazarclient/metadata.xml
+++ b/dev-python/python-blazarclient/metadata.xml
@@ -8,4 +8,5 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/python-bugzilla/Manifest b/dev-python/python-bugzilla/Manifest
index 4e90a1beb794..db73f4f97043 100644
--- a/dev-python/python-bugzilla/Manifest
+++ b/dev-python/python-bugzilla/Manifest
@@ -1,3 +1,3 @@
-DIST python-bugzilla-2.5.0.tar.gz 110931 BLAKE2B e7a4dc0ee00abd4bd4c55aafac8a8d2902ade116b9f35d881c3ea07441b340dc247405951b5437545720c1742f54aae3c28fe64f93191a4d7f178a3cd2db7a0e SHA512 a840db5790a7f45cdcf6ef9e261d86c6b930db30ab6340a1f351b3fd32f32e4d0f6afb68af9befef5d4e84969d568471c5c236be047f6dbab52534af3570a244
 DIST python-bugzilla-3.0.0.tar.gz 112525 BLAKE2B f2746091c0152779f49502fd3394e41fdd16349c93806829a06561c49d47f6d9c9ee3b75135b9d6f66dcbb95b892aa62108634ec2e5f642b25e2cce2d06d997b SHA512 1762b1eeed125f3d35f36fa2673c1e9e808209b8723c0fdbf06f3327c40d3a5795b668913d01cf91cde3e4a0516e35c82015dbb6fc575c97b82bb421525ff03f
 DIST python-bugzilla-3.0.1.tar.gz 112600 BLAKE2B b8c81b1b3f16e9b180763dcad8615c2847bf11c2a424d1fe4995091b466c202c23c072659066f66830d6d80a96a864e4148daa7a099edd2962f28345b9c9a8af SHA512 b372aa142e9e3eb456f4bba7cbc71056304ae333635c9ae85605bdcae1e5e92e13263500dba0f844c9c577bcede8ea988a753bfe23e016c8da17f3b6e9efdf3f
+DIST python-bugzilla-3.0.2.tar.gz 115324 BLAKE2B 3f64af96bf61d16e720338055391b187f53a968488535e76a5d6e56817030fc1c45f824ed27424b3e7440dc03759e77bcb8d417fa2278aa611b995bea2775f7a SHA512 c4fb79c9ca4d813a5dd9573e9a300aa01ea713fa11d43e2ee7ca13efb4720fed14fff339e9cc1b756505f43348768f0fdaaa8ae0b370640ff70e402f852e9b1a
diff --git a/dev-python/python-bugzilla/python-bugzilla-3.0.0.ebuild b/dev-python/python-bugzilla/python-bugzilla-3.0.0.ebuild
index 24046df4f1db..f997f2f1be61 100644
--- a/dev-python/python-bugzilla/python-bugzilla-3.0.0.ebuild
+++ b/dev-python/python-bugzilla/python-bugzilla-3.0.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A python module for interacting with Bugzilla over XMLRPC"
 HOMEPAGE="https://github.com/python-bugzilla/python-bugzilla"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 LICENSE="GPL-2+"
 SLOT="0"
 
diff --git a/dev-python/python-bugzilla/python-bugzilla-2.5.0.ebuild b/dev-python/python-bugzilla/python-bugzilla-3.0.2.ebuild
similarity index 93%
rename from dev-python/python-bugzilla/python-bugzilla-2.5.0.ebuild
rename to dev-python/python-bugzilla/python-bugzilla-3.0.2.ebuild
index f997f2f1be61..24046df4f1db 100644
--- a/dev-python/python-bugzilla/python-bugzilla-2.5.0.ebuild
+++ b/dev-python/python-bugzilla/python-bugzilla-3.0.2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A python module for interacting with Bugzilla over XMLRPC"
 HOMEPAGE="https://github.com/python-bugzilla/python-bugzilla"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 LICENSE="GPL-2+"
 SLOT="0"
 
diff --git a/dev-python/python-ceilometerclient/metadata.xml b/dev-python/python-ceilometerclient/metadata.xml
index d5a99cc1367a..3db2d512370d 100644
--- a/dev-python/python-ceilometerclient/metadata.xml
+++ b/dev-python/python-ceilometerclient/metadata.xml
@@ -13,6 +13,7 @@
 		This is a client library for Ceilometer built on the Ceilometer API. It
 		provides a Python API (the ceilometerclient module) and a command-line tool (ceilometer).
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">python-ceilometerclient</remote-id>
 		<remote-id type="github">openstack/python-ceilometerclient</remote-id>
diff --git a/dev-python/python-cinderclient/metadata.xml b/dev-python/python-cinderclient/metadata.xml
index 89b79ab63e40..e690cb365128 100644
--- a/dev-python/python-cinderclient/metadata.xml
+++ b/dev-python/python-cinderclient/metadata.xml
@@ -9,6 +9,7 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">python-cinderclient</remote-id>
     <remote-id type="launchpad">python-cinderclient</remote-id>
diff --git a/dev-python/python-daemon/metadata.xml b/dev-python/python-daemon/metadata.xml
index 19019cc44c02..abe3281e9421 100644
--- a/dev-python/python-daemon/metadata.xml
+++ b/dev-python/python-daemon/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">python-daemon</remote-id>
 	</upstream>
diff --git a/dev-python/python-daemon/python-daemon-2.2.4.ebuild b/dev-python/python-daemon/python-daemon-2.2.4.ebuild
index c732f2ebbde7..30bac6cf4593 100644
--- a/dev-python/python-daemon/python-daemon-2.2.4.ebuild
+++ b/dev-python/python-daemon/python-daemon-2.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/python-glanceclient/metadata.xml b/dev-python/python-glanceclient/metadata.xml
index 9196a5b2dbdc..022d661c2d67 100644
--- a/dev-python/python-glanceclient/metadata.xml
+++ b/dev-python/python-glanceclient/metadata.xml
@@ -9,6 +9,7 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">python-glanceclient</remote-id>
     <remote-id type="github">openstack/python-glanceclient</remote-id>
diff --git a/dev-python/python-heatclient/metadata.xml b/dev-python/python-heatclient/metadata.xml
index 7b130c7316f2..569ee5741ed0 100644
--- a/dev-python/python-heatclient/metadata.xml
+++ b/dev-python/python-heatclient/metadata.xml
@@ -9,6 +9,7 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">python-heatclient</remote-id>
   </upstream>
diff --git a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild
index 33b6d6e78990..5c641f31ecab 100644
--- a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild
+++ b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/python-keystoneclient/metadata.xml b/dev-python/python-keystoneclient/metadata.xml
index 78397ff12367..a0f8b1fa8570 100644
--- a/dev-python/python-keystoneclient/metadata.xml
+++ b/dev-python/python-keystoneclient/metadata.xml
@@ -9,6 +9,7 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">python-keystoneclient</remote-id>
   </upstream>
diff --git a/dev-python/python-language-server/python-language-server-0.35.1-r1.ebuild b/dev-python/python-language-server/python-language-server-0.35.1-r1.ebuild
index 884370818a7c..448f19adc85a 100644
--- a/dev-python/python-language-server/python-language-server-0.35.1-r1.ebuild
+++ b/dev-python/python-language-server/python-language-server-0.35.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/python-ldap/python-ldap-3.3.1.ebuild b/dev-python/python-ldap/python-ldap-3.3.1.ebuild
index 2253b09dab6a..633024efc05d 100644
--- a/dev-python/python-ldap/python-ldap-3.3.1.ebuild
+++ b/dev-python/python-ldap/python-ldap-3.3.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
 fi
 
 LICENSE="PSF-2"
diff --git a/dev-python/python-magnumclient/metadata.xml b/dev-python/python-magnumclient/metadata.xml
index 613fd157a4e8..1febf4924cb9 100644
--- a/dev-python/python-magnumclient/metadata.xml
+++ b/dev-python/python-magnumclient/metadata.xml
@@ -9,6 +9,7 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">python-magnumclient</remote-id>
 		<remote-id type="github">openstack/python-magnumclient</remote-id>
diff --git a/dev-python/python-manilaclient/metadata.xml b/dev-python/python-manilaclient/metadata.xml
index c04205840a7e..aff03ce98fc3 100644
--- a/dev-python/python-manilaclient/metadata.xml
+++ b/dev-python/python-manilaclient/metadata.xml
@@ -9,6 +9,7 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">python-manilaclient</remote-id>
 		<remote-id type="github">openstack/python-manilaclient</remote-id>
diff --git a/dev-python/python-mistralclient/metadata.xml b/dev-python/python-mistralclient/metadata.xml
index 5fdf08e55bc5..e3c12e29ffb0 100644
--- a/dev-python/python-mistralclient/metadata.xml
+++ b/dev-python/python-mistralclient/metadata.xml
@@ -9,6 +9,7 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">python-mistralclient</remote-id>
     <remote-id type="github">openstack/python-mistralclient</remote-id>
diff --git a/dev-python/python-monascaclient/metadata.xml b/dev-python/python-monascaclient/metadata.xml
index 5ee1512f006b..b704f4ceb940 100644
--- a/dev-python/python-monascaclient/metadata.xml
+++ b/dev-python/python-monascaclient/metadata.xml
@@ -9,6 +9,7 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">python-monascaclient</remote-id>
     <remote-id type="github">openstack/python-monascaclient</remote-id>
diff --git a/dev-python/python-neutronclient/metadata.xml b/dev-python/python-neutronclient/metadata.xml
index abb39171838b..e5e5b124bb61 100644
--- a/dev-python/python-neutronclient/metadata.xml
+++ b/dev-python/python-neutronclient/metadata.xml
@@ -9,6 +9,7 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">python-neutronclient</remote-id>
     <remote-id type="launchpad">neutron</remote-id>
diff --git a/dev-python/python-novaclient/metadata.xml b/dev-python/python-novaclient/metadata.xml
index 4a42bfb639f1..f168af5fbc8f 100644
--- a/dev-python/python-novaclient/metadata.xml
+++ b/dev-python/python-novaclient/metadata.xml
@@ -15,6 +15,7 @@
   and a command-line script (nova).
   Each implements 100% of the OpenStack Nova API.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">python-novaclient</remote-id>
     <remote-id type="github">openstack/python-novaclient</remote-id>
diff --git a/dev-python/python-openstackclient/metadata.xml b/dev-python/python-openstackclient/metadata.xml
index 72295857a915..b8bee6e81b09 100644
--- a/dev-python/python-openstackclient/metadata.xml
+++ b/dev-python/python-openstackclient/metadata.xml
@@ -9,6 +9,7 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">python-openstackclient</remote-id>
     <remote-id type="github">openstack/python-openstackclient</remote-id>
diff --git a/dev-python/python-senlinclient/metadata.xml b/dev-python/python-senlinclient/metadata.xml
index 17025f778bed..2fd3bf60633d 100644
--- a/dev-python/python-senlinclient/metadata.xml
+++ b/dev-python/python-senlinclient/metadata.xml
@@ -9,6 +9,7 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">python-senlinclient</remote-id>
 		<remote-id type="github">openstack/python-senlinclient</remote-id>
diff --git a/dev-python/python-swiftclient/metadata.xml b/dev-python/python-swiftclient/metadata.xml
index a010a5af3d53..a1c76340971a 100644
--- a/dev-python/python-swiftclient/metadata.xml
+++ b/dev-python/python-swiftclient/metadata.xml
@@ -8,6 +8,7 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">python-swiftclient</remote-id>
     <remote-id type="launchpad">python-swiftclient</remote-id>
diff --git a/dev-python/python-troveclient/metadata.xml b/dev-python/python-troveclient/metadata.xml
index c0a405d5dac8..ff96511157dd 100644
--- a/dev-python/python-troveclient/metadata.xml
+++ b/dev-python/python-troveclient/metadata.xml
@@ -9,6 +9,7 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">python-troveclient</remote-id>
     <remote-id type="github">openstack/python-troveclient</remote-id>
diff --git a/dev-python/python-vitrageclient/metadata.xml b/dev-python/python-vitrageclient/metadata.xml
index 3ee70120def4..631e40d11e7e 100644
--- a/dev-python/python-vitrageclient/metadata.xml
+++ b/dev-python/python-vitrageclient/metadata.xml
@@ -8,4 +8,5 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/python-zunclient/metadata.xml b/dev-python/python-zunclient/metadata.xml
index 3ee70120def4..631e40d11e7e 100644
--- a/dev-python/python-zunclient/metadata.xml
+++ b/dev-python/python-zunclient/metadata.xml
@@ -8,4 +8,5 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/pyvirtualdisplay/pyvirtualdisplay-1.3.2.ebuild b/dev-python/pyvirtualdisplay/pyvirtualdisplay-1.3.2.ebuild
index cc01722c6b06..51c1c3aa0d2b 100644
--- a/dev-python/pyvirtualdisplay/pyvirtualdisplay-1.3.2.ebuild
+++ b/dev-python/pyvirtualdisplay/pyvirtualdisplay-1.3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ponty/PyVirtualDisplay/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="test? (
 	dev-python/backports[${PYTHON_USEDEP}]
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index 3bb9af9b1a1b..20950bd9d595 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,2 +1,3 @@
 DIST pyzmq-19.0.1_p20200608.tar.gz 390927 BLAKE2B d70a2f615782cc5a53ed2ffab4d5549bc5d15cc1e0e63f640a357fe8575ca327a5976a3e8b11d97c236a31ca17025f37fe423d166b684b5c4aafc139a0941492 SHA512 7f077ed3858c226eb1e3f5e51dfb5d4b517ec94357b37cc66d17cfe2543786b86627ce7eb4c12785a2709a499af998d02642d972c119a637df3cec5201e909d1
 DIST pyzmq-19.0.2.tar.gz 390927 BLAKE2B d70a2f615782cc5a53ed2ffab4d5549bc5d15cc1e0e63f640a357fe8575ca327a5976a3e8b11d97c236a31ca17025f37fe423d166b684b5c4aafc139a0941492 SHA512 7f077ed3858c226eb1e3f5e51dfb5d4b517ec94357b37cc66d17cfe2543786b86627ce7eb4c12785a2709a499af998d02642d972c119a637df3cec5201e909d1
+DIST pyzmq-20.0.0.gh.tar.gz 393041 BLAKE2B 1f22f556f5d0f2755c2e56411fdb9f583bbdfad6315e4e72fbaa1fb18d0ad5436ee0ee8d17497641421cea3f4e1b53b8ff85bf7ced96c8f1c80db0be901ca3d5 SHA512 30359e501e76d6ec14175622d6c970d9ec0f227b372d2b1c6e6650be812dd47017b797a016f5a2da83f72d00536e64d2f005a38003c9a1b4fbb7266f2640782d
diff --git a/dev-python/pyzmq/pyzmq-20.0.0.ebuild b/dev-python/pyzmq/pyzmq-20.0.0.ebuild
new file mode 100644
index 000000000000..6331efd8fcf1
--- /dev/null
+++ b/dev-python/pyzmq/pyzmq-20.0.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit flag-o-matic distutils-r1 toolchain-funcs
+
+DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
+HOMEPAGE="
+	https://www.zeromq.org/bindings:python
+	https://pypi.org/project/pyzmq/
+	https://github.com/zeromq/pyzmq/"
+SRC_URI="
+	https://github.com/zeromq/pyzmq/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="+draft"
+
+DEPEND="
+	>=net-libs/zeromq-4.2.2-r2:=[drafts]
+"
+# it uses cffi backend for pypy, cython backend for cpython
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/py[${PYTHON_USEDEP}]
+		dev-python/cffi:=[${PYTHON_USEDEP}]
+	' pypy3)
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/cython[${PYTHON_USEDEP}]
+	' 'python*')
+	test? (
+		>=www-servers/tornado-5.0.2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	"dev-python/numpydoc"
+
+python_configure_all() {
+	tc-export CC
+	append-cppflags -DZMQ_BUILD_DRAFT_API=$(usex draft '1' '0')
+}
+
+python_compile() {
+	esetup.py cython --force
+	distutils-r1_python_compile
+}
+
+python_test() {
+	local deselect=(
+		# broken tests
+		zmq/tests/test_asyncio.py::TestAsyncioAuthentication::test_curve_user_id
+		zmq/tests/test_asyncio.py::TestThreadAuthentication::test_curve_user_id
+		zmq/tests/test_auth.py::TestThreadAuthentication::test_curve_user_id
+		zmq/tests/test_constants.py::TestConstants::test_draft
+		zmq/tests/test_draft.py::TestDraftSockets::test_client_server
+		zmq/tests/test_draft.py::TestDraftSockets::test_radio_dish
+		zmq/tests/test_message.py::TestFrame::test_buffer_numpy
+		zmq/tests/test_message.py::TestFrame::test_bytes
+		zmq/tests/test_message.py::TestFrame::test_frame_more
+		zmq/tests/test_message.py::TestFrame::test_lifecycle1
+		zmq/tests/test_message.py::TestFrame::test_lifecycle2
+		zmq/tests/test_message.py::TestFrame::test_memoryview_shape
+		zmq/tests/test_message.py::TestFrame::test_multi_tracker
+		zmq/tests/test_message.py::TestFrame::test_tracker
+		zmq/tests/test_security.py::TestSecurity::test_curve
+		zmq/tests/test_security.py::TestSecurity::test_plain
+		zmq/tests/test_socket.py::TestSocket::test_large_send
+		zmq/tests/test_socket.py::TestSocket::test_tracker
+		zmq/tests/test_socket.py::TestSocketGreen::test_large_send
+
+		# hanging tests
+		zmq/tests/test_socket.py::TestSocketGreen::test_tracker
+	)
+
+	pytest -vv ${deselect[@]/#/--deselect } ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/readme_renderer/readme_renderer-27.0.ebuild b/dev-python/readme_renderer/readme_renderer-27.0.ebuild
index f8236e8ca574..ccea32933f1d 100644
--- a/dev-python/readme_renderer/readme_renderer-27.0.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-27.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/reno/Manifest b/dev-python/reno/Manifest
index feab07451c05..b7302f283d4a 100644
--- a/dev-python/reno/Manifest
+++ b/dev-python/reno/Manifest
@@ -1,2 +1 @@
-DIST reno-2.11.3.tar.gz 73296 BLAKE2B a09c79c12945396425f2d3a45259e15e1fe8909df107de90884a51c87a5f4ac9f425907c1f9f401417d979e8762f80f188d2e783a7ff36541c107a9497a12746 SHA512 8d5bfe30c7a886d295d77b3d38e7fde09a8febacfacbf984f919bd5c813d81999870684f7da5b3e77a95436c912ea8e275b68548622462218356e23ad084140c
 DIST reno-3.2.0.tar.gz 77316 BLAKE2B 43fe83a5f4c3e812daa3d2456f6c3b0bc7ba661193187f05527108e7b182dd078ec7a26b39e2939d51efc231e60f3d503479a4729b391faf764fa1e5d941c967 SHA512 b0399e5472afa4c883af563949cf4083571ee6dfcc05babb9845fa44fb9cfa2d0a1be6f315915597c22e86e0504102cb4f90aee59273ccbaceb15e93ed078b65
diff --git a/dev-python/reno/metadata.xml b/dev-python/reno/metadata.xml
index d9ed302410fe..947dd7dbb1dc 100644
--- a/dev-python/reno/metadata.xml
+++ b/dev-python/reno/metadata.xml
@@ -5,6 +5,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">reno</remote-id>
 	</upstream>
diff --git a/dev-python/reno/reno-2.11.3.ebuild b/dev-python/reno/reno-2.11.3.ebuild
deleted file mode 100644
index 9ed1b48a725b..000000000000
--- a/dev-python/reno/reno-2.11.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Release notes manager, storing release notes in a git repo and building docs"
-HOMEPAGE="https://pypi.org/project/reno/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc64 x86"
-IUSE=""
-
-BDEPEND=">=dev-python/pbr-1.4[${PYTHON_USEDEP}]"
-RDEPEND="${BDEPEND}
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/reno/reno-3.2.0.ebuild b/dev-python/reno/reno-3.2.0.ebuild
index 3a693a7badac..9408169f6b9d 100644
--- a/dev-python/reno/reno-3.2.0.ebuild
+++ b/dev-python/reno/reno-3.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/routes/Manifest b/dev-python/routes/Manifest
index 68ceaccf3907..319143004d09 100644
--- a/dev-python/routes/Manifest
+++ b/dev-python/routes/Manifest
@@ -1,2 +1 @@
-DIST Routes-2.4.1.tar.gz 182403 BLAKE2B 21a079616e1533af8fae44b0ad428b3309e5e8d1e27dddddbf3632cb3e1f5286225aec73246012a8c7c22d59d755be27f10fa09ab6ee6b34f71c6c540dfd36e4 SHA512 b0566f10ca83af0459e9c59fa2217bdc5ebf349d944396bcb21ffa731ad189c642e409381979cb5da3153630c24f20aa974a99711f16aca9f91413976af2bb04
 DIST Routes-2.5.1.tar.gz 190905 BLAKE2B e1498d0a26c7ebb1ee423ad211221f648d5bab4d37effac8c34a5f5189558a62c3ab34780f98f6a1620a261efc6085afd54f0827ac0e7a80217de7ae2226580a SHA512 06ec9a8426ced86524096703de47e3da2fa08bd0ed8c962d451b4338966804245b5074077021fb58a5afcb63acd6dcffa05a89703b8b54841a69a4cdff12b755
diff --git a/dev-python/routes/metadata.xml b/dev-python/routes/metadata.xml
index 7bdfdfe972fe..c9aac92f8e12 100644
--- a/dev-python/routes/metadata.xml
+++ b/dev-python/routes/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Routes</remote-id>
 	</upstream>
diff --git a/dev-python/routes/routes-2.4.1-r1.ebuild b/dev-python/routes/routes-2.4.1-r1.ebuild
deleted file mode 100644
index 7f92c712c814..000000000000
--- a/dev-python/routes/routes-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="Routes"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A re-implementation of Rails routes system, mapping URLs to Controllers/Actions"
-HOMEPAGE="https://routes.readthedocs.io/en/latest/ https://pypi.org/project/Routes/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/repoze-lru-0.3[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? ( dev-python/webob[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests nose
-distutils_enable_sphinx doc
-
-# The testsuite appears to be held back by the author
-
-# https://github.com/bbangert/routes/issues/42 presents a patch
-# for the faulty docbuild converted to sed stmnts
-python_prepare_all() {
-	# The default theme in sphinx switched to classic from shpinx-1.3.1
-	if has_version ">=dev-python/sphinx-1.3.1"; then
-		sed -e "s:html_theme_options = {:html_theme = 'classic'\n&:" \
-			-i docs/conf.py || die
-	else
-		sed -e "s:html_theme_options = {:html_theme = 'default'\n&:" \
-			-i docs/conf.py || die
-	fi
-	sed -e "s:changes:changes\n   todo:" \
-		-i docs/index.rst || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/routes/routes-2.5.1.ebuild b/dev-python/routes/routes-2.5.1.ebuild
index e6334510ba32..39460443ca9a 100644
--- a/dev-python/routes/routes-2.5.1.ebuild
+++ b/dev-python/routes/routes-2.5.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/rtslib-fb/Manifest b/dev-python/rtslib-fb/Manifest
index c9f7958ebf3d..c52c5a43dfc1 100644
--- a/dev-python/rtslib-fb/Manifest
+++ b/dev-python/rtslib-fb/Manifest
@@ -1,2 +1 @@
-DIST rtslib-fb-2.1.73.tar.gz 73883 BLAKE2B 2e1a9306386b019ed7d4f89dc976959020f981812a28f0a8f4c520f311ec6ce08da2e45115d394cab272296bd84e16fd1c15a6aecdf4650d52f96e294aed4cc5 SHA512 70bfad6a055af1242f989fcab706b5a49ebe8c1ed7183ac3f739eb54e0c628cc27efe9823dd017c33d735847888a142a791fdba3e5f4d4817290df7f8b6347f0
 DIST rtslib-fb-2.1.74.tar.gz 73919 BLAKE2B d16527ed1efae379aa976929d8e6dd8a13cb1d47eb8efe8897ee495b0864225f520b42bd27fe502a1fad11369d20690b9751e54ae7a328c60917144114358d24 SHA512 b0b0722a5a7e10af698ae0570a65b51d7f091bfcc370850dacb3087471ca98bd229b4a5ed73760b7ed5bbee1b53dae4781cc2b3d5e7a1ff8ce37c5c144477852
diff --git a/dev-python/rtslib-fb/metadata.xml b/dev-python/rtslib-fb/metadata.xml
index c215ffbabf74..ad6475acdc40 100644
--- a/dev-python/rtslib-fb/metadata.xml
+++ b/dev-python/rtslib-fb/metadata.xml
@@ -9,6 +9,7 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <maintainer status="active">
       <email>mlombard@redhat.com</email>
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.73.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.73.ebuild
deleted file mode 100644
index 95ddca21b91d..000000000000
--- a/dev-python/rtslib-fb/rtslib-fb-2.1.73.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
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="A Python object API for managing the Linux LIO kernel target"
-HOMEPAGE="https://github.com/open-iscsi/rtslib-fb"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/pyudev[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-src_install() {
-	distutils-r1_src_install
-	systemd_dounit "${FILESDIR}/target.service"
-}
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.74.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.74.ebuild
index 0b6c439786d1..95ddca21b91d 100644
--- a/dev-python/rtslib-fb/rtslib-fb-2.1.74.ebuild
+++ b/dev-python/rtslib-fb/rtslib-fb-2.1.74.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/pyudev[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/ryu/Manifest b/dev-python/ryu/Manifest
index 1855346f4956..ae65836645e4 100644
--- a/dev-python/ryu/Manifest
+++ b/dev-python/ryu/Manifest
@@ -1,2 +1 @@
-DIST ryu-4.26.tar.gz 1518130 BLAKE2B bc6c03ad746b5b20f53c1b5ab8d9637efcdf92dec83eb2ea105898125b4887fdf03c478122b3d33ad099da4be8d51368c24875cfe0aa1aca58ca5b3f26255adc SHA512 a88c98904945270b8465b8daaa96c57e067e0091f7b300086f2ab8b07a7c024963382fc73c018fd15eac6c25a565125107e3ef4e79c2a5b49cf297c74511a260
 DIST ryu-4.34.tar.gz 1100203 BLAKE2B fd8f133ffe3b13781664b5da871419e76b6b869bcd35991e7231c61af91c7c76201679bf5a449660d2cc5841d77303d1b6e65271f27977a6ba8954e41c9b8ea1 SHA512 6841bb9325366c2558b11854a5f4e922cdf8a16723c1c48a7cc6fb4d0848e00686086eaecb9cef1e53686553d2ed689fd1d8da84882b60eefb95cb1ad21eead9
diff --git a/dev-python/ryu/metadata.xml b/dev-python/ryu/metadata.xml
index e491d9a1ccd8..638c9587a0c0 100644
--- a/dev-python/ryu/metadata.xml
+++ b/dev-python/ryu/metadata.xml
@@ -5,6 +5,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">ryu</remote-id>
 	</upstream>
diff --git a/dev-python/ryu/ryu-4.26-r1.ebuild b/dev-python/ryu/ryu-4.26-r1.ebuild
deleted file mode 100644
index 2db1d6e99e72..000000000000
--- a/dev-python/ryu/ryu-4.26-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Component-based Software-defined Networking Framework"
-HOMEPAGE="https://ryu-sdn.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pbr[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${D}"/usr/etc "${D}"/etc
-}
diff --git a/dev-python/ryu/ryu-4.34.ebuild b/dev-python/ryu/ryu-4.34.ebuild
index 6373262ca368..ad627c3bba89 100644
--- a/dev-python/ryu/ryu-4.34.ebuild
+++ b/dev-python/ryu/ryu-4.34.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="dev-python/pbr[${PYTHON_USEDEP}]"
diff --git a/dev-python/semantic_version/semantic_version-2.8.5.ebuild b/dev-python/semantic_version/semantic_version-2.8.5.ebuild
index fbfa023af245..06a0d4f3fb31 100644
--- a/dev-python/semantic_version/semantic_version-2.8.5.ebuild
+++ b/dev-python/semantic_version/semantic_version-2.8.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme
diff --git a/dev-python/sentry-sdk/sentry-sdk-0.18.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-0.18.0.ebuild
index 6b1c57ff72d3..2420ea26b0e0 100644
--- a/dev-python/sentry-sdk/sentry-sdk-0.18.0.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-0.18.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/sentry-python-${PV}"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]
diff --git a/dev-python/spur/Manifest b/dev-python/spur/Manifest
index 20627fdfee42..8ffdb4654927 100644
--- a/dev-python/spur/Manifest
+++ b/dev-python/spur/Manifest
@@ -1,2 +1 @@
-DIST spur.py-0.3.21.gh.tar.gz 17666 BLAKE2B 0628417e6b5f4c744041693445113a59daac4f89776bc39849a2e1fab21826f3c6783bf72bf528a262f05df08d0680044e69f119c367f29ca4d6f0df554fa49d SHA512 7cd49690b989952707629fad5682201dc7f00865d8120da9e84eb9046e7a8fe7b7183785b4c2eac996d2743025cc09508b0ceb7b762b7bddb5447ecbc42d00a4
 DIST spur.py-0.3.22.gh.tar.gz 17760 BLAKE2B 676484e73fa38ebcd3bcc2ace21853590b652d0ec2dc31f7635a55a8bbb213e559fbdd7b70e545091e7e28e6000862ef45eba748e13c546b765756b41c352028 SHA512 36518a080d3fff97fdab5af8e7e3045c58ad6b1acad9fb79e11da688d484565ee4d50868f3c3ee10299e135f2c01bd35348256df7bb1b4f6200aa175cafc7f0a
diff --git a/dev-python/spur/spur-0.3.21.ebuild b/dev-python/spur/spur-0.3.21.ebuild
deleted file mode 100644
index f4219634c4e0..000000000000
--- a/dev-python/spur/spur-0.3.21.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-inherit distutils-r1
-
-MY_P=spur.py-${PV}
-DESCRIPTION="Run commands locally or over SSH using the same interface"
-HOMEPAGE="https://github.com/mwilliamson/spur.py"
-SRC_URI="
-	https://github.com/mwilliamson/spur.py/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	# TODO: set up a local SSH server?
-	rm tests/{ssh_tests,testing}.py || die
-
-	# does random guesswork on top of exceptions that stopped working
-	# in py3.8;  this only causes a different exception to be raised
-	# https://github.com/mwilliamson/spur.py/issues/85
-	sed -e 's:spawning_command_that_uses_path_env_variable_asks_if_command_is_installed:_&:' \
-		-e 's:spawning_non_existent_command_raises_specific_no_such_command_exception:_&:' \
-		-e 's:using_non_existent_command_and_correct_cwd_raises_no_such_command_exception:_&:' \
-		-i tests/process_test_set.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/spur/spur-0.3.22.ebuild b/dev-python/spur/spur-0.3.22.ebuild
index 03fee9aa9257..f4219634c4e0 100644
--- a/dev-python/spur/spur-0.3.22.ebuild
+++ b/dev-python/spur/spur-0.3.22.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/paramiko[${PYTHON_USEDEP}]"
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index c5caff9cd008..051c2b70a88b 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,3 +1,2 @@
-DIST SQLAlchemy-1.3.11.tar.gz 6007784 BLAKE2B c889ea28ae08fcb83d338ab01a64533142428ee91a6c11b9a7f2116f99161c066e66f49d76bdd2c7600f1a7f86a2add217f49dda4cf97566a875f28d3d4b24be SHA512 c691539db4edd62af749087728dfd424010bfb3ca2cc8503a4b96c1625d059d4c2a748b9a35cc870cc99ca9df61966cce406f9b570b25e55c3632a99b8621e74
 DIST SQLAlchemy-1.3.17.tar.gz 5979141 BLAKE2B f0fa46493461f532ebca9420fc9f49a2c04af888aa99653946a5bb563d40b8bb714a03301300ebb80cca76a99f8226ddfcde4216e8fc2593d3a161b5072276ab SHA512 6f6d54b9018ece6c289f28a3a41ffb1b2216206edee08c49f387e9f30740969dfe0f8272654ce4efca159a2a6619e76c41b2ad2b10c391cdd64681ac17d0bc79
 DIST SQLAlchemy-1.3.20.tar.gz 6264898 BLAKE2B 4c386eff56c2f9ec7ef467e3bc0032629582a970707dc11e3744fe3903d9cb18457f5e0be4dc9c20727b5733f158e031bf8b40f586dadb8f4ab8d0cae3cf7398 SHA512 29c52ada1a66f906ed2563df2ab093eceb7c09de45749c96031f30a1512d20b1d698e00640c777169ef3db99ab012151770a3daea45a51df934269b554ff4b28
diff --git a/dev-python/sqlalchemy/files/sqlalchemy-pytest-deprecation.patch b/dev-python/sqlalchemy/files/sqlalchemy-pytest-deprecation.patch
deleted file mode 100644
index ee09a7312e6a..000000000000
--- a/dev-python/sqlalchemy/files/sqlalchemy-pytest-deprecation.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 993e6449e3f5f3532f6f5426b824718435ce6c6d Mon Sep 17 00:00:00 2001
-From: Mike Bayer <mike_mp@zzzcomputing.com>
-Date: Thu, 12 Mar 2020 19:44:37 -0400
-Subject: [PATCH] Dont raise on pytest deprecation warnings
-
-py.test 5.4.0 emits deprecation warnings for pytest.Class.
-make sure we don't raise for these, and log the code that will
-be used for 5.4.0 when we bump requirements.
-
-Fixes: #5201
-Change-Id: I83e0402c4a6b2365a63b58d052c6989df3a37328
----
- lib/sqlalchemy/testing/plugin/pytestplugin.py | 13 +++++++++++++
- lib/sqlalchemy/testing/warnings.py            |  9 +++++++++
- 3 files changed, 29 insertions(+)
-
-diff --git a/lib/sqlalchemy/testing/plugin/pytestplugin.py b/lib/sqlalchemy/testing/plugin/pytestplugin.py
-index c39f9f32e..f2e7d706f 100644
---- a/lib/sqlalchemy/testing/plugin/pytestplugin.py
-+++ b/lib/sqlalchemy/testing/plugin/pytestplugin.py
-@@ -160,6 +160,11 @@ def pytest_collection_modifyitems(session, config, items):
-             if sub_cls is not test_class.cls:
-                 per_cls_dict = rebuilt_items[test_class.cls]
- 
-+                # in pytest 5.4.0
-+                # for inst in pytest.Class.from_parent(
-+                #     test_class.parent.parent, name=sub_cls.__name__
-+                # ).collect():
-+
-                 for inst in pytest.Class(
-                     sub_cls.__name__, parent=test_class.parent.parent
-                 ).collect():
-@@ -188,6 +193,14 @@ def pytest_collection_modifyitems(session, config, items):
- def pytest_pycollect_makeitem(collector, name, obj):
- 
-     if inspect.isclass(obj) and plugin_base.want_class(name, obj):
-+
-+        # in pytest 5.4.0
-+        # return [
-+        #     pytest.Class.from_parent(collector,
-+        # name=parametrize_cls.__name__)
-+        #     for parametrize_cls in _parametrize_cls(collector.module, obj)
-+        # ]
-+
-         return [
-             pytest.Class(parametrize_cls.__name__, parent=collector)
-             for parametrize_cls in _parametrize_cls(collector.module, obj)
-diff --git a/lib/sqlalchemy/testing/warnings.py b/lib/sqlalchemy/testing/warnings.py
-index cc11e556c..6b42c98cb 100644
---- a/lib/sqlalchemy/testing/warnings.py
-+++ b/lib/sqlalchemy/testing/warnings.py
-@@ -34,6 +34,15 @@ def setup_filters():
-     # ignore 2.0 warnings unless we are explicitly testing for them
-     warnings.filterwarnings("ignore", category=sa_exc.RemovedIn20Warning)
- 
-+    try:
-+        import pytest
-+    except ImportError:
-+        pass
-+    else:
-+        warnings.filterwarnings(
-+            "once", category=pytest.PytestDeprecationWarning
-+        )
-+
- 
- def assert_warnings(fn, warning_msgs, regex=False):
-     """Assert that each of the given warnings are emitted by fn.
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild
deleted file mode 100644
index ede4b5dfa758..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild
+++ /dev/null
@@ -1,64 +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} pypy3 )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 flag-o-matic optfeature
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="doc examples +sqlite test"
-
-REQUIRED_USE="test? ( sqlite )"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/sqlalchemy-pytest-deprecation.patch
-	)
-	# Disable tests hardcoding function call counts specific to Python versions.
-	rm -r test/aaa_profiling || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/. )
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "MySQL support" dev-python/mysql-python dev-python/mysql-connector-python
-	optfeature "mssql support" dev-python/pymssql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.20.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.20.ebuild
index 4a9946d21638..bf2e3ea2ad62 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.20.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.20.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 REQUIRED_USE="test? ( sqlite )"
diff --git a/dev-python/sqlparse/metadata.xml b/dev-python/sqlparse/metadata.xml
index 13cb8d15beee..1f5d59d49b8e 100644
--- a/dev-python/sqlparse/metadata.xml
+++ b/dev-python/sqlparse/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">sqlparse</remote-id>
     <remote-id type="github">andialbrecht/sqlparse</remote-id>
diff --git a/dev-python/sqlparse/sqlparse-0.4.1.ebuild b/dev-python/sqlparse/sqlparse-0.4.1.ebuild
index 45594ba40a24..edaec538f391 100644
--- a/dev-python/sqlparse/sqlparse-0.4.1.ebuild
+++ b/dev-python/sqlparse/sqlparse-0.4.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 S="${WORKDIR}"/${P#python-}
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 LICENSE="BSD-2"
 
 distutils_enable_sphinx docs/source
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 7c7c854b721d..227bee587f62 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,2 +1 @@
-DIST tox-3.19.0.tar.gz 296499 BLAKE2B cad41c7791108ecdf6efc7bca99623c66d1d8ffbb2b06688eb84e575f14958ba2b497e0035ccc331fc8e0ce667824cba2c8dd37488ac48b3c16902c7b546074b SHA512 7a542282dc2fdef7ab8aff04372aeeeaad54b83bd7f1022c1c60465604d67a5984abcea7d409b8593b646192407c78cb88422aa4dfd11fb2a2d9da520aeafb39
 DIST tox-3.20.1.tar.gz 297516 BLAKE2B 2a13059bce229f30670e247b17ffd03d4b0d907b2fa7eb7d2f6848ada8d81e1a0aad983748c4346dfa61877f88edd22e4616ed20efcbd15da34fdc1c87b4439a SHA512 0989cc3dfd25eb3d1236d973d490f12c81273c93e84140b54342217eb73dd944f446c7ce9fe228b644d764b94300f1c6ccaf94e442d0e34835d05de84cccabd6
diff --git a/dev-python/tox/tox-3.19.0.ebuild b/dev-python/tox/tox-3.19.0.ebuild
deleted file mode 100644
index 8fcf947120f9..000000000000
--- a/dev-python/tox/tox-3.19.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
-SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-# doc disabled because of missing deps in tree
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
-	' python3_{5,6,7} pypy3)
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
-# TODO: figure out how to make tests work without the package being
-# installed first.
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
-		dev-python/pathlib2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# broken without internet
-	sed -i -e 's:test_provision_non_canonical_dep:_&:' \
-		tests/unit/session/test_provision.py || die
-	sed -i -e 's:test_provision_interrupt_child:_&:' \
-		tests/integration/test_provision_int.py || die
-	# broken with our mock version (?)
-	sed -i -e 's:test_create_KeyboardInterrupt:_&:' \
-		tests/unit/test_venv.py || die
-	# broken with Gentoo Python layout
-	sed -i -e 's:test_tox_get_python_executable:_&:' \
-		-e 's:test_find_alias_on_path:_&:' \
-		tests/unit/interpreters/test_interpreters.py || die
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/tox/tox-3.20.1.ebuild b/dev-python/tox/tox-3.20.1.ebuild
index 499658c518d4..8fcf947120f9 100644
--- a/dev-python/tox/tox-3.20.1.ebuild
+++ b/dev-python/tox/tox-3.20.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 # doc disabled because of missing deps in tree
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/traitlets/metadata.xml b/dev-python/traitlets/metadata.xml
index 9c39adc4acfd..bd5452722413 100644
--- a/dev-python/traitlets/metadata.xml
+++ b/dev-python/traitlets/metadata.xml
@@ -14,6 +14,7 @@
     used for configuring Python objects. This package powers
     the config system of IPython and Jupyter.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">traitlets</remote-id>
     <remote-id type="github">ipython/traitlets</remote-id>
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index ba3d0b2776fd..7c0d67ea2f13 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -1,3 +1,2 @@
 DIST ujson-1.35.tar.gz 192027 BLAKE2B 320058e7142f2264bee8b02a411bedb3b32d1c2fc86157eb47272f75cb401e6c75ce7d9e3dba5092cd1db99dbded8804347d4c7be11eaedb47bc8b4b8125fbd3 SHA512 931d8f574fc4920c9ded48369774666060e951f40982606ce9f1d9de3420004042af7d797075a54d92a2b25c4f313572a5e1a30f3bc8ce387ef8f3881193eee7
-DIST ujson-3.2.0.tar.gz 7128952 BLAKE2B 7e4c409eb8e87d542d37595439ded5c85e934e87a18987e18dce5ab0aebd5f9431b8a2c12ebaa467da928c3158d03325a40a9ae65230e39c93106d65b098c407 SHA512 8915e17acbd9650964dc9ae4f8a89021af921fac8f77f5456fdb8c0d6ceaa02767891d070c515c926deef76efb210a969c573e387ae62c15b2c8be761f6adb70
 DIST ujson-4.0.1.tar.gz 7128868 BLAKE2B 159496bfa2b7efff744c1f725c5a8c362c6baac20518d440e5827ec8af1a9a77b4e060126d9b35b39baae079f7092e64d49d0cd23a637174a4bca261203939d6 SHA512 11fb28166afab30e29d71070c91cfb78245eed704a769bf6fb0871c267135fac3fa1042c4ac875dcb870f8a00615e6bcc8fdcd0168edd5ccbae6437605b4df0d
diff --git a/dev-python/ujson/ujson-3.2.0.ebuild b/dev-python/ujson/ujson-3.2.0.ebuild
deleted file mode 100644
index dacad4fa08c6..000000000000
--- a/dev-python/ujson/ujson-3.2.0.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
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Ultra fast JSON encoder and decoder for Python"
-HOMEPAGE="https://pypi.org/project/ujson/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/pytz[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/ujson/ujson-4.0.1.ebuild b/dev-python/ujson/ujson-4.0.1.ebuild
index 18e434f25cf1..dacad4fa08c6 100644
--- a/dev-python/ujson/ujson-4.0.1.ebuild
+++ b/dev-python/ujson/ujson-4.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 5f08aba1e331..ec6666283fac 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -3,3 +3,4 @@ DIST urllib3-1.25.10.tar.gz 256875 BLAKE2B 3f2ad2cb3ac9a09f73c1ec03e89aa7313055a
 DIST urllib3-1.25.11.tar.gz 260300 BLAKE2B 06bd2107bad479e36c6474f95567c3ecb119d18b193b358df9e345e4d09392366255b21597b26fbf2374220b921cc2117a1972f88021c3a6ebac3844a319acbe SHA512 58f77edb9ced62cbac7b0baf2651c07f9f413267f103730ee25f08c5d4d0bf52a2ace02f58841bcd55652db677c7a1dc9a756681e7e32d590bc69d8b93e8f173
 DIST urllib3-1.26.0.tar.gz 291709 BLAKE2B e750bcd28c6205cb8e7f12c2a1c6123d48979877b206914fc122f67ff6cdf3e16e5d7ee0ffae1f4af40f028075f9592cdebf8856ca7e29b541283a8023afbf0d SHA512 5e5a78486cded9a378532a094818cfcaf6ec621d3aefbffac4c78f130798ee06f08e47d14f3d154274a502c8c1e3963a12d65030ba6109108ed786202637bd42
 DIST urllib3-1.26.1.tar.gz 286708 BLAKE2B 19f210a56850e9754faa7a7a309292ba69450ba3ca232bc42f10e1f163eb72e7430eb233d8a0ee1cf97acbdfa132b2e515561e67fade3806347e04e6c7869db2 SHA512 5fbb28e190ecf58aae0932994bc1adb1542041bf96f176a9ece22bd6ee8d4ae8dc8f40dea77359601b704025e65c65ca27137f65d3d47fac3fc796b7bbd112f3
+DIST urllib3-1.26.2.tar.gz 286877 BLAKE2B dc5884e2561fae476ba8695cf9e50abb63d8dfc45ad6219d07ba30ecae48e5f27fbdd9a324c0e71f739555c90a3653f18eda513f2ea45b76abcd8c6c714ec0f7 SHA512 4de7cf844ed0deb83c4129e1b1742eafefe95035dd7ffbeaeaaccabca8bd361de9fa240882ea4dec16a7f0b5c5684416656f0d58bea15e7aefd4132024a25c9e
diff --git a/dev-python/urllib3/urllib3-1.26.2.ebuild b/dev-python/urllib3/urllib3-1.26.2.ebuild
new file mode 100644
index 000000000000..d690d8c84ad2
--- /dev/null
+++ b/dev-python/urllib3/urllib3-1.26.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
+HOMEPAGE="https://github.com/urllib3/urllib3"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="brotli test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
+	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
+	brotli? ( dev-python/brotlipy[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep "
+			${RDEPEND}
+			dev-python/brotlipy[\${PYTHON_USEDEP}]
+			dev-python/mock[\${PYTHON_USEDEP}]
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
+			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
+			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
+		" python3_{6,7,8,9})
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/alabaster \
+	dev-python/mock
+
+python_prepare_all() {
+	# https://github.com/urllib3/urllib3/issues/1756
+	sed -e 's:10.255.255.1:240.0.0.0:' \
+		-i test/__init__.py || die
+	# tests failing if 'localhost.' cannot be resolved
+	sed -e 's:test_dotted_fqdn:_&:' \
+		-i test/with_dummyserver/test_https.py || die
+	sed -e 's:test_request_host_header_ignores_fqdn_dot:_&:' \
+		-i test/with_dummyserver/test_socketlevel.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x CI=1
+	# FIXME: get tornado ported
+	case ${EPYTHON} in
+		python3*)
+			pytest -vv || die "Tests fail with ${EPYTHON}"
+			;;
+	esac
+}
diff --git a/dev-python/vcrpy/Manifest b/dev-python/vcrpy/Manifest
index 689c02bcb00c..8bc3f60270bc 100644
--- a/dev-python/vcrpy/Manifest
+++ b/dev-python/vcrpy/Manifest
@@ -1,2 +1 @@
-DIST vcrpy-4.1.0.tar.gz 330122 BLAKE2B a7a2516d4dfcc01da801fb8685ea3b56f50ce474d35477ae36785ea1bfbae113bd3c18fb3faadb13fc81c37fa1d282a84bc60fdd27f4fc4a1f3e952312d7bc5f SHA512 7ad5517cd52f6f31448db9b608d8a7b274741727487ede21b7f80e4060e3ddbb34c731166f67ae7136c86a8d3e7fd23128e035a148f18f771066bfa71319624f
 DIST vcrpy-4.1.1.tar.gz 329508 BLAKE2B b6981150a8fd742301e0d7897d84855c741c97307bbb5c5751680f3d33d69d6333a18d714fcc14cb018f5dd6c02e840e1313136660c4459e2755d448fc0b07e9 SHA512 afa1904bff37bfd2d278ed49fa3982a357eb6bb113818b532044da0f11a9dd877cc152d7f0d81d88bdc0f870521b1241f6aecf959f668211904e3c6c7cea4ad8
diff --git a/dev-python/vcrpy/vcrpy-4.1.0.ebuild b/dev-python/vcrpy/vcrpy-4.1.0.ebuild
deleted file mode 100644
index 3eb99b56e0ee..000000000000
--- a/dev-python/vcrpy/vcrpy-4.1.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Automatically mock your HTTP interactions to simplify and speed up testing"
-HOMEPAGE="https://github.com/kevin1024/vcrpy"
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/kevin1024/vcrpy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/wrapt[${PYTHON_USEDEP}]
-	dev-python/yarl[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# tests requiring Internet
-	rm tests/integration/test_aiohttp.py || die
-	sed -e 's:test_flickr_should_respond_with_200:_&:' \
-		-e 's:test_amazon_doctype:_&:' \
-		-i tests/integration/test_wild.py || die
-	sed -e 's:testing_connect:_&:' \
-		-i tests/unit/test_stubs.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x REQUESTS_CA_BUNDLE=$("${EPYTHON}" -m pytest_httpbin.certs)
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/vcrpy/vcrpy-4.1.1.ebuild b/dev-python/vcrpy/vcrpy-4.1.1.ebuild
index e28175b7cb17..3fb0d4e0776a 100644
--- a/dev-python/vcrpy/vcrpy-4.1.1.ebuild
+++ b/dev-python/vcrpy/vcrpy-4.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/kevin1024/vcrpy/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index 8e613681cff9..71911589bb3c 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,2 +1 @@
-DIST xlsxwriter-1.3.6-tests.tar.gz 32500145 BLAKE2B 796cc49f26ffbb6f980488b2fb184da95a4d95049544e30d6754823cdac9f98cc829cd665c293220033b9e654ce95816b668ad364796b4b19a47e0fb6ac03fb9 SHA512 5a8031a92e467f1afef4a2bdcde199f35bf3a013cfe01b28cf182c9c6f51f46f51547c73165e05094f0bfbdab6b2e8f96ff75e531fe63681ce72cf93325c098d
 DIST xlsxwriter-1.3.7-tests.tar.gz 32545996 BLAKE2B 789ee62a955422629f5a1ab80924774a98c34b2276f9fbc865d6a9d0e31778a49c5b4be72b3f7db55a13ff1d265514bd1dfaadb9243b21faa8ed2740db60ebd7 SHA512 516be34f5f5fd64835a4015c6eb23c23e8aabb34adc189a50f6ff4afe5cb31f01282870ce037679d14e0c40757f1ed51d26b4cb8fecdf952b4c38b6638d1d72f
diff --git a/dev-python/xlsxwriter/xlsxwriter-1.3.6.ebuild b/dev-python/xlsxwriter/xlsxwriter-1.3.6.ebuild
deleted file mode 100644
index 8be09eb57bd2..000000000000
--- a/dev-python/xlsxwriter/xlsxwriter-1.3.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="XlsxWriter"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python module for creating Excel XLSX files"
-HOMEPAGE="https://github.com/jmcnamara/XlsxWriter"
-SRC_URI="https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_${PV}.tar.gz -> ${P}-tests.tar.gz"
-S="${WORKDIR}/${MY_PN}-RELEASE_${PV}"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests pytest
diff --git a/dev-python/xlsxwriter/xlsxwriter-1.3.7.ebuild b/dev-python/xlsxwriter/xlsxwriter-1.3.7.ebuild
index 0976f9f9d2f1..8be09eb57bd2 100644
--- a/dev-python/xlsxwriter/xlsxwriter-1.3.7.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-1.3.7.ebuild
@@ -17,6 +17,6 @@ S="${WORKDIR}/${MY_PN}-RELEASE_${PV}"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index 441f2760ead9..e608bad9e084 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,2 +1,3 @@
 DIST yarl-1.6.0.tar.gz 175492 BLAKE2B e6e3ebb30a591fa1e94d07c353700b1ebf7c21a729d8c9a4cd582f591235d54dee40a109e28fb806893e281b9ab36ca2b1ca1cdf7f093587bde8a5a9c4e7bf89 SHA512 d08d2c4a906706bba3c1fad2b02e01299d076d9f6c1a1eb172d116d0ccbb1e6143b7dd959d242f2a1b5d450416bb15ab6e53ee9e05876b161d61ec23e054f29b
 DIST yarl-1.6.2.tar.gz 177534 BLAKE2B a7a587387c8030737874b445007aac4a7bc7f5552238fb892cbb99325e9a3862c599a11df5738d79e47dd1073e29731f80bd941f351e4a7b1867780fba9986ce SHA512 5e3ab46216d567583558a6945127d0d8d758475636deb0733bae25fc869d842f05e996f06aa4a7dc6fd067f7e38afdc6e328cc8019735819d2a1cebc50ca165d
+DIST yarl-1.6.3.tar.gz 176823 BLAKE2B 58d36c6d18ef661cb08074153081f541fc98968107d71e7b501297f45f38de092804bba2ae89ddcf0da79b5d4fca62292a4c460bc9dff9d723d3958bc64ff84b SHA512 4c76b94198b8e334f4b4e71d92b0fe23f752d35e0c29bc68df99648b3f48fbb6e3dd8d7339138544e5dc8fbf64c15cb61678052670ac47edc5be958df819d42e
diff --git a/dev-python/yarl/yarl-1.6.2.ebuild b/dev-python/yarl/yarl-1.6.2.ebuild
index 28fd8a84c1dc..093e6cb94530 100644
--- a/dev-python/yarl/yarl-1.6.2.ebuild
+++ b/dev-python/yarl/yarl-1.6.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/yarl/yarl-1.6.3.ebuild b/dev-python/yarl/yarl-1.6.3.ebuild
new file mode 100644
index 000000000000..28fd8a84c1dc
--- /dev/null
+++ b/dev-python/yarl/yarl-1.6.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Yet another URL library"
+HOMEPAGE="https://github.com/aio-libs/yarl/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
+	' python3_{6,7} pypy3)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.2-test-without-coverage.patch
+)
diff --git a/dev-python/zope-event/metadata.xml b/dev-python/zope-event/metadata.xml
index 49df4f06572b..87127e30d008 100644
--- a/dev-python/zope-event/metadata.xml
+++ b/dev-python/zope-event/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">zopefoundation/zope.event</remote-id>
 		<remote-id type="pypi">zope.event</remote-id>
diff --git a/dev-python/zope-event/zope-event-4.5.0-r1.ebuild b/dev-python/zope-event/zope-event-4.5.0-r1.ebuild
index dbc825122225..2ad5ae9beeb5 100644
--- a/dev-python/zope-event/zope-event-4.5.0-r1.ebuild
+++ b/dev-python/zope-event/zope-event-4.5.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
 
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 568ffae965b4..c95e118e0aba 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/ascii85/Manifest b/dev-ruby/ascii85/Manifest
index fb602c2a6d64..d2705ed078a9 100644
--- a/dev-ruby/ascii85/Manifest
+++ b/dev-ruby/ascii85/Manifest
@@ -1 +1,2 @@
 DIST Ascii85-1.0.3.gem 11776 BLAKE2B e08bbc089546dd3b91ff5fd85b8652dd6f5c06025c29ac67004bd7d4c7bb8fc38c77b604dd5a884970b05041e173f37eaf895f0bb9ac1947ce70e4f0cc54906c SHA512 b324ff06ea0cd46a679619a2bfca9f05c30ece9f0342f8a8d097841f3fb4dbb29cf4b6f6832742c50fe5a51895a9048308981be296466422269ce34c4d936f5c
+DIST Ascii85-1.1.0.gem 12288 BLAKE2B 637ee421b51ec8ee88f00c32acc4d05a818fe7a26ec9f512a207d5c2e8c9b99e9866b904451a2ae811f024cd26b810b3dfbc346b6d935fd135a2c2615f2453ef SHA512 f160dbc06f49aaf1c678ece5b94fab4c3878cf7fe6accc267e64505e412072cb28b9dc28ec1ed8bf01ddbd7c08c920d95fbe182f756072d614b9827f6ec50094
diff --git a/dev-ruby/ascii85/ascii85-1.1.0.ebuild b/dev-ruby/ascii85/ascii85-1.1.0.ebuild
new file mode 100644
index 000000000000..4bbddd140e29
--- /dev/null
+++ b/dev-ruby/ascii85/ascii85-1.1.0.ebuild
@@ -0,0 +1,28 @@
+# 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_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md History.txt"
+
+RUBY_FAKEGEM_NAME="Ascii85"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Methods for encoding/decoding Adobe's binary-to-text encoding of the same name"
+HOMEPAGE="https://github.com/datawraith/ascii85gem"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+}
diff --git a/dev-ruby/duktape-rb/Manifest b/dev-ruby/duktape-rb/Manifest
new file mode 100644
index 000000000000..a78c853e0a81
--- /dev/null
+++ b/dev-ruby/duktape-rb/Manifest
@@ -0,0 +1 @@
+DIST duktape-rb-2.3.0.0.tar.gz 1356464 BLAKE2B be7362ddbe6860bcb12c8f8909f66ae525585e628f7be2317b07eb07960f8f25e503dbc89e713e57144cc8108751ac856aa73a16cbd58502e928acf9e116247c SHA512 af4fd45387c3f40cd24bf3c879ef4e0d7efd43ca24f0cb866bf869db7fa9f4add9b60122c0dcfbce5491cdd7479b1414637fa1054078216b9f57fa426feb0154
diff --git a/dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r2.ebuild b/dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r2.ebuild
new file mode 100644
index 000000000000..3ea9f53b2a6e
--- /dev/null
+++ b/dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r2.ebuild
@@ -0,0 +1,51 @@
+# 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_GEMSPEC="duktape.gemspec"
+RUBY_FAKEGEM_NAME="duktape"
+
+inherit ruby-fakegem
+
+MY_PN=${PN/-/\.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Ruby bindings to the Duktape JavaScript interpeter"
+HOMEPAGE="https://github.com/judofyr/duktape.rb"
+SRC_URI="https://github.com/judofyr/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="dev-lang/duktape"
+DEPEND+="${COMMON_DEPEND}"
+RDEPEND+="${COMMON_DEPEND}"
+
+ruby_add_bdepend "
+	dev-ruby/pkg-config
+	dev-ruby/rake-compiler
+	dev-ruby/sdoc
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.0.0_duktape-2.5.0-tests.patch
+	"${FILESDIR}"/${PN}-2.3.0.0_use-system-duktape.patch
+)
+
+RUBY_S=${MY_P}
+
+all_ruby_prepare() {
+	rm ext/duktape/duktape.{c,h} ext/duktape/duk_config.h || die "Failed to remove bundled duktape"
+}
+
+each_ruby_configure() {
+	${RUBY} -C ext/duktape extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake compile
+}
diff --git a/dev-ruby/duktape-rb/files/duktape-rb-2.3.0.0_duktape-2.5.0-tests.patch b/dev-ruby/duktape-rb/files/duktape-rb-2.3.0.0_duktape-2.5.0-tests.patch
new file mode 100644
index 000000000000..20228c480da8
--- /dev/null
+++ b/dev-ruby/duktape-rb/files/duktape-rb-2.3.0.0_duktape-2.5.0-tests.patch
@@ -0,0 +1,28 @@
+The parse-error message asserted by two of the tests has changed since
+duktape-2.3.0, it is now
+
+# encoding: ASCII-8BIT
+parse error (line 1, end of input)
+
+This should hopefully cover both cases.
+
+--- a/test/test_duktape.rb
++++ b/test/test_duktape.rb
+@@ -102,7 +102,7 @@
+         @ctx.eval_string('{')
+       end
+ 
+-      assert_equal "parse error (line 1)", err.message
++      assert_match /parse error [(]line 1/, err.message
+     end
+ 
+     def test_type_error
+@@ -160,7 +160,7 @@
+         @ctx.exec_string('{')
+       end
+ 
+-      assert_equal "parse error (line 1)", err.message
++      assert_match /parse error [(]line 1/, err.message
+     end
+ 
+     def test_type_error
diff --git a/dev-ruby/duktape-rb/files/duktape-rb-2.3.0.0_use-system-duktape.patch b/dev-ruby/duktape-rb/files/duktape-rb-2.3.0.0_use-system-duktape.patch
new file mode 100644
index 000000000000..9f35293c9e81
--- /dev/null
+++ b/dev-ruby/duktape-rb/files/duktape-rb-2.3.0.0_use-system-duktape.patch
@@ -0,0 +1,79 @@
+--- a/MANIFEST.txt
++++ b/MANIFEST.txt
+@@ -1,9 +1,6 @@
+ README.md
+ CHANGELOG.md
+-ext/duktape/duktape.c
+-ext/duktape/duktape.h
+ ext/duktape/duktape_ext.c
+-ext/duktape/duk_config.h
+ ext/duktape/extconf.rb
+ lib/duktape/version.rb
+ lib/duktape.rb
+--- a/ext/duktape/extconf.rb
++++ b/ext/duktape/extconf.rb
+@@ -1,6 +1,64 @@
+ require 'mkmf'
+ require 'zlib'
+ 
++#
++# functions
++#
++
++def package_config pkg, options={}
++  package = pkg_config(pkg)
++  return package if package
++
++  begin
++    require 'rubygems'
++    gem 'pkg-config', (gem_ver='~> 1.1')
++    require 'pkg-config' and message("Using pkg-config gem version #{PKGConfig::VERSION}\n")
++  rescue LoadError
++    message "pkg-config could not be used to find #{pkg}\nPlease install either `pkg-config` or the pkg-config gem per\n\n    gem install pkg-config -v #{gem_ver.inspect}\n\n"
++  else
++    return nil unless PKGConfig.have_package(pkg)
++
++    cflags  = PKGConfig.cflags(pkg)
++    ldflags = PKGConfig.libs_only_L(pkg)
++    libs    = PKGConfig.libs_only_l(pkg)
++
++    Logging::message "PKGConfig package configuration for %s\n", pkg
++    Logging::message "cflags: %s\nldflags: %s\nlibs: %s\n\n", cflags, ldflags, libs
++
++    [cflags, ldflags, libs]
++  end
++end
++
++def duktape_try_compile
++  try_compile "int main() {return 0;}", "", {werror: true}
++end
++
++def add_cflags(flags)
++  print "checking if the C compiler accepts #{flags}... "
++  with_cflags("#{$CFLAGS} #{flags}") do
++    if duktape_try_compile
++      puts 'yes'
++      true
++    else
++      puts 'no'
++      false
++    end
++  end
++end
++
++#
++# main
++#
++
++if ENV['CC']
++  RbConfig::CONFIG['CC'] = RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC']
++end
++$LIBS << " #{ENV["LIBS"]}"
++$LDFLAGS << " #{ENV["LDFLAGS"]}"
++add_cflags(ENV["CFLAGS"])
++
++package_config('duktape')
++
+ $CFLAGS += ' -std=c99'
+ have_func 'rb_sym2str'
+ create_makefile 'duktape_ext'
diff --git a/dev-ruby/duktape-rb/metadata.xml b/dev-ruby/duktape-rb/metadata.xml
new file mode 100644
index 000000000000..9e38302f85b5
--- /dev/null
+++ b/dev-ruby/duktape-rb/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>marecki@gentoo.org</email>
+    <name>Marek Szuba</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">judofyr/duktape.rb</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/erubi/Manifest b/dev-ruby/erubi/Manifest
index 9c38ce72f61f..011e8eeba48b 100644
--- a/dev-ruby/erubi/Manifest
+++ b/dev-ruby/erubi/Manifest
@@ -1 +1,2 @@
+DIST erubi-1.10.0.tar.gz 11212 BLAKE2B 1a31994bc02a6acd0a5ec025c71961422dc8850de1b871a23b6b89fba59b0d3221153a1e1418d2c279ae40b2a942c53290f4695793b0fedba0a4e7b7c324b41a SHA512 adf62511ce9324b4c5f7a95863254c9d95cf40f2107eddad1118ef97d7f534fb74d79b48575ff17209e492811a9a8f87c52fa7a30e4b6ea4e50504cf5572c024
 DIST erubi-1.9.0.gem 13824 BLAKE2B 00cb428e3433090370e9f61d2445f98553a45e2a92181076114db2601fa7261d8ffc44c3f4a0ecb73d616fb5e93dcc52ca6a2efab3945b11bd17d4a53c68fed1 SHA512 34770c01215b323797739af54c5c821d28e982309a76f0a212657868629625ae6dfca3e9e2f5ae16893813fc81b5afbb172c397ddad1e2f93108c5112c540bd6
diff --git a/dev-ruby/erubi/erubi-1.10.0.ebuild b/dev-ruby/erubi/erubi-1.10.0.ebuild
new file mode 100644
index 000000000000..112ff370658f
--- /dev/null
+++ b/dev-ruby/erubi/erubi-1.10.0.ebuild
@@ -0,0 +1,25 @@
+# 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_EXTRADOC="CHANGELOG README.rdoc"
+
+RUBY_FAKEGEM_TASK_TEST="spec"
+
+RUBY_FAKEGEM_GEMSPEC="erubi.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="a ERB template engine for ruby; a simplified fork of Erubis"
+HOMEPAGE="https://github.com/jeremyevans/erubi"
+SRC_URI="https://github.com/jeremyevans/erubi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/minitest-global_expectations )"
diff --git a/dev-ruby/listen/Manifest b/dev-ruby/listen/Manifest
index 3f8ad16998ed..9ecdf3fcaab7 100644
--- a/dev-ruby/listen/Manifest
+++ b/dev-ruby/listen/Manifest
@@ -1,3 +1,4 @@
 DIST listen-1.3.1-git.tgz 35521 BLAKE2B 6b93daff2b3ba221d0c0f196c67353963e983610dd9deb3409c8ad270f7221d50e9eefee826c16c51ac0361cf7f5da727db216b1bd92a02077b0bee580fa368c SHA512 4676d030a3e676249a221cf4a136ce69651009ce5855821924be184460e404e4f33026627c9d524156a89344c826b48a690a249f1059493d7d214b922381bdd0
 DIST listen-3.2.1.tar.gz 51030 BLAKE2B 1c7df3910c856c472f42417d51449f04d56635f0c77dbc6eb7a30d25042482f4efc7bbfa2d74609aa9f8d4ae134f53dc675b621efe35c2cc6faed8780d7128c8 SHA512 24cd67b926589401123dfce1a344a6d1ab1d0f9435b9646b7f638deebc0f683b77df70064537f84538eaf800beca4c67fd7c02e40d955fac92866b8ce1eeb769
 DIST listen-3.3.0.tar.gz 53387 BLAKE2B 4e68e0789fde26c43bdeaba3742d1e3ca6f573441ed0b71f54ca85712c39727cb5dc4975b06a6ce52ac2e7049588442a787c7deaada7e162076af5a514884f1f SHA512 c3a4df6293429962c6412b16c7bbabe0244e1296a6bd5516397699f8770793cb7f7dfac78f74593183c2312eb8832f4ab7a650ee29722c7e4e1493faace1b726
+DIST listen-3.3.1.tar.gz 53470 BLAKE2B 6dfe8074883cbced8f7b707414309428b16e755e6652106cb0525dbee0a7596ae1b57b22e8dca665294d9a23de6776738ecb527ea8467fa6c0ff5a04ecdd04f6 SHA512 fbdd743eecd7be5431e7a698d8a00b17f0889975292b1eb798ab8fbddf997aaeb296ee13f846481bc68fbcd512e91f65296792829557a1d420a422717bf1e8a5
diff --git a/dev-ruby/listen/listen-3.3.1.ebuild b/dev-ruby/listen/listen-3.3.1.ebuild
new file mode 100644
index 000000000000..7120fbcdf848
--- /dev/null
+++ b/dev-ruby/listen/listen-3.3.1.ebuild
@@ -0,0 +1,47 @@
+# 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_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Listens to file modifications and notifies you about the changes"
+HOMEPAGE="https://github.com/guard/listen"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+# Block on other packages trying to install a /usr/bin/listen
+RDEPEND+="!!media-radio/ax25-apps !!<dev-ruby/listen-2.8.6-r1:2"
+
+ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.10"
+
+ruby_add_bdepend "test? ( dev-ruby/thor )"
+
+all_ruby_prepare() {
+	rm -f Gemfile || die
+	sed -i -e "/git/,+3d" -e "/rb-fsevent/d" ${PN}.gemspec || die
+	sed -i -e "/rb-fsevent/d"  lib/listen/adapter/darwin.rb || die
+	rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
+}
+
+each_ruby_prepare() {
+	mkdir spec/.fixtures || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	rm -rf spec/.fixtures || die
+}
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index c8ceb8373a74..3fc01df9698c 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -1,4 +1,5 @@
 DIST rspec-core-2.99.2-git.tgz 212935 BLAKE2B 37195012f79aca3a1959f9143e2f5cbab63230ab07ea97928d6f66face8d07ab54d87f19535f5f235c441b2da6dec17ef2a889e9ccd7e83d987086e24afd1b82 SHA512 e13bc3384fd85c367481a8651c14be4a412cba5f58e12a8f4ab14b5d2768a7b92191b81e000e7dbf6a28275b41044d8b3eb70a04e4b30b5bf88db98cbec4cc44
+DIST rspec-core-3.10.0-git.tgz 396978 BLAKE2B 6fb8947598234351595a8832e47baf941f2ca3e8bd39570fba79b9539a7af51144ef41a257d309eddab895ba1e8ba7fe1efb22c855aaab7f1556998d7024ef4a SHA512 f00531021e20fd389dd7a5129ff3bf338c3fa35dfa5e15b0b73ba16eb081d3d7ed2014b1b2ea4ad2682e06f2822c2b895736ac9e80d6af3fba1aecb5cfcea8a3
 DIST rspec-core-3.8.2-git.tgz 387788 BLAKE2B e6cf93f5cef70f53039b6c22fc875cff58eaff4c0c7d4e75d23dedfbe16081980c6fe575d3082dbe6ed9edc8e81f0cbb9e29618da78af40a94c517a859f9d793 SHA512 2fe88ee3d66ecf134562dfa7b1001f23a1a750640c4f65cdec64d85dd735e0fde9d91479286f8f9c38064746813f41632d12d21b3926724ccd7c9ded50d2a7c8
 DIST rspec-core-3.9.1-git.tgz 392102 BLAKE2B e41d4d930201e854015b486eb97e32f356027a837930f061f6282215a0d7e80db99c30c8b537d10f9359380512b46a03fe10ec382f5403704cdc7f0c1796aeed SHA512 2da714ebf35e78be789758857efbebc69548df7a11fff8bcd74a854b61485ef726cf0cec781e27a97d20f4eac0010aad50656b6074248c94b1833d4cb267189a
 DIST rspec-core-3.9.3-git.tgz 396080 BLAKE2B ea52a33586dc32af49a72950c7dbf24eef52a74891b2d7004ec4c5083e2e6d63c602f5033fba3a8ec1dfe6e8da349208b468a79b4e16aa5150d2fc8e93055c0e SHA512 f821ae3017c0fd9ac7f3ced0e81d0ebc54f2c17261f426c58a46c0bf1debb20efca7acc4b751b671e160de72ce5790f897bcb55d5d276fab228a4ea8d388a046
diff --git a/dev-ruby/rspec-core/rspec-core-3.10.0.ebuild b/dev-ruby/rspec-core/rspec-core-3.10.0.ebuild
new file mode 100644
index 000000000000..937c6cffe645
--- /dev/null
+++ b/dev-ruby/rspec-core/rspec-core-3.10.0.ebuild
@@ -0,0 +1,91 @@
+# 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="none"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+# Also install this custom path since internal paths depend on it.
+RUBY_FAKEGEM_EXTRAINSTALL="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-core"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="highlight"
+
+SUBVERSION="$(ver_cut 1-2)"
+
+ruby_add_rdepend "
+	=dev-ruby/rspec-support-${SUBVERSION}*
+	highlight? ( >=dev-ruby/coderay-1.1.1 )
+"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/nokogiri-1.5.2
+		>=dev-ruby/coderay-1.1.1
+		dev-ruby/syntax
+		>=dev-ruby/thread_order-1.1.0
+		>=dev-ruby/rspec-expectations-3.8.0:3
+		>=dev-ruby/rspec-mocks-2.99.0:3
+		>=dev-ruby/rspec-support-3.9.1:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Avoid dependency on cucumber since we can't run the features anyway.
+	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
+
+	# Duplicate exe also in bin. We can't change it since internal stuff
+	# also depends on this and fixing that is going to be fragile. This
+	# way we can at least install proper bin scripts.
+	cp -R exe bin || die
+
+	# Avoid unneeded dependency on git.
+	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
+
+	# Avoid aruba dependency so that we don't end up in dependency hell.
+	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/support/aruba_support.rb || die
+	rm -f spec/integration/{bisect_runners,failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb || die
+	rm -f spec/integration/{spec_file_load_errors,output_stream,fail_if_no_examples}_spec.rb || die
+
+	# Avoid a spec failing due to path issues
+	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
+		spec/rspec/core/configuration_spec.rb || die
+
+	# Avoid a spec that depends on dev-ruby/rspec to lessen circular
+	# dependencies, bug 662328
+	sed -i -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' spec/rspec/core_spec.rb || die
+
+	# Avoid a spec depending on specifics on local networks
+	# This fails when localhost resolves to ::1 which may be a
+	# ruby regression in the drb/acl code.
+	rm -f spec/rspec/core/bisect/server_spec.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
+}
+
+each_ruby_test() {
+	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
+}
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index dd17a6e881f4..00c26ca13bbf 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -1,4 +1,5 @@
 DIST rspec-expectations-2.99.2-git.tgz 106884 BLAKE2B 5b31c8681306d5c688f62fc3fc6adf7be6cabad6df6fd16195c71787d73495924233d793633fa041a94d796f63c9ff97c58e6f4a75bdc09dfbe56e770bb6a5c9 SHA512 6042cafe225b2b16df458c7bf69e1694b637afcac6f6195e35a0be199432610457ccaa3e7e4bd114b27a7a6c3d530d94f4c0603c65f469cbadc55bd3f75b6f3a
+DIST rspec-expectations-3.10.0-git.tgz 211125 BLAKE2B 50fc17eadc94b94a28bf56b1ba6af1d45afe3f62548533515c49eb434becc11ce12f6b6fbd92e98483a1e7c97beec4f0dbb87bc00f3dc9fa1f6877480dab331e SHA512 edb0be319ca2459425498ebe84db0f712dd9d97b36c8a1d99a810ad16f877226bdf9b88c8e84a8379659179868a173745501ce933519727eae20619cb15c4b2d
 DIST rspec-expectations-3.8.4-git.tgz 200149 BLAKE2B 45fe4cdc4b032bb773ef0e7d3e9b75e6d14a6e8c1850ad6fd84991d85a61860730caa9f191aa9d1ce4e21c85dadd2c52bb69bd0a1454f5ab918dc1e563fc54f1 SHA512 0ecb16f11ccf19c02c40ce587f33846fb2241f1663dd87f012b9b782338c213362dac624c434dee6e00ad2cc7ec4a1cd0af7f2edf1a8e9ebb0a0dfb31cd244d8
 DIST rspec-expectations-3.8.6-git.tgz 200343 BLAKE2B 9d668216c18716344e8c249086bcbf2b70e7c1a5a0d1f3a5328fe03752ef4ace6f5029219314016a4bb00ef482f440702a2adb7d9fe49392b5b1c6ec15f6a2e5 SHA512 9ded8de53127f63f2117f5ef64b6608b643586be498d8df24909366ce159a8bb95c9d8771633b777897f3e4ad3c9a12e3dfe62b2310513320b3d9656d24a120a
 DIST rspec-expectations-3.9.1-git.tgz 203727 BLAKE2B 47db054658bdec43c252fd5ac155e7ca794d60ecf8c8b0d3c8e072cf05629153c9778ad618619e5cde5400c95a85c1520f2b9fc3824699af33805fa187549115 SHA512 23a453a46c3eb3bd3f2a39f48f62f05832cf559b570ba0e09235dd6299687254491bab50f5502fefe69dbdeefa09e9d8c5568bc77d0b6b658bb469e197e67572
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.10.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.10.0.ebuild
new file mode 100644
index 000000000000..51856b64738b
--- /dev/null
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.10.0.ebuild
@@ -0,0 +1,47 @@
+# 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_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-expectations"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+SUBVERSION="$(ver_cut 1-2)"
+
+ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*
+	=dev-ruby/rspec-support-${SUBVERSION}*"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/rspec-mocks-3.2.0:3
+		>=dev-ruby/rspec-support-3.5.0:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Remove the Gemfile to avoid running through 'bundle exec'
+	rm -f Gemfile || die
+
+	# fix up the gemspecs
+	sed -i \
+		-e '/git ls/d' \
+		-e '/add_development_dependency/d' \
+		"${RUBY_FAKEGEM_GEMSPEC}" || die
+}
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index c84b71e9ea82..f33900f30331 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -1,4 +1,5 @@
 DIST rspec-mocks-2.99.2-git.tgz 101731 BLAKE2B 27ae180381d427b642c53c351e7b53602caba4252ddf5393949d940be8474110eb0697901afaaa878cd8d368f081c6644c0fcbce86d9d14b9f93f48c027ae808 SHA512 dd3b9394d56de8d3089db7777cda1e1a5bbdc46486876a99a8a83b602b84ba0320913d8e8dabe5e0367645eb01b943607b93e67d87cc26e380c8db6e048e4e0d
+DIST rspec-mocks-3.10.0-git.tgz 193499 BLAKE2B 9bddac80a299e2fc8f549bf4beb2bd3fa5dea21486df7dda9112b008334014284330965881207fedf4b6bea09c25f36b8b2e15ac7bbc6cb244f3504942673d0c SHA512 a2bf76a59b74b89891e4032519fe83ae49a662d3508ecbd9919e6a76d13f0a736063e7215bfda21a3aa58cd88e69fd5eea2a4cbf998a06ee0c192c3d5650995a
 DIST rspec-mocks-3.8.1-git.tgz 191543 BLAKE2B dae8b22a011a3563eb65d1709006169bf5dcf310749cb858f4ff20c7b82e7675a616fc427136fe5e0edeef1db0b42a1d0af1c5623eed35807e84dc355131c8cc SHA512 ec71c4b815beef315f8db329bd2b0e60cdbb1fa37939c624799c1589d94dd28f74b3d1a4c0b9025bc98a809f80d625315458351fe7dec8291bad20e79beecca8
 DIST rspec-mocks-3.8.2-git.tgz 191807 BLAKE2B 9ec44fcaad9fe1e9d75cfb84253e52411b7083070de5dbb19bcdf7c518eb2439e6493e979daf814df7b31bab8bbe72821d42eb797ab88d95e051a700b63d93b5 SHA512 42b9b952386ce862a1cc19116991ae6b4633d551db057babe2e4aa6553acb6eafbb05b98df8a5c6cb362a00025ac3ce0f43f3c4e4ea63343c8bf0dad769a3aed
 DIST rspec-mocks-3.9.1-git.tgz 192772 BLAKE2B abcc8fc82648993e6a407a8c4ac4f5b146b821e1e842c1dd2b95824d8468aac0ea796438d77e376c897675f66bd2bc9024da8fa5ccaf60139ea296b388d542cd SHA512 f804783fca4cf2258e83f82515cd5881ceae0bdd3aedb452a1db901e01de5dbca1d2bdef0ac0828a4bd23a1de58d127a42150c8c204219bca39ea7072619098f
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.10.0.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.10.0.ebuild
new file mode 100644
index 000000000000..222b056a4786
--- /dev/null
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.10.0.ebuild
@@ -0,0 +1,50 @@
+# 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_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-mocks.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-mocks"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+SUBVERSION="$(ver_cut 1-2)"
+
+ruby_add_rdepend "=dev-ruby/rspec-support-${SUBVERSION}*
+	>=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/rspec-core-3.3.0:3
+		>=dev-ruby/rspec-expectations-2.99.0:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Remove the Gemfile to avoid running through 'bundle exec'
+	rm Gemfile || die
+
+	# Remove .rspec options to avoid dependency on newer rspec when
+	# bootstrapping.
+	rm .rspec || die
+
+	sed -i -e '1irequire "spec_helper"' spec/rspec/mocks/any_instance_spec.rb || die
+
+	sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index 1f00d03f6ab2..129df46ef4c9 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -1,3 +1,4 @@
+DIST rspec-support-3.10.0-git.tgz 72853 BLAKE2B 59c585800013fff2dea15ad33dfeed430c9a932206623bb368f4f4660682f537391090cc8538f9052ebafcab336ebd2fdc79003844330adc447be6d977e5648b SHA512 f7183f01b7a7ad55360823617a88a46b2351063d85d81bbd722ecf8b4bb41d014c9ae0af6123caa9405374d484aa61971153f4c59d009986aa20e93afd4a177d
 DIST rspec-support-3.8.2-git.tgz 69112 BLAKE2B 84600d3e2b4d847618f7f53efdf60be3836c7ba6c586de88cdf085e84749e616ad556683b1e7b588b9aec08adee10054e64ae1daf69c6ad58a00d1c2447171f7 SHA512 9fb9f8f2507edee5e7c414d32c1641803eed7a5e17fd300308449277ec6efb786f07207d8f28bcea0a669b8d76a2da53057488d149990ae973c0f7a0343180dc
 DIST rspec-support-3.8.3-git.tgz 69654 BLAKE2B 1ea3eed0602655fbf5f92cdc14217eb8377d980378c9835a342840bb7a00bb1cf095b6fe57a24f80c01ce1835b398ac3c1bd11ac1f95a90b501be6a000e8f6d2 SHA512 90d678e08ca93be30ace986a60aba4c4a81a58d7c56d34863aca70f91efe92480299970aa7eb158e3f8c4878b1ea3303aa0afabfc8c7782bc78f7f63b90b4f9a
 DIST rspec-support-3.9.0-git.tgz 69705 BLAKE2B 96d5cea9c63e6ec2acdbbfc4b7253acc26dbf5202c3bafc4a461123380db7d56958d2bbc787eaf3f1c480801441f6a134e1f29b1d3ce23b1bd3225fe4d8f37a5 SHA512 10e8fa4af59097891219f00e2ced5940e7a5bc67d946fbd348683d2246a4a491e62f7bac6bb757e14d82bb0ba970fe5633609ca4ab2c97c4900719b8004cf4b5
diff --git a/dev-ruby/rspec-support/rspec-support-3.10.0.ebuild b/dev-ruby/rspec-support/rspec-support-3.10.0.ebuild
new file mode 100644
index 000000000000..ae05db178ec0
--- /dev/null
+++ b/dev-ruby/rspec-support/rspec-support-3.10.0.ebuild
@@ -0,0 +1,51 @@
+# 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="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-support"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.9.0:3 >=dev-ruby/thread_order-1.1.0 )"
+
+all_ruby_prepare() {
+	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Remove spec that, by following symlinks, tries to scan pretty much
+	# the whole filesystem.
+	rm spec/rspec/support/caller_filter_spec.rb || die
+
+	# Avoid spec that requires a dependency on git
+	sed -i -e '/library wide checks/,/]/ s:^:#:' spec/rspec/support_spec.rb || die
+
+	# Avoid a spec requiring a specific locale
+	sed -i -e '/copes with encoded strings/ s/RSpec::Support::OS.windows?/true/' spec/rspec/support/differ_spec.rb || die
+
+	# Avoid a brittle spec depending on ruby implementation details
+	# should be fixed upstream in next version
+	#sed -i -e '/returns a hash containing nodes for each line number/askip "ruby26"' spec/rspec/support/source_spec.rb || die
+}
+
+each_ruby_prepare() {
+	# Use the ruby version being tested
+	sed -i -e '/shell_out/ s:ruby:'${RUBY}':' spec/rspec/support/spec/shell_out_spec.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB=lib ${RUBY} -S rspec spec || die
+}
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index 7d026f85e35b..2013450792d8 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -1,3 +1,4 @@
 DIST rspec-2.99.0.gem 5632 BLAKE2B eba837aeebcb0d65dc18a644fd935f241a6703998885418460b2c0bb59574ef144c416518099a77905ca7676852903804169d1bafc2cf8b3f79654b669c43762 SHA512 bcdf5e86938b102200144c49370e0a0691e39a8720048df2eab1a55f95a5bc5e4ced84c7da86d0ddc83ee4ce0f40602c2ae7ee10e55dccf8bb8b769ab048ebb8
+DIST rspec-3.10.0.gem 10752 BLAKE2B e0af9c31a5263b0656341be7432e1597afa56af9bfc5e6d21f1daa7553e5bd3daf2b383a7e1a5b6f761a5880540020e7accd8d4eb6cca6e57d616dcc41690970 SHA512 dd1a3a1c7c73ae9c053e071d7851780d8cf61e92ddba24072b9f2c00a342ed08c81090332ba2eaf7ab96adac3fc723685996195e5cc584e15de57ff02a4455ec
 DIST rspec-3.8.0.gem 10752 BLAKE2B 14b1710fb64fb2ab46d59ac692ceb95dbe7f5e2f5c54e4f97170bd99c2b0d32e1977250f69160ab191367c8016663ecf5cd4e0c89941ff12c727ed52e6118551 SHA512 aa3ecee499240a26866797c00461c7e63915bb84a9a29afce75bd4e7864027588bafde05b108aa7b6d988c1a123265587db807567a8e0f3d03527b0f2d8329ba
 DIST rspec-3.9.0.gem 10752 BLAKE2B 212cebbae9e71b8a090757ec4b9902f20043eaf95b079a409247990e1fca4236e13d0e9a3bd9b9eacfbc2d2aaab19583452dbe08b298ca69a85e20f0163741c2 SHA512 a7dbb22f01d842a41b54c375d32d94c77a7b964d1ea5b1971e7c228dfd5dbfcfe03c007d687781addb93f819dde8de664dda307c266137fdd0a07dab96f96fad
diff --git a/dev-ruby/rspec/rspec-3.10.0.ebuild b/dev-ruby/rspec/rspec-3.10.0.ebuild
new file mode 100644
index 000000000000..517190c916cf
--- /dev/null
+++ b/dev-ruby/rspec/rspec-3.10.0.ebuild
@@ -0,0 +1,26 @@
+# 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_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+SUBVERSION="$(ver_cut 1-2)"
+
+ruby_add_rdepend "
+	=dev-ruby/rspec-core-${SUBVERSION}*
+	=dev-ruby/rspec-expectations-${SUBVERSION}*
+	=dev-ruby/rspec-mocks-${SUBVERSION}*"
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 51e0a60638cd..967cafd18c4a 100644
Binary files a/dev-tcltk/Manifest.gz and b/dev-tcltk/Manifest.gz differ
diff --git a/dev-tcltk/tcllib/tcllib-1.20.ebuild b/dev-tcltk/tcllib/tcllib-1.20.ebuild
index 54cb1d43047c..22b8250cdf27 100644
--- a/dev-tcltk/tcllib/tcllib-1.20.ebuild
+++ b/dev-tcltk/tcllib/tcllib-1.20.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.xz"
 LICENSE="BSD"
 SLOT="0"
 IUSE="examples"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 27a200b75cbe..a7ebb50599dd 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 9c98fa4972f0..6aab218fe7ed 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,4 +1 @@
-DIST bpftrace-0.10.0.tar.gz 835854 BLAKE2B 623369bb2a2ad8d5eec364afa98bdae3fbe5e66182d8f1187fe86a8bd70ee357a554eb063fdbe5476eab23912adf2cf027092cac3e6989d8f716e91aa5d01212 SHA512 da400efe78cea505a32deead594b047ec4394d3eefe86e7b6853fe2dc715c5847a3abcbd26c1fac39d0a534f1e57d6c0bc3625e0c3f1054b0d84b7b1d6eb69b9
-DIST bpftrace-0.11.0.tar.gz 867444 BLAKE2B a99255befadea0b4cb54299a8318c0a7a667ac2258b612750705b4d351ac59f4411f2567bc0100929291e3c9756d276671e41af9d398b118b3d486dace2953d7 SHA512 32bf0c23a7b0e1a57d0e0b8fc845a9e184e201ac3f6018a3d3cee8c97096093b333578cb898ede02fb3ab8d55ba9bcd2bb67ac70b81a49461c0f6e5c03c2a6f5
-DIST bpftrace-0.11.1.tar.gz 867481 BLAKE2B d77e69e21a1cdd65c610b57a8e16d02ff2da69bbb6fd207ff312d2ee3dd4ccbaded205e4b9f16a7ff24177fbc227304ffbb447cd974f44c7828d54f38ad573d5 SHA512 361cedc6ce8a950188717db5ffd005b9709371010810cf6bc870ca945c1db9bdc7ab99b55b694345d580d03145b3eb6ca169f2f1f9909f3e9fc34250df9999f3
-DIST bpftrace-0.11.2.tar.gz 867724 BLAKE2B 6d0a10c8a4261277fc3a6e5f422e26238673dcd76abcae6bd8079cc98ee713d3d34d3e09284f5c79ba323d7203d6d944999da17f73ab2afbf1d403cb0dd1a392 SHA512 25bcc9863d24646108252f0010b96afb823eb795c8c6d94112b7804740d7688139ead7d862a205a1b44b86ef135b412e533fc119939ce550e5509b1bd37952fa
+DIST bpftrace-0.11.3.tar.gz 867967 BLAKE2B 950362e4a4c0f61d67056eacfde0b54a9be9b65285b243cbbb137d113020868f01b1792fddaffbaf41ed174b47cd2f197c0aa89f78690d3e71dae4b7a4c05e3e SHA512 76f6b19ce2a2f3989ebafc49a4df337c6b5f3acf39e7415846b16ee08e2fa7a59821cd18de3c9ed29420b323de8458d1411ccf801e9cd5f3ac64f2bd981e2c3c
diff --git a/dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild b/dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild
deleted file mode 100644
index 26c1753afef8..000000000000
--- a/dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs linux-info cmake-utils
-
-DESCRIPTION="High-level tracing language for eBPF"
-HOMEPAGE="https://github.com/iovisor/bpftrace"
-
-if [[ ${PV} =~ 9{4,} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/iovisor/${PN}"
-	BDEPEND=""
-else
-	MY_PV="${PV//_/}"
-	SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	BDEPEND="app-arch/xz-utils "
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-COMMON_DEPEND="dev-util/systemtap
-	sys-devel/clang:=
-	dev-libs/libbpf:=
-	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
-	<sys-devel/clang-10:=
-	<sys-devel/llvm-10:=[llvm_targets_BPF(+)]
-	>=dev-util/bcc-0.12.0:=
-	virtual/libelf"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-cpp/gtest )"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND+="dev-util/cmake
-	sys-devel/flex
-	sys-devel/bison"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
-
-PATCHES=(
-	"${FILESDIR}/bpftrace-0.10.0-install-libs.patch"
-	"${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch"
-	"${FILESDIR}/bpftrace-0.10.0-llvm-multi.patch"
-	# bpf_detach_kfunc has always been a noop
-	"${FILESDIR}/bpftrace-0.10.0-no-bpf_detach_kfunc.patch"
-)
-
-# lots of fixing needed
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="
-		~BPF
-		~BPF_EVENTS
-		~BPF_JIT
-		~BPF_SYSCALL
-		~FTRACE_SYSCALLS
-		~HAVE_EBPF_JIT
-	"
-
-	check_extra_config
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local -a mycmakeargs
-	mycmakeargs=(
-		"-DSTATIC_LINKING:BOOL=OFF"
-		"-DBUILD_TESTING:BOOL=OFF"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-util/bpftrace/bpftrace-0.11.0-r1.ebuild b/dev-util/bpftrace/bpftrace-0.11.0-r1.ebuild
deleted file mode 100644
index 6eeeb6c28d67..000000000000
--- a/dev-util/bpftrace/bpftrace-0.11.0-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs llvm linux-info cmake
-
-DESCRIPTION="High-level tracing language for eBPF"
-HOMEPAGE="https://github.com/iovisor/bpftrace"
-
-if [[ ${PV} =~ 9{4,} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/iovisor/${PN}"
-	BDEPEND=""
-else
-	MY_PV="${PV//_/}"
-	SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	BDEPEND="app-arch/xz-utils "
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-COMMON_DEPEND="
-	dev-util/systemtap
-	sys-devel/clang:=
-	dev-libs/libbpf:=
-	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
-	sys-devel/clang:=
-	>=dev-util/bcc-0.13.0:=
-	virtual/libelf
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-cpp/gtest )
-"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND+="
-	>=dev-util/cmake-3.8
-	sys-devel/flex
-	sys-devel/bison
-"
-
-S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
-QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
-
-PATCHES=(
-	"${FILESDIR}/bpftrace-0.11.0-install-libs.patch"
-	"${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch"
-)
-
-# lots of fixing needed
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="
-		~BPF
-		~BPF_EVENTS
-		~BPF_JIT
-		~BPF_SYSCALL
-		~FTRACE_SYSCALLS
-		~HAVE_EBPF_JIT
-	"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=11 llvm_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local -a mycmakeargs
-	mycmakeargs=(
-		"-DSTATIC_LINKING:BOOL=OFF"
-		"-DBUILD_TESTING:BOOL=OFF"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/bpftrace/bpftrace-0.11.1.ebuild b/dev-util/bpftrace/bpftrace-0.11.1.ebuild
deleted file mode 100644
index 6eeeb6c28d67..000000000000
--- a/dev-util/bpftrace/bpftrace-0.11.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs llvm linux-info cmake
-
-DESCRIPTION="High-level tracing language for eBPF"
-HOMEPAGE="https://github.com/iovisor/bpftrace"
-
-if [[ ${PV} =~ 9{4,} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/iovisor/${PN}"
-	BDEPEND=""
-else
-	MY_PV="${PV//_/}"
-	SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	BDEPEND="app-arch/xz-utils "
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-COMMON_DEPEND="
-	dev-util/systemtap
-	sys-devel/clang:=
-	dev-libs/libbpf:=
-	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
-	sys-devel/clang:=
-	>=dev-util/bcc-0.13.0:=
-	virtual/libelf
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-cpp/gtest )
-"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND+="
-	>=dev-util/cmake-3.8
-	sys-devel/flex
-	sys-devel/bison
-"
-
-S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
-QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
-
-PATCHES=(
-	"${FILESDIR}/bpftrace-0.11.0-install-libs.patch"
-	"${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch"
-)
-
-# lots of fixing needed
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="
-		~BPF
-		~BPF_EVENTS
-		~BPF_JIT
-		~BPF_SYSCALL
-		~FTRACE_SYSCALLS
-		~HAVE_EBPF_JIT
-	"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=11 llvm_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local -a mycmakeargs
-	mycmakeargs=(
-		"-DSTATIC_LINKING:BOOL=OFF"
-		"-DBUILD_TESTING:BOOL=OFF"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/bpftrace/bpftrace-0.11.2.ebuild b/dev-util/bpftrace/bpftrace-0.11.3-r1.ebuild
similarity index 96%
rename from dev-util/bpftrace/bpftrace-0.11.2.ebuild
rename to dev-util/bpftrace/bpftrace-0.11.3-r1.ebuild
index 263e993188ec..b941fc56d719 100644
--- a/dev-util/bpftrace/bpftrace-0.11.2.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.11.3-r1.ebuild
@@ -25,12 +25,11 @@ IUSE="test"
 
 COMMON_DEPEND="
 	dev-util/systemtap
-	<dev-libs/libbpf-0.2:=
+	dev-libs/libbpf:=
 	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
 	<=sys-devel/llvm-12:=[llvm_targets_BPF(+)]
 	<=sys-devel/clang-12:=
 	>=dev-util/bcc-0.13.0:=
-	<dev-util/bcc-0.17.0:=
 	virtual/libelf
 "
 DEPEND="${COMMON_DEPEND}
diff --git a/dev-util/bpftrace/bpftrace-9999.ebuild b/dev-util/bpftrace/bpftrace-9999.ebuild
index 6eeeb6c28d67..2a14dc584768 100644
--- a/dev-util/bpftrace/bpftrace-9999.ebuild
+++ b/dev-util/bpftrace/bpftrace-9999.ebuild
@@ -25,10 +25,10 @@ IUSE="test"
 
 COMMON_DEPEND="
 	dev-util/systemtap
-	sys-devel/clang:=
-	dev-libs/libbpf:=
+	<dev-libs/libbpf-0.2:=
 	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
-	sys-devel/clang:=
+	<=sys-devel/llvm-12:=[llvm_targets_BPF(+)]
+	<=sys-devel/clang-12:=
 	>=dev-util/bcc-0.13.0:=
 	virtual/libelf
 "
diff --git a/dev-util/bpftrace/files/bpftrace-0.10.0-llvm-multi.patch b/dev-util/bpftrace/files/bpftrace-0.10.0-llvm-multi.patch
deleted file mode 100644
index 48eeeb8e2001..000000000000
--- a/dev-util/bpftrace/files/bpftrace-0.10.0-llvm-multi.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -ru a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2020-05-20 21:00:22.789744736 -0500
-+++ b/CMakeLists.txt	2020-05-20 18:52:38.241091110 -0500
-@@ -30,6 +30,11 @@
-   elseif(STATIC_LIBC)
-     message(WARNING "static libc is known to cause problems, consider STATIC_LIBC=OFF. Proceed at your own risk") #iovisor/bpftrace/issues/266
-   endif()
-+else()
-+  find_package(LLVM 9 REQUIRED CONFIG)
-+
-+  message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
-+  message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
- endif()
-
- if(EMBED_LIBCLANG_ONLY AND NOT EMBED_CLANG)
-diff -ru a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt
---- a/src/ast/CMakeLists.txt	2020-05-20 21:00:22.777744534 -0500
-+++ b/src/ast/CMakeLists.txt	2020-05-20 20:52:39.657888690 -0500
-@@ -42,26 +41,29 @@
-     if(EMBED_LIBCLANG_ONLY)
-       unlink_transitive_dependency("${CLANG_EXPORTED_TARGETS}" "LLVM")
-     endif()
--    target_link_libraries(bpftraceast ${CLANG_EMBEDDED_CMAKE_TARGETS})
-+    target_link_libraries(bpftraceast ${CLANG_EMBEDDED_CMAKE_TARGETS})
-   else()
-     list(INSERT clang_libs 0 libclang.a)
-   endif()
-
-   if(EMBED_LLVM)
--    target_link_libraries(bpftraceast ${LLVM_EMBEDDED_CMAKE_TARGETS})
-+    target_link_libraries(bpftraceast ${LLVM_EMBEDDED_CMAKE_TARGETS})
-   else()
-     llvm_map_components_to_libnames(llvm_libs bpfcodegen ipo irreader mcjit orcjit ${LLVM_TARGETS_TO_BUILD})
--    target_link_libraries(bpftraceast ${clang_libs})
--    target_link_libraries(bpftraceast ${llvm_libs})
-+    target_link_libraries(bpftraceast ${clang_libs})
-+    target_link_libraries(bpftraceast ${llvm_libs})
-   endif()
- else()
--  find_library(found_LLVM LLVM HINTS ${LLVM_LIBRARY_DIRS})
--  if(found_LLVM)
--    target_link_libraries(bpftraceast LLVM)
--  else()
--    llvm_map_components_to_libnames(_llvm_libs bpfcodegen ipo irreader mcjit orcjit ${LLVM_TARGETS_TO_BUILD})
--    llvm_expand_dependencies(llvm_libs ${_llvm_libs})
--    target_link_libraries(bpftraceast ${llvm_libs})
-+  find_package(LLVM 9 REQUIRED CONFIG)
-+
-+  include_directories(${LLVM_INCLUDE_DIRS})
-+  add_definitions(${LLVM_DEFINITIONS})
-+
-+  find_library(found_clang clang HINTS ${LLVM_LIBRARY_DIRS})
-+  if(found_clang)
-+    target_link_libraries(bpftraceast ${found_clang})
-   endif()
--  target_link_libraries(bpftraceast libclang)
-+  llvm_map_components_to_libnames(_llvm_libs bpfcodegen ipo irreader mcjit orcjit ${LLVM_TARGETS_TO_BUILD})
-+  llvm_expand_dependencies(llvm_libs ${_llvm_libs})
-+  target_link_libraries(bpftraceast ${llvm_libs})
- endif()
diff --git a/dev-util/bpftrace/files/bpftrace-0.10.0-no-bpf_detach_kfunc.patch b/dev-util/bpftrace/files/bpftrace-0.10.0-no-bpf_detach_kfunc.patch
deleted file mode 100644
index 145fb1c0ca91..000000000000
--- a/dev-util/bpftrace/files/bpftrace-0.10.0-no-bpf_detach_kfunc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/attached_probe.cpp b/src/attached_probe.cpp
-index c7e789e..08f657e 100644
---- a/src/attached_probe.cpp
-+++ b/src/attached_probe.cpp
-@@ -116,7 +116,7 @@ void AttachedProbe::attach_kfunc(void)
- int AttachedProbe::detach_kfunc(void)
- {
-   close(tracing_fd_);
--  return bpf_detach_kfunc(progfd_, NULL);
-+  return 0;
- }
- #else
- void AttachedProbe::attach_kfunc(void)
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index d86d278e7554..9db6c02c4c05 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,3 +1,2 @@
-DIST ccache-3.7.11.tar.xz 354160 BLAKE2B 46fc5d65d6224bb796db7632b35ccca1089e5fed36eeb2ba231cf4c1aaa94be10bf0504f6ef565ce11673e527e09dee64583a764062ca7fea38364d790dd8cc1 SHA512 47b71b3ab4b89bf9b6f6d15941c22d2207b369922f51f9a8fbf4e86554325053dccce669e1c1ed3c0019a7e0a3d610f399e52d3fee68b56111aa7c1b24132c11
 DIST ccache-3.7.12.tar.xz 354684 BLAKE2B b0b1028ede8206622c4b563cdc1351bdbe49ac11aa92d405c778af91db5bac029f7331371ef0a55bc3b1c7a0b60fbc5711277e048481bf0f4ad4b1be8acd3495 SHA512 0eb47869f86d36b3e5fad0d5073973f0444f3efe23fd14469a9e05154ea219228443098b1c5e4a8a0c5c78b4bfa7623735b50ebd6b8b4d0626766061850d6a62
 DIST ccache-4.0.tar.xz 383264 BLAKE2B ef4ca19860e2a0d313354cbd59a9eff441e86663820e8233dcf4b45a008ffa330b4a4c22eb11f3c6a7a98950d7d247034e60eb71c84ec4471f60fa19591651bd SHA512 1e55767bc2919109ae3c9b74f0adcd518e7e11df45c3981b2e9f8b04a780f9730457eeef1df137c65ab20e0959600c5317f06b58ffb82f5806c7c9f6cc305715
diff --git a/dev-util/ccache/ccache-3.7.11.ebuild b/dev-util/ccache/ccache-3.7.11.ebuild
deleted file mode 100644
index 04f64dcc7b6a..000000000000
--- a/dev-util/ccache/ccache-3.7.11.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="fast compiler cache"
-HOMEPAGE="https://ccache.dev/"
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="test"
-
-DEPEND="app-arch/xz-utils
-	sys-libs/zlib"
-RDEPEND="${DEPEND}
-	dev-util/shadowman
-	sys-apps/gentoo-functions"
-# clang-specific tests use dev-libs/elfutils to compare objects for equality.
-# Let's pull in the dependency unconditionally.
-DEPEND+="
-	test? ( dev-libs/elfutils )"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
-	"${FILESDIR}"/${PN}-3.7.10-objdump.patch
-)
-
-src_prepare() {
-	default
-
-	sed \
-		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-		"${FILESDIR}"/ccache-config-3 > ccache-config || die
-
-	# mainly used in tests
-	tc-export OBJDUMP
-}
-
-src_configure() {
-	econf --without-bundled-zlib
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_test() {
-	emake check V=1
-}
-
-src_install() {
-	DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
-	default
-
-	dobin ccache-config
-	insinto /usr/share/shadowman/tools
-	newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then
-		eselect compiler-shadow remove ccache
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${ROOT:-/} == / ]]; then
-		eselect compiler-shadow update ccache
-	fi
-}
diff --git a/dev-util/ccache/ccache-3.7.12.ebuild b/dev-util/ccache/ccache-3.7.12.ebuild
index 4d0791b5ad18..5dfae60d7ef7 100644
--- a/dev-util/ccache/ccache-3.7.12.ebuild
+++ b/dev-util/ccache/ccache-3.7.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
 
 LICENSE="GPL-3"
 SLOT="0"
-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"
 IUSE="test"
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/colm/colm-0.13.0.5.ebuild b/dev-util/colm/colm-0.13.0.5.ebuild
index a64627ad7bb8..ec66f5a78c62 100644
--- a/dev-util/colm/colm-0.13.0.5.ebuild
+++ b/dev-util/colm/colm-0.13.0.5.ebuild
@@ -10,6 +10,14 @@ SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 arm arm64 ~ia64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 DEPEND="app-text/asciidoc"
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-util/cpputest/Manifest b/dev-util/cpputest/Manifest
index 05c8565c0dbb..ac81a89d7d2a 100644
--- a/dev-util/cpputest/Manifest
+++ b/dev-util/cpputest/Manifest
@@ -1,2 +1 @@
-DIST cpputest-3.8.tar.gz 2722956 BLAKE2B 1da16c06d242703462dcaf9c6c26eb875c2622bcce4113fd0b990805d06ee7401a6776d2f0451eda49e7914caa59a5665a92387684ffb6dbbe884cf0fe07bd86 SHA512 a9592bdc9ffab8b42026ef2010f504e7e37d77fc2f197f89d23f7c9285a101059a0ec66418b914db0383974616d31b26addd1938fb27f45c3e7d9496ed0a0fac
 DIST cpputest-4.0.tar.gz 1163749 BLAKE2B 2ae0f4658662ead0fe5a46a0ae521edf7677a7b64e3c7ce9bad374c4f953ea5a548cdfe1d9128821ab5031211c10f02d0728085e68db02e0d021ea16d8b38f1c SHA512 69f39fffdcd965c871e598118db38ddb74a3e75fd7a7965f8d236029fa891f6fcb6b671147c166ad08482bbd0737537fafe90aa8439a0ab62389f19150cc39d7
diff --git a/dev-util/cpputest/cpputest-3.8.ebuild b/dev-util/cpputest/cpputest-3.8.ebuild
deleted file mode 100644
index dad5aebdc6dc..000000000000
--- a/dev-util/cpputest/cpputest-3.8.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="unit testing and mocking framework for C/C++"
-HOMEPAGE="https://cpputest.github.io/ https://github.com/cpputest/cpputest"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( >=dev-cpp/gtest-1.8.0 )"
-
-DOCS=( AUTHORS README.md README_CppUTest_for_C.txt )
diff --git a/dev-util/cucumber-messages/Manifest b/dev-util/cucumber-messages/Manifest
index 15ec0fc3abd0..3fb6f645586f 100644
--- a/dev-util/cucumber-messages/Manifest
+++ b/dev-util/cucumber-messages/Manifest
@@ -1 +1,2 @@
 DIST cucumber-messages-13.1.0.gem 10752 BLAKE2B 53ee61ab3ebb9f746701d583abbc78b31f929dabe848b88288888df891c0c8a9c2fe1ca416de5cf84cd47bdcb5b7d821a1ddf77ac2e5684b5315fdcdd104dc6b SHA512 cbb7ef75f8ef33dcb6230b62408f4c53ddc490029d271de54c753205aac761b4f47fec72d1d579be9c804c1dd512f3a9359f84b2a633d9bec211bba81b39a9e1
+DIST cucumber-messages-13.2.0.gem 10752 BLAKE2B babc649d1ba76819b9d6dade7eb926a0a220da02efdcc6438077c03ae1ebdccb29f2dd7d806fe950c47a796fa0b254760db0cdd4e1ff4d489e750f861156c2fd SHA512 0ad0fd6bcca7965129c70996a35e65fe7cad23b767273c1eb1851fee5c83e26ecdc5e1d5bc63a85950d0248682f45bdcd373da562e4e3fd541e633890216edab
diff --git a/dev-util/cucumber-messages/cucumber-messages-13.2.0.ebuild b/dev-util/cucumber-messages/cucumber-messages-13.2.0.ebuild
new file mode 100644
index 000000000000..6bff67f90b06
--- /dev/null
+++ b/dev-util/cucumber-messages/cucumber-messages-13.2.0.ebuild
@@ -0,0 +1,21 @@
+# 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_EXTRAINSTALL="VERSION"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Protocol Buffer messages for Cucumber's inter-process communication"
+HOMEPAGE="https://github.com/cucumber/cucumber-messages-ruby#readme"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+
+ruby_add_rdepend ">=dev-util/protobuf-cucumber-3.10.8:3"
diff --git a/dev-util/diffball/diffball-1.0.1-r2.ebuild b/dev-util/diffball/diffball-1.0.1-r2.ebuild
index 315c3c7a4696..789ab5f84495 100644
--- a/dev-util/diffball/diffball-1.0.1-r2.ebuild
+++ b/dev-util/diffball/diffball-1.0.1-r2.ebuild
@@ -16,18 +16,19 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug"
 
-RDEPEND=">=sys-libs/zlib-1.1.4
+RDEPEND="
+	>=sys-libs/zlib-1.1.4
 	>=app-arch/bzip2-1.0.2
 	app-arch/xz-utils"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 # Invalid RESTRICT for source package. Investigate.
 RESTRICT="strip"
 
 PATCHES=(
-	"${DISTDIR}/${P}-bug_543310_stack_buffer_overflows.patch"
-	"${DISTDIR}/${P}-bug_708736_cseek_xz_reset_avail_in_out.patch"
+	"${DISTDIR}"/${P}-bug_543310_stack_buffer_overflows.patch
+	"${DISTDIR}"/${P}-bug_708736_cseek_xz_reset_avail_in_out.patch
 )
 
 src_prepare() {
@@ -38,5 +39,14 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --disable-static $(use_enable debug asserts)
+	econf \
+		--disable-static \
+		$(use_enable debug asserts)
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.64.5.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.64.5.ebuild
index 76616a6792ac..34a868d371b5 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.64.5.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.64.5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/glib-utils/glib-utils-2.64.5.ebuild b/dev-util/glib-utils/glib-utils-2.64.5.ebuild
index 8cd44c27d7a0..56e015526f0b 100644
--- a/dev-util/glib-utils/glib-utils-2.64.5.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.64.5.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild b/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
index e9d4fcf797ab..ac05cc2f848b 100644
--- a/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtk.org/gtk-doc/"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 
 IUSE="debug doc emacs"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild
index 3ae8d2db01ca..c82aa749e296 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # man page was previously installed by gtk+:3 ebuild
 RDEPEND="
diff --git a/dev-util/hfstospell/Manifest b/dev-util/hfstospell/Manifest
index d6cc1b658582..fd7d9e959c93 100644
--- a/dev-util/hfstospell/Manifest
+++ b/dev-util/hfstospell/Manifest
@@ -1,2 +1 @@
-DIST hfstospell-0.5.1.tar.gz 152056 BLAKE2B fa589908312bd4a4b40b88b221ee5f6bdc281d6151984a87b237372b0141157db87b3494e357d74a17f0ee137fd5ce35ec8caddb12d5bffe15930a74345cd3ee SHA512 bd8ffdd3ee822da2a57a3405b139ec1e635dc8bb293dbd9abd05912b8929df29633304e64b97522e4590a3907ddfa3aefec3e4da5ab709b9be1857cc2ecd2018
 DIST hfstospell-0.5.2.tar.gz 152115 BLAKE2B 667c01672fd6fd6ee743a6542677ffe74e3900c27ab2754f8fa7dcc57081074bd98e8d82827fe176b2a6c9abc4565efcb3204df43110906f5a333405ec8a6bf2 SHA512 307aff3aec91ac6ffed3ebabdc2baa1a6e913431f57a80a0d0254be57fbd72e28d7592c35e0d72e5979f7e0b4c585f11b8eb91183b0877f9670a9cd5206c0140
diff --git a/dev-util/hfstospell/files/hfstospell-0.5.1-gcc-10-fix.patch b/dev-util/hfstospell/files/hfstospell-0.5.1-gcc-10-fix.patch
deleted file mode 100644
index 0998beebe7d7..000000000000
--- a/dev-util/hfstospell/files/hfstospell-0.5.1-gcc-10-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From a9d5afb14aa71893f142dfd3ae735e8930aa0f8a Mon Sep 17 00:00:00 2001
-From: Martin Liska <mliska@suse.cz>
-Date: Mon, 16 Mar 2020 11:32:10 +0100
-Subject: [PATCH] Fix a typo in wide string conversion function (#49).
-
-Revert a hunk from:
-04e4843e4c66beb61b756f3ceb2ac94628142185.
----
- main.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/main.cc b/main.cc
-index abecf46..e4fd676 100644
---- a/main.cc
-+++ b/main.cc
-@@ -61,7 +61,7 @@ static bool suggest_reals = false;
- #ifdef WINDOWS
- static std::string wide_string_to_string(const std::wstring & wstr)
- {
--  int size_needed = WideCharToMultiByte(CP_UTF8, 0, &wstr[0], (int)§wstr.size(), NULL, 0, NULL, NULL);
-+  int size_needed = WideCharToMultiByte(CP_UTF8, 0, &wstr[0], (int)wstr.size(), NULL, 0, NULL, NULL);
-   std::string str( size_needed, 0 );
-   WideCharToMultiByte(CP_UTF8, 0, &wstr[0], (int)wstr.size(), &str[0], size_needed, NULL, NULL);
-   return str;
diff --git a/dev-util/hfstospell/hfstospell-0.5.1.ebuild b/dev-util/hfstospell/hfstospell-0.5.1.ebuild
deleted file mode 100644
index b3e56cf85239..000000000000
--- a/dev-util/hfstospell/hfstospell-0.5.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="HFST spell checker library and command line tool"
-HOMEPAGE="https://github.com/hfst/hfst-ospell"
-SRC_URI="https://github.com/hfst/hfst-ospell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="app-arch/libarchive
-	dev-cpp/libxmlpp:2.6
-	dev-libs/icu:=
-	dev-libs/tinyxml2"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/hfst-ospell-${PV}"
-
-PATCHES=( "${FILESDIR}/hfstospell-0.5.1-gcc-10-fix.patch" )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete -o -name '*.a' -delete || die
-}
diff --git a/dev-util/hfstospell/hfstospell-0.5.2.ebuild b/dev-util/hfstospell/hfstospell-0.5.2.ebuild
index 645a081e763b..f269ab5ace37 100644
--- a/dev-util/hfstospell/hfstospell-0.5.2.ebuild
+++ b/dev-util/hfstospell/hfstospell-0.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hfst/hfst-ospell/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="app-arch/libarchive
 	dev-cpp/libxmlpp:2.6
diff --git a/dev-util/pkgconf/pkgconf-1.6.3.ebuild b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
index 114a0bfd9d0a..1338eee18e3d 100644
--- a/dev-util/pkgconf/pkgconf-1.6.3.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
@@ -54,7 +54,7 @@ src_prepare() {
 
 multilib_src_configure() {
 	local ECONF_SOURCE="${S}"
-	econf
+	econf --disable-static
 }
 
 multilib_src_test() {
diff --git a/dev-util/promu/promu-0.5.0.ebuild b/dev-util/promu/promu-0.5.0.ebuild
index 199f7360e01d..b4fa942d188e 100644
--- a/dev-util/promu/promu-0.5.0.ebuild
+++ b/dev-util/promu/promu-0.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/prometheus/promu/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 RESTRICT+=" test"
diff --git a/dev-util/promu/promu-0.6.1.ebuild b/dev-util/promu/promu-0.6.1.ebuild
index db82f31450ca..61b8d779f6c1 100644
--- a/dev-util/promu/promu-0.6.1.ebuild
+++ b/dev-util/promu/promu-0.6.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/prometheus/promu/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 RESTRICT+=" test"
diff --git a/dev-util/rocm-cmake/Manifest b/dev-util/rocm-cmake/Manifest
index 9dd556d95290..86ce26f868b7 100644
--- a/dev-util/rocm-cmake/Manifest
+++ b/dev-util/rocm-cmake/Manifest
@@ -1 +1,2 @@
 DIST rocm-cmake-3.8.0.tar.gz 15823 BLAKE2B 321d31769cee254f9f9048104c7837fc6eb4a224d53e3e3ec18d5fa283f33cb116ece739a19f791cf62ac84f533933233461fd9e470b5c413363aa58fe23b57a SHA512 52e71033ef85b526edc00c1c11681c888ca7a50cf70a69f111ac2d7d32821340d8c812714a525711ff7ec54c8e7cbb79c4cb620a6e559699c509397ebf1b5886
+DIST rocm-cmake-3.9.0.tar.gz 15815 BLAKE2B 86fedeb90ee27367b5fcfe842009055ef073932823fe54c9c6b7dfc7d08e92165c6cb4befebee347645777948b8c24de0c90f2547648cadbd34d39de2da540ef SHA512 bda392023494929ae743a81afdb4b802a3f7728a101ec06dd49c2e1d1165a2306d25beda6a4ea7dfc0aeeeee3f8bad8949d5c897618a362262570d6582c789db
diff --git a/dev-util/rocm-cmake/rocm-cmake-3.9.0.ebuild b/dev-util/rocm-cmake/rocm-cmake-3.9.0.ebuild
new file mode 100644
index 000000000000..a8e68baa5599
--- /dev/null
+++ b/dev-util/rocm-cmake/rocm-cmake-3.9.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/rocm-cmake/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocm-cmake-rocm-${PV}"
+fi
+
+DESCRIPTION="Radeon Open Compute CMake Modules"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocm-cmake"
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="test"
+
+src_prepare() {
+	sed -e "s:set(ROCM_INSTALL_LIBDIR lib):set(ROCM_INSTALL_LIBDIR $(get_libdir)):" -i "${S}/share/rocm/cmake/ROCMInstallTargets.cmake" || die
+	cmake_src_prepare
+}
diff --git a/dev-util/rocminfo/Manifest b/dev-util/rocminfo/Manifest
index e79a96708c03..c9c1ac5f6b78 100644
--- a/dev-util/rocminfo/Manifest
+++ b/dev-util/rocminfo/Manifest
@@ -1,2 +1,3 @@
 DIST rocminfo-3.7.0.tar.gz 15104 BLAKE2B 728ce471e52dadca8b59aa3196c2f75933650e3002335014accd7f8eada19d4936a7404f908d50747a0e51faa8a65764200072cf598f9d0855a3052db8290160 SHA512 25a6a9216366e310ece9db50a21bc0eb7741760a7b46fa1818ee102557000348f430f9269e2ba9e872437dfafcb31ac563476e2bf83a10705fde8dd5fc854404
 DIST rocminfo-3.8.0.tar.gz 15103 BLAKE2B afa6a2cd3315b18f2711cf1de4701e672beac76d08548453f9377c865f2b108f4f50340f545a9040450c7acded3ac093d334908a7ceddba35c847136fe92aa77 SHA512 c75fa7a4116b9cfa75d6b7ff3920c85ad19fea09ab5f6a7abebde9cd184763905aea8684574f6b1919044806af8ab35a81d7f6010cbd0fb18b36699a182b5f39
+DIST rocminfo-3.9.0.tar.gz 15106 BLAKE2B 0be734ee03298a83892fb237f7b171c7bb5779d153efa2f49ceadd27a32709fd7f6fe4895d43c7d55763be6a5ddf22a4ab9c6b42e4f28946b0d35d44cd897d54 SHA512 aaa2feaad1e0c8583f5211d629934c270f30c046d4e4067c142ea5ddc4fba95c6719d38cd623d1f5190962ccbbfc63196a3f4618d84e9b223bc6ee8cc5544530
diff --git a/dev-util/rocminfo/rocminfo-3.9.0.ebuild b/dev-util/rocminfo/rocminfo-3.9.0.ebuild
new file mode 100644
index 000000000000..6de4e9b7cca0
--- /dev/null
+++ b/dev-util/rocminfo/rocminfo-3.9.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocminfo-rocm-${PV}"
+fi
+
+DESCRIPTION="ROCm Application for Reporting System Info"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocminfo"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocr-runtime-${PV}"
+DEPEND="${RDEPEND}"
diff --git a/dev-util/watchman/metadata.xml b/dev-util/watchman/metadata.xml
index 57a0732b555f..0dc2b75aa0cb 100644
--- a/dev-util/watchman/metadata.xml
+++ b/dev-util/watchman/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-        <email>monsieurp@gentoo.org</email>
+		<email>monsieurp@gentoo.org</email>
 		<name>Patrice Clement</name>
 	</maintainer>
 	<maintainer type="person">
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 21641fc18489..ba9f9c488050 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass
index 048d0c9b016c..99279ba58a99 100644
--- a/eclass/kernel-build.eclass
+++ b/eclass/kernel-build.eclass
@@ -197,6 +197,38 @@ kernel-build_pkg_postinst() {
 	savedconfig_pkg_postinst
 }
 
+# @FUNCTION: kernel-build_merge_configs
+# @USAGE: [distro.config...]
+# @DESCRIPTION:
+# Merge the config files specified as arguments (if any) into
+# the '.config' file in the current directory, then merge
+# any user-supplied configs from ${BROOT}/etc/kernel/config.d/*.config.
+# The '.config' file must exist already and contain the base
+# configuration.
+kernel-build_merge_configs() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	[[ -f .config ]] || die "${FUNCNAME}: .config does not exist"
+	has .config "${@}" &&
+		die "${FUNCNAME}: do not specify .config as parameter"
+
+	local shopt_save=$(shopt -p nullglob)
+	shopt -s nullglob
+	local user_configs=( "${BROOT}"/etc/kernel/config.d/*.config )
+	shopt -u nullglob
+
+	if [[ ${#user_configs[@]} -gt 0 ]]; then
+		elog "User config files are being applied:"
+		local x
+		for x in "${user_configs[@]}"; do
+			elog "- ${x}"
+		done
+	fi
+
+	./scripts/kconfig/merge_config.sh -m -r \
+		.config "${@}" "${user_configs[@]}" || die
+}
+
 _KERNEL_BUILD_ECLASS=1
 fi
 
diff --git a/eclass/nvidia-driver.eclass b/eclass/nvidia-driver.eclass
index c286a5d8f551..a2206c5e7894 100644
--- a/eclass/nvidia-driver.eclass
+++ b/eclass/nvidia-driver.eclass
@@ -3,7 +3,7 @@
 
 # @ECLASS: nvidia-driver.eclass
 # @MAINTAINER:
-# No maintainer <maintainer-needed@gentoo.org>
+# David Seifert <soap@gentoo.org>
 # @AUTHOR:
 # Original author: Doug Goldstein <cardoe@gentoo.org>
 # @BLURB: Provide useful messages for nvidia-drivers
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 085551a120bc..6b4c8ae66e0f 100644
Binary files a/games-arcade/Manifest.gz and b/games-arcade/Manifest.gz differ
diff --git a/games-arcade/moleinvasion/files/moleinvasion-0.4-fno-common.patch b/games-arcade/moleinvasion/files/moleinvasion-0.4-fno-common.patch
new file mode 100644
index 000000000000..3d1833148792
--- /dev/null
+++ b/games-arcade/moleinvasion/files/moleinvasion-0.4-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/worldmap.h
++++ b/worldmap.h
+@@ -24,7 +24,7 @@
+ void draw_level_name(int current_level,myList * all_level_desc);
+ 
+ /* on stocke ici toutes les datas evoluant relatives au monde en cours */
+-#ifdef MAIN_WORLDMAP
++#ifndef MAIN_WORLDMAP
+ #define EXTERN_WLD extern
+ #else
+ #define EXTERN_WLD
diff --git a/games-arcade/moleinvasion/moleinvasion-0.4-r2.ebuild b/games-arcade/moleinvasion/moleinvasion-0.4-r2.ebuild
index 885dd1d1524f..91e9e1aa5d0a 100644
--- a/games-arcade/moleinvasion/moleinvasion-0.4-r2.ebuild
+++ b/games-arcade/moleinvasion/moleinvasion-0.4-r2.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit desktop
+EAPI=7
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Mole infested 2D platform game"
 HOMEPAGE="http://moleinvasion.tuxfamily.org/"
-SRC_URI="ftp://download.tuxfamily.org/minvasion/packages/MoleInvasion-${PV}.tar.bz2
+SRC_URI="
+	ftp://download.tuxfamily.org/minvasion/packages/MoleInvasion-${PV}.tar.bz2
 	music? ( mirror://gentoo/${PN}-music-20090731.tar.gz )"
 
 LICENSE="GPL-2"
@@ -14,19 +16,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="music"
 
-DEPEND="media-libs/libsdl[opengl,video]
-	virtual/opengl
+DEPEND="
+	media-libs/libsdl[opengl,video]
 	media-libs/sdl-image[jpeg,png]
 	media-libs/sdl-mixer[vorbis]
 	media-libs/sdl-ttf
-"
+	virtual/opengl"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${P}/src"
 
 src_prepare() {
 	default
-	use music && mv -f "${WORKDIR}"/music ../
+
+	if use music; then
+		mv -f "${WORKDIR}"/music ../ || die
+	fi
+
 	sed -i \
 		-e '/^CFLAGS/s:= -g:+=:' \
 		-e '/^LDFLAGS/d' \
@@ -34,13 +40,20 @@ src_prepare() {
 		-e "/^FINALDATADIR/s:/usr.*:/usr/share/${PN}:" \
 		Makefile || die "sed failed"
 
-	eapply "${FILESDIR}"/${P}-opengl.patch \
-		"${FILESDIR}"/${P}-underlink.patch
+	eapply \
+		"${FILESDIR}"/${P}-opengl.patch \
+		"${FILESDIR}"/${P}-underlink.patch \
+		"${FILESDIR}"/${P}-fno-common.patch
+}
+
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
 	emake DESTDIR="${D}" install install-data
-	newicon ../gfx/icon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Mole Invasion"
 	doman ../debian/*.6
+
+	newicon ../gfx/icon.xpm moleinvasion.xpm
+	make_desktop_entry moleinvasion "Mole Invasion"
 }
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index f4c26a1040b2..b6ee8bd64666 100644
Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ
diff --git a/games-emulation/advancescan/Manifest b/games-emulation/advancescan/Manifest
index 063211b0755d..9085d415886f 100644
--- a/games-emulation/advancescan/Manifest
+++ b/games-emulation/advancescan/Manifest
@@ -1 +1,2 @@
+DIST advancescan-1.16-gcc6.patch 24440 BLAKE2B bd7b25859798cc3935fedc6d60ea822189301232426e2b071665aaf6af3a85f16d93c22373e8ad1b46da96ab577fceebe681e86021452aa20e24b0e0fd9b2a8a SHA512 e758ba7d900f1ca5fd6f32c3572fbf4c2a7cf77877f926511bd724ec5ec8ddb9697244f5a582eeb5275188ae2c8a14e8388cac93365ac348e9cc60835884a499
 DIST advancescan-1.16.tar.gz 316895 BLAKE2B 1ce2ec88a80cca8ff8d1fa09cba7b9c5583e42a3419bfd561bb184b53fe071c011b864ee813f0107667881112ca4adf01cd2b8e8148712927af1c82bc73f43c1 SHA512 6d359c160d54a0a1cd13db10f5fc9986fae4f1151e205024e40c21b0f933723351907156faec22a92561ad523151e3b7d4ff70a6eebbb6152bd3767063a31031
diff --git a/games-emulation/advancescan/advancescan-1.16-r1.ebuild b/games-emulation/advancescan/advancescan-1.16-r1.ebuild
index 46c0c1379bcb..e81b0ed11764 100644
--- a/games-emulation/advancescan/advancescan-1.16-r1.ebuild
+++ b/games-emulation/advancescan/advancescan-1.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,8 @@ inherit autotools eutils
 
 DESCRIPTION="A command line rom manager for MAME, MESS, AdvanceMAME, AdvanceMESS and Raine"
 HOMEPAGE="http://advancemame.sourceforge.net/scan-readme.html"
-SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz
+	https://dev.gentoo.org/~juippis/distfiles/tmp/advancescan-1.16-gcc6.patch"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,7 +20,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-sys-expat.patch
-	"${FILESDIR}"/${P}-gcc6.patch
+	"${DISTDIR}"/${P}-gcc6.patch
 )
 
 src_prepare() {
diff --git a/games-emulation/advancescan/files/advancescan-1.16-gcc6.patch b/games-emulation/advancescan/files/advancescan-1.16-gcc6.patch
deleted file mode 100644
index 1f9c73f6db60..000000000000
--- a/games-emulation/advancescan/files/advancescan-1.16-gcc6.patch
+++ /dev/null
@@ -1,520 +0,0 @@
---- advancescan-1.16/analyze.cc.old	2016-09-25 19:17:21.698171287 -0400
-+++ advancescan-1.16/analyze.cc	2016-09-25 19:22:12.027465540 -0400
-@@ -33,467 +33,6 @@
- { 0, 0, 0 }
- };
- 
--char MAMEDK_DATA[] = {
--	0x2e, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2e, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x5f, 0x20,
--	0x5f, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x5f, 0x20, 0x5f, 0x5f, 0x20, 0x5f,
--	0x5f, 0x5f, 0x20, 0x20, 0x20, 0x5f, 0x5f, 0x20,
--	0x5f, 0x20, 0x5f, 0x20, 0x5f, 0x5f, 0x20, 0x5f,
--	0x5f, 0x5f, 0x20, 0x20, 0x20, 0x5f, 0x5f, 0x5f,
--	0x20, 0x20, 0x20, 0x5f, 0x5f, 0x7c, 0x20, 0x7c,
--	0x20, 0x7c, 0x20, 0x5f, 0x5f, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x7c, 0x20, 0x27, 0x5f, 0x20, 0x60, 0x20,
--	0x5f, 0x20, 0x5c, 0x20, 0x2f, 0x20, 0x5f, 0x60,
--	0x20, 0x7c, 0x20, 0x27, 0x5f, 0x20, 0x60, 0x20,
--	0x5f, 0x20, 0x5c, 0x20, 0x2f, 0x20, 0x5f, 0x20,
--	0x5c, 0x20, 0x2f, 0x20, 0x5f, 0x60, 0x20, 0x7c,
--	0x20, 0x7c, 0x2f, 0x20, 0x2f, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x7c, 0x20, 0x7c, 0x20, 0x7c, 0x20, 0x7c,
--	0x20, 0x7c, 0x20, 0x7c, 0x20, 0x28, 0x5f, 0x7c,
--	0x20, 0x7c, 0x20, 0x7c, 0x20, 0x7c, 0x20, 0x7c,
--	0x20, 0x7c, 0x20, 0x7c, 0x20, 0x20, 0x5f, 0x5f,
--	0x2f, 0x7c, 0x20, 0x28, 0x5f, 0x7c, 0x20, 0x7c,
--	0x20, 0x20, 0x20, 0x3c, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x7c, 0x5f, 0x7c, 0x20, 0x7c, 0x5f, 0x7c,
--	0x20, 0x7c, 0x5f, 0x7c, 0x5c, 0x5f, 0x5f, 0x2c,
--	0x5f, 0x7c, 0x5f, 0x7c, 0x20, 0x7c, 0x5f, 0x7c,
--	0x20, 0x7c, 0x5f, 0x7c, 0x5c, 0x5f, 0x5f, 0x5f,
--	0x28, 0x5f, 0x29, 0x5f, 0x5f, 0x2c, 0x5f, 0x7c,
--	0x5f, 0x7c, 0x5c, 0x5f, 0x5c, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x68, 0x74,
--	0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77,
--	0x2e, 0x6d, 0x61, 0x6d, 0x65, 0x2e, 0x64, 0x6b,
--	0x2f, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x3e, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x3c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x70, 0x72, 0x6f, 0x75, 0x64, 0x6c, 0x79,
--	0x20, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74,
--	0x73, 0x20, 0x72, 0x61, 0x66, 0x6c, 0x65, 0x73,
--	0x69, 0x61, 0x2e, 0x7a, 0x69, 0x70, 0x20, 0x66,
--	0x6f, 0x72, 0x20, 0x79, 0x6f, 0x75, 0x72, 0x20,
--	0x6d, 0x61, 0x6d, 0x65, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x22, 0x52, 0x61, 0x66, 0x66, 0x6c, 0x65,
--	0x73, 0x69, 0x61, 0x22, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73,
--	0x20, 0x63, 0x6f, 0x70, 0x79, 0x72, 0x69, 0x67,
--	0x68, 0x74, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x43, 0x6f, 0x72,
--	0x65, 0x6c, 0x61, 0x6e, 0x64, 0x20, 0x2f, 0x20,
--	0x53, 0x65, 0x67, 0x61, 0x20, 0x31, 0x39, 0x38,
--	0x36, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x3e, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x3c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x59, 0x6f,
--	0x75, 0x20, 0x6d, 0x61, 0x79, 0x20, 0x68, 0x61,
--	0x76, 0x65, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20,
--	0x67, 0x61, 0x6d, 0x65, 0x20, 0x52, 0x4f, 0x4d,
--	0x20, 0x4f, 0x4e, 0x4c, 0x59, 0x20, 0x69, 0x66,
--	0x20, 0x79, 0x6f, 0x75, 0x20, 0x61, 0x72, 0x65,
--	0x20, 0x6c, 0x65, 0x67, 0x61, 0x6c, 0x6c, 0x79,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x6c, 0x65,
--	0x64, 0x20, 0x73, 0x6f, 0x2e, 0x20, 0x42, 0x79,
--	0x20, 0x22, 0x6c, 0x65, 0x67, 0x61, 0x6c, 0x6c,
--	0x79, 0x20, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x6c,
--	0x65, 0x64, 0x22, 0x20, 0x77, 0x65, 0x20, 0x6d,
--	0x65, 0x61, 0x6e, 0x3a, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x59, 0x6f,
--	0x75, 0x20, 0x6f, 0x77, 0x6e, 0x20, 0x74, 0x68,
--	0x65, 0x20, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c,
--	0x20, 0x61, 0x72, 0x63, 0x61, 0x64, 0x65, 0x20,
--	0x6f, 0x72, 0x20, 0x67, 0x61, 0x6d, 0x65, 0x70,
--	0x61, 0x6b, 0x20, 0x6f, 0x66, 0x20, 0x61, 0x20,
--	0x52, 0x4f, 0x4d, 0x20, 0x79, 0x6f, 0x75, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x61,
--	0x72, 0x65, 0x20, 0x64, 0x6f, 0x77, 0x6e, 0x6c,
--	0x6f, 0x61, 0x64, 0x69, 0x6e, 0x67, 0x2e, 0x20,
--	0x55, 0x6e, 0x64, 0x65, 0x72, 0x20, 0x74, 0x68,
--	0x65, 0x20, 0x63, 0x6f, 0x70, 0x79, 0x72, 0x69,
--	0x67, 0x68, 0x74, 0x20, 0x6c, 0x61, 0x77, 0x73,
--	0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x55, 0x2e, 0x53, 0x2e, 0x2c, 0x20, 0x79, 0x6f,
--	0x75, 0x20, 0x61, 0x72, 0x65, 0x20, 0x65, 0x6e,
--	0x74, 0x69, 0x74, 0x6c, 0x65, 0x64, 0x20, 0x74,
--	0x6f, 0x20, 0x6f, 0x77, 0x6e, 0x20, 0x61, 0x20,
--	0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x20, 0x6f,
--	0x66, 0x20, 0x61, 0x6e, 0x79, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x73,
--	0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x20,
--	0x79, 0x6f, 0x75, 0x20, 0x68, 0x61, 0x76, 0x65,
--	0x20, 0x70, 0x61, 0x69, 0x64, 0x20, 0x66, 0x6f,
--	0x72, 0x2e, 0x20, 0x53, 0x69, 0x6e, 0x63, 0x65,
--	0x20, 0x52, 0x4f, 0x4d, 0x53, 0x20, 0x63, 0x61,
--	0x6e, 0x27, 0x74, 0x20, 0x62, 0x65, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74,
--	0x65, 0x64, 0x20, 0x28, 0x6e, 0x6f, 0x74, 0x20,
--	0x77, 0x69, 0x74, 0x68, 0x6f, 0x75, 0x74, 0x20,
--	0x73, 0x70, 0x65, 0x63, 0x69, 0x61, 0x6c, 0x20,
--	0x68, 0x61, 0x72, 0x64, 0x77, 0x61, 0x72, 0x65,
--	0x29, 0x2c, 0x20, 0x52, 0x4f, 0x4d, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69,
--	0x6d, 0x61, 0x67, 0x65, 0x73, 0x20, 0x61, 0x72,
--	0x65, 0x20, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64,
--	0x65, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x74, 0x68,
--	0x65, 0x20, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63,
--	0x20, 0x61, 0x73, 0x20, 0x61, 0x20, 0x73, 0x65,
--	0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x52, 0x65, 0x6d,
--	0x65, 0x6d, 0x62, 0x65, 0x72, 0x2c, 0x20, 0x74,
--	0x68, 0x65, 0x20, 0x70, 0x75, 0x72, 0x70, 0x6f,
--	0x73, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x61, 0x6e,
--	0x20, 0x65, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x6f,
--	0x72, 0x20, 0x69, 0x73, 0x20, 0x74, 0x6f, 0x20,
--	0x70, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x67, 0x61,
--	0x6d, 0x65, 0x73, 0x20, 0x28, 0x73, 0x6f, 0x20,
--	0x74, 0x68, 0x61, 0x74, 0x20, 0x74, 0x68, 0x65,
--	0x79, 0x20, 0x64, 0x6f, 0x6e, 0x27, 0x74, 0x20,
--	0x64, 0x69, 0x73, 0x73, 0x61, 0x70, 0x70, 0x65,
--	0x61, 0x72, 0x29, 0x2c, 0x20, 0x74, 0x6f, 0x20,
--	0x68, 0x61, 0x76, 0x65, 0x20, 0x61, 0x6c, 0x6c,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x79, 0x6f, 0x75,
--	0x72, 0x20, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x20,
--	0x6f, 0x6e, 0x20, 0x79, 0x6f, 0x75, 0x72, 0x20,
--	0x50, 0x43, 0x20, 0x28, 0x73, 0x6f, 0x20, 0x74,
--	0x68, 0x61, 0x74, 0x20, 0x79, 0x6f, 0x75, 0x20,
--	0x64, 0x6f, 0x6e, 0x27, 0x74, 0x20, 0x74, 0x69,
--	0x65, 0x20, 0x75, 0x70, 0x20, 0x74, 0x68, 0x65,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x66, 0x61, 0x6d,
--	0x69, 0x6c, 0x79, 0x20, 0x54, 0x56, 0x29, 0x20,
--	0x61, 0x6e, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x6b,
--	0x65, 0x65, 0x70, 0x20, 0x61, 0x20, 0x62, 0x61,
--	0x63, 0x6b, 0x75, 0x70, 0x20, 0x6f, 0x66, 0x20,
--	0x67, 0x61, 0x6d, 0x65, 0x73, 0x20, 0x79, 0x6f,
--	0x75, 0x20, 0x6f, 0x77, 0x6e, 0x20, 0x69, 0x6e,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63,
--	0x61, 0x73, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20,
--	0x67, 0x61, 0x6d, 0x65, 0x20, 0x28, 0x6f, 0x72,
--	0x20, 0x61, 0x72, 0x63, 0x61, 0x64, 0x65, 0x2f,
--	0x68, 0x6f, 0x6d, 0x65, 0x20, 0x63, 0x6f, 0x6e,
--	0x73, 0x6f, 0x6c, 0x65, 0x29, 0x20, 0x66, 0x61,
--	0x69, 0x6c, 0x73, 0x20, 0x6f, 0x72, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x68, 0x61, 0x76,
--	0x65, 0x20, 0x61, 0x6c, 0x72, 0x65, 0x61, 0x64,
--	0x79, 0x20, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64,
--	0x2e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x49, 0x74, 0x27, 0x73,
--	0x20, 0x66, 0x6f, 0x72, 0x20, 0x65, 0x64, 0x75,
--	0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
--	0x20, 0x70, 0x75, 0x72, 0x70, 0x6f, 0x73, 0x65,
--	0x73, 0x20, 0x6f, 0x6e, 0x6c, 0x79, 0x20, 0x28,
--	0x69, 0x6e, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20,
--	0x79, 0x6f, 0x75, 0x20, 0x61, 0x72, 0x65, 0x20,
--	0x61, 0x6e, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x65, 0x6d, 0x75, 0x6c,
--	0x61, 0x74, 0x6f, 0x72, 0x20, 0x70, 0x72, 0x6f,
--	0x67, 0x72, 0x61, 0x6d, 0x6d, 0x65, 0x72, 0x29,
--	0x2e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x59, 0x6f, 0x75,
--	0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x4e, 0x45,
--	0x56, 0x45, 0x52, 0x20, 0x73, 0x65, 0x6c, 0x6c,
--	0x20, 0x74, 0x68, 0x65, 0x73, 0x65, 0x20, 0x52,
--	0x4f, 0x4d, 0x53, 0x20, 0x66, 0x6f, 0x72, 0x20,
--	0x70, 0x72, 0x6f, 0x66, 0x69, 0x74, 0x2e, 0x20,
--	0x4d, 0x6f, 0x73, 0x74, 0x20, 0x67, 0x61, 0x6d,
--	0x65, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x63, 0x6f, 0x6d, 0x70,
--	0x61, 0x6e, 0x69, 0x65, 0x73, 0x20, 0x64, 0x6f,
--	0x6e, 0x27, 0x74, 0x20, 0x6d, 0x69, 0x6e, 0x64,
--	0x20, 0x74, 0x68, 0x65, 0x20, 0x64, 0x69, 0x73,
--	0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f,
--	0x6e, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65,
--	0x69, 0x72, 0x20, 0x67, 0x61, 0x6d, 0x65, 0x27,
--	0x73, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x52,
--	0x4f, 0x4d, 0x53, 0x20, 0x62, 0x65, 0x63, 0x61,
--	0x75, 0x73, 0x65, 0x20, 0x74, 0x68, 0x65, 0x79,
--	0x20, 0x6e, 0x6f, 0x20, 0x6c, 0x6f, 0x6e, 0x67,
--	0x65, 0x72, 0x20, 0x65, 0x78, 0x69, 0x73, 0x74,
--	0x2c, 0x20, 0x62, 0x75, 0x74, 0x20, 0x74, 0x68,
--	0x65, 0x79, 0x20, 0x57, 0x49, 0x4c, 0x4c, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x6d, 0x69, 0x6e, 0x64, 0x20, 0x69, 0x66,
--	0x20, 0x73, 0x6f, 0x6d, 0x65, 0x6f, 0x6e, 0x65,
--	0x20, 0x73, 0x65, 0x6c, 0x6c, 0x73, 0x20, 0x74,
--	0x68, 0x65, 0x6d, 0x2e, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x59, 0x6f, 0x75,
--	0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x4e, 0x4f,
--	0x54, 0x20, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69,
--	0x62, 0x75, 0x74, 0x65, 0x20, 0x52, 0x4f, 0x4d,
--	0x53, 0x20, 0x74, 0x6f, 0x67, 0x65, 0x74, 0x68,
--	0x65, 0x72, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20,
--	0x65, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x6f, 0x72,
--	0x73, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x61, 0x73, 0x20,
--	0x61, 0x20, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67,
--	0x65, 0x2e, 0x20, 0x41, 0x6e, 0x64, 0x20, 0x61,
--	0x67, 0x61, 0x69, 0x6e, 0x2c, 0x20, 0x4e, 0x4f,
--	0x20, 0x73, 0x65, 0x6c, 0x6c, 0x69, 0x6e, 0x67,
--	0x2e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x59, 0x6f,
--	0x75, 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x4e,
--	0x45, 0x56, 0x45, 0x52, 0x20, 0x68, 0x6f, 0x6c,
--	0x64, 0x20, 0x6d, 0x61, 0x6d, 0x65, 0x2e, 0x64,
--	0x6b, 0x20, 0x28, 0x69, 0x6e, 0x63, 0x6c, 0x75,
--	0x64, 0x69, 0x6e, 0x67, 0x20, 0x69, 0x74, 0x73,
--	0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63,
--	0x6f, 0x6d, 0x70, 0x61, 0x6e, 0x79, 0x2c, 0x20,
--	0x77, 0x65, 0x62, 0x6d, 0x61, 0x73, 0x74, 0x65,
--	0x72, 0x73, 0x2c, 0x20, 0x65, 0x6d, 0x70, 0x6c,
--	0x6f, 0x79, 0x65, 0x65, 0x73, 0x2c, 0x20, 0x73,
--	0x74, 0x61, 0x66, 0x66, 0x20, 0x6f, 0x72, 0x20,
--	0x61, 0x6e, 0x79, 0x62, 0x6f, 0x64, 0x79, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x65, 0x6c, 0x73, 0x65, 0x20, 0x72, 0x65, 0x6c,
--	0x61, 0x74, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20,
--	0x74, 0x68, 0x69, 0x73, 0x20, 0x77, 0x65, 0x62,
--	0x73, 0x69, 0x74, 0x65, 0x29, 0x20, 0x6f, 0x72,
--	0x20, 0x6f, 0x75, 0x72, 0x20, 0x77, 0x65, 0x62,
--	0x68, 0x6f, 0x73, 0x74, 0x73, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65,
--	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x69, 0x62, 0x6c,
--	0x65, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x61, 0x6e,
--	0x79, 0x20, 0x64, 0x61, 0x6d, 0x61, 0x67, 0x65,
--	0x20, 0x63, 0x61, 0x75, 0x73, 0x65, 0x64, 0x20,
--	0x74, 0x6f, 0x20, 0x79, 0x6f, 0x75, 0x72, 0x20,
--	0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2c, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x66,
--	0x6f, 0x72, 0x20, 0x61, 0x6e, 0x79, 0x20, 0x6c,
--	0x65, 0x67, 0x61, 0x6c, 0x20, 0x61, 0x63, 0x74,
--	0x69, 0x6f, 0x6e, 0x73, 0x20, 0x74, 0x61, 0x6b,
--	0x65, 0x6e, 0x20, 0x61, 0x67, 0x61, 0x69, 0x6e,
--	0x73, 0x74, 0x20, 0x79, 0x6f, 0x75, 0x20, 0x66,
--	0x6f, 0x72, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x6f, 0x62, 0x65, 0x79, 0x69,
--	0x6e, 0x67, 0x20, 0x74, 0x68, 0x65, 0x20, 0x61,
--	0x62, 0x6f, 0x76, 0x65, 0x20, 0x73, 0x74, 0x61,
--	0x74, 0x65, 0x64, 0x20, 0x72, 0x75, 0x6c, 0x65,
--	0x73, 0x2c, 0x20, 0x6f, 0x72, 0x20, 0x66, 0x6f,
--	0x72, 0x20, 0x61, 0x6e, 0x79, 0x20, 0x6f, 0x74,
--	0x68, 0x65, 0x72, 0x20, 0x72, 0x65, 0x61, 0x73,
--	0x6f, 0x6e, 0x2e, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6d,
--	0x61, 0x6d, 0x65, 0x2e, 0x64, 0x6b, 0x20, 0x68,
--	0x61, 0x73, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x64,
--	0x75, 0x6d, 0x70, 0x65, 0x64, 0x20, 0x74, 0x68,
--	0x65, 0x20, 0x52, 0x4f, 0x4d, 0x53, 0x20, 0x6f,
--	0x6e, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x77,
--	0x65, 0x62, 0x73, 0x69, 0x74, 0x65, 0x2c, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x61, 0x6e, 0x64, 0x20, 0x6f, 0x75, 0x72, 0x20,
--	0x70, 0x75, 0x72, 0x70, 0x6f, 0x73, 0x65, 0x20,
--	0x69, 0x73, 0x20, 0x74, 0x6f, 0x20, 0x70, 0x72,
--	0x6f, 0x76, 0x69, 0x64, 0x65, 0x20, 0x61, 0x20,
--	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x20,
--	0x74, 0x6f, 0x20, 0x74, 0x68, 0x65, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x49,
--	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x20,
--	0x61, 0x6e, 0x64, 0x20, 0x67, 0x61, 0x6d, 0x69,
--	0x6e, 0x67, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x75,
--	0x6e, 0x69, 0x74, 0x79, 0x2e, 0x20, 0x4e, 0x6f,
--	0x20, 0x68, 0x61, 0x72, 0x6d, 0x20, 0x69, 0x73,
--	0x20, 0x62, 0x65, 0x69, 0x6e, 0x67, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x64, 0x6f, 0x6e, 0x65, 0x20, 0x74, 0x6f,
--	0x20, 0x67, 0x61, 0x6d, 0x65, 0x20, 0x63, 0x6f,
--	0x6d, 0x70, 0x61, 0x6e, 0x69, 0x65, 0x73, 0x2c,
--	0x20, 0x61, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20,
--	0x52, 0x4f, 0x4d, 0x53, 0x20, 0x6f, 0x6e, 0x20,
--	0x74, 0x68, 0x69, 0x73, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x77, 0x65,
--	0x62, 0x73, 0x69, 0x74, 0x65, 0x20, 0x61, 0x72,
--	0x65, 0x20, 0x6f, 0x66, 0x20, 0x67, 0x61, 0x6d,
--	0x65, 0x73, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20,
--	0x61, 0x72, 0x65, 0x20, 0x6e, 0x6f, 0x20, 0x6c,
--	0x6f, 0x6e, 0x67, 0x65, 0x72, 0x20, 0x66, 0x6f,
--	0x72, 0x20, 0x73, 0x61, 0x6c, 0x65, 0x2c, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x66,
--	0x72, 0x6f, 0x6d, 0x20, 0x77, 0x68, 0x69, 0x63,
--	0x68, 0x20, 0x67, 0x61, 0x6d, 0x65, 0x20, 0x63,
--	0x6f, 0x6d, 0x70, 0x61, 0x6e, 0x69, 0x65, 0x73,
--	0x20, 0x63, 0x61, 0x6e, 0x20, 0x6e, 0x6f, 0x20,
--	0x6c, 0x6f, 0x6e, 0x67, 0x65, 0x72, 0x20, 0x70,
--	0x72, 0x6f, 0x66, 0x69, 0x74, 0x2e, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x60, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0xb4, 0x0d, 0x0a
--};
--
--#define MAMEDK_SIZE 3648
--
- analyze_entry::analyze_entry(const string& Aname, unsigned Asize, unsigned Acrc)
- 	: name(Aname), size(Asize), crc(Acrc) {
- }
-@@ -576,49 +115,12 @@
- 	return true;
- }
- 
--static void sset(char* dst, unsigned w, const char* s)
--{
--	unsigned l = strlen(s);
--	if (l > w)
--		l = w;
--	unsigned b = (w - l) / 2;
--
--	memset(dst, ' ', w);
--	memcpy(dst + b, s, l);
--}
--
- analyze::analyze(const gamearchive& gar)
- {
- 	// insert some standard crc
- 	for(analyze_entry_static* i=GARBAGE;i->size;++i) {
- 		garbage.insert(*i);
- 	}
--
--	// insert the MAMEDK crc for the current info
--	for(game_by_name_set::const_iterator i=gar.begin();i!=gar.end();++i) {
--		char t0[128];
--		char t1[128];
--		char t2[128];
--		char name[64];
--
--		snprintf(t0, sizeof(t0), "proudly presents %s.zip for your mame", i->name_get().c_str());
--		snprintf(t1, sizeof(t1), "\"%s\"", i->description_get().c_str());
--		snprintf(t2, sizeof(t2), "%s %s", i->manufacturer_get().c_str(), i->year_get().c_str());
--
--		sset(MAMEDK_DATA + 64*9 + 1, 60, t0);
--		sset(MAMEDK_DATA + 64*11 + 1, 60, t1);
--		sset(MAMEDK_DATA + 64*13 + 1, 60, t2);
--
--		analyze_entry_static e;
--
--		snprintf(name, sizeof(name), "%s.txt", i->name_get().c_str());
--
--		e.name = name;
--		e.size = MAMEDK_SIZE;
--		e.crc = crc_compute(MAMEDK_DATA, MAMEDK_SIZE);
--
--		garbage.insert(e);
--	}
- }
- 
- analyze_type analyze::operator()(const string& name, unsigned size, unsigned crc) const
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 01baf820dc66..a6e21d24cc36 100644
Binary files a/games-fps/Manifest.gz and b/games-fps/Manifest.gz differ
diff --git a/games-fps/alienarena/alienarena-20130827-r1.ebuild b/games-fps/alienarena/alienarena-20130827-r1.ebuild
deleted file mode 100644
index 8f32fffbdf54..000000000000
--- a/games-fps/alienarena/alienarena-20130827-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop gnome2-utils
-
-MY_PN="alienarena-7.66"
-
-DESCRIPTION="Fast-paced multiplayer deathmatch game"
-HOMEPAGE="http://red.planetarena.org/"
-SRC_URI="http://icculus.org/alienarena/Files/${MY_PN}-linux${PV}.tar.gz
-	http://red.planetarena.org/files/${MY_PN}-linux${PV}.tar.gz"
-
-LICENSE="GPL-2 free-noncomm"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated +dga +vidmode +zlib"
-
-UIRDEPEND="
-	virtual/jpeg:0
-	media-libs/openal
-	media-libs/libvorbis
-	media-libs/freetype:2
-	virtual/glu
-	virtual/opengl
-	dga? ( x11-libs/libXxf86dga )
-	vidmode? ( x11-libs/libXxf86vm )
-	zlib? ( sys-libs/zlib )
-	net-misc/curl
-"
-UIDEPEND="
-	dga? ( x11-base/xorg-proto )
-	vidmode? ( x11-base/xorg-proto )
-"
-RDEPEND="!dedicated? ( ${UIRDEPEND} )"
-DEPEND="${RDEPEND}
-	!dedicated? ( ${UIDEPEND} )
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_PN/_/.}"
-
-PATCHES=( "${FILESDIR}"/${P}-format.patch )
-
-src_configure() {
-	econf \
-		--with-icondir=/usr/share/icons/hicolor/48x48/apps/ \
-		--without-system-libode \
-		--disable-documents \
-		$(use_enable !dedicated client) \
-		$(use_with zlib) \
-		$(use_with vidmode xf86vm) \
-		$(use_with dga xf86dga)
-}
-
-src_install() {
-	DOCS="docs/README.txt README" default
-	if ! use dedicated ; then
-		make_desktop_entry ${PN} "Alien Arena"
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-fps/alienarena/alienarena-7.66.ebuild b/games-fps/alienarena/alienarena-7.66.ebuild
new file mode 100644
index 000000000000..1630e7efd263
--- /dev/null
+++ b/games-fps/alienarena/alienarena-7.66.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop flag-o-matic xdg
+
+MY_P="${P}-linux20130827"
+
+DESCRIPTION="Fast-paced multiplayer deathmatch game"
+HOMEPAGE="http://red.planetarena.org/"
+SRC_URI="
+	http://icculus.org/alienarena/Files/${MY_P}.tar.gz
+	http://red.planetarena.org/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 free-noncomm"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated +dga +vidmode +zlib"
+
+RDEPEND="
+	!dedicated? (
+		media-libs/freetype:2
+		media-libs/libvorbis
+		media-libs/openal
+		net-misc/curl
+		virtual/glu
+		virtual/jpeg:0
+		virtual/opengl
+		dga? ( x11-libs/libXxf86dga )
+		vidmode? ( x11-libs/libXxf86vm )
+		zlib? ( sys-libs/zlib )
+	)"
+DEPEND="${RDEPEND}
+	!dedicated? (
+		dga? ( x11-base/xorg-proto )
+		vidmode? ( x11-base/xorg-proto )
+	)"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-format.patch
+	"${FILESDIR}"/${P}-ar.patch
+	"${FILESDIR}"/${P}-C99-inline.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# too many variables defined in .h to patch, https://bugs.gentoo.org/707814
+	append-cflags -fcommon
+
+	econf \
+		--with-icondir="${EPREFIX}/usr/share/icons/hicolor/48x48/apps/" \
+		--without-system-libode \
+		--disable-documents \
+		$(use_enable !dedicated client) \
+		$(use_with zlib) \
+		$(use_with vidmode xf86vm) \
+		$(use_with dga xf86dga)
+}
+
+src_install() {
+	DOCS=( docs/README.txt README )
+	default
+
+	use !dedicated && make_desktop_entry ${PN} "Alien Arena"
+}
diff --git a/games-fps/alienarena/files/alienarena-7.66-C99-inline.patch b/games-fps/alienarena/files/alienarena-7.66-C99-inline.patch
new file mode 100644
index 000000000000..0b9166a2631f
--- /dev/null
+++ b/games-fps/alienarena/files/alienarena-7.66-C99-inline.patch
@@ -0,0 +1,25 @@
+From: Markus Koschany <apo@debian.org>
+Date: Fri, 18 Aug 2017 23:24:22 +0200
+Subject: gcc7
+
+Fix FTBFS with GCC 7.
+
+Bug-Debian: https://bugs.debian.org/871218
+Forwarded: no
+---
+ source/ref_gl/r_iqm.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source/ref_gl/r_iqm.c b/source/ref_gl/r_iqm.c
+index ba5d178..cb3d2da 100644
+--- a/source/ref_gl/r_iqm.c
++++ b/source/ref_gl/r_iqm.c
+@@ -1263,7 +1263,7 @@ void IQM_Vlight (vec3_t baselight, mnormal_t *normal, vec3_t angles, vec3_t ligh
+ void R_Mesh_SetupShell (int shell_skinnum, qboolean ragdoll, qboolean using_varray, vec3_t lightcolor);
+ void R_Mesh_SetupGLSL (int skinnum, rscript_t *rs, vec3_t lightcolor);
+ 
+-inline void IQM_DrawVBO (qboolean tangents)
++void IQM_DrawVBO (qboolean tangents)
+ {
+ 	qglEnableClientState( GL_VERTEX_ARRAY );
+ 	GL_BindVBO(vbo_xyz);
diff --git a/games-fps/alienarena/files/alienarena-7.66-ar.patch b/games-fps/alienarena/files/alienarena-7.66-ar.patch
new file mode 100644
index 000000000000..7674e00e561d
--- /dev/null
+++ b/games-fps/alienarena/files/alienarena-7.66-ar.patch
@@ -0,0 +1,13 @@
+Fix for -native-symlinks
+
+diff -r 262952236ff5 configure.ac
+--- a/configure.ac	Sun Oct 11 11:33:09 2020 +0000
++++ b/configure.ac	Sun Oct 11 11:33:37 2020 +0000
+@@ -65,6 +65,7 @@
+ AC_PROG_RANLIB
+ AC_PROG_MKDIR_P
+ AM_PROG_CC_C_O
++AM_PROG_AR
+ PKG_PROG_PKG_CONFIG
+ 
+ 
diff --git a/games-fps/alienarena/files/alienarena-20130827-format.patch b/games-fps/alienarena/files/alienarena-7.66-format.patch
similarity index 100%
rename from games-fps/alienarena/files/alienarena-20130827-format.patch
rename to games-fps/alienarena/files/alienarena-7.66-format.patch
diff --git a/games-fps/avp/avp-20150214-r1.ebuild b/games-fps/avp/avp-20150214-r1.ebuild
index 7a41b588eaad..fb38321a71fb 100644
--- a/games-fps/avp/avp-20150214-r1.ebuild
+++ b/games-fps/avp/avp-20150214-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils cmake-utils
+EAPI=7
+
+inherit cmake
 
 DESCRIPTION="Linux port of Aliens vs Predator"
 HOMEPAGE="http://www.icculus.org/avp/"
@@ -11,36 +12,30 @@ SRC_URI="http://www.icculus.org/avp/files/${P}.tar.gz"
 LICENSE="AvP"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+RESTRICT="bindist mirror"
 
 RDEPEND="
 	media-libs/libsdl[video,joystick,opengl]
 	media-libs/openal"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-CMAKE_BUILD_TYPE=Release
+PATCHES=( "${FILESDIR}"/avp-20150214-fno-common.patch )
 
 src_configure() {
 	local mycmakeargs=(
-		"-DCMAKE_VERBOSE_MAKEFILE=TRUE"
 		-DSDL_TYPE=SDL
 		-DOPENGL_TYPE=OPENGL
 	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
+	cmake_src_configure
 }
 
 src_install() {
-	dobin "${BUILD_DIR}/${PN}"
-	dodoc README
+	dobin "${BUILD_DIR}"/avp
+	einstalldocs
 }
 
 pkg_postinst() {
-	elog "Please follow the instructions in /usr/share/doc/${PF}"
+	elog "Please follow the instructions in ${EROOT}/usr/share/doc/${PF}"
 	elog "to install the rest of the game."
 }
diff --git a/games-fps/avp/files/avp-20150214-fno-common.patch b/games-fps/avp/files/avp-20150214-fno-common.patch
new file mode 100644
index 000000000000..0f25b1cf267f
--- /dev/null
+++ b/games-fps/avp/files/avp-20150214-fno-common.patch
@@ -0,0 +1,22 @@
+--- a/src/avp/win95/d3d_render.cpp
++++ b/src/avp/win95/d3d_render.cpp
+@@ -2990,7 +2990,7 @@
+ //#define WATER_POLY_SCALE 256
+ int MeshXScale;
+ int MeshZScale;
+-int WaterFallBase;
++extern int WaterFallBase;
+ void PostLandscapeRendering(void)
+ {
+ 	extern int NumOnScreenBlocks;
+--- a/src/opengl.c
++++ b/src/opengl.c
+@@ -2796,7 +2796,7 @@
+ 
+ int MeshXScale;
+ int MeshZScale;
+-int WaterFallBase;
++extern int WaterFallBase;
+ 
+ int WaterXOrigin;
+ int WaterZOrigin;
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index ba3b774ee4ae..f416271b4976 100644
Binary files a/games-misc/Manifest.gz and b/games-misc/Manifest.gz differ
diff --git a/games-misc/typespeed/files/typespeed-0.6.5-link-tinfo.patch b/games-misc/typespeed/files/typespeed-0.6.5-link-tinfo.patch
new file mode 100644
index 000000000000..9ffb9cfcc567
--- /dev/null
+++ b/games-misc/typespeed/files/typespeed-0.6.5-link-tinfo.patch
@@ -0,0 +1,35 @@
+diff -r 8cf704f4cffa configure.ac
+--- a/configure.ac	Thu Oct 15 23:52:32 2020 +0000
++++ b/configure.ac	Thu Oct 15 23:52:58 2020 +0000
+@@ -16,6 +16,6 @@
+ 
+ # Checks for libraries.
+-AC_CHECK_LIB([ncurses], [initscr])
++PKG_CHECK_MODULES([NCURSES], [ncurses], [], [exit 1])
+ 
+ # I18N
+ AM_GNU_GETTEXT_VERSION([0.14.5])
+diff -r e64ba00e0147 src/Makefile.am
+--- a/src/Makefile.am	Fri Oct 16 00:08:17 2020 +0000
++++ b/src/Makefile.am	Fri Oct 16 00:08:39 2020 +0000
+@@ -15,7 +15,7 @@
+ 	-DCONFIGFILE=\"$(sysconfdir)/typespeedrc\" \
+         -DHIGHFILE=\"$(highscoredir)/$(HIGHFILE)\" \
+ 	-DWORDDIR=\"$(WORDDIR)\" -DRULEDIR=\"$(RULEDIR)\"
+-typespeed_LDADD = @LIBINTL@
++typespeed_LDADD = @LIBINTL@ @NCURSES_LIBS@
+ typespeed_SOURCES = file.c gettext.h menu.c misc.c network.c pathnames.h \
+ 	    typespeed.c typespeed.h
+ 
+diff -r 987ceebc438f testsuite/Makefile.am
+--- a/testsuite/Makefile.am	Fri Oct 16 00:14:34 2020 +0000
++++ b/testsuite/Makefile.am	Fri Oct 16 00:15:37 2020 +0000
+@@ -2,7 +2,7 @@
+ 
+ localedir = $(datadir)/locale
+ AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -DTVERSION=\"v$(VERSION)\" -DTEST
+-LDADD = @LIBINTL@
++LDADD = @LIBINTL@ @NCURSES_LIBS@
+ 
+ EXTRA_DIST = t_unescstr.sh t_loadwords_data/3_empty
+ 
diff --git a/games-misc/typespeed/files/typespeed-0.6.5-use-extern.patch b/games-misc/typespeed/files/typespeed-0.6.5-use-extern.patch
new file mode 100644
index 000000000000..cd5e4ea54c03
--- /dev/null
+++ b/games-misc/typespeed/files/typespeed-0.6.5-use-extern.patch
@@ -0,0 +1,116 @@
+Description: Fix FTBFS with gcc-10
+
+Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+Bug-Debian: https://bugs.debian.org/957887
+
+---
+
+--- typespeed-0.6.5.orig/src/file.c
++++ typespeed-0.6.5/src/file.c
+@@ -142,6 +142,9 @@ extern int	 hfd;
+ extern char	*rankki[11];
+ extern char	*typorank[12];
+ extern char	*usedwordfile;
++extern struct rules	rules;
++struct rawdata	words;
++struct opt	opt;
+ 
+ char ruledir[MAXPATHLEN];
+ char worddir[MAXPATHLEN];
+--- typespeed-0.6.5.orig/src/menu.c
++++ typespeed-0.6.5/src/menu.c
+@@ -76,6 +76,9 @@ void		 tellstory(void);
+ 
+ extern int	 misses;
+ extern char	*rankki[11];
++extern struct stats	now;
++extern struct rules	rules;
++extern struct opt	opt;
+ 
+ struct positions {
+ 	int rank;
+--- typespeed-0.6.5.orig/src/misc.c
++++ typespeed-0.6.5/src/misc.c
+@@ -75,6 +75,7 @@ char		*xstrdup(char *);
+ void		 xstrncpy(char *, char *, size_t);
+ 
+ extern char	*progname;
++extern struct opt opt;
+ 
+ static int graph = 0;
+ 
+--- typespeed-0.6.5.orig/src/network.c
++++ typespeed-0.6.5/src/network.c
+@@ -116,6 +116,7 @@ void		setnoblock(void);
+ void		writenum(char *, uint32_t);
+ 
+ extern FILE	*netlogfile;
++extern struct opt opt;
+ 
+ static int	 ds = -1;
+ static int	 ss = -1;
+--- typespeed-0.6.5.orig/src/typespeed.c
++++ typespeed-0.6.5/src/typespeed.c
+@@ -146,6 +146,7 @@ char *typorank[12] =
+ 
+ FILE		*netlogfile;
+ struct stats	 best;
++struct stats	 now;
+ int		 hfd;
+ int		 misses;
+ struct stats	 other;
+@@ -155,6 +156,9 @@ char		*usedwordfile;
+ int		 wordcount = 0;
+ int		 wordpos[22];
+ char		 wordstring[22][20];
++struct rules	 rules;
++extern struct rawdata	words;
++extern struct opt	opt;
+ 
+ struct option options[] = {
+ 	{"cheat", no_argument, &opt.cheat, 1},
+--- typespeed-0.6.5.orig/src/typespeed.h
++++ typespeed-0.6.5/src/typespeed.h
+@@ -56,7 +56,7 @@ struct stats {
+ 	clock_t duration;
+ 	unsigned int sinit;
+ 	char name[21];
+-} now;
++};
+ 
+ struct opt {
+ 	int cheat;
+@@ -66,7 +66,7 @@ struct opt {
+ 	int usecolors;
+ 	char name[21];
+ 	char order[3];
+-} opt;
++};
+ 
+ struct rules {
+ 	int misses;
+@@ -85,12 +85,12 @@ struct rules {
+ 	int maxtime;
+ 	char name[31];
+ 	char fname[FILENAME_MAX + 1];
+-} rules;
++};
+ 
+ struct rawdata {
+ 	char *bulk;
+ 	char **word;
+ 	size_t n;
+ 	size_t max;
+-} words;
++};
+ 
+--- typespeed-0.6.5.orig/testsuite/t_loadwords.c
++++ typespeed-0.6.5/testsuite/t_loadwords.c
+@@ -52,6 +52,7 @@ extern void	freewords(void);
+ extern int	loadwords(char *);
+ 
+ extern char	worddir[MAXPATHLEN];
++extern struct rawdata  words;
+ 
+ int
+ main(void)
diff --git a/games-misc/typespeed/typespeed-0.6.5-r1.ebuild b/games-misc/typespeed/typespeed-0.6.5-r2.ebuild
similarity index 57%
rename from games-misc/typespeed/typespeed-0.6.5-r1.ebuild
rename to games-misc/typespeed/typespeed-0.6.5-r2.ebuild
index 9e0c90a21b2a..04092fb9bf55 100644
--- a/games-misc/typespeed/typespeed-0.6.5-r1.ebuild
+++ b/games-misc/typespeed/typespeed-0.6.5-r2.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools
 
 DESCRIPTION="Test your typing speed, and get your fingers CPS"
@@ -15,28 +16,29 @@ IUSE="nls"
 
 RDEPEND="
 	sys-libs/ncurses:0=
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-musl.patch
+	"${FILESDIR}"/${P}-use-extern.patch
+	"${FILESDIR}"/${P}-link-tinfo.patch
+)
 
 src_prepare() {
 	default
-	sed -i \
-		-e 's/testsuite//' \
-		-e 's/doc//' \
-		Makefile.am || die
-	sed -i -e '/^CC =/d' src/Makefile.am || die
-	eapply "${FILESDIR}"/${P}-musl.patch
-	rm -rf m4 #417265
+	sed -i -e '/^CC =/d' \
+		src/Makefile.am \
+		testsuite/Makefile.am || die
+	rm -r m4 || die #bug 417265
 	eautoreconf
 }
 
 src_configure() {
-	econf \
-		--localedir=/usr/share/locale \
-		$(use_enable nls)
+	econf $(use_enable nls)
 }
 
 src_install() {
diff --git a/games-misc/xcowsay/Manifest b/games-misc/xcowsay/Manifest
index 81a77437eede..a9444f62857a 100644
--- a/games-misc/xcowsay/Manifest
+++ b/games-misc/xcowsay/Manifest
@@ -1,2 +1 @@
 DIST xcowsay-1.5.1.tar.gz 101281 BLAKE2B 568f6ad7225cd859c37d79bf3ddf66c184f47d8feb6dedbafbd29ca4e05d97d883c6d6e4f4d60cebe107f1527e1ff01e17ec61430a3e55e2f504c2c00e402488 SHA512 55c165b5b2c01b11463af0eeb13fd646ea50138e2938ddfc25d44f1a704b7473d047bc7c95165f449a600de51ee005904f007843e33a8ef02c725b827eaec616
-DIST xcowsay-1.5.tar.gz 100878 BLAKE2B 0763648cb808c44cf519c1e77506e8c35f8a71584f81eee406736e52322b7317937f558b4a6931ec293ea334ca45c8085a51dfc49803754bb734d96d7df04dbe SHA512 13b297a675ec02af6f5617db19abe05979be7137ff37437a64cb079749a69551d453f1a584cf3ca2be62ed0dc6363ebac4986b1f93807bba66b21d0e2ba8cf2c
diff --git a/games-misc/xcowsay/xcowsay-1.5.ebuild b/games-misc/xcowsay/xcowsay-1.5.ebuild
deleted file mode 100644
index 139fea2aac0c..000000000000
--- a/games-misc/xcowsay/xcowsay-1.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Displays a cute cow and message on your desktop"
-HOMEPAGE="
-	https://github.com/nickg/xcowsay
-	https://www.doof.me.uk/xcowsay/
-"
-SRC_URI="https://github.com/nickg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dbus fortune nls"
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gtk+:3
-	x11-libs/pango
-	dbus? (	dev-libs/dbus-glib )
-	fortune? ( games-misc/fortune-mod )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	if ! use fortune; then
-		sed -e 's/xcowfortune//g' -i src/Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-rpath
-		$(use_enable dbus)
-		$(use_enable nls)
-	)
-
-	econf ${myeconfargs[@]}
-}
diff --git a/games-mud/Manifest.gz b/games-mud/Manifest.gz
index 781915659890..5ce8da6e724f 100644
Binary files a/games-mud/Manifest.gz and b/games-mud/Manifest.gz differ
diff --git a/games-mud/tf/Manifest b/games-mud/tf/Manifest
index 1e69e03b54d2..de8c02261010 100644
--- a/games-mud/tf/Manifest
+++ b/games-mud/tf/Manifest
@@ -2,3 +2,4 @@ DIST tf-50b8-help.tar.gz 175591 BLAKE2B b4b5d2be336206fa00db870367369454d33a7e32
 DIST tf-50b8.tar.gz 719553 BLAKE2B 3218878cdc4a2049fd7f2a8e0426ec589bf304e0bb24ad557e5bea39cbaba76e6a1c52f064860e499623abb51bc9f14a0c8388b927fd15a66a7945fe5eaccf84 SHA512 3b99c039d7a9c6ab7ee7b1040ff7c99fe39cbe991f373333ea7c130d54383f102f14ae33303a415f5419cd43238caffc46114e842c6964329c0999e0f506e3d0
 DIST tf-allrootpatch.txt 3349 BLAKE2B ca57b7ddfdbaa377c69ad07427185a3952368d35231f4bca77c78a5ed7b5c1c362f4ef1512e23c248b96810739056e8f53c4d41320a1c1dc320b1fd22d965199 SHA512 3fe44e7291d133abd04040f0f8258da6a2b7f67cab79cb1628897a4a483a0998495b6cf97eaf29ee447a650fdb16a48c846599807e570f687a256bb58179495e
 DIST tf-allsrcpatch.txt 10392 BLAKE2B 9a24f99d6bdaa835b4cc2588d87824ea07a12fee38d576ec63f48493f5b92c7155ad959fa80599edf28a39f76d85ba8a2a19e1ff2b03c7893fe4d7b4b7d9af97 SHA512 3ac2447e05911d156509bb44e8809c06c4b1a92cbc8067d196c7e5f688fccd5186a9073001958ca0e757c9db20e9f96889fe7a5b6255495539f23208f72ec613
+DIST tf5_5.0beta8-8.debian.tar.xz 12732 BLAKE2B f663283d571c272e0c159c7175967a206ab30e95fb64b935c73fa1952a3e7ba559af104bf7d4640218bf5748968059f0f9e180cd1d1191beef4d8b0c472eefac SHA512 dcc220d7bec11dd3760104502c51aba320e7b6701b7b295ed188fa32edec7d23ac287995da6d08d34a55f937ccc53b6f02186afe4bbde02e934d90a57c7f52b1
diff --git a/games-mud/tf/files/tf-50_beta8-stdarg.patch b/games-mud/tf/files/tf-50_beta8-stdarg.patch
deleted file mode 100644
index a34b70abe1fd..000000000000
--- a/games-mud/tf/files/tf-50_beta8-stdarg.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -U5 -r a/src/tfio.c b/src/tfio.c
---- a/src/tfio.c	2007-01-13 18:12:39.000000000 -0500
-+++ b/src/tfio.c	2007-02-02 16:50:12.000000000 -0500
-@@ -495,10 +495,11 @@
-     const char *q, *sval;
-     char *specptr, quote;
-     const conString *Sval;
-     int len, min, max, leftjust, stars;
-     attr_t attrs = buf->attrs;
-+    va_list aq;
- 
-     if (!(flags & SP_APPEND) && buf->data) Stringtrunc(buf, 0);
-     while (*fmt) {
-         if (*fmt != '%' || *++fmt == '%') {
-             for (q = fmt + 1; *q && *q != '%'; q++);
-@@ -520,11 +521,13 @@
-         switch (*fmt) {
-         case 'd': case 'i':
-         case 'x': case 'X': case 'u': case 'o':
-         case 'f': case 'e': case 'E': case 'g': case 'G':
-         case 'p':
--            vsprintf(tempbuf, spec, ap);
-+            va_copy(aq, ap);
-+            vsprintf(tempbuf, spec, aq);
-+            va_end(aq);
-             Stringcat(buf, tempbuf);
-             /* eat the arguments used by vsprintf() */
-             while (stars--) (void)va_arg(ap, int);
-             switch (*fmt) {
-             case 'd': case 'i':
diff --git a/games-mud/tf/tf-50_beta8-r2.ebuild b/games-mud/tf/tf-5.0_beta8_p8.ebuild
similarity index 67%
rename from games-mud/tf/tf-50_beta8-r2.ebuild
rename to games-mud/tf/tf-5.0_beta8_p8.ebuild
index 1009fb07dc03..a3910fb79ca7 100644
--- a/games-mud/tf/tf-50_beta8-r2.ebuild
+++ b/games-mud/tf/tf-5.0_beta8_p8.ebuild
@@ -1,35 +1,44 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-MY_P="${P/_beta/b}"
+inherit autotools
+
+MY_PV="${PV/_beta/b}"
+MY_PV="${MY_PV/_p*/}"
+MY_PV="$(ver_rs 1 '' "${MY_PV}")"
+# 5.0_beta8_p8 -> 5.0beta8-8
+MY_DEB_PV="$(ver_cut 1-2)$(ver_cut 3-4)-$(ver_cut 6)"
 
 DESCRIPTION="A small, flexible, screen-oriented MUD client (aka TinyFugue)"
 HOMEPAGE="http://tinyfugue.sourceforge.net/"
 SRC_URI="
-	mirror://sourceforge/tinyfugue/${MY_P}.tar.gz
+	mirror://sourceforge/tinyfugue/tf-${MY_PV}.tar.gz
+	mirror://debian/pool/main/t/tf5/tf5_${MY_DEB_PV}.debian.tar.xz
 	http://homepage.mac.com/mikeride/abelinc/scripts/allrootpatch.txt -> tf-allrootpatch.txt
 	http://homepage.mac.com/mikeride/abelinc/scripts/allsrcpatch.txt -> tf-allsrcpatch.txt
-	doc? ( mirror://sourceforge/tinyfugue/${MY_P}-help.tar.gz )"
+	doc? ( mirror://sourceforge/tinyfugue/tf-${MY_PV}-help.tar.gz )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+atcp debug doc +gmcp ipv6 +option102 ssl"
+IUSE="+atcp doc +gmcp ipv6 +option102 ssl"
 
 RDEPEND="
+	dev-libs/libpcre
+	sys-libs/ncurses:=
 	ssl? ( dev-libs/openssl:0= )
-	dev-libs/libpcre"
-DEPEND=${RDEPEND}
+"
+DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/tf-${MY_PV}"
 
 PATCHES=(
+	"${WORKDIR}"/debian/patches
 	"${DISTDIR}"/tf-allrootpatch.txt
 	"${DISTDIR}"/tf-allsrcpatch.txt
-	"${FILESDIR}"/${P}-pcre.patch
-	"${FILESDIR}"/${P}-stdarg.patch
+	"${FILESDIR}"/tf-50_beta8-pcre.patch
 )
 
 src_configure() {
@@ -38,9 +47,9 @@ src_configure() {
 		$(use_enable gmcp) \
 		$(use_enable option102) \
 		$(use_enable ssl) \
-		$(use_enable debug core) \
 		$(use_enable ipv6 inet6) \
-		--enable-manpage
+		--enable-manpage \
+		--enable-termcap=tinfo
 }
 
 src_install() {
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 846edf9c6201..fb4436384c49 100644
Binary files a/games-puzzle/Manifest.gz and b/games-puzzle/Manifest.gz differ
diff --git a/games-puzzle/rezerwar/files/rezerwar-0.4.2-gcc-CC.patch b/games-puzzle/rezerwar/files/rezerwar-0.4.2-gcc-CC.patch
new file mode 100644
index 000000000000..18471a8d3007
--- /dev/null
+++ b/games-puzzle/rezerwar/files/rezerwar-0.4.2-gcc-CC.patch
@@ -0,0 +1,12 @@
+diff -r 4e0421547ae0 configure
+--- a/configure	Sat Oct 03 14:28:50 2020 +0000
++++ b/configure	Sat Oct 03 14:41:42 2020 +0000
+@@ -58,7 +58,7 @@
+ }
+ EOF
+ 
+-	if ! gcc `sdl-config --cflags` test_sdl_mixer.c -o test_sdl_mixer; then
++	if ! $CC `sdl-config --cflags` test_sdl_mixer.c -o test_sdl_mixer; then
+ 		echo "SDL_mixer not found =/"
+ 		rm -f test_sdl_mixer*
+ 		exit
diff --git a/games-puzzle/rezerwar/files/rezerwar-0.4.2-gcc10.patch b/games-puzzle/rezerwar/files/rezerwar-0.4.2-gcc10.patch
new file mode 100644
index 000000000000..d219301b8aa1
--- /dev/null
+++ b/games-puzzle/rezerwar/files/rezerwar-0.4.2-gcc10.patch
@@ -0,0 +1,12 @@
+diff -r 3f22f3a0051b src/events.c
+--- a/src/events.c	Sat Oct 03 14:42:28 2020 +0000
++++ b/src/events.c	Sat Oct 03 14:42:42 2020 +0000
+@@ -38,7 +38,7 @@
+ 
+ extern Board *board;
+ extern Configuration *conf;
+-SDL_Surface *screen;
++extern SDL_Surface *screen;
+ Cube *speedy;			// currently accelerated cube
+ 
+ 
diff --git a/games-puzzle/rezerwar/rezerwar-0.4.2-r1.ebuild b/games-puzzle/rezerwar/rezerwar-0.4.2-r2.ebuild
similarity index 61%
rename from games-puzzle/rezerwar/rezerwar-0.4.2-r1.ebuild
rename to games-puzzle/rezerwar/rezerwar-0.4.2-r2.ebuild
index 042921d7df86..bead5c2cecc7 100644
--- a/games-puzzle/rezerwar/rezerwar-0.4.2-r1.ebuild
+++ b/games-puzzle/rezerwar/rezerwar-0.4.2-r2.ebuild
@@ -1,22 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit desktop
+EAPI=7
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Puzzle game like the known tetromino and the average pipe games"
-HOMEPAGE="http://tamentis.com/projects/rezerwar/"
-SRC_URI="http://tamentis.com/projects/rezerwar/files/${P}.tar.gz"
+HOMEPAGE="https://tamentis.com/projects/rezerwar/"
+SRC_URI="https://tamentis.com/projects/rezerwar/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="media-libs/libsdl[sound,joystick,video]
+DEPEND="
+	media-libs/libsdl[sound,joystick,video]
 	media-libs/sdl-mixer[vorbis]"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc-CC.patch
+	"${FILESDIR}"/${P}-gcc10.patch
+)
+
 src_prepare() {
 	default
 	sed -i \
@@ -31,10 +37,12 @@ src_prepare() {
 }
 
 src_configure() {
+	tc-export CC
+
 	SDLCONFIG=sdl-config \
-	TARGET_BIN="/usr/bin" \
-	TARGET_DOC=/usr/share/doc/${PF} \
-	TARGET_DATA="/usr/share/${PN}" \
+	TARGET_BIN="${EPREFIX}/usr/bin" \
+	TARGET_DOC="${EPREFIX}/usr/share/doc/${PF}" \
+	TARGET_DATA="${EPREFIX}/usr/share/${PN}" \
 		./configure || die "configure failed"
 	sed -i \
 		-e '/TARGET_DOC/d' \
diff --git a/games-puzzle/zaz/zaz-1.0.0-r1.ebuild b/games-puzzle/zaz/zaz-1.0.0-r1.ebuild
index 1ea20bafcd65..4a3321038e57 100644
--- a/games-puzzle/zaz/zaz-1.0.0-r1.ebuild
+++ b/games-puzzle/zaz/zaz-1.0.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools flag-o-matic
+inherit autotools flag-o-matic xdg
 
 DESCRIPTION="A puzzle game where the player has to arrange balls in triplets"
 HOMEPAGE="https://sourceforge.net/projects/zaz/"
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 052fef80f92d..9105ae227767 100644
Binary files a/games-roguelike/Manifest.gz and b/games-roguelike/Manifest.gz differ
diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild
new file mode 100644
index 000000000000..449552e96b56
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO
+# - attempt +test, linked bug claims to be fixed
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+VIRTUALX_REQUIRED="manual"
+inherit desktop eutils lua-single xdg-utils toolchain-funcs
+
+MY_P="stone_soup-${PV}"
+DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
+HOMEPAGE="http://crawl.develz.org/wordpress/"
+SRC_URI="
+	https://github.com/crawl/crawl/releases/download/${PV}/${PN/-/_}-${PV}.zip
+	https://dev.gentoo.org/~hasufell/distfiles/${PN}.png
+	https://dev.gentoo.org/~hasufell/distfiles/${PN}.svg
+"
+
+# 3-clause BSD: mt19937ar.cc, MSVC/stdint.h
+# 2-clause BSD: all contributions by Steve Noonan and Jesse Luehrs
+# Public Domain|CC0: most of tiles
+# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
+LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug ncurses sound test +tiles"
+# test is broken
+# see https://crawl.develz.org/mantis/view.php?id=6121
+RESTRICT="test"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	${LUA_DEPS}
+	dev-db/sqlite:3
+	sys-libs/zlib
+	!ncurses? ( !tiles? ( sys-libs/ncurses:0 ) )
+	ncurses? ( sys-libs/ncurses:0 )
+	tiles? (
+		media-fonts/dejavu
+		media-libs/freetype:2
+		media-libs/libpng:0
+		sound? (
+			   media-libs/libsdl2[X,opengl,sound,video]
+			   media-libs/sdl2-mixer
+		)
+		!sound? ( media-libs/libsdl2[X,opengl,video] )
+		media-libs/sdl2-image[png]
+		virtual/glu
+		virtual/opengl
+	)"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-python/pyyaml
+	sys-devel/flex
+	tiles? (
+		sys-libs/ncurses:0
+	)
+	virtual/pkgconfig
+	virtual/yacc
+	"
+
+S=${WORKDIR}/${MY_P}/source
+S_TEST=${WORKDIR}/${MY_P}_test/source
+PATCHES=(
+	"${FILESDIR}"/gitless-1.patch
+	"${FILESDIR}"/rltiles-ldflags-libs.patch
+)
+
+pkg_setup() {
+	lua-single_pkg_setup
+
+	if use !ncurses && use !tiles ; then
+		ewarn "Neither ncurses nor tiles frontend"
+		ewarn "selected, choosing ncurses only."
+		ewarn "Note that you can also enable both."
+	fi
+
+	if use sound && use !tiles ; then
+		ewarn "Sound support is only available with tiles."
+	fi
+}
+
+src_compile() {
+
+	# Insurance that we're not using bundled lib sources
+	rm -rf contrib || die "Couldn't delete contrib directory"
+
+	export HOSTCXX=$(tc-getBUILD_CXX)
+
+	# leave DATADIR at the top
+	myemakeargs=(
+		$(usex debug "FULLDEBUG=y DEBUG=y" "")
+		BUILD_LUA=
+		AR="$(tc-getAR)"
+		CFOPTIMIZE=''
+		CFOTHERS="${CXXFLAGS}"
+		CONTRIBS=
+		DATADIR="/usr/share/${PN}"
+		GCC="$(tc-getCC)"
+		GXX="$(tc-getCXX)"
+		LDFLAGS="${LDFLAGS}"
+		MAKEOPTS="${MAKEOPTS}"
+		PKGCONFIG="$(tc-getPKG_CONFIG)"
+		RANLIB="$(tc-getRANLIB)"
+		SAVEDIR="~/.crawl"
+		SOUND=$(usex sound "y" "")
+		STRIP=touch
+		USE_LUAJIT=
+		V=1
+		prefix="/usr"
+	)
+
+	if use ncurses || (use !ncurses && use !tiles) ; then
+		emake "${myemakeargs[@]}"
+		# move it in case we build both variants
+		use tiles && { mv crawl "${WORKDIR}"/crawl-ncurses || die ;}
+	fi
+
+	if use tiles ; then
+		emake clean
+		emake "${myemakeargs[@]}" "TILES=y"
+	fi
+}
+
+src_install() {
+	emake "${myemakeargs[@]}" $(usex tiles "TILES=y" "") DESTDIR="${D}" prefix_fp="" bin_prefix="${D}/usr/bin" install
+	[[ -e "${WORKDIR}"/crawl-ncurses ]] && dobin "${WORKDIR}"/crawl-ncurses
+
+	# don't relocate docs, needed at runtime
+	rm -rf "${D}/usr/share/${PN}"/docs/license
+
+	doman "${WORKDIR}/${MY_P}"/docs/crawl.6
+
+	# icons and menu for graphical build
+	if use tiles ; then
+		doicon -s 48 "${DISTDIR}"/${PN}.png
+		doicon -s scalable "${DISTDIR}"/${PN}.svg
+		make_desktop_entry crawl
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+
+	if use tiles && use ncurses ; then
+		elog "Since you have enabled both tiles and ncurses frontends"
+		elog "the ncurses binary is called 'crawl-ncurses' and the"
+		elog "tiles binary is called 'crawl'."
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index 304f0361fa75..066e442aa86e 100644
Binary files a/games-server/Manifest.gz and b/games-server/Manifest.gz differ
diff --git a/games-server/mtavc/mtavc-0.5-r2.ebuild b/games-server/mtavc/mtavc-0.5-r2.ebuild
index 224b9f29ea3c..4d828a967955 100644
--- a/games-server/mtavc/mtavc-0.5-r2.ebuild
+++ b/games-server/mtavc/mtavc-0.5-r2.ebuild
@@ -41,6 +41,6 @@ src_install() {
 	doins ${files}
 	dodoc README CHANGELOG
 	for f in ${files} ; do
-		dosym /etc/${PN}/${f} "${dir}"/${f}
+		dosym ../../etc/${PN}/${f} "${dir}"/${f}
 	done
 }
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index 525cca0f5248..640948841f11 100644
Binary files a/games-simulation/Manifest.gz and b/games-simulation/Manifest.gz differ
diff --git a/games-simulation/openrct2/openrct2-0.3.0.ebuild b/games-simulation/openrct2/openrct2-0.3.0-r1.ebuild
similarity index 99%
rename from games-simulation/openrct2/openrct2-0.3.0.ebuild
rename to games-simulation/openrct2/openrct2-0.3.0-r1.ebuild
index 41e425c753d0..5a111a1f34fd 100644
--- a/games-simulation/openrct2/openrct2-0.3.0.ebuild
+++ b/games-simulation/openrct2/openrct2-0.3.0-r1.ebuild
@@ -41,7 +41,7 @@ COMMON_DEPEND="
 	)
 	libressl? ( dev-libs/libressl:0= )
 	!libressl? ( dev-libs/openssl:0= )
-	scripting? ( dev-lang/duktape )
+	scripting? ( dev-lang/duktape:= )
 	truetype? (
 		media-libs/fontconfig:1.0
 		media-libs/freetype:2
diff --git a/games-simulation/openrct2/openrct2-0.3.2.ebuild b/games-simulation/openrct2/openrct2-0.3.2-r1.ebuild
similarity index 99%
rename from games-simulation/openrct2/openrct2-0.3.2.ebuild
rename to games-simulation/openrct2/openrct2-0.3.2-r1.ebuild
index 24e3f80c410d..f27d85fc6c3c 100644
--- a/games-simulation/openrct2/openrct2-0.3.2.ebuild
+++ b/games-simulation/openrct2/openrct2-0.3.2-r1.ebuild
@@ -41,7 +41,7 @@ COMMON_DEPEND="
 	)
 	libressl? ( dev-libs/libressl:0= )
 	!libressl? ( dev-libs/openssl:0= )
-	scripting? ( dev-lang/duktape )
+	scripting? ( dev-lang/duktape:= )
 	truetype? (
 		media-libs/fontconfig:1.0
 		media-libs/freetype:2
diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
index 8b991bc8ba97..ed4aa33550f6 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-9999.ebuild
@@ -43,7 +43,7 @@ COMMON_DEPEND="
 	)
 	libressl? ( dev-libs/libressl:0= )
 	!libressl? ( dev-libs/openssl:0= )
-	scripting? ( dev-lang/duktape )
+	scripting? ( dev-lang/duktape:= )
 	truetype? (
 		media-libs/fontconfig:1.0
 		media-libs/freetype:2
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 70208fc84edc..350a2b1fcbed 100644
Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ
diff --git a/games-strategy/seven-kingdoms/Manifest b/games-strategy/seven-kingdoms/Manifest
index f7545bdcaeb3..f668f78f342a 100644
--- a/games-strategy/seven-kingdoms/Manifest
+++ b/games-strategy/seven-kingdoms/Manifest
@@ -1,3 +1,3 @@
 DIST 7kaa-2.14.7.tar.xz 31342092 BLAKE2B 1e2456ff8e40eace3185f842aad1d436e7e336eb4489a1a23022c89e7695ef1fc6f632d884d5d992c63f8b67f8b045fbda37e2fa3a07e9be13b9801d959b1e93 SHA512 5c2067a842af18f2eaa21267ee0c48064eecfc6b967eb2abf967f2bf782a9699186b038d87de03fad71b5d88ec9fc1cfddd7521cb90c255a3a8d2aa586d3f2c1
-DIST 7kaa-2.15.2.tar.xz 46821276 BLAKE2B f5297ebed906937389c86bc4f7ac80a022172ec2c7157d52086ba2742fd2a3231cbb1ee1b8bb8a1c2beba27eb8cee006ce1cce70ea12ef01ede3b1ef4f989a0e SHA512 df053b9934fa3fc32a9a0a239fdafdfb7e441b7e98e280d1c74622f867919be48335ddbc54abb06b12b11e4a84b7a20ebb244fac9e4d7aebb8ad3cbe3192c29a
+DIST 7kaa-2.15.4p1.tar.xz 46927880 BLAKE2B b32b819bef5918f2de378893224dcb7a27af6afe4e09791d59a2208f92aa8b82f3d9936553734a8b1cdfec93a8cc5562c65a78a15734fa1457dc94a64a49ed93 SHA512 eac0ca91755f828cfc8b0ea07ad1d0c08030c60ac236473992cc7887f8da43a3246a1f375f569e4fc71afaf7c5797ae6911b8b617217077429e5f5c51af4f4b6
 DIST 7kaa.png 559 BLAKE2B 0379e60a5355c93cddf2a5f30b5e84711f77df073db4e85eee13d51654180572cd73dc96e8a9b954101e8b0ecacd879d6fa9e57feb70b66d1bdd043d07a40113 SHA512 0ec1ba67107a7823943704879efaf12297c5441c43b54f49684550927b10dc40c657fe93eb7c4cc85208d08194f179c9602fd8df6545776f3e1b4481803b16e6
diff --git a/games-strategy/seven-kingdoms/files/seven-kingdoms-2.15.2-fortify.patch b/games-strategy/seven-kingdoms/files/seven-kingdoms-2.15.2-fortify.patch
deleted file mode 100644
index 9377287a6089..000000000000
--- a/games-strategy/seven-kingdoms/files/seven-kingdoms-2.15.2-fortify.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 5f765d8f0ef76c227277c3f9e3162f9deac654db
-Author: Jesse Allen <the3dfxdude@gmail.com>
-Date:   Wed Jun 26 18:11:30 2019 -0700
-
-    LocaleRes: Don't use database field to enable transliteration.
-
-diff --git a/src/LocaleRes.cpp b/src/LocaleRes.cpp
-index 5b4300a..88d975f 100644
---- a/src/LocaleRes.cpp
-+++ b/src/LocaleRes.cpp
-@@ -107,10 +107,13 @@ void LocaleRes::init(const char *locale)
- 		strcpy(lang, "??");
- 		strcpy(codeset, "ISO-8859-1");
- 	}
--	strcat(codeset, "//TRANSLIT");
- 
--	cd = iconv_open(codeset, "");
-+	String tocode(codeset);
-+	tocode += "//TRANSLIT";
-+	cd = iconv_open(tocode, "");
-+
- 	cd_latin = iconv_open("ISO-8859-1", "");
-+
- 	in_buf = mem_add(INIT_BUF_SIZE+1);
- 	in_buf_size = INIT_BUF_SIZE;
- 	out_buf = mem_add(INIT_BUF_SIZE+1);
diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild b/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild
index 33a7974f04b1..e76f54f62801 100644
--- a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild
+++ b/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 MY_PN="7kaa"
 MY_P="${MY_PN}-${PV}"
@@ -29,6 +29,10 @@ src_unpack() {
 	unpack ${MY_P}.tar.xz
 }
 
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
 src_install() {
 	default
 
diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.2.ebuild b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.4_p1.ebuild
similarity index 82%
rename from games-strategy/seven-kingdoms/seven-kingdoms-2.15.2.ebuild
rename to games-strategy/seven-kingdoms/seven-kingdoms-2.15.4_p1.ebuild
index f8f2227e3f71..a23677ae1b8b 100644
--- a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.2.ebuild
+++ b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.4_p1.ebuild
@@ -3,14 +3,15 @@
 
 EAPI=7
 
-inherit desktop
+inherit desktop toolchain-funcs
 
 MY_PN="7kaa"
-MY_P="${MY_PN}-${PV}"
+MY_PV="$(ver_rs 3- '')"
+MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="Seven Kingdoms: Ancient Adversaries"
 HOMEPAGE="https://7kfans.com/"
-SRC_URI="https://github.com/the3dfxdude/${MY_PN}/releases/download/v${PV}/${MY_P}.tar.xz
+SRC_URI="https://github.com/the3dfxdude/${MY_PN}/releases/download/v${MY_PV}/${MY_P}.tar.xz
 	https://dev.gentoo.org/~pinkbyte/distfiles/${MY_PN}.png"
 
 LICENSE="GPL-2"
@@ -23,14 +24,16 @@ DEPEND="net-libs/enet:1.3=
 	net-misc/curl"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-fortify.patch" )
-
 S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	unpack ${MY_P}.tar.xz
 }
 
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
 src_install() {
 	default
 
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 88463ebb5059..0c3cc9f0e9c1 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,3 +1,2 @@
-DIST wesnoth-1.14.13.tar.gz 502959933 BLAKE2B 48f2e4340e9ae015c2e45f75f419ddfbb95a436a4ffbebbe417fdcf322e162ed0ad799680757adb88e19cba717cc48ec0e3d83c4c170e3502fea7be73a39a0c7 SHA512 ee1b7a93e2ae49698ec185cf6385cd93a49116315ebdec474bd5d5b73ab6af59db92ee5621fab68581edd81c74d8584237d5068fd30362054377d84a3dcb5ea0
 DIST wesnoth-1.14.14.tar.gz 502931191 BLAKE2B 25bbead74d74bbce9c47b5ac9339fd5b4d996cb9f80137f0b1d9a600c71c82b732ed66937419a4dd59995311685960630415daf3fd3f51e8cf891f29a16ec024 SHA512 3924aa26b59445568472a10c5fe0e1ddf87eb0a878faf2bcc52d4618f5743dfeda103d1f4025f4a129628e6a25f4c16407e968d594769a0751ada2c9a733e2e4
 DIST wesnoth-1.15.4.tar.gz 500087559 BLAKE2B bb46766369cfcb1432b5b5e8df62636e2a45ff45bf3ec4381aa9e73b20a4a5a6e196f0355b10d2b86ffad608cfdd24f8d2fad21061db9b18f1a2decf11b0e466 SHA512 b209e584a187934b0ca3808cb870f4703b49edd5de357b6a6b01bdad2c71b8d755b81d3628c5281cd19f82ee8d030716d6bf64a806e6636426949b0a3d85ee9d
diff --git a/games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch b/games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch
new file mode 100644
index 000000000000..4a7c8cf41e72
--- /dev/null
+++ b/games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch
@@ -0,0 +1,14 @@
+Leave default AR as is, https://bugs.gentoo.org/732096
+
+diff -r 419bf3de54e5 CMakeLists.txt
+--- a/CMakeLists.txt	Sat Oct 24 19:50:25 2020 +0000
++++ b/CMakeLists.txt	Sat Oct 24 19:50:53 2020 +0000
+@@ -390,8 +390,6 @@
+ 	MESSAGE("Using ar, ranlib, and default linker")
+ 	find_program(NON_LTO_AR NAMES ar)
+ 	find_program(NON_LTO_RANLIB NAMES ranlib)
+-	set(CMAKE_AR "${NON_LTO_AR}" CACHE STRING "Does not support LTO" FORCE)
+-	set(CMAKE_RANLIB "${NON_LTO_RANLIB}" CACHE STRING "Does not support LTO" FORCE)
+ endif()
+ MARK_AS_ADVANCED(LTO_AR LTO_RANLIB NON_LTO_AR NON_LTO_RANLIB)
+ 
diff --git a/games-strategy/wesnoth/wesnoth-1.14.13.ebuild b/games-strategy/wesnoth/wesnoth-1.14.13.ebuild
deleted file mode 100644
index 407e3840468a..000000000000
--- a/games-strategy/wesnoth/wesnoth-1.14.13.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic toolchain-funcs xdg
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org
-	https://github.com/wesnoth/wesnoth"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# uneven minor versions are development versions
-if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
-	KEYWORDS="~amd64 ~x86"
-fi
-IUSE="dbus dedicated doc fribidi libressl nls server"
-
-RDEPEND="
-	acct-group/wesnoth
-	acct-user/wesnoth
-	>=dev-libs/boost-1.50:=[nls,threads,icu]
-	>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
-	!dedicated? (
-		dev-libs/glib:2
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-		>=media-libs/fontconfig-2.4.1
-		>=media-libs/sdl2-image-2.0.0[jpeg,png]
-		>=media-libs/sdl2-mixer-2.0.0[vorbis]
-		>=media-libs/sdl2-ttf-2.0.12
-		media-libs/libvorbis
-		>=x11-libs/pango-1.22.0
-		>=x11-libs/cairo-1.10.0
-		sys-libs/readline:0=
-		dbus? ( sys-apps/dbus )
-		fribidi? ( dev-libs/fribidi )
-	)"
-DEPEND="${RDEPEND}
-	x11-libs/libX11
-"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	cmake_src_prepare
-
-	if ! use doc ; then
-		sed -i \
-			-e '/manual/d' \
-			doc/CMakeLists.txt || die
-	fi
-
-	# respect LINGUAS (bug #483316)
-	if [[ ${LINGUAS+set} ]] ; then
-		local lang langs=()
-		for lang in $(cat po/LINGUAS) ; do
-			has ${lang} ${LINGUAS} && langs+=( ${lang} )
-		done
-		echo "${langs[@]}" > po/LINGUAS || die
-	fi
-}
-
-src_configure() {
-	filter-flags -ftracer -fomit-frame-pointer
-	if [[ $(gcc-major-version) -eq 3 ]] ; then
-		filter-flags -fstack-protector
-		append-flags -fno-stack-protector
-	fi
-
-	# Work around eclass
-	append-flags -UNDEBUG
-
-	if use dedicated || use server ; then
-		mycmakeargs=(
-			-DENABLE_CAMPAIGN_SERVER="ON"
-			-DENABLE_SERVER="ON"
-			-DSERVER_UID="${PN}"
-			-DSERVER_GID="${PN}"
-			-DFIFO_DIR="/run/wesnothd"
-			)
-	else
-		mycmakeargs=(
-			-DENABLE_CAMPAIGN_SERVER="OFF"
-			-DENABLE_SERVER="OFF"
-			)
-	fi
-	mycmakeargs+=(
-		-Wno-dev
-		-DENABLE_GAME="$(usex !dedicated)"
-		-DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
-		-DENABLE_NLS="$(usex nls)"
-		-DENABLE_NOTIFICATIONS="$(usex dbus)"
-		-DENABLE_FRIBIDI="$(usex fribidi)"
-		-DENABLE_STRICT_COMPILATION="OFF"
-		)
-	cmake_src_configure
-}
-
-src_install() {
-	local DOCS=( README.md changelog.md )
-	cmake_src_install
-	if use dedicated || use server; then
-		rmdir "${ED}/run/wesnothd" || die
-		newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
-	fi
-}
diff --git a/games-strategy/wesnoth/wesnoth-1.14.14.ebuild b/games-strategy/wesnoth/wesnoth-1.14.14.ebuild
index 407e3840468a..4d50bca27254 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.14.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.14.ebuild
@@ -46,6 +46,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/wesnoth-1.14.14-ar.patch"
+)
+
 src_prepare() {
 	cmake_src_prepare
 
@@ -72,9 +76,6 @@ src_configure() {
 		append-flags -fno-stack-protector
 	fi
 
-	# Work around eclass
-	append-flags -UNDEBUG
-
 	if use dedicated || use server ; then
 		mycmakeargs=(
 			-DENABLE_CAMPAIGN_SERVER="ON"
diff --git a/games-strategy/wesnoth/wesnoth-1.15.4.ebuild b/games-strategy/wesnoth/wesnoth-1.15.4.ebuild
index 407e3840468a..4d50bca27254 100644
--- a/games-strategy/wesnoth/wesnoth-1.15.4.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.15.4.ebuild
@@ -46,6 +46,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/wesnoth-1.14.14-ar.patch"
+)
+
 src_prepare() {
 	cmake_src_prepare
 
@@ -72,9 +76,6 @@ src_configure() {
 		append-flags -fno-stack-protector
 	fi
 
-	# Work around eclass
-	append-flags -UNDEBUG
-
 	if use dedicated || use server ; then
 		mycmakeargs=(
 			-DENABLE_CAMPAIGN_SERVER="ON"
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index b5020b5b777e..b469e729cac3 100644
Binary files a/games-util/Manifest.gz and b/games-util/Manifest.gz differ
diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
index fe7a800819bd..55c2da9df18a 100644
--- a/games-util/lutris/Manifest
+++ b/games-util/lutris/Manifest
@@ -1,2 +1,2 @@
 DIST lutris_0.5.7.1.tar.xz 2145584 BLAKE2B eb766d5e36aca63af7af8f2e85f51b4e3e37b8372b13a59702c545a0c697fa5feb1403cd9589d22c2bdff6593f69ed39e1bcb7ecb28ecc24b7a77b09ed1b2f89 SHA512 9efff4d92ae4d9051a7253324047dfa57f463188ebdbcede5feba2c0268494e8fa7929d2ef30bfe85e52824bbb9c05b1f1688b6658376597cc4cc35c26a19da3
-DIST lutris_0.5.7.tar.xz 2133524 BLAKE2B d27191668f582a5cd50941ca227d6121f1bfdb4824c490dd54cc513fda523712af9480451b0e5503404aba8d083c94ce91b928ed3faf4e94ea9f0bbf28b764c1 SHA512 f751be82dd5550dc882932980a3a04a62f183e5f0dddc9939154025408da081392917834324875a80ae8b354906e04835c2df56c23f1d6d29cd9fbdc514e1c57
+DIST lutris_0.5.8.tar.xz 892740 BLAKE2B eaa8c71ade35392e701b3fd1d8ef2c0077e7fb7b96c3f037b5e4353d89b50b82e8a75fb2fb537e6ceeb9b6faaa5962e0ffe425f52820168b60eed742024610a4 SHA512 dcd963ff8b3c6d66fe79acc1e1c237196f7351d87bf1b4e5920201ecd7f1b2a80ac59f7151287e70e68c402c2b1b00e961d7314e6d5cbbbae0f4ca5fda562a0f
diff --git a/games-util/lutris/lutris-0.5.7.ebuild b/games-util/lutris/lutris-0.5.8.ebuild
similarity index 75%
rename from games-util/lutris/lutris-0.5.7.ebuild
rename to games-util/lutris/lutris-0.5.8.ebuild
index 11cbc20a4482..4052ada5d976 100644
--- a/games-util/lutris/lutris-0.5.7.ebuild
+++ b/games-util/lutris/lutris-0.5.8.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite,threads(+)"
+DISTUTILS_SINGLE_IMPL="1"
 
 inherit distutils-r1 virtualx xdg
 
@@ -26,19 +27,25 @@ SLOT="0"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/nose[${PYTHON_USEDEP}]
+		')
+	)
 "
 RDEPEND="
 	app-arch/cabextract
 	app-arch/p7zip
 	app-arch/unrar
 	app-arch/unzip
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/python-evdev[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/python-evdev[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	')
 	gnome-base/gnome-desktop:3[introspection]
 	media-sound/fluid-soundfont
 	net-libs/libsoup
@@ -53,16 +60,13 @@ RDEPEND="
 python_install_all() {
 	local DOCS=( AUTHORS README.rst docs/installers.rst )
 	distutils-r1_python_install_all
+	python_fix_shebang "${ED}"/usr/share/lutris/bin/lutris-wrapper #740048
 }
 
 python_test() {
 	virtx nosetests -v
 }
 
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
 pkg_postinst() {
 	xdg_pkg_postinst
 
@@ -72,7 +76,3 @@ pkg_postinst() {
 	elog "in ${EROOT}/usr/share/doc/${PF}/installers.rst.bz2, and is also"
 	elog "available online at lutris.net."
 }
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index e769fea75d2c..1331c8ae87c1 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/dconf/dconf-0.36.0.ebuild b/gnome-base/dconf/dconf-0.36.0.ebuild
index 65bcd1f0fe3a..837fd6a3656e 100644
--- a/gnome-base/dconf/dconf-0.36.0.ebuild
+++ b/gnome-base/dconf/dconf-0.36.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/dconf"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
 IUSE="gtk-doc"
 RESTRICT="!test? ( test )" # IUSE=test comes from virtualx.eclass
 
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index e61a01ab662c..42105165f437 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-shell-3.36.5-patchset.tar.xz 5296 BLAKE2B 6b353bd7714e2439590b74d25c964f06c8792337b22504b17cf37f4113bb0712d642fa1ab4fab9e1944544b3c57d6624c1758c97ef3b2f2a5ba2596305d4831e SHA512 669f8c2d5fe73c8f99f60ec38ac4b4fbf43e2d3667c1710f4f6179d77848f3f9d4245e22c128f41c1e594b44ba317b2430edbefa67c6886054d39726cdddd165
 DIST gnome-shell-3.36.5.tar.xz 1776080 BLAKE2B 82a53777a9fa56c3bd1c6914c1aefe85256d3cd640e95c9804b37c711360e09e758f536e9caee79c88d1686ffb3bc672f215cc454237922942edcec93f6bafd3 SHA512 e8cbcd9ee9643083870415fa3ea8ed0f1b6f2a138054f92e23479514c57b22afc38e3e082a89051f2be4e91e2dea3a68951a06eb0589f507825da9137d92e545
+DIST gnome-shell-3.36.7-patchset.tar.xz 6364 BLAKE2B 80a2e2a03e4cc3b15db6af872a2330c0921a63bcd03db78a970190fee93c982296b381d08ac4bd1cb5dbe5b14d9732e447445f5dcc06d607826a9026395f10bb SHA512 6f9145fd00117e6b4170e7457c83a8c3bbbbfc6086ce3bcd07813b5a4f05e58f42e889cc90799d6988af05fce9791a792e4d8d60ffe58818563c852f9923930d
+DIST gnome-shell-3.36.7.tar.xz 1777236 BLAKE2B 4dd3b98e8a2ffa711bffe0b3b78708c85c1979122ee71e7e0d7c55626a608ba4598071bf8659338c960ba4b0349e5b621b97f294a4961cf021b9047753136af5 SHA512 7275d1e2d2629abd2fbfae910a77c25485464e39f8317ba1b0e8e1ae3368e69af4eb85c2611e82ea04270bfd8185e24f13002df9b13335adbdff144847790656
 DIST gnome-shell-3.38.1.tar.xz 1812860 BLAKE2B d58dd9f5962d953f4bfa8aede62e24007185e0b4b82781c54cce87d8505657e01b0f76a9119b60634e6c723b7dd9320f5c56b984b59cc8fce61ad4a897291b44 SHA512 7ab580f892c4b4dac2fc8625343dfab1bf7a11e148dc01e6e805a5b1ac1d4cb17943b9a3058ec69fc086c270d76ef8073dca494991a5da1dcfa52b42dcc03f01
diff --git a/gnome-base/gnome-shell/gnome-shell-3.36.7.ebuild b/gnome-base/gnome-shell/gnome-shell-3.36.7.ebuild
new file mode 100644
index 000000000000..43c5f42a3cc4
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.36.7.ebuild
@@ -0,0 +1,190 @@
+# 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 gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( elogind systemd )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
+# FIXME:
+#  * gstreamer support is currently automagic
+DEPEND="
+	>=gnome-extra/evolution-data-server-3.33.1:=
+	>=app-crypt/gcr-3.7.5[introspection]
+	>=dev-libs/glib-2.57.2:2
+	>=dev-libs/gobject-introspection-1.49.1:=
+	>=dev-libs/gjs-1.63.2
+	>=x11-libs/gtk+-3.15.0:3[introspection]
+	>=x11-wm/mutter-3.36.0:0/6[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	>=gnome-base/gsettings-desktop-schemas-3.33.1
+	>=x11-libs/startup-notification-0.11
+	>=app-i18n/ibus-1.5.2
+	>=gnome-base/gnome-desktop-3.35.90:3=[introspection]
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+	>=media-libs/gstreamer-0.11.92:1.0
+	media-libs/gst-plugins-base:1.0
+	networkmanager? (
+		>=net-misc/networkmanager-1.10.4:=[introspection]
+		net-libs/libnma[introspection]
+		>=app-crypt/libsecret-0.18
+		dev-libs/dbus-glib )
+	systemd? ( >=sys-apps/systemd-31
+		>=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
+	elogind? ( >=sys-auth/elogind-237 )
+	app-arch/gnome-autoar
+	dev-libs/json-glib
+
+	>=app-accessibility/at-spi2-atk-2.5.3
+	x11-libs/gdk-pixbuf:2[introspection]
+	dev-libs/libxml2:2
+	x11-libs/libX11
+
+	>=media-sound/pulseaudio-12.99.3[glib]
+	>=dev-libs/atk-2[introspection]
+	dev-libs/libical:=
+	>=x11-libs/libXfixes-5.0
+
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	media-libs/mesa[X(+)]
+"
+# Runtime-only deps are probably incomplete and approximate.
+# Introspection deps generated using:
+#  grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
+# Each block:
+# 1. Introspection stuff needed via imports.gi.*
+# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
+# 3. Control shell settings
+# 4. logind interface needed for suspending support
+# 5. xdg-utils needed for xdg-open, used by extension tool
+# 6. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
+# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c  # TODO: Review
+# 8. IBus is needed for nls integration
+# 9. Optional telepathy chat integration
+# 10. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
+# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
+RDEPEND="${DEPEND}
+	>=sys-apps/accountsservice-0.6.14[introspection]
+	app-accessibility/at-spi2-core:2[introspection]
+	app-misc/geoclue[introspection]
+	>=dev-libs/libgweather-3.26:2[introspection]
+	>=sys-power/upower-0.99:=[introspection]
+	x11-libs/pango[introspection]
+	gnome-base/librsvg:2[introspection]
+
+	>=gnome-base/gnome-session-2.91.91
+	>=gnome-base/gnome-settings-daemon-3.8.3
+
+	x11-misc/xdg-utils
+
+	>=x11-themes/adwaita-icon-theme-3.26
+
+	networkmanager? (
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )
+	ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
+	telepathy? (
+		>=net-im/telepathy-logger-0.2.4[introspection]
+		>=net-libs/telepathy-glib-0.19[introspection] )
+	media-fonts/cantarell
+"
+# avoid circular dependency, see bug #546134
+PDEPEND="
+	>=gnome-base/gdm-3.5[introspection]
+	>=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
+	browser-extension? ( gnome-extra/chrome-gnome-shell )
+"
+BDEPEND="
+	dev-lang/sassc
+	dev-libs/libxslt
+	app-text/asciidoc
+	>=dev-util/gdbus-codegen-2.45.3
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.17
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# origin/gnome-3-36@03062d0d9d9f + try to fix crashes related to custom stylesheet; triggered often by package installs (probably desktop database update), screen unlock, etc
+	# https://gitlab.gnome.org/GNOME/gnome-shell/issues/1265
+	# https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/536
+	"${WORKDIR}"/patches
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	"${FILESDIR}"/3.34-optional-bluetooth.patch
+	# Change favorites defaults, bug #479918
+	"${FILESDIR}"/3.36-defaults.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	# Hack in correct python shebang
+	sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use bluetooth)
+		-Dextensions_tool=true
+		-Dextensions_app=true
+		$(meson_use gtk-doc gtk_doc)
+		-Dman=true
+		$(meson_use networkmanager)
+		$(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4
+		# (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
+		# suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
+		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
+	fi
+
+	if ! has_version "media-libs/mesa[llvm]"; then
+		elog "llvmpipe is used as fallback when no 3D acceleration"
+		elog "is available. You will need to enable llvm USE for"
+		elog "media-libs/mesa if you do not have hardware 3D setup."
+	fi
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=563084
+	# TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)?
+	if has_version "x11-drivers/nvidia-drivers[-kms]"; then
+		ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
+		ewarn "otherwise Gnome will fail to start"
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.36.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.36.1.ebuild
index 678e122b3ab5..7d8eb077cbb8 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.36.1.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.36.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+introspection"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
 
 BDEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 576c96ac1238..2a117a23d88a 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index be6c81c2396c..b22492a5ceea 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-shell-extensions-3.36.3.tar.xz 207956 BLAKE2B be266e773e8adae06e063eac7b363ac628bde672cc4977ea38d437bfd078d1de61f4fa9402b433d22b61509fb530fa169731decd2e75c822b4c6b693bac61b9c SHA512 812580abb07f03bd82a80ced7aabca5a9daacd0ef1ec5990ee8e8f4cc231f93f880c33adc87519432cad3fc90f3a6fd3e33f4cff0a90c001bfeb825951d40bf9
+DIST gnome-shell-extensions-3.36.7.tar.xz 207968 BLAKE2B 61e0e817af900d1a385d44cc3fe2a4d2fb89421aa692d9c02d92c6b841b7da248a267194e057fe5c9fb4e08a713bb72c657eb2fd4982b8bbcdb541644307d934 SHA512 b571f369dcd395d882b4afe5da213a52e3989b5e8e11886fd305d6c77a63ff73ed9d52eb7260ab7e880461354b882d659d28930176ca0aa8c1e75b4a39989997
 DIST gnome-shell-extensions-3.38.1.tar.xz 209964 BLAKE2B 38fad074689aa93d0ca16a230db92417ef90363dc9f27be6c1692bc2296ff2019d0c42542f30d552f79c357795fad07e59bc508476b7cf09abfdeb5860487f0f SHA512 256dbb7ad4ae3b759afca85ae1c042f7b3f3cc46b2713f5a6f2f52d1cbc916a1fd8a634e20218a6eeb1baa6141f65c9c19170c5bfe2f7f677b679bbf78b3bce1
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.36.7.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.36.7.ebuild
new file mode 100644
index 000000000000..88401c357a10
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.36.7.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eapi7-ver gnome.org readme.gentoo-r1 meson xdg
+
+DESCRIPTION="JavaScript extensions for GNOME Shell"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="test"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.26:2
+	>=gnome-base/libgtop-2.28.3[introspection]
+	>=app-eselect/eselect-gnome-shell-extensions-20111211
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-libs/gjs-1.29
+	dev-libs/gobject-introspection:=
+	dev-libs/atk[introspection]
+	gnome-base/gnome-menus:3[introspection]
+	=gnome-base/gnome-shell-$(ver_cut 1-2)*
+	media-libs/clutter:1.0[introspection]
+	net-libs/telepathy-glib[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	x11-themes/adwaita-icon-theme
+	>=x11-wm/mutter-3.32[introspection]
+"
+DEPEND="${COMMON_DEPEND}
+	dev-lang/sassc
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( dev-lang/spidermonkey:68 )
+"
+
+RESTRICT="!test? ( test )"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="Installed extensions installed are initially disabled by default.
+To change the system default and enable some extensions, you can use
+# eselect gnome-shell-extensions
+
+Alternatively, to enable/disable extensions on a per-user basis,
+you can use the https://extensions.gnome.org/ web interface, the
+gnome-extra/gnome-tweaks GUI, or modify the org.gnome.shell
+enabled-extensions gsettings key from the command line or a script."
+
+src_configure() {
+	meson_src_configure \
+		-Dextension_set=all \
+		-Dclassic_mode=true
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+
+	readme.gentoo_print_elog
+}
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.36.0.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.36.0.ebuild
index 0d3d4be36355..185ba651964a 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.36.0.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.36.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/yelp-xsl"
 LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~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"
 
 RDEPEND="
 	>=dev-libs/libxml2-2.6.12:=
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 3c230a4e9b18..e521cb2708fe 100644
Binary files a/gui-apps/Manifest.gz and b/gui-apps/Manifest.gz differ
diff --git a/gui-apps/gtkgreet/files/gtkgreet-0.6-r1-werror.patch b/gui-apps/gtkgreet/files/gtkgreet-0.6-r1-werror.patch
new file mode 100644
index 000000000000..f47a21adc122
--- /dev/null
+++ b/gui-apps/gtkgreet/files/gtkgreet-0.6-r1-werror.patch
@@ -0,0 +1,12 @@
+diff --git a/meson.build b/meson.build
+index eb3a2b8..07bee48 100644
+--- a/meson.build
++++ b/meson.build
+@@ -7,7 +7,6 @@ project(
+ 	default_options: [
+ 		'c_std=c11',
+ 		'warning_level=2',
+-		'werror=true',
+ 	],
+ )
+ 
diff --git a/gui-apps/gtkgreet/gtkgreet-0.6-r1.ebuild b/gui-apps/gtkgreet/gtkgreet-0.6-r1.ebuild
index a74b52eb2e4b..93f8843afbf4 100644
--- a/gui-apps/gtkgreet/gtkgreet-0.6-r1.ebuild
+++ b/gui-apps/gtkgreet/gtkgreet-0.6-r1.ebuild
@@ -12,8 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/gtkgreet"
 else
-	MY_PV=${PV/_rc/-rc}
-	SRC_URI="https://git.sr.ht/~kennylevinsen/gtkgreet/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://git.sr.ht/~kennylevinsen/gtkgreet/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
@@ -23,8 +22,8 @@ IUSE="+layershell +man"
 
 DEPEND="
 	dev-libs/json-c:=
-	x11-libs/gtk+:3
 	layershell? ( gui-libs/gtk-layer-shell )
+	x11-libs/gtk+:3
 "
 RDEPEND="
 	${DEPEND}
@@ -35,6 +34,8 @@ BDEPEND="
 	man? ( app-text/scdoc )
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-0.6-r1-werror.patch )
+
 src_configure() {
 	local emesonargs=(
 		$(meson_feature man man-pages)
diff --git a/gui-apps/gtkgreet/gtkgreet-9999.ebuild b/gui-apps/gtkgreet/gtkgreet-9999.ebuild
index bc41aaec11f9..93f8843afbf4 100644
--- a/gui-apps/gtkgreet/gtkgreet-9999.ebuild
+++ b/gui-apps/gtkgreet/gtkgreet-9999.ebuild
@@ -34,6 +34,8 @@ BDEPEND="
 	man? ( app-text/scdoc )
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-0.6-r1-werror.patch )
+
 src_configure() {
 	local emesonargs=(
 		$(meson_feature man man-pages)
diff --git a/gui-apps/wayland-logout/Manifest b/gui-apps/wayland-logout/Manifest
new file mode 100644
index 000000000000..abc4336a7b56
--- /dev/null
+++ b/gui-apps/wayland-logout/Manifest
@@ -0,0 +1 @@
+DIST wayland-logout-1.0.tar.gz 16663 BLAKE2B 7f8932342cd584f9e8c6abcaf83b2a5ff7ff14eda00f6d47a402206cff5786a9f4d5fbd75b8704fd0c39fad9550e47dbd499ac4a9b233f63ee6ed80b544d4556 SHA512 2c31fe11d4e6de53c7e873e7d235c4dcfbcb1425f4d7d2969b623574dd0bea77ee1fd482949b09cd86a1755ed48f2a8b39e4b2db6adedaf6d465144e9ef71652
diff --git a/gui-apps/wayland-logout/metadata.xml b/gui-apps/wayland-logout/metadata.xml
new file mode 100644
index 000000000000..d155fdbc0406
--- /dev/null
+++ b/gui-apps/wayland-logout/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@aisha.cc</email>
+		<name>Aisha Tammy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/gui-apps/wayland-logout/wayland-logout-1.0.ebuild b/gui-apps/wayland-logout/wayland-logout-1.0.ebuild
new file mode 100644
index 000000000000..edb385b32abf
--- /dev/null
+++ b/gui-apps/wayland-logout/wayland-logout-1.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="general logout scripts for wayland compositors"
+
+HOMEPAGE="https://github.com/soreau/wayland-logout"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/soreau/wayland-logout"
+else
+	SRC_URI="https://github.com/soreau/wayland-logout/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="sys-process/lsof"
+
+src_install() {
+	newbin wayland-logout.sh wayland-logout
+	dosym wayland-logout /usr/bin/wlogout
+}
diff --git a/gui-apps/wayland-logout/wayland-logout-9999.ebuild b/gui-apps/wayland-logout/wayland-logout-9999.ebuild
new file mode 100644
index 000000000000..edb385b32abf
--- /dev/null
+++ b/gui-apps/wayland-logout/wayland-logout-9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="general logout scripts for wayland compositors"
+
+HOMEPAGE="https://github.com/soreau/wayland-logout"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/soreau/wayland-logout"
+else
+	SRC_URI="https://github.com/soreau/wayland-logout/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="sys-process/lsof"
+
+src_install() {
+	newbin wayland-logout.sh wayland-logout
+	dosym wayland-logout /usr/bin/wlogout
+}
diff --git a/gui-apps/wcm/Manifest b/gui-apps/wcm/Manifest
index 075cc71bb061..4e304edcad70 100644
--- a/gui-apps/wcm/Manifest
+++ b/gui-apps/wcm/Manifest
@@ -1 +1,2 @@
 DIST wcm-0.5.0.tar.gz 253120 BLAKE2B 44f6e36425ed070f086fcea6b3374b8fd2f1e3420176098699ec735cb74a1de0d6919ca71e62ca61116005ad26e50562e0a927dce7990d87eb7559511fb371e3 SHA512 c06e97fa3b22f33bb7f05efda380484377596cce83b7874d42b6f3795f275faee2fdd2f2a6a6f24ebbb7e339a0dd3e526a3d02a2e1d4c45b34f76d627896bc53
+DIST wcm-0.6.0.tar.gz 308100 BLAKE2B 22fd0867b7efee153375844bd9b06fa7978a488494bf48c5da10ecf59ab9ff1ee49fc31e82de294d2a5bf2af5339ccd367916f3e66c9e173379679622c5d9c93 SHA512 a0ce6541ea1416585d3102a07f8ccc73d53345cdab472a9f1a839af652ccaa3b7c4ef26dbe3c24d3ff4bfb5be9a1c61a7922170dafa9a66082c0de90ebcba3d9
diff --git a/gui-apps/wcm/wcm-0.6.0.ebuild b/gui-apps/wcm/wcm-0.6.0.ebuild
new file mode 100644
index 000000000000..66c8ce7b2447
--- /dev/null
+++ b/gui-apps/wcm/wcm-0.6.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Wayfire Config Manager"
+HOMEPAGE="https://github.com/WayfireWM/wcm"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/WayfireWM/wcm.git"
+else
+	SRC_URI="https://github.com/WayfireWM/wcm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+DEPEND="
+	dev-libs/libevdev
+	dev-libs/libxml2
+	dev-cpp/gtkmm:3.0[wayland]
+	>=gui-wm/wayfire-${PV%.*}
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	dev-libs/wayland-protocols
+	virtual/pkgconfig
+"
diff --git a/gui-apps/wcm/wcm-9999.ebuild b/gui-apps/wcm/wcm-9999.ebuild
index 375772702783..66c8ce7b2447 100644
--- a/gui-apps/wcm/wcm-9999.ebuild
+++ b/gui-apps/wcm/wcm-9999.ebuild
@@ -23,7 +23,7 @@ DEPEND="
 	dev-libs/libevdev
 	dev-libs/libxml2
 	dev-cpp/gtkmm:3.0[wayland]
-	>=gui-wm/wayfire-${PV}
+	>=gui-wm/wayfire-${PV%.*}
 "
 
 RDEPEND="${DEPEND}"
diff --git a/gui-apps/wf-shell/Manifest b/gui-apps/wf-shell/Manifest
index acc3e68fe84c..5af436f3cf28 100644
--- a/gui-apps/wf-shell/Manifest
+++ b/gui-apps/wf-shell/Manifest
@@ -1 +1,2 @@
 DIST wf-shell-0.5.0.tar.xz 8998296 BLAKE2B c32232fc08292b15a0048d11d0f179a82fd21b3179223d898057ac95b42ac35ec063467f67c0f1261857c3b643edc4367112a05bb63f002788b64ed86559addd SHA512 d0029746ea10625bb47381a7ed74aadb8aa3823f83f751b539eefd49da5aa1643a2d16c55fe23d30bd71528ad5c1ea8d389909fe8cc1026746b3b76aa5dabd2b
+DIST wf-shell-0.6.1.tar.xz 9014596 BLAKE2B 5256ceb8dc2b3dd4cf5d4503595c46b72bcde1dd4804a5871e225cee5b028ac69b02618d9c348fca4e21f2fd81b2be51fb0122126dd200dcdaeac894ec902c21 SHA512 d710cf703f5671bba01d056c7733724f90e6510a50e45a1a30cacde33a689c065335d802a3fd556cf9f8f0f420266ed2a8616706ecf5a68dcdf45a79876a4bcf
diff --git a/gui-apps/wf-shell/wf-shell-0.6.1.ebuild b/gui-apps/wf-shell/wf-shell-0.6.1.ebuild
new file mode 100644
index 000000000000..08f4995b15b2
--- /dev/null
+++ b/gui-apps/wf-shell/wf-shell-0.6.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="A compiz like 3D wayland compositor"
+HOMEPAGE="https://github.com/WayfireWM/wf-shell"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
+else
+	SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+pulseaudio"
+
+DEPEND="
+	dev-cpp/gtkmm:3.0=[wayland]
+	dev-libs/gobject-introspection
+	gui-libs/gtk-layer-shell
+	>=gui-wm/wayfire-${PV%.*}
+	pulseaudio? ( media-sound/pulseaudio )
+"
+RDEPEND="${DEPEND}
+	gui-apps/wayland-logout
+"
+BDEPEND="
+	dev-libs/wayland-protocols
+	virtual/pkgconfig
+"
+
+src_configure () {
+	local emesonargs=(
+		"$(meson_feature pulseaudio pulse)"
+		-Dwayland-logout=false
+	)
+	meson_src_configure
+}
diff --git a/gui-apps/wf-shell/wf-shell-9999.ebuild b/gui-apps/wf-shell/wf-shell-9999.ebuild
index 94c26507f32a..08f4995b15b2 100644
--- a/gui-apps/wf-shell/wf-shell-9999.ebuild
+++ b/gui-apps/wf-shell/wf-shell-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
 else
-	SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/${PV}/${P}.tar.xz"
+	SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
@@ -23,13 +23,13 @@ IUSE="+pulseaudio"
 DEPEND="
 	dev-cpp/gtkmm:3.0=[wayland]
 	dev-libs/gobject-introspection
-	>=gui-libs/gtk-layer-shell-0.1
-	>=gui-wm/wayfire-${PV}
+	gui-libs/gtk-layer-shell
+	>=gui-wm/wayfire-${PV%.*}
 	pulseaudio? ( media-sound/pulseaudio )
 "
-
-RDEPEND="${DEPEND}"
-
+RDEPEND="${DEPEND}
+	gui-apps/wayland-logout
+"
 BDEPEND="
 	dev-libs/wayland-protocols
 	virtual/pkgconfig
@@ -38,6 +38,7 @@ BDEPEND="
 src_configure () {
 	local emesonargs=(
 		"$(meson_feature pulseaudio pulse)"
+		-Dwayland-logout=false
 	)
 	meson_src_configure
 }
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 18e2ad12096b..962df1bd36c7 100644
Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ
diff --git a/gui-libs/wf-config/Manifest b/gui-libs/wf-config/Manifest
index 16290450f81a..56c8d4c22dff 100644
--- a/gui-libs/wf-config/Manifest
+++ b/gui-libs/wf-config/Manifest
@@ -1 +1,2 @@
 DIST wf-config-0.5.0.tar.xz 64760 BLAKE2B c1939035820794828b356371c51dbd55a73a569e3a9dcf801b4aedf61c3c0131e47040a1b05e2a8cd30ecbb57f160f702b735437dfb49051a8a6a63d95201204 SHA512 b365884195cb7fc64a1ca1d74a2d12b56e1ef0f4dd49d298a9379455f2917f2c644de2b12f5068304ca404b112490e38fbfe3111aac31d301f02f23429df87c7
+DIST wf-config-0.6.0.tar.xz 65360 BLAKE2B 130a8752e311863642d68c44ef6696bb4b6795775d538f79b26130d611035ecc399757b1fdad0d8984fb79ea66d14aad2b8fe14fea5a42e6acf4de69132ba121 SHA512 f6c954fe0aee47074cab4c50bdafba82fe01f502eac3154da3ff94cf69b235ed7f7af10ad56a17dbca44b0b472c6b87e0513eae12a86d64cf10fdfc365242403
diff --git a/gui-libs/wf-config/wf-config-0.6.0.ebuild b/gui-libs/wf-config/wf-config-0.6.0.ebuild
new file mode 100644
index 000000000000..fdcbe17d4da5
--- /dev/null
+++ b/gui-libs/wf-config/wf-config-0.6.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="library for managing wayfire configuration files"
+HOMEPAGE="https://github.com/WayfireWM/wf-config"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/WayfireWM/wf-config.git"
+else
+	SRC_URI="https://github.com/WayfireWM/wf-config/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+DEPEND="
+	dev-libs/libevdev
+	dev-libs/libxml2
+	>=gui-libs/wlroots-0.12.0
+	media-libs/glm
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	dev-libs/wayland-protocols
+	virtual/pkgconfig
+"
diff --git a/gui-libs/wf-config/wf-config-9999.ebuild b/gui-libs/wf-config/wf-config-9999.ebuild
index b100b1d861f4..fdcbe17d4da5 100644
--- a/gui-libs/wf-config/wf-config-9999.ebuild
+++ b/gui-libs/wf-config/wf-config-9999.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
 DEPEND="
 	dev-libs/libevdev
 	dev-libs/libxml2
-	>=gui-libs/wlroots-0.11.0
+	>=gui-libs/wlroots-0.12.0
 	media-libs/glm
 "
 
diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index e1767e313b3e..f06779d2f301 100644
Binary files a/gui-wm/Manifest.gz and b/gui-wm/Manifest.gz differ
diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest
index 66ae5e3cf95e..f705f3f30439 100644
--- a/gui-wm/wayfire/Manifest
+++ b/gui-wm/wayfire/Manifest
@@ -1 +1,2 @@
 DIST wayfire-0.5.0.tar.xz 670680 BLAKE2B 6a1555669352dd1303f7472db4fbb8ada6173c09825f4e999a2862787bd5bf31e070e9e12110249b9407d8c380235f4a9d3c5be6b23defe36094822526eed6ef SHA512 9c2d116a5d6e77e37b0e4eef26624d43d6ab3a80e56e19a2de1fdd28a2a522c24b9e346eb4529848f3b2c3668460a51f428a0c196286ec8300e4823250eae811
+DIST wayfire-0.6.0.tar.xz 701084 BLAKE2B 3ee0274c706aaa4690e9eb9617d2f272dd1e6573529c40b43d3fd05e79a4ddceef8dec34a7d2363aff8603fb3fd7490c4d2e79e67bff825a3bb68cc8090ad301 SHA512 dc6b5378dc51352ab41ac3c5713e73f341caa2a119a91826818b0a7cde629e63ce855a4376b5c60b468717336dda4806fb1195d534cd7ab2e5d6285c8075102e
diff --git a/gui-wm/wayfire/files/wayfire-session b/gui-wm/wayfire/files/wayfire-session
new file mode 100644
index 000000000000..8267ea0e11fc
--- /dev/null
+++ b/gui-wm/wayfire/files/wayfire-session
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# output to syslog and stderr
+# with PID and syslog identity 'wayfire'
+exec 1> >(logger --id=$$ --stderr --tag wayfire) 2>&1
+
+# if undefined, or empty, set to freedesktop specification defaults
+[ -z "$XDG_DATA_DIRS" ] && export XDG_DATA_DIRS="/usr/local/share:/usr/share"
+
+# freedesktop specifications mandate that the definition
+# of XDG_SESSION_TYPE should be respected
+export XDG_SESSION_TYPE=wayland
+export GDK_BACKEND=wayland
+export QT_QPA_PLATFORM=wayland
+export MOZ_ENABLE_WAYLAND=1
+
+exec @EPREFIX@/usr/bin/wayfire "$@"
diff --git a/gui-wm/wayfire/files/wayfire-session.desktop b/gui-wm/wayfire/files/wayfire-session.desktop
new file mode 100644
index 000000000000..1088c4e0b793
--- /dev/null
+++ b/gui-wm/wayfire/files/wayfire-session.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Wayfire Session
+Comment=wayfire session with proper env vars
+Exec=@EPREFIX@/usr/bin/wayfire-session $*
+TryExec=@EPREFIX@/usr/bin/wayfire-session
+Type=Application
+DesktopNames=Wayfire
diff --git a/gui-wm/wayfire/wayfire-0.6.0.ebuild b/gui-wm/wayfire/wayfire-0.6.0.ebuild
new file mode 100644
index 000000000000..96f551ce51ca
--- /dev/null
+++ b/gui-wm/wayfire/wayfire-0.6.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="compiz like 3D wayland compositor"
+HOMEPAGE="https://github.com/WayfireWM/wayfire"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
+else
+	SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+gles +system-wfconfig +system-wlroots elogind systemd X"
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+	dev-libs/libevdev
+	dev-libs/libinput
+	gui-libs/gtk-layer-shell
+	media-libs/glm
+	media-libs/mesa:=[gles2,wayland,X?]
+	media-libs/libjpeg-turbo
+	media-libs/libpng
+	media-libs/freetype:=[X?]
+	x11-libs/libdrm
+	x11-libs/gtk+:3=[wayland,X?]
+	x11-libs/cairo:=[X?,svg]
+	X? ( x11-libs/libxkbcommon:=[X] )
+	x11-libs/pixman
+	gles? ( media-libs/libglvnd[X?] )
+	system-wfconfig? ( >=gui-libs/wf-config-${PV%.*} )
+	!system-wfconfig? ( !gui-libs/wf-config )
+	system-wlroots? ( >=gui-libs/wlroots-0.12.0[elogind=,systemd=,X?] )
+	!system-wlroots? ( !gui-libs/wlroots )
+"
+
+RDEPEND="
+	${DEPEND}
+	elogind? ( sys-auth/elogind )
+	systemd? ( sys-apps/systemd )
+	x11-misc/xkeyboard-config
+"
+
+BDEPEND="
+	dev-libs/wayland-protocols
+	virtual/pkgconfig
+"
+
+src_configure() {
+	sed -e "s:@EPREFIX@:${EPREFIX}:" \
+	    "${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die
+	sed -e "s:@EPREFIX@:${EPREFIX}:" \
+	    "${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die
+	local emesonargs=(
+		$(meson_feature system-wfconfig use_system_wfconfig)
+		$(meson_feature system-wlroots use_system_wlroots)
+		$(meson_feature X xwayland)
+		$(meson_use gles enable_gles32)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	default
+	meson_src_install
+	dobin "${T}"/wayfire-session
+	einstalldocs
+
+	insinto "/usr/share/wayland-sessions/"
+	insopts -m644
+	doins wayfire.desktop
+	doins "${T}"/wayfire-session.desktop
+
+	dodoc wayfire.ini
+
+	if ! use systemd && ! use elogind; then
+		fowners root:0 /usr/bin/wayfire
+		fperms 4511 /usr/bin/wayfire
+	fi
+}
+
+pkg_postinst() {
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog "Wayfire has been installed but the session cannot be used"
+		elog "until you install a configuration file. The default config"
+		elog "file is installed at \"/usr/share/doc/${PF}/wayfire.ini.bz2\""
+		elog "To install the file execute"
+		elog "\$ mkdir -p ~/.config && bzcat /usr/share/doc/${PF}/wayfire.ini.bz2 > ~/.config/wayfire.ini"
+	fi
+}
diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild
index f2df4accbaa3..96f551ce51ca 100644
--- a/gui-wm/wayfire/wayfire-9999.ebuild
+++ b/gui-wm/wayfire/wayfire-9999.ebuild
@@ -36,9 +36,9 @@ DEPEND="
 	X? ( x11-libs/libxkbcommon:=[X] )
 	x11-libs/pixman
 	gles? ( media-libs/libglvnd[X?] )
-	system-wfconfig? ( >=gui-libs/wf-config-${PV} )
+	system-wfconfig? ( >=gui-libs/wf-config-${PV%.*} )
 	!system-wfconfig? ( !gui-libs/wf-config )
-	system-wlroots? ( >=gui-libs/wlroots-0.11.0[elogind=,systemd=,X?] )
+	system-wlroots? ( >=gui-libs/wlroots-0.12.0[elogind=,systemd=,X?] )
 	!system-wlroots? ( !gui-libs/wlroots )
 "
 
@@ -55,6 +55,10 @@ BDEPEND="
 "
 
 src_configure() {
+	sed -e "s:@EPREFIX@:${EPREFIX}:" \
+	    "${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die
+	sed -e "s:@EPREFIX@:${EPREFIX}:" \
+	    "${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die
 	local emesonargs=(
 		$(meson_feature system-wfconfig use_system_wfconfig)
 		$(meson_feature system-wlroots use_system_wlroots)
@@ -67,11 +71,13 @@ src_configure() {
 src_install() {
 	default
 	meson_src_install
+	dobin "${T}"/wayfire-session
 	einstalldocs
 
 	insinto "/usr/share/wayland-sessions/"
 	insopts -m644
 	doins wayfire.desktop
+	doins "${T}"/wayfire-session.desktop
 
 	dodoc wayfire.ini
 
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index bc859cc06e0e..f82ad3f7da3c 100644
Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ
diff --git a/kde-frameworks/attica/Manifest b/kde-frameworks/attica/Manifest
index 53ae489397b8..e6a965532d51 100644
--- a/kde-frameworks/attica/Manifest
+++ b/kde-frameworks/attica/Manifest
@@ -1,2 +1,3 @@
 DIST attica-5.74.0.tar.xz 65848 BLAKE2B 614879805233be3508adaf425b71697fb895b99600717de915dbb5c8bad569bfa20b4914638b35adc140c74e4f5a3c0a30389db3b8f92876dd59e06e1931d680 SHA512 261bcec9836c36c3e22df6d629dee35512dac6d8194a393bf2d818432696eb053edee04f5474383f4ab69559f5b875ac392a4c41727eedbea2df9d51b81a19e0
 DIST attica-5.75.0.tar.xz 65876 BLAKE2B fe3428cf0d4a9d21b2501ec3927fca36fb28965ad13bb830c1b3be1592bb296902158e6f619a9b21a0b99111d124af8d3b573f53b94b9ff7580e99c7884137ae SHA512 c523057406efd33a21304df2230c0165f3a7f30582e872171a24fca2997970f23f54a2f53c5b5ca7cc6b890f622874a40af9bb2f555d0c58c313c05a9f2d99f3
+DIST attica-5.76.0.tar.xz 65828 BLAKE2B b2ab42f98ce2d5257dc9e4de82eb2294f60c7be363bc518e8355d68a940ee6d5368b3a378a981003a3b835cefb1985d944a8dd1ea348f0ce35dca9275d970e50 SHA512 b644c1abc6c7309bd8f03e552316f2ed4e660c65b929197da60057468c136dd7e54a83a2f7cfd3553aac74075752ca8bcbd3049ed2c14ec7c2657239dca2bfcd
diff --git a/kde-frameworks/attica/attica-5.76.0.ebuild b/kde-frameworks/attica/attica-5.76.0.ebuild
new file mode 100644
index 000000000000..b233e73c428e
--- /dev/null
+++ b/kde-frameworks/attica/attica-5.76.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing access to Open Collaboration Services"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtnetwork-${QTMIN}:5
+"
+DEPEND="${RDEPEND}"
+
+src_test() {
+	# requires network access, bug #661230
+	local myctestargs=(
+		-E "(providertest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest
index 5e000abf1024..90ce59024d72 100644
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@@ -1,2 +1,3 @@
 DIST baloo-5.74.0.tar.xz 286000 BLAKE2B e0759f01364413e5ef232c0746ca7fa54585ecc55ac7073d3cf20bfc06227f055ad2f4a11611dc3f745fe3da736529a42fde3b30e77c761425b8eea917e88354 SHA512 e044b3d0aa924154e32d2a7a66c6de0c4a8b572d3357d5c2600e9a64ae3e32751ea5953a37bbb8a0bde939732b1298486ccceaa64a84400f6179e44cd360ec5f
 DIST baloo-5.75.0.tar.xz 287140 BLAKE2B c306a54f9d4592005a6bc75dbeadfc4dfbbf63f99c91be07546f42aa12be2c5010e7ff55fd4da3c44ba7edc4a11a363c2bcedbf492bb37a90c029e03ecf8b22a SHA512 6f57c629088ce7ed45b2316b38763b4c0d6ce9e5fca52404e50792d56108ae9b75fea5545ea78306a40f4f7871e6825a7bcd0345b35ad4665a53d04e4faa23cc
+DIST baloo-5.76.0.tar.xz 289520 BLAKE2B 187eee91eace370b7ae6ef57e4c2c59e4c9c51aebe1186b1542e1d474e28f5d09f61a819a3310738b3c620e449087d22e910da6727ccd103f2d52b855175ff66 SHA512 0deafcbbe560d57d9f235a9991c6fe54de12d340961627a26a44079e1a234a0cb8eee86fcc0f1fb4ab1568a030dcfd91827065eb17d7c4ad76223454b1515213
diff --git a/kde-frameworks/baloo/baloo-5.76.0.ebuild b/kde-frameworks/baloo/baloo-5.76.0.ebuild
new file mode 100644
index 000000000000..b4693c49c8ba
--- /dev/null
+++ b/kde-frameworks/baloo/baloo-5.76.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for searching and managing metadata"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-db/lmdb-0.9.17
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/kfilemetadata-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kidletime-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/solid-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test" # bug 624250
diff --git a/kde-frameworks/bluez-qt/Manifest b/kde-frameworks/bluez-qt/Manifest
index 8427ad74037a..1cd150f7b832 100644
--- a/kde-frameworks/bluez-qt/Manifest
+++ b/kde-frameworks/bluez-qt/Manifest
@@ -1,2 +1,3 @@
 DIST bluez-qt-5.74.0.tar.xz 101916 BLAKE2B f57f138cd1386c9efe7560c10cb71d3c1f64ff348876cd9698fa38fd41296dac6b962951f943c2eb08701aa7c37ca90a9380a36a05c10f223ae95e20ccf8c723 SHA512 dfd13e5610233453596e633766c0da30d4f6ba219af32249ce502f5f6a64e9315d26408a5bfd6fc2f51043df531c73127d9c431ff51a0159a043aa681bd743c6
 DIST bluez-qt-5.75.0.tar.xz 102248 BLAKE2B c1ccb562eb56d94f80c2219d3e8354704bda4f8acfe3072a7d7aee5ce63196d5cb6e39ef124fd255f3a3761285802960fd258e436fd45d7724df1cc00e4e3024 SHA512 e042709e7c07d2f62ae782fb055cb7c1e9bde60e8ac949e84da8084faaf3f4fda02f785ad0ed2166cdc63504cbaa2de0db1a0b47bb7b3f3de21a90a550685f30
+DIST bluez-qt-5.76.0.tar.xz 102212 BLAKE2B 7e7ee44e57e570daa099b34a679f03697242d792aba1e2e6122b94c642a595a71fcdd0db7c174579bcdf9dac56f97380a141e2cecfc1d6e953f05005df764f27 SHA512 77b09dd12086186e857c545f8164fa4119eb4a147abf3b5d95c4a960bd416efb4a600c0a6002d2ef6ac4efde14eb08465230655e908b982525b7ebfcce35b55a
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.76.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.76.0.ebuild
new file mode 100644
index 000000000000..d9074740c506
--- /dev/null
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.76.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org udev
+
+DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUDEV_RULES_INSTALL_DIR="$(get_udevdir)/rules.d"
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# parallel tests fail, bug 609248; managertest hangs, bug 668196
+	local myctestargs=(
+		-j1
+		-E "(managertest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-frameworks/breeze-icons-rcc/Manifest b/kde-frameworks/breeze-icons-rcc/Manifest
index 1489ebe4cb7d..dd17ac528b52 100644
--- a/kde-frameworks/breeze-icons-rcc/Manifest
+++ b/kde-frameworks/breeze-icons-rcc/Manifest
@@ -1,2 +1,3 @@
 DIST breeze-icons-5.74.0.tar.xz 1968940 BLAKE2B bc238f6b408e33806f708a0bfa7ac738e75ec0f6531f16b1b558ae734c417c9d825789de00c37371975786d6d8bc35c6c1952add77bf2c04dafe3e406d3cca69 SHA512 735bfd7349a400b9709a1387119187ba1ca712020a8fbfc5acced97200f17b7dc8a8a6e823d7a3223012e2a990ef46af25293c013b5ffff231526ab18fd86935
 DIST breeze-icons-5.75.0.tar.xz 1973616 BLAKE2B eef8a2e32adc315f3bb4931dfea78ce05a19078dfffb8520502ca5d989fdc0b0ccdaaddf817d36081bc2ec714e3860eed18a95631fb5aba8f543b2f1f3327f5d SHA512 be224dca840fd8c82698b512734b03a11e4ba6de333fc35b7c485c90d5b23895f66f733b51af6a58f8f941c0c1f2e5f76774f674ea4c91052d3ea41b47916601
+DIST breeze-icons-5.76.0.tar.xz 1991580 BLAKE2B 926c45b2ca628942819e12c9fa00ac59c25a358faaf893c49d4d2612b6d164ee9ab5938d8933095957e4eef2ce0d5da8169519bf5f8124f8a95075105d67ada0 SHA512 47b5d8e93f25d9ed1524ac16009bbe92d2cc4003b280b75ff3e070e9457dd45e941268f4953aca1da69e45046ba83eac9aa9d90151159422794cff592a4512aa
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.76.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.76.0.ebuild
new file mode 100644
index 000000000000..6a7e3a576974
--- /dev/null
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.76.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_ORG_NAME="breeze-icons"
+PVCUT=$(ver_cut 1-2)
+inherit cmake kde.org
+
+DESCRIPTION="Breeze SVG icon theme binary resource"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="test"
+
+BDEPEND="
+	dev-qt/qtcore:5
+	>=kde-frameworks/extra-cmake-modules-${PVCUT}:5
+	test? ( app-misc/fdupes )
+"
+DEPEND="test? ( dev-qt/qttest:5 )"
+
+RESTRICT+=" !test? ( test )"
+
+src_prepare() {
+	cmake_src_prepare
+	use test || cmake_comment_add_subdirectory autotests
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBINARY_ICONS_RESOURCE=ON
+		-DSKIP_INSTALL_ICONS=ON
+	)
+	cmake_src_configure
+}
diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest
index 1489ebe4cb7d..dd17ac528b52 100644
--- a/kde-frameworks/breeze-icons/Manifest
+++ b/kde-frameworks/breeze-icons/Manifest
@@ -1,2 +1,3 @@
 DIST breeze-icons-5.74.0.tar.xz 1968940 BLAKE2B bc238f6b408e33806f708a0bfa7ac738e75ec0f6531f16b1b558ae734c417c9d825789de00c37371975786d6d8bc35c6c1952add77bf2c04dafe3e406d3cca69 SHA512 735bfd7349a400b9709a1387119187ba1ca712020a8fbfc5acced97200f17b7dc8a8a6e823d7a3223012e2a990ef46af25293c013b5ffff231526ab18fd86935
 DIST breeze-icons-5.75.0.tar.xz 1973616 BLAKE2B eef8a2e32adc315f3bb4931dfea78ce05a19078dfffb8520502ca5d989fdc0b0ccdaaddf817d36081bc2ec714e3860eed18a95631fb5aba8f543b2f1f3327f5d SHA512 be224dca840fd8c82698b512734b03a11e4ba6de333fc35b7c485c90d5b23895f66f733b51af6a58f8f941c0c1f2e5f76774f674ea4c91052d3ea41b47916601
+DIST breeze-icons-5.76.0.tar.xz 1991580 BLAKE2B 926c45b2ca628942819e12c9fa00ac59c25a358faaf893c49d4d2612b6d164ee9ab5938d8933095957e4eef2ce0d5da8169519bf5f8124f8a95075105d67ada0 SHA512 47b5d8e93f25d9ed1524ac16009bbe92d2cc4003b280b75ff3e070e9457dd45e941268f4953aca1da69e45046ba83eac9aa9d90151159422794cff592a4512aa
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.76.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.76.0.ebuild
new file mode 100644
index 000000000000..9904bfe215d0
--- /dev/null
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.76.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+inherit cmake kde.org xdg-utils
+
+DESCRIPTION="Breeze SVG icon theme"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+
+BDEPEND="
+	dev-qt/qtcore:5
+	>=kde-frameworks/extra-cmake-modules-${PVCUT}:5
+	test? ( app-misc/fdupes )
+"
+DEPEND="test? ( dev-qt/qttest:5 )"
+
+RESTRICT+=" !test? ( test )"
+
+src_prepare() {
+	cmake_src_prepare
+	use test || cmake_comment_add_subdirectory autotests
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBINARY_ICONS_RESOURCE=OFF
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index dc18576036b5..6bb59f16c69c 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,2 +1,3 @@
 DIST extra-cmake-modules-5.74.0.tar.xz 344588 BLAKE2B 00724160628ee9cb628b5f3f3b119908b9f0b135f4c98f5f2ac0b2d707abb0fd8775cb87ff7bad152e2010647b64222c57ee8a042d89c5649bb7d27d5f3b3839 SHA512 5d4f612758bda73d8327cc582bda3550807de90e1b729d24a59ac7e70db127da208a53590f48cda9775f2be6e22a7db47958e3f01577b4baf0b8ef86672579a1
 DIST extra-cmake-modules-5.75.0.tar.xz 348904 BLAKE2B 56c5b7f63a2e26a67ba838d953eff433043a22da0d901de76dc3510fea39869aa5d8061f4dad1158db26f592c34bab07a309ff0afb8c756a2af65681d32e8633 SHA512 b322ef33ba6e910bdc7374e572d218fab540453044218a08eb2633998d4aacd0e925f3dd3b7dd20af43d5853a81d540512e0e47d444cb7d864fca63b7e78731a
+DIST extra-cmake-modules-5.76.0.tar.xz 349944 BLAKE2B a287da2445e0e6a66b9a316b4e2f0715454919074c0e9b476e1a7a1a5805d5ec934f4fd8b87d3615129863531b879923d3934d716e1a9f53efbcbf3c4da405ad SHA512 7d3f63dd3ca07678fc3be6c382fec790ef1c189be36125b4f63cf1ea07ffa10ba47e82aa1ef3c6baab03372ce8ee6fbe04bb95fe2f6b9025d2c222936e5b1eb6
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.76.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.76.0.ebuild
new file mode 100644
index 000000000000..d5afc98321ee
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.76.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+QTMIN=5.15.1
+inherit cmake kde.org python-any-r1
+
+DESCRIPTION="Extra modules and scripts for CMake"
+HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+
+BDEPEND="
+	doc? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+		>=dev-qt/qthelp-${QTMIN}:5
+	)
+	test? (
+		>=dev-qt/linguist-tools-${QTMIN}:5
+		>=dev-qt/qtcore-${QTMIN}:5
+	)
+"
+RDEPEND="
+	app-arch/libarchive[bzip2]
+"
+
+RESTRICT+=" !test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
+	"${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch"
+	"${FILESDIR}/${PN}-5.74.0-disable-qmlplugindump.patch"
+)
+
+python_check_deps() {
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	# Requires PyQt5, bug #680256
+	sed -i -e "/^if(NOT SIP_Qt5Core_Mod_FILE)/s/NOT SIP_Qt5Core_Mod_FILE/TRUE/" \
+		tests/CMakeLists.txt || die "failed to disable GenerateSipBindings tests"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDOC_INSTALL_DIR=/usr/share/doc/"${PF}"
+		-DBUILD_QTHELP_DOCS=$(usex doc)
+		-DBUILD_HTML_DOCS=$(usex doc)
+		-DBUILD_MAN_DOCS=$(usex doc)
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	# ECMToolchainAndroidTest passes but then breaks src_install
+	# ECMPoQmToolsTest is broken, bug #627806
+	# possible race condition with multiple jobs, bug #701854
+	local myctestargs=(
+		-j1
+		-E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)"
+	)
+
+	cmake_src_test
+}
diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest
index 2684ca3638ba..a442828f8070 100644
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@@ -1,2 +1,3 @@
 DIST frameworkintegration-5.74.0.tar.xz 1754176 BLAKE2B f325c8362182c066f7fef108a350e9c9378e084c7955e1395fb44918759dbd7e5f55cae037525b286cf9f6b0c67788a766b62bdf737994378b1978a7ef7dd507 SHA512 4bf533b261c149a10ed4b4607f532b57b989f6e130c417a0398216ddbe1b4b3ab964009aa5c021bdc92960f8c25c7f5c66cf8606ed7956b25adfa401d0f08e68
 DIST frameworkintegration-5.75.0.tar.xz 1754740 BLAKE2B 8a3d58fcfc35da8df3b4482cb4550cef7312071d92b168d87555119f124350847d870616b908f24a73f08d03c04bf944b0a9c9c33d29113656e0a2581ced814f SHA512 38c3182d7278ca985acb9f4a9a8c47fa1e7b61a6c23a8285000fd67d1ae4fdc59d2f05f48471ade38c92a35ffb8fafeb4092f46704f3501e2e0dbb7b94d602ea
+DIST frameworkintegration-5.76.0.tar.xz 1754768 BLAKE2B 8b2dbed7f8b57647b796475646abe16258cdfa4321c0648121c891f9bba662abcb573dcc74bb24b4dea21b5b6d899732a36c874984e0848682300d4537241392 SHA512 7f54c0c2c70eddb8442fe28e009994a80f5627294d235ec1a341e71f6ac9abbd5a6515018c883ce1825a36478403ed5f4bca03424f077abbba28f1f29f4820d4
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.76.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.76.0.ebuild
new file mode 100644
index 000000000000..694c122e0a59
--- /dev/null
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.76.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/knewstuff-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+"
+DEPEND="${RDEPEND}
+	=kde-frameworks/kpackage-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+"
+
+# requires running Plasma environment
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kactivities-stats/Manifest b/kde-frameworks/kactivities-stats/Manifest
index 4e3122b6ddc0..5f28f8c145ac 100644
--- a/kde-frameworks/kactivities-stats/Manifest
+++ b/kde-frameworks/kactivities-stats/Manifest
@@ -1,2 +1,3 @@
 DIST kactivities-stats-5.74.0.tar.xz 81968 BLAKE2B 51c27340d9058261b955f9f590fa1472d69939b3e3f52b7d996b3fc04cfdbe7148c343405790e04b2c0743ef0147d497eab2c3e6ee390d007e6f0d2f2af127ad SHA512 0caa8afb52b7643cf21a6d3fdaa3e987b632f1414e9888fc174623fe8b646c3eef4a8f57a2d0d22f7d726e9952a074550d1f35fb0f65cc5d061222746a6dbbac
 DIST kactivities-stats-5.75.0.tar.xz 81956 BLAKE2B edfc8bfb55380b83fd640a5e8d57ffa1b14210f54748ccedd81438c7c286716044f22c00580a6ecb284c20950b62593a9648c22ba77faeddb8d1a2e4260318e5 SHA512 7954a887d270bdfd3b84e34def0f610370121d430a224a1de32b5d25f7bb9a09a6f360b919a8cb97c2d18d951d75275a3d584996a777c538f670053bfbe2e609
+DIST kactivities-stats-5.76.0.tar.xz 81964 BLAKE2B 02bd87119fdb171a7b0ed30aa8969ef2cc49cca3306b0cf4d07a92f7d660c1b181393eee7103ef52713b9468688b179822b790582d7e5b1e6beede642fe6a22a SHA512 5e21f31d2db3051d248d1931a9d09283846868ab25479f3c0bb863842f3e6674ae9b1d571e83753b24d3b9de51d64dd35bd95b06146775ddee9bc3d3156bea27
diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.76.0.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-5.76.0.ebuild
new file mode 100644
index 000000000000..c913f360f3a1
--- /dev/null
+++ b/kde-frameworks/kactivities-stats/kactivities-stats-5.76.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Framework for getting the usage statistics collected by the activities service"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	=kde-frameworks/kactivities-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.54
+"
diff --git a/kde-frameworks/kactivities/Manifest b/kde-frameworks/kactivities/Manifest
index 519852dced4f..7c8c30295285 100644
--- a/kde-frameworks/kactivities/Manifest
+++ b/kde-frameworks/kactivities/Manifest
@@ -1,2 +1,3 @@
 DIST kactivities-5.74.0.tar.xz 72588 BLAKE2B 4471f68ffb59351ecf054c2aa11b0fa6dfc0e7fc888b672ce5c162800e3a8b69722cdd74170d9b0511297a5f353cc81e5f5906fb19a8f25423fcb1680b6e36cc SHA512 fcfae3047e19dc7b41c0f0752c6aa95a652d635947c78ba9a3d069e365f9c68475b325c591a3a864c63ef285d243b473720f63e92d86802df661bfdd7826b7e7
 DIST kactivities-5.75.0.tar.xz 72580 BLAKE2B 093f43626ff244ac9026347fd24fc910ae1d9959a094f4879a698b3af4497b728db4d35431eca3e50eafa1a0e6c1d5fd3ecb01cf1648c891d885268da0201394 SHA512 473eac6a56ee8fee3fe53d6fb71cfbcf495520741a95b9709937071331271fe644f5b5ee6dc2a382f22ff7e5e5976750d753290b7292d34f28bea4e5a1bba4b7
+DIST kactivities-5.76.0.tar.xz 72604 BLAKE2B 3b9d1787006943863ee12bc971edb84629ce29244b67851644270546f588eb68337087e09645a2e11a16ce6ccb4ca010c06a8b949a8a554cd57f75c2632deea2 SHA512 9196174959792cf0378e68eecefedd468220e6f4c1ec32cc9f876b63e82f33d94f9d12585a7601e4ded1eae47b85821225730001d396c04b70cef7f4004c4a29
diff --git a/kde-frameworks/kactivities/kactivities-5.76.0.ebuild b/kde-frameworks/kactivities/kactivities-5.76.0.ebuild
new file mode 100644
index 000000000000..e360aefc9b51
--- /dev/null
+++ b/kde-frameworks/kactivities/kactivities-5.76.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+PLASMA_MINIMAL=5.16.5
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Framework for working with KDE activities"
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-plasma/kactivitymanagerd-${PLASMA_MINIMAL}:5
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.54
+"
diff --git a/kde-frameworks/kapidox/Manifest b/kde-frameworks/kapidox/Manifest
index bd248e0cee3b..6a15a11b5a7e 100644
--- a/kde-frameworks/kapidox/Manifest
+++ b/kde-frameworks/kapidox/Manifest
@@ -1,2 +1,3 @@
 DIST kapidox-5.74.0.tar.xz 158916 BLAKE2B 999357b65fefa4ca2e386f00c59e825cce352fb79726a090a87052f96af7184aa3869ec8efa313930ddb06ab6a6baf090e2bc1087330f977612947b7b6c4d136 SHA512 0292f1836576e67d2a0b439ca3890d10b580ec6dfcf947760c305320ba67f688d2e75323d9976be0673dfbf241f7d1978cfbfc5954de8ff7b2fdbab88bf62b1f
 DIST kapidox-5.75.0.tar.xz 190000 BLAKE2B e91c6aa470117e834deeb2d18c0dc054ee93e85cbe7fa51df04a7278b70c06faf49ac4020b3abe1d2a25bb52fe4c88a3209dfe9606f1c886ad54009b1a3d87a4 SHA512 63250a87c8f4d4201ffb993d5a941dee2f7d3c8b4fba73468bc2822acd6652dd1965244a7dc2dd3cbdba9fdc56b7dddcf5d36d4739e706f8a771f5723ed2eeab
+DIST kapidox-5.76.0.tar.xz 190032 BLAKE2B 5152ca8c815284348ec4a22874ff0f15d5ed04df1bc7004545de13a4a2d71ba7e9ff8b69008d5011ebe77e8b5c7b57de053024601ba5a88a9ed23b4744e7c8b3 SHA512 445051ab42cb1a393c73f4df2997af0d4c9870a3cd08401ff2c80d00ed7b6bfc9f6a0b095d66197a8a3170e3bc43f12e1110cf77491ebd54664197116abea6a9
diff --git a/kde-frameworks/kapidox/kapidox-5.76.0.ebuild b/kde-frameworks/kapidox/kapidox-5.76.0.ebuild
new file mode 100644
index 000000000000..e0a3ba25a3c1
--- /dev/null
+++ b/kde-frameworks/kapidox/kapidox-5.76.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_SINGLE_IMPL="true"
+DISTUTILS_USE_SETUPTOOLS="bdepend"
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit kde.org distutils-r1
+
+DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-doc/doxygen
+	$(python_gen_cond_dep '
+		dev-python/jinja[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+	')
+	media-gfx/graphviz[python,${PYTHON_SINGLE_USEDEP}]
+"
diff --git a/kde-frameworks/karchive/Manifest b/kde-frameworks/karchive/Manifest
index f9e47ce8b74a..7508f6657488 100644
--- a/kde-frameworks/karchive/Manifest
+++ b/kde-frameworks/karchive/Manifest
@@ -1,2 +1,3 @@
 DIST karchive-5.74.0.tar.xz 983512 BLAKE2B 871fe031a882f36a8a463233b86a26746b85b44242ba493631d5cbf7ba45ff9fe62ea3c7c5496b6983b96a9531a848df20f2b714649434ac3ffdf091b06ca15d SHA512 c43aef33cd5cd1128637ab8ac3f7c8f26eaa27fb9f14ce0f2b5d122be2cf08f4b758fe08147c570969834600f714c1e236d1e7c05864ce1cd2dd8ca2f4e62069
 DIST karchive-5.75.0.tar.xz 983444 BLAKE2B 4f1533b3f1d35e5bdec526d731f6da871d3e34207bf64566b595c94b2b54d76315dff3dab32d44e36294a2531d589adc1e5afc3800712c1caea878c392d47b57 SHA512 b92a50b013cb14789c886b4b8ba576e60ad87d9ab11b8658a5f9e3c9cdab7a95f95e7199cd57755cb50c39d0f603d9b7387f977dd10a98aff2e407c7ff36f9f8
+DIST karchive-5.76.0.tar.xz 983456 BLAKE2B cf40b8f4f3527dd0cb81b795e2f089b775c0c40bd69d9332b0fe67cfbf405d82a791a69de2a9169b4aaa70bc5cc98cb0441deb7bb9db73c027006a839d6fc84d SHA512 ea8be609be1b60d505b0dd17a307e61f80b789b1807b2d03d889638e42a2cc99e942e86cc0671839c21c992355a243535ac0a23ce44eb2270cad15f66904a45d
diff --git a/kde-frameworks/karchive/karchive-5.76.0.ebuild b/kde-frameworks/karchive/karchive-5.76.0.ebuild
new file mode 100644
index 000000000000..bb212d03f1c5
--- /dev/null
+++ b/kde-frameworks/karchive/karchive-5.76.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit ecm kde.org
+
+DESCRIPTION="Framework for reading, creation, and manipulation of various archive formats"
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	app-arch/bzip2
+	app-arch/xz-utils
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kauth/Manifest b/kde-frameworks/kauth/Manifest
index 83c7343fc877..6b16b485c577 100644
--- a/kde-frameworks/kauth/Manifest
+++ b/kde-frameworks/kauth/Manifest
@@ -1,2 +1,3 @@
 DIST kauth-5.74.0.tar.xz 87860 BLAKE2B fef152c84368769f8b5e528e01164b9002e702ee02057c173370613a62888d0e99fe680fc5236afa2b24ca6dd4429d6e3727a62dad9074d93ff2a7d617eef224 SHA512 277ff88cf447fdcf6c413997b4a3be871e7bddc0cd23cb379cb35f05c4b93cf68d7f0792eabc5d56ec7f043bf6de53ba9cec223750c4569a72e88c27f8d36036
 DIST kauth-5.75.0.tar.xz 87964 BLAKE2B 3f1e533a1fcfaca703fb3a8db1cbf72c48eee5c2c7b845092d9e6eac48b1cc57c6488487d2e69b3bb6cdc555f08648f4ec07b3abc3a7c66fa4b70c75c9fd286b SHA512 cd9648dc953c1013b492fd155ef235b58f7dacb5b1131dbc5f1b232ae303403c9a950ac09b3b57583bbe61f304bef7aed2975bbf5e57bb7196393fd90064d1cf
+DIST kauth-5.76.0.tar.xz 88008 BLAKE2B 2a9b39c5c6af484df63311bae803b0ac493593ffe6df5d808f9e70c78177478a1184a66ae97c72ecca2f2876ff99effe4becd98173a137ea57ff2bc7511b80e2 SHA512 6bab48c4f1de14dc80721e3c8b4e2644d2234a99b73de973b9a9eef2258f54f236fd0fb99d3d5ecf96817f61622241de65cad03c0937f0cecd2bab01a64a57d1
diff --git a/kde-frameworks/kauth/kauth-5.76.0.ebuild b/kde-frameworks/kauth/kauth-5.76.0.ebuild
new file mode 100644
index 000000000000..d2593910f374
--- /dev/null
+++ b/kde-frameworks/kauth/kauth-5.76.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework to let applications perform actions as a privileged user"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls +policykit"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	policykit? ( >=sys-auth/polkit-qt-0.113.0 )
+"
+RDEPEND="${DEPEND}"
+PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+		$(cmake_use_find_package policykit PolkitQt5-1)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# KAuthHelperTest test fails, bug 654842
+	local myctestargs=(
+		-E "(KAuthHelperTest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-frameworks/kbookmarks/Manifest b/kde-frameworks/kbookmarks/Manifest
index bd32ac3d7e48..913d1f855cfc 100644
--- a/kde-frameworks/kbookmarks/Manifest
+++ b/kde-frameworks/kbookmarks/Manifest
@@ -1,2 +1,3 @@
 DIST kbookmarks-5.74.0.tar.xz 126504 BLAKE2B 8928fa25818fcc4fe30465ef39009c41cfc38f34854435a45df3e91fc69d2612c9bb4666ee5e70660d6a7d2a8f8777ea7bdf60dae3e8b3bf13a2d498e25d3e0f SHA512 c12bf2f54f64bb2bb7ff3c7e4124d404369878f29ae095d919aed2ea57b07b78b8c9b66f8c8631fd0653ea7623a05425a5bc7d383d69ae079cf0cfaeec662be7
 DIST kbookmarks-5.75.0.tar.xz 126308 BLAKE2B 45833cae25087d955ab3c73fe01f4cdd6ed813c483406344a9e326cbf5762f0f6cbb4df12f8f3ba24e1ee7778ed7ba5767173be5c46cce0f10a8e47993e5abb0 SHA512 031469870dbc2dbf5d974e7661a47605bc8c54e3fd97a576fba6b0807f653f73488ae7fb662a91e3f36397f95570ee179a0954e48906f2110a053adf2dceaabc
+DIST kbookmarks-5.76.0.tar.xz 126340 BLAKE2B 28bf8230206347c039fd2ca3dd820e9c9df5344366ba98033e55aef75994fd84e5853348be7de67c6496dc5d324c0ec38b52fda0c6e707282940834a44a14729 SHA512 a8259fb1e2a7d3b822f5d0499b14650a63f044b43fabc1b35cd149f8d021d5199aad1b1ca30e01873f88a57da35a59c6cf0b803f2345c52fb00c73f74cd65e91
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.76.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.76.0.ebuild
new file mode 100644
index 000000000000..357f370ef7ac
--- /dev/null
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.76.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for managing bookmarks stored in XBEL format"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kcodecs-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/kconfigwidgets-${PVCUT}:5
+"
diff --git a/kde-frameworks/kcalendarcore/Manifest b/kde-frameworks/kcalendarcore/Manifest
index 7db7ddc97d73..5874b5734d61 100644
--- a/kde-frameworks/kcalendarcore/Manifest
+++ b/kde-frameworks/kcalendarcore/Manifest
@@ -1,2 +1,3 @@
 DIST kcalendarcore-5.74.0.tar.xz 255684 BLAKE2B 8e2547f784881f031e9e9bd3a461aaa6219d419c43b096be9a7a357ed95fd232c5350577298bc4cc640966023cf6fec51bd952fca4a11cac817d6756fab3b2e4 SHA512 f6b48283d5433e171a1961abcbf47422fb8ce1e6412d0a83de20c16b2e81e065e16c1525440e1a29791b31ec74fbe672878cd554fceab703cc0c9c45c23524af
 DIST kcalendarcore-5.75.0.tar.xz 254312 BLAKE2B 8ebd043721b152b7b4dc57c0249b845a50ebdcf7901c1c8a768b18b0ec21275d2329237c76d64e429edc5eb914511d74e78bf1fdd4d61a6acd8aba29f6837d8b SHA512 66a18b4c08988fbe821b6bb695d01898f5da4e5a9a135c91521bf343da08ee4ffd224c7ca7aad601c3126918fa2d1c0ca5ce6a27ff966a04e832d1393f3bafb7
+DIST kcalendarcore-5.76.0.tar.xz 256404 BLAKE2B 297c05e36c2562b8ac71aca338e99cc1e72c6224baf4a19457c2ea9bb5c0a7936ae3bd6470b92614c185e4e01ad2c9719a9bcc2f07cc1a9b9967bc8189d6a69f SHA512 9b6ce54997e8d95a04f3d0042ef3bd1488874aeeaa9896afbda281bd8098d8256face05edaa68d790b92e38338b1eb31151826b2c52fd94488a7ac2c87a72785
diff --git a/kde-frameworks/kcalendarcore/files/kcalendarcore-5.76.0-rfc7986-colour-support-for-incidence.patch b/kde-frameworks/kcalendarcore/files/kcalendarcore-5.76.0-rfc7986-colour-support-for-incidence.patch
new file mode 100644
index 000000000000..3be1f0c4a52b
--- /dev/null
+++ b/kde-frameworks/kcalendarcore/files/kcalendarcore-5.76.0-rfc7986-colour-support-for-incidence.patch
@@ -0,0 +1,141 @@
+From b567a3af18a19009a1e0fc637bdd004ce4ca857f Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 8 Nov 2020 18:07:09 +0100
+Subject: [PATCH] Revert Revert "Add COLOR property serialization from
+ RFC7986."
+
+The raised minimum dependency is no problem for us.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/icalformat_p.cpp | 10 ++++++++++
+ src/incidence.cpp    | 21 +++++++++++++++++++++
+ src/incidence.h      | 16 ++++++++++++++++
+ src/incidencebase.h  |  3 ++-
+ 4 files changed, 49 insertions(+), 1 deletion(-)
+
+diff --git a/src/icalformat_p.cpp b/src/icalformat_p.cpp
+index 51ebda04a..aa7b526d9 100644
+--- a/src/icalformat_p.cpp
++++ b/src/icalformat_p.cpp
+@@ -530,6 +530,12 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,
+         icalcomponent_add_property(parent, icalproperty_new_class(secClass));
+     }
+ 
++    // color
++    if (!incidence->color().isEmpty()) {
++        icalcomponent_add_property(
++            parent, icalproperty_new_color(incidence->color().toUtf8().constData()));
++    }
++
+     // geo
+     if (incidence->hasGeo()) {
+         icalgeotype geo;
+@@ -1881,6 +1887,10 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent, const Incidence::Ptr &
+             incidence->addAttachment(readAttachment(p));
+             break;
+ 
++        case ICAL_COLOR_PROPERTY:
++            incidence->setColor(QString::fromUtf8(icalproperty_get_color(p)));
++            break;
++
+         default:
+             // TODO: do something about unknown properties?
+             break;
+diff --git a/src/incidence.cpp b/src/incidence.cpp
+index db0d3255b..ab13048d5 100644
+--- a/src/incidence.cpp
++++ b/src/incidence.cpp
+@@ -73,6 +73,7 @@ public:
+         , mPriority(p.mPriority)
+         , mStatus(p.mStatus)
+         , mSecrecy(p.mSecrecy)
++        , mColor(p.mColor)
+         , mDescriptionIsRich(p.mDescriptionIsRich)
+         , mSummaryIsRich(p.mSummaryIsRich)
+         , mLocationIsRich(p.mLocationIsRich)
+@@ -150,6 +151,7 @@ public:
+     int mPriority;                      // priority: 1 = highest, 2 = less, etc.
+     Status mStatus;                     // status
+     Secrecy mSecrecy;                   // secrecy
++    QString mColor;                     // background color
+     bool mDescriptionIsRich = false;            // description string is richtext.
+     bool mSummaryIsRich = false;                // summary string is richtext.
+     bool mLocationIsRich = false;               // location string is richtext.
+@@ -284,6 +286,7 @@ bool Incidence::equals(const IncidenceBase &incidence) const
+         && secrecy() == i2->secrecy()
+         && priority() == i2->priority()
+         && stringCompare(location(), i2->location())
++        && stringCompare(color(), i2->color())
+         && stringCompare(schedulingID(), i2->schedulingID())
+         && recurrenceId() == i2->recurrenceId()
+         && thisAndFuture() == i2->thisAndFuture();
+@@ -542,6 +545,24 @@ QString Incidence::relatedTo(RelType relType) const
+     return d->mRelatedToUid.value(relType);
+ }
+ 
++void Incidence::setColor(const QString &colorName)
++{
++    if (mReadOnly) {
++        return;
++    }
++    if (!stringCompare(d->mColor, colorName)) {
++        update();
++        d->mColor = colorName;
++        setFieldDirty(FieldColor);
++        updated();
++    }
++}
++
++QString Incidence::color() const
++{
++    return d->mColor;
++}
++
+ // %%%%%%%%%%%%  Recurrence-related methods %%%%%%%%%%%%%%%%%%%%
+ 
+ Recurrence *Incidence::recurrence() const
+diff --git a/src/incidence.h b/src/incidence.h
+index 622ddb6f5..5ea625042 100644
+--- a/src/incidence.h
++++ b/src/incidence.h
+@@ -397,6 +397,22 @@ public:
+     */
+     Q_REQUIRED_RESULT QString relatedTo(RelType relType = RelTypeParent) const;
+ 
++    /**
++      Set the incidence color, as added in RFC7986.
++
++      @param colorName a named color as defined in CSS3 color name, see
++       https://www.w3.org/TR/css-color-3/#svg-color.
++      @since: 5.76
++     */
++    void setColor(const QString &colorName);
++
++    /**
++      Returns the color, if any is defined, for this incidence.
++
++      @since: 5.76
++     */
++    Q_REQUIRED_RESULT QString color() const;
++
+ // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ // %%%%%  Convenience wrappers for property handling
+ // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+diff --git a/src/incidencebase.h b/src/incidencebase.h
+index 2dcac9a34..c079c0df2 100644
+--- a/src/incidencebase.h
++++ b/src/incidencebase.h
+@@ -185,7 +185,8 @@ public:
+         FieldComment,         ///> Field representing the COMMENT component.
+         FieldUid,             ///> Field representing the UID component.
+         FieldUnknown,         ///> Something changed. Always set when you use the assignment operator.
+-        FieldUrl              ///> Field representing the URL component.
++        FieldUrl,             ///> Field representing the URL component.
++        FieldColor            ///> Field representing the COLOR component.
+     };
+ 
+     /**
+-- 
+2.29.2
+
diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-5.76.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-5.76.0.ebuild
new file mode 100644
index 000000000000..17e3740db53b
--- /dev/null
+++ b/kde-frameworks/kcalendarcore/kcalendarcore-5.76.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Library for interfacing with calendars"
+LICENSE="GPL-2+ test? ( LGPL-3+ )"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="
+	sys-devel/bison
+"
+DEPEND="
+	>=dev-libs/libical-3.0.5:=
+	>=dev-qt/qtgui-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kcalcore:5
+"
+
+RESTRICT+=" test" # multiple tests fail or hang indefinitely
+
+PATCHES=( "${FILESDIR}/${P}-rfc7986-colour-support-for-incidence.patch" )
diff --git a/kde-frameworks/kcmutils/Manifest b/kde-frameworks/kcmutils/Manifest
index d9791f07d3af..07284ba4c97e 100644
--- a/kde-frameworks/kcmutils/Manifest
+++ b/kde-frameworks/kcmutils/Manifest
@@ -1,2 +1,3 @@
 DIST kcmutils-5.74.0.tar.xz 256364 BLAKE2B f05f8a5b1a97fcba211acae104008bf75d1b2fa3105ba56a6a08e57b4e4ccab8e18f5e9687d74480deb5a66d5f4a05b0071424dc01b517d7a568cf8f0dc96166 SHA512 105664749e73eeb0b911479d3befe813eef290d7dafa4ec51c134a79c58826361f90e18acf6d8f5d5b7e8d5d6a5956a73bc31e2c6f3de9ad45fec80341963c7a
 DIST kcmutils-5.75.0.tar.xz 256200 BLAKE2B 5fc89ed36f7e2a70b66a090d81e6f5748085f6b0e859a6f237b474e307dac99c0ac5eaa80ce069fc2c086ae1ee48825ad48d121471a5b08ce13077d8a5eb83c3 SHA512 fb665dea08a5e734962b9d4c6d5ef863fb9a88bec450191d47664385e927a6a02d2b2410b4f600f9605a5bf39ec07e574e3ce2ca4671008edfd68082a6b89a14
+DIST kcmutils-5.76.0.tar.xz 257776 BLAKE2B 9a97d65a8222f18276b836e5cfe7bdd21bf3d60e915914ce12df3ffb5c59c081376600cf28693d7662c7de93794c794af98ff7f4ea8db281bed41a09286a0a5b SHA512 fd8ec5933a21f1d3274aadf673753adccb3a05b59355053261a74be6b5c75dbcbf06e27d9eeb0c58857747ed61acd486bb9fea9ec3d9bcbd365970878101f199
diff --git a/kde-frameworks/kcmutils/kcmutils-5.76.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.76.0.ebuild
new file mode 100644
index 000000000000..1c07bba948c0
--- /dev/null
+++ b/kde-frameworks/kcmutils/kcmutils-5.76.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework to work with KDE System Settings modules"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kauth-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kdeclarative-${PVCUT}*:5
+	=kde-frameworks/kguiaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kcodecs/Manifest b/kde-frameworks/kcodecs/Manifest
index b45eadacda6f..867c0686e756 100644
--- a/kde-frameworks/kcodecs/Manifest
+++ b/kde-frameworks/kcodecs/Manifest
@@ -1,2 +1,3 @@
 DIST kcodecs-5.74.0.tar.xz 227976 BLAKE2B 256ca557a5fc5f83ed286a610a056a4f4c76ea36ff49843b08ab92eed377c23f4e6b28a22df2afde8cf93e3d244ae46b1f1ea2911ed23b6b1f3cac762a6183bd SHA512 1858eb0d18b79ee197e780d995a30bf208d63acc17d8f474d27ddb67ffb4e0e7c8a909a1f3750a1121088735b4a6087609bba6d7cbf0838d414adec2c53d6491
 DIST kcodecs-5.75.0.tar.xz 228108 BLAKE2B bc67e15439205dbb19c1c35980f4c508c31ffbf26fa7fc0fa018333324da7a22132a5d65023efbc717878420dc8ab87b0f5bc86f261d4eb9d53aa4940a4c0095 SHA512 8848012d46e9c067aab77d27e1bcec00a7a1a84eb25553bb2e51765bd9714851358f4de50606dc851f605ceac5c52003ad75246d0831e7218eee2521800f887a
+DIST kcodecs-5.76.0.tar.xz 228220 BLAKE2B 117e7fdea58cdd4d9fe302d8fd0317274c97a8c194342f14e7cb8cd6507ef81ba90c35b36eccfe85ec0e8d2901f8e575d81037ff0488dd96f74119994fe994e9 SHA512 9f9bcebe8311c85111d3bae86b6ab022b0b423efc166424be175d0b2df5e7319907358111f732998e58d6b25447a11ae8388390a7cafba5856a10e9b0c01d5e3
diff --git a/kde-frameworks/kcodecs/kcodecs-5.76.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.76.0.ebuild
new file mode 100644
index 000000000000..408a40472ad9
--- /dev/null
+++ b/kde-frameworks/kcodecs/kcodecs-5.76.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Framework for manipulating strings using various encodings"
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls"
+
+BDEPEND="
+	dev-util/gperf
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kcompletion/Manifest b/kde-frameworks/kcompletion/Manifest
index fb659da5f72a..9e4c60bdebf4 100644
--- a/kde-frameworks/kcompletion/Manifest
+++ b/kde-frameworks/kcompletion/Manifest
@@ -1,2 +1,3 @@
 DIST kcompletion-5.74.0.tar.xz 121524 BLAKE2B cc0c0b7f37cc781795e7db7d91d88728b0a62d85dd870f2967bb00f4a466dfcae7754921a4c2dcabc7200dfac51ee0ae7642b94fd338c5788a6346616618138b SHA512 d63bb7a1f4a2ed42888b3811328416d0a63ff3f9cd2fd64f836cbaaabcdd5a11847e26d00e96ab2794f08c02cbfd60a969caa53f9210c21c0a85a3ce688cdaba
 DIST kcompletion-5.75.0.tar.xz 121432 BLAKE2B 8a5472400730f7ca981ca0821efe4c303fc8dc40ea31f09cdf88a0a9528d64a8828eae2d7d2e1dbd2010c1f4f1e89fb67a7de431160f07b4a358c57eea32fc3d SHA512 84d973d8b8dee7106fde69f944bc52a902fbaddc440bd4be5c01d2de4d0576fa849ab4ef4c583c7016e9a5e664c69e8ef4e8b68398e1dd453c9c2a3227bbfbbf
+DIST kcompletion-5.76.0.tar.xz 121464 BLAKE2B 458bb01686846287bb9d3ac41db08bda1dcc159786bcbdabdad057408970ae2aa74f9b26023e58db6b1e5b079f1b82465f224efd2d90be9ba013c4ecbf16154b SHA512 96d11749bd972109b9c635a7664d205515caf7a3426b26006659e6bc32511fdb3d90f1ec91d1071d567e8ab96883bddd16cf303401b94c1ab72cd9c658040f6e
diff --git a/kde-frameworks/kcompletion/kcompletion-5.76.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.76.0.ebuild
new file mode 100644
index 000000000000..280b3ee0bc3e
--- /dev/null
+++ b/kde-frameworks/kcompletion/kcompletion-5.76.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for common completion tasks such as filename or URL completion"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kconfig/Manifest b/kde-frameworks/kconfig/Manifest
index aeee04aba6af..6b26973e3637 100644
--- a/kde-frameworks/kconfig/Manifest
+++ b/kde-frameworks/kconfig/Manifest
@@ -1,2 +1,3 @@
 DIST kconfig-5.74.0.tar.xz 261752 BLAKE2B 05d11f2f14d2d6460238233b0f4032917e155d0c1a7eaf57f0ea83d24f67f2500f05783909df28c853893da6df775357beba2aeb87fa883a3047a362644f4bc8 SHA512 6c2bbf8aabef7344e5e085664d77c50b97541f2412e2c60f64f76b553034369b7a25cfbdd251f2b62e3bb91c2cd98749051cea3855ed09fb5baf80a098274242
 DIST kconfig-5.75.0.tar.xz 263448 BLAKE2B 04e842202fb55ea51e2ff8e5d290d6b6f58ae7f54de18775424f0a310151490e8053bd5ae1297918bf34926d82cf51b86d8a3881fcd7f925ca16db3506837517 SHA512 06407e4ae39185b93231c09cec2552ee9948a3c16c52095ee9b1b2cf164335158b87ecc0981ee0e93517e41951d20a2b22b28ab0a9a7a73fc5daa1f2dd8118cb
+DIST kconfig-5.76.0.tar.xz 263716 BLAKE2B 185de3d8f7bee5214f313ea40240d3f90b6930cf78e3ef22a82633dec3a4369ed1b7a98525c43a1da6f735990d00a6d5c336280a68d39ef43368508eb920144d SHA512 859bd88a6afa6c403aa9cefa97120064b529a551360e6e16f19a7eb292274529a617a6243c42fd2a72dd7e4dfdc8437bbff8eb68427685a22e3e3398d6cba574
diff --git a/kde-frameworks/kconfig/kconfig-5.76.0.ebuild b/kde-frameworks/kconfig/kconfig-5.76.0.ebuild
new file mode 100644
index 000000000000..66ba8ef4dd97
--- /dev/null
+++ b/kde-frameworks/kconfig/kconfig-5.76.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for reading and writing configuration"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="dbus nls"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
+"
+
+# bug 560086
+RESTRICT+=" test"
+
+DOCS=( DESIGN docs/DESIGN.kconfig docs/options.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+		-DKCONFIG_USE_DBUS=$(usex dbus)
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kconfigwidgets/Manifest b/kde-frameworks/kconfigwidgets/Manifest
index 4dbb1cc8fc2b..8779203fb106 100644
--- a/kde-frameworks/kconfigwidgets/Manifest
+++ b/kde-frameworks/kconfigwidgets/Manifest
@@ -1,2 +1,3 @@
 DIST kconfigwidgets-5.74.0.tar.xz 386728 BLAKE2B 6badc87c26cc1509fd85f78ab483c005c8e882177bdeba4f20ed45faa3d21134b54d4eb40eff3f4adab1b20b029451616293da3e684ee092a4acd37639600fde SHA512 c51f005494aed3587a3f39a8582d5cb3e1f9e4c6da0074d9e9ad78038e63663278c891231c6358ca38ee9b41e00fe13da2bf0719b3213507eae8e5da35275e76
 DIST kconfigwidgets-5.75.0.tar.xz 387020 BLAKE2B 0348a216c00e2709fbb91c3c1ba388dc31a094fa8d086c2a21b2779b751ad33088b009b945243f67c201d13e49774e14588028b1e187974d226d0a17ef67488b SHA512 8ef5f0f09e80a35e6ed169016c9c5b697958b53aa179730a600047e20af71aa8c53fcb67c66e703287bb1c7b6054377d7bd5318fa8044212a5908d0df2d3fbb9
+DIST kconfigwidgets-5.76.0.tar.xz 387088 BLAKE2B 89ada17db335056f5fd17312806932647580af2a72a86efddb3c30bc3c2555081dc08a154f242c4d25e9aaa76a7e23336bdfb6f5f7c504726ad45f0a6fa5ad76 SHA512 b3693dde3c1998e9d046c3f01b54b2ef8918f6f7ec3188a71f1f812fdb40a63f3744812b8af4591b7c64f3832d2ce1dac4a40dfc7a86123a6e2056a1ae72c5c7
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.76.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.76.0.ebuild
new file mode 100644
index 000000000000..1119cf7224bc
--- /dev/null
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.76.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing an assortment of configuration-related widgets"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+man"
+
+BDEPEND="
+	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
+"
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kauth-${PVCUT}*:5
+	=kde-frameworks/kcodecs-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kguiaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+		$(cmake_use_find_package man KF5DocTools)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kcontacts/Manifest b/kde-frameworks/kcontacts/Manifest
index c20d050c4be5..38961b1781d1 100644
--- a/kde-frameworks/kcontacts/Manifest
+++ b/kde-frameworks/kcontacts/Manifest
@@ -1,2 +1,3 @@
 DIST kcontacts-5.74.0.tar.xz 543200 BLAKE2B c7e00bbdb0d613ea4bbed7daaca00f2b3c9733b961ee12e7bfb2fc9239d9deffc260d4d082c1ffef4f659282af2cac80a38b83340de2f3c9986c3c07c7fe16a3 SHA512 a4c78e0676a52abbee473310924280a7776c79bec3cf2273379f0c90e904ea0a31f5b5bd372472b29bfa5ec3a7ca5764af9e422bfc6a06fe3158287182815c71
 DIST kcontacts-5.75.0.tar.xz 543264 BLAKE2B 46ea53096e5c4f1a7b9e081dd8f89fe32f65d5b7e1466e3a3548812877a584f90eb882108b5bbca268265c27dd15fb8ef0e462171d97a43fa4996233fc5b1d49 SHA512 9e5cf4cad6f8b251fec888f48442af6179172d78a583726600fd67053a1f0e32eba5bf5250bb8c1ef88abaec6a400f970d0f01ad42a9ac632908d109b457d155
+DIST kcontacts-5.76.0.tar.xz 543564 BLAKE2B e942294868cb75c4b4ce289b99fdb0fc4f718cdf00804ebd8fae4954ac6827b1cfb94c08c5cd9fc48f9fc15cc2da0273c27035196ec408aa603248e6969d8a9f SHA512 79605ed5c11c1257b06272ac3fe212d451c5f87bd776d3b1a7daa8947d5d3bec5bd327552bbaad381896bec3f5a210992c528da38c222ce1bdfa42be92dd60b9
diff --git a/kde-frameworks/kcontacts/kcontacts-5.76.0.ebuild b/kde-frameworks/kcontacts/kcontacts-5.76.0.ebuild
new file mode 100644
index 000000000000..00a2b94dd8be
--- /dev/null
+++ b/kde-frameworks/kcontacts/kcontacts-5.76.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Address book API based on KDE Frameworks"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	=kde-frameworks/kcodecs-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kcontacts:5
+	app-text/iso-codes
+"
+
+src_test() {
+	# bug #566648 (access to /dev/dri/card0 denied), bug #625988
+	local myctestargs=(
+		-E "(kcontacts-addresstest|kcontacts-picturetest)"
+	)
+	ecm_src_test
+}
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index 39510c6201cd..d410adfc91c0 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1,2 +1,3 @@
 DIST kcoreaddons-5.74.0.tar.xz 407000 BLAKE2B 00eb816331d2ecf9339c9815dd19d0fcff3a8398f18f2d4ebd12f27700281e84fdfef3d298476ea40a2bd047c8ae7337d3ce11acc5d9c8cb2edb6c41cdf936d7 SHA512 bbb1bdba02cf745ac705753558719d2b8b6b8279bdde2b77013da25f44f56421c5199efc061257f729ee4430e2674c4818941d89fd908b76a5a044628bbf9d3c
 DIST kcoreaddons-5.75.0.tar.xz 409736 BLAKE2B 11b397c8ae861fc2638cbbfe52580829cd94dc9074b5268de4a73d26dad1522df8438d9c1029014939152eddd8bdd9dc1396a9630cad2ad4af159dea0ba92f2d SHA512 9c413a0be85eec459cbfe179b5528ff728207d9591fd1bbfc98d021509f3c59caba0e45f01c7eb8ed70220edbba18990f83d4cf6391b31157b04987bd46d3362
+DIST kcoreaddons-5.76.0.tar.xz 400428 BLAKE2B 15d9bd0155e0f82b34211795fdb4bacea7ea5584651f3e21b27a6d0e97b50789b4924829870ecffb6a56b8904cd8f9a7d592a72507084ef387c508eb88eeaca3 SHA512 3ccfa682546db6c82eb80db67ae6e2c62dc7a2cdd96b6c2169e1e584508419c89606bbbf18809aeeece3f2e0e326cb301bb90ac942cbe3318f178c7db265cde7
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.76.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.76.0.ebuild
new file mode 100644
index 000000000000..469867be4509
--- /dev/null
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.76.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.15.1
+inherit ecm kde.org xdg-utils
+
+DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="fam nls"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	>=dev-qt/qtcore-${QTMIN}:5[icu]
+	fam? ( virtual/fam )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-D_KDE4_DEFAULT_HOME_POSTFIX=4
+		-DENABLE_PROCSTAT=OFF # silence FreeBSD spam
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+		$(cmake_use_find_package fam FAM)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# bugs: 619656, 632398, 647414, 665682
+	local myctestargs=(
+		-j1
+		-E "(kautosavefiletest|kdirwatch_qfswatch_unittest|kdirwatch_stat_unittest|kformattest)"
+	)
+
+	ecm_src_test
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	ecm_pkg_postrm
+	xdg_mimeinfo_database_update
+}
diff --git a/kde-frameworks/kcrash/Manifest b/kde-frameworks/kcrash/Manifest
index 7087456bd454..fedb37e736f4 100644
--- a/kde-frameworks/kcrash/Manifest
+++ b/kde-frameworks/kcrash/Manifest
@@ -1,2 +1,3 @@
 DIST kcrash-5.74.0.tar.xz 22256 BLAKE2B 8ae601bdb04853ae1cc79f409ed51688a8b61cec818bca51a29fe75f63c798ce477428610a5ebcd35ec73e1c7952f8a7c4ff4259ba681d305b3b800f4c7cb1ff SHA512 082a18aa69e62b05c262111396fbda62a5a5192f345ed9563f9f549ca05be34d6027e7339aef66d46d02a3fa7abc57c362db49dbbb71e94111815644890f0447
 DIST kcrash-5.75.0.tar.xz 22252 BLAKE2B 420efcfddf525076d108bc235295169e98b25d49c0efd780e17b033db57554c32f9271f07b2b091640f54cb36803775a98e13346f90afb2d3d05e1596ac8efa4 SHA512 8a6b9e9ab32daa45d3c8ef2ef7c9a8c5f02cbb30e20a473218af2888833d3786364ba48264ea1fbb555810ce82ad50dbdc6417853a3577991d92ea986c90d81f
+DIST kcrash-5.76.0.tar.xz 22256 BLAKE2B 81f0a1563e408358201e78ff63b5f25a67f21332e11fbd62e102215edff9e816ae7a4670c06b9654ed2ede7873b66b75c74cf95d9c050f292a7d585bfd6d2704 SHA512 2a67b5a4fa8b9902c626e8c97a90fc04ba19a5933e012f2ba11344a548c930a3e74eb188c125236d846dadf21bae9b072d3c181dfcdffd555a150dfdc9ab4ecd
diff --git a/kde-frameworks/kcrash/kcrash-5.76.0.ebuild b/kde-frameworks/kcrash/kcrash-5.76.0.ebuild
new file mode 100644
index 000000000000..2688b2b4205c
--- /dev/null
+++ b/kde-frameworks/kcrash/kcrash-5.76.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for intercepting and handling application crashes"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls"
+
+# requires running kde environment
+RESTRICT+=" test"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
+"
diff --git a/kde-frameworks/kdav/Manifest b/kde-frameworks/kdav/Manifest
index 565e951a087d..5a7971cbd9db 100644
--- a/kde-frameworks/kdav/Manifest
+++ b/kde-frameworks/kdav/Manifest
@@ -1,2 +1,3 @@
 DIST kdav-5.74.0.tar.xz 58624 BLAKE2B eea0d23caa6a6fdd363de3cc891ff366ea9dd11e80c3f82b90c7908101d41d96279ac42e775ff8ed4480b61545ab64fc930757459b1fb94f2e4c08d85e1df271 SHA512 77d789edc670d5930010185f5969c6b34678f39a4e3c0c2e05b79fb9cb029c7bc152b2418ee3a57659fb40472cd9fd8b40beeae4834299cf8dc1f9ede189fa4c
 DIST kdav-5.75.0.tar.xz 59884 BLAKE2B bb44779bd47cb33421c530bee151b797b269fe306e324b3a9ab29cb2f741e62c721c82f7094ba5754f34f6e4864557926e964d6303d7b97f8ecd9ac29748447e SHA512 c187ea9087dcd7ea89e684618a38e7e2442bbfa013b295c3aa1fa74cf8445a9f95dda5734971a4cd7a6fb88febca8189e2dab6d51594fff1efa70f1d394c2236
+DIST kdav-5.76.0.tar.xz 60008 BLAKE2B ef64f9ef24e0fee2eaebd52a6471e5d37982f87d5d6663ee5a1d4a77fd5ee0cd23adb0bba404e749f8ef121138b1b89755c78cd4f940f87d1742f0b73b183ce0 SHA512 c7a2b63bfccb6bd1c315e564ee8b2fbaad8fbcaa73ac1389c617d82db5d8e21aaa713bc403dafebefbb0cd11d674b4e866f7a676c3894b75cf3217301fe4bbba
diff --git a/kde-frameworks/kdav/kdav-5.76.0.ebuild b/kde-frameworks/kdav/kdav-5.76.0.ebuild
new file mode 100644
index 000000000000..8b3627220883
--- /dev/null
+++ b/kde-frameworks/kdav/kdav-5.76.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="DAV protocol implemention with KJobs"
+
+LICENSE="LGPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=dev-qt/qtxmlpatterns-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${PVCUT}:5
+	>=kde-frameworks/ki18n-${PVCUT}:5
+	>=kde-frameworks/kio-${PVCUT}:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdav:5
+"
+
+src_test() {
+	# bug 616808 - DavItemFetchJobTest requires D-Bus
+	# bug 653602 - DavItemsListJobTest mimetypes unsupported
+	local myctestargs=(
+		-E "(kdav-davitemfetchjob|kdav-davitemslistjob)"
+	)
+	ecm_src_test
+}
diff --git a/kde-frameworks/kdbusaddons/Manifest b/kde-frameworks/kdbusaddons/Manifest
index baf55b94f598..1003f19710c3 100644
--- a/kde-frameworks/kdbusaddons/Manifest
+++ b/kde-frameworks/kdbusaddons/Manifest
@@ -1,2 +1,3 @@
 DIST kdbusaddons-5.74.0.tar.xz 42556 BLAKE2B 71974bf22caa01d1b0e128557fcfc620dcc3b5cd3ecfd2b8f76c4c5f30bccb8f9a54ee59ddba8dae31473117f7546f6f2b4f6c7415fbf2513ad6bde455fbb9e1 SHA512 752726ff477e0159491a4002b60720f962bc832fbf824c342cfd16194b253ef5d94963e2aaefa0daad46af73fe62b4afa888a05846123533f2a8b875be90e72a
 DIST kdbusaddons-5.75.0.tar.xz 42568 BLAKE2B 7a65fff7d1a84d25f225d6b20f2f19fc31e490620c73803f1d2cfa066600371438bf5a4d245e553ef72fef1eb4ebc009058a6915661fce9f59d41ae4022eb539 SHA512 4b062d8b50c138deec639294b45e603f81d8a4d9f125657bb89a69a366545c8bf721eacdf88e52be1dabb3b4ea709664eb2c9aac24aa786b0bac382e005677e4
+DIST kdbusaddons-5.76.0.tar.xz 42568 BLAKE2B 2c54d08062b7fb7a874cf46b11c8b39aa52b180790b05c42131ac5f171aae513b7e3addda3bb027377b38587e48b11daf881e40fd71901c468927d5c2b5f77fe SHA512 33eeb2471053894236edd65e04e83b8a96ac5fb04bf9f1faf4f9f110d0c70e965a530312a5e6da739c80acb19f7e12f266d0fe98a427cfd3122a22d9f68528be
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.76.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.76.0.ebuild
new file mode 100644
index 000000000000..f94570fe749a
--- /dev/null
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-5.76.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.15.1
+VIRTUALDBUS_TEST="true"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for registering services and applications per freedesktop standards"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls X"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+		$(cmake_use_find_package X Qt5X11Extras)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest
index 110b5331385f..5e9b1c824ee9 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1,2 +1,3 @@
 DIST kdeclarative-5.74.0.tar.xz 190360 BLAKE2B cf4ac587189c4f6fba6a13eaea4eea95e7e8aacf902c8ed809fac03f5ca76c9e42eff9fa74c1dfb0d0618c71bd4109a1c6b8f6964b242659757efadcc149ddb5 SHA512 8428a60146275dff201518764678bb7c5acce473bcfa584ea1b4924db485ade1b45e55f3aa758fbcf326b15e0e24dcb0913fbabbedd795b7b47e3b3f7e897f78
 DIST kdeclarative-5.75.0.tar.xz 190756 BLAKE2B 63a1d37581443cde399fcfa519eb0c08fe068f0a37a95079fe4a85ce517e4f8713de3651888772bd5ad637d46cc5a81188cd38d67e0936afc65b4b78a0068201 SHA512 9dac6929cff1c1aeef8f4fcfcf76023bb510ef5584542489c13c6fac408397215c8305ce71566655c85967c77b5beffebaa42a2b24aa77e90752f769c5de491a
+DIST kdeclarative-5.76.0.tar.xz 190984 BLAKE2B 5de980e7ac4a73c751e607d5cea9b0c2753c55770e568a1338f9523756d57c9b2f561efea4fd60bc9c0ca0eba6b32b5ac29a161c6c998083c655c372ca4f7ff9 SHA512 282a3969f078af768f1d03f2ec7a9d4ba4118fdadb97f97413db6c169ad0cce96f3127949558cb4966d5fb156441f090a58498ae132d6c880d0abd6e53df0451
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.76.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.76.0.ebuild
new file mode 100644
index 000000000000..dc9a811e54f6
--- /dev/null
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.76.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing integration of QML and KDE work spaces"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kglobalaccel-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kpackage-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	media-libs/libepoxy
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest
index 7df996a7676c..65125ceb8f6c 100644
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@@ -1,2 +1,3 @@
 DIST kded-5.74.0.tar.xz 36584 BLAKE2B 2714966ad3d45a5392b5f5c2c7efcc9d992f09881a26a78cebdb7ae58cf5a1b8f7854951564f7810ba16e009ceb795a59a2c03166bbe0065234f52e19f6d10b9 SHA512 625ffe6667a228d3330535d2049870fbee83a4c95ae221b733f9d22c608b37f4795c2e24c1cb91f87c78cf2863710062ea87c57146764323e14653d4baeedec3
 DIST kded-5.75.0.tar.xz 36624 BLAKE2B b37cbf879ddffb5382fbb524ae0f6742f3c0b4606d88555426e1c1eeb9296f76d83c6a61b4a2331ef56d9636c251521aa4655d5b6567ed2c914a0a1a9d8d32ef SHA512 9d054ebf1100c61e0364eff67d0b8d307e632126df8687863129047fa1d310b2e0340c45e6c39c2efa58dd41d7d8f54bcea86e8e0159ec6473cb46273782e300
+DIST kded-5.76.0.tar.xz 36664 BLAKE2B 89c66b071b77e485e5561f510980211757bd4cf941b0407742f7b8b7aa5e034aa66d13faabac52856a01f604afedea11755f8e3177fe8bcbea36f69e4f93359e SHA512 4ef53504e96188af0448b8b400ece5d54d1aae2b5eed487217bc05054c0dd3426a0c9b66c52c14da7a88cc9ae63b0b6a53b2ee32e5d062a186e96f931088b831
diff --git a/kde-frameworks/kded/kded-5.76.0.ebuild b/kde-frameworks/kded/kded-5.76.0.ebuild
new file mode 100644
index 000000000000..e902cd503ebf
--- /dev/null
+++ b/kde-frameworks/kded/kded-5.76.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Central daemon of KDE workspaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+man"
+
+BDEPEND="
+	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
+"
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/kinit-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package man KF5DocTools)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index faf483ca27e4..bc483a00618a 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -1,2 +1,3 @@
 DIST kdelibs4support-5.74.0.tar.xz 3533248 BLAKE2B 712e9304e2de3a167f2bfae07911b2e4ae236eb1002504cfe7f4507e9615500b10488327a5ca28d25412432a1fed992075e3585afa67038ac2e8d440553e6b9a SHA512 a1b19ec933a947a1ebe3a60004341e1fa4fecd3a64de197ee997bbba6a14fae114e3409180d01de04d20e32e52182eeb9e85e131cba51601689f12eff4af3eab
 DIST kdelibs4support-5.75.0.tar.xz 3533820 BLAKE2B 90d275e86326f90a69f5cb220f9d72d46ccfc9312f38d0ebe3c013b1a945c8a975cb6aca742663325bbe5419174b9c77398f855300daf9dcb35afd8d7a2d8d7e SHA512 016a59323476480f7df1cad4d27319dbe021987dd54cf3292e19c1d6daca46a275567f10367de2088a5c0e8fe8b6d1db73bee9b057a5d0147d3674f255e19eec
+DIST kdelibs4support-5.76.0.tar.xz 3539072 BLAKE2B 48f3749ed5dabca566562ffb414270cd2496b84684bf8f26614070d890098e29cde7f45d0846675e9d2502496f6eae8e9680643f579481240d370e57609ffe56 SHA512 19107ebbfd90ac8fa466fc21611460ead2e82f91d96205e61c958f41114bc0212c647db01676fb49c8a52e5d3fd6c20794a550ffaebc05f1720e587b785b9718
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.76.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.76.0.ebuild
new file mode 100644
index 000000000000..2d89421246a6
--- /dev/null
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.76.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="true"
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="libressl X"
+
+BDEPEND="
+	dev-lang/perl
+	dev-perl/URI
+"
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qttest-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kauth-${PVCUT}*:5
+	=kde-frameworks/kcodecs-${PVCUT}*:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	>=kde-frameworks/kded-${PVCUT}:5
+	=kde-frameworks/kdesignerplugin-${PVCUT}*:5
+	=kde-frameworks/kdoctools-${PVCUT}*:5
+	=kde-frameworks/kemoticons-${PVCUT}*:5
+	=kde-frameworks/kglobalaccel-${PVCUT}*:5
+	=kde-frameworks/kguiaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kjobwidgets-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kparts-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/ktextwidgets-${PVCUT}*:5
+	=kde-frameworks/kunitconversion-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	=kde-frameworks/solid-${PVCUT}*:5
+	app-text/docbook-xml-dtd:4.2
+	virtual/libintl
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/designer-${QTMIN}:5
+	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
+	X? ( x11-base/xorg-proto )
+"
+RDEPEND="${COMMON_DEPEND}
+	=kde-frameworks/kinit-${PVCUT}*:5
+	=kde-frameworks/kitemmodels-${PVCUT}*:5
+	>=dev-qt/qtxml-${QTMIN}:5
+"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	ecm_src_prepare
+	if ! use handbook; then
+		sed -e "/kdoctools_install/ s/^/#DONT/" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kdesignerplugin/Manifest b/kde-frameworks/kdesignerplugin/Manifest
index 5d2e6877bd76..233c4a32ddfc 100644
--- a/kde-frameworks/kdesignerplugin/Manifest
+++ b/kde-frameworks/kdesignerplugin/Manifest
@@ -1,2 +1,3 @@
 DIST kdesignerplugin-5.74.0.tar.xz 73340 BLAKE2B a725a0889a85351e25b0191cfb3751fef8bbcec663686940ddf1589f92cc90bf823077f14303c07f693261abbddad0e0c21bd0813cdd5a5a89f0b26e37b1a41c SHA512 3d1fe367322ace3dcc665775d5503e9d8d413de6b0a8af710b1f774e33cd7b335b7a42ba619191a6bb6729def7913ed7e606cd9adce8aeeee9ca96c5241e899e
 DIST kdesignerplugin-5.75.0.tar.xz 73348 BLAKE2B d66946514e0289da55290013ca483eed8d3afb94d830dd4bf508b3eb3f7c418937f3201205ad388d2888eb5f866b3c75de094cd31d570a610fcff60d67a965ae SHA512 bce0be6a6bd03098c3d63a5b3271071f6029f41434af251dbf776a7c2dd02fc5f01313e13f0961e9f3cba52abcf0cd91abb1792e0bddc0bdd89386b55c8fe5a5
+DIST kdesignerplugin-5.76.0.tar.xz 73452 BLAKE2B 2456229d6ddf1539104c6f344732b1249e31438127d4d354abbe29323e852b357ba68502f28e6d4c800a010d759a4aa82e0ca88885bf7a48d3243def25eb49f9 SHA512 2f49410b9c350dc1c0f263a8e46dbb4fea2009ccf716037e7ab655dbc3f7b86eea1fa11d85a2e99bc298ecf89d1e78d068873fdb7514ebda6eff906d39c5c9e4
diff --git a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.76.0.ebuild b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.76.0.ebuild
new file mode 100644
index 000000000000..0433d915f436
--- /dev/null
+++ b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.76.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_QTHELP="false"
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing plugins to use KDE frameworks widgets in QtDesigner"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kdesu/Manifest b/kde-frameworks/kdesu/Manifest
index d411f347a035..5f917d26340f 100644
--- a/kde-frameworks/kdesu/Manifest
+++ b/kde-frameworks/kdesu/Manifest
@@ -1,2 +1,3 @@
 DIST kdesu-5.74.0.tar.xz 51280 BLAKE2B 7a56eb0c8cfb0032c4452e5fbc24d27afe2a27e77403ec203eadddcd6d4a36672f17f78e168ee6d363f17b4d1c4f47a621ddb74808fc6c58827d2b472d85ae48 SHA512 7d04ded1fd6e466d4d851bc87475c1ab9d459fe1b8c25f284a196ce90fb1ceb16d0c532a14f1bf75b005cf0f09049d07268270ffb508e0c334b8eb1a8af13b5f
 DIST kdesu-5.75.0.tar.xz 51288 BLAKE2B fe21fec9c9b8cf88e85463da90564f40060172d6a7792a10186cd0783c4991682d4c35b242e803548412fd304fd9b9d68119ac51a2445eef8e8565f46b23ccda SHA512 c45e79212be2ce3bb979e12c8ee9aae02a0f488e92d65c39b4a3275bf3efc2afdc306625bfec3492df245220f90b92bad8018b4bbe588deea1c2f3fcdb444a25
+DIST kdesu-5.76.0.tar.xz 51296 BLAKE2B 03a44ecce385dd019d7897138d507b976e634b1e9261204da7a9269c4f64d717b60084d08532275a8ee181288c0c4d3e46c5e5d59ed61d94782e1650d27233f0 SHA512 22fa78ebad3df0bb1019d4d8bc7a9fcc3ccca212572101fab83126321fa4f621e2e2d92c165719998b039039857be14908c6c8aa860ce2d91c444005dd1d1c94
diff --git a/kde-frameworks/kdesu/kdesu-5.76.0.ebuild b/kde-frameworks/kdesu/kdesu-5.76.0.ebuild
new file mode 100644
index 000000000000..fc8d98e4b310
--- /dev/null
+++ b/kde-frameworks/kdesu/kdesu-5.76.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
+inherit ecm kde.org
+
+DESCRIPTION="Framework to handle super user actions"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="X"
+
+RDEPEND="
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kpty-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	X? ( x11-libs/libX11 )
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kdewebkit/Manifest b/kde-frameworks/kdewebkit/Manifest
index 2084861d66ff..c8dc2f6fcf83 100644
--- a/kde-frameworks/kdewebkit/Manifest
+++ b/kde-frameworks/kdewebkit/Manifest
@@ -1,2 +1,3 @@
 DIST kdewebkit-5.74.0.tar.xz 29676 BLAKE2B 80e827530412b328306649f513fd98e4b1ccee4cd5665a18d0fb0020ff30061b8bd4d74a906daeb35e6a82612303879f7465e63c4b51ccdd80bfeee72cffbbfa SHA512 2363bbcf1d83ddc4ab30c80347c44a0c5ec1a3527772ee476ba488d5e58ae7ff6cba942e5da46d4400844ea56afdd116ffdb8693571753b7d50aa1b73ca53c0d
 DIST kdewebkit-5.75.0.tar.xz 29680 BLAKE2B 23fb518e8b99e10aac39576df311505327e8f59ac3e20210766af8b2c92137b2c35f57ddf4c53d6e363fbd79f70ac21746caef53380a121f80eeed7ca314085b SHA512 fdeabba712698c456f108987921cd12ecc3b5ada3fa6a5fa7c74b76d8d5d88a07bc92164c339b6dbb1b5802679506ec896b3dfccb19e2d8de2e226ea2b3693be
+DIST kdewebkit-5.76.0.tar.xz 29676 BLAKE2B a5451e0c24157e7050de69fd7801ebb6211fecab32b70d203e51a4ef6bb088d4d54f19a46a583fa3035420ca6d1e32cf376b69816f005e6cbfb5b6561a94af0e SHA512 529a56367b8d20ba4a95b3001e686b0ff1b7bea1fe90f32e9068db5277e61a5e8a5e91089bbef77cafb265caea6985189d96d1433eda216f87be9eb647190a8b
diff --git a/kde-frameworks/kdewebkit/kdewebkit-5.76.0.ebuild b/kde-frameworks/kdewebkit/kdewebkit-5.76.0.ebuild
new file mode 100644
index 000000000000..24ca1777374a
--- /dev/null
+++ b/kde-frameworks/kdewebkit/kdewebkit-5.76.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing KDE integration of QtWebKit"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="designer"
+
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwebkit-5.212.0_pre20180120:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kjobwidgets-${PVCUT}*:5
+	=kde-frameworks/kparts-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwallet-${PVCUT}*:5
+	designer? ( =kde-frameworks/kdesignerplugin-${PVCUT}*:5 )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtnetwork-${QTMIN}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DESIGNERPLUGIN=$(usex designer)
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kdnssd/Manifest b/kde-frameworks/kdnssd/Manifest
index 1fc3dbab806a..5f7497ba7d14 100644
--- a/kde-frameworks/kdnssd/Manifest
+++ b/kde-frameworks/kdnssd/Manifest
@@ -1,2 +1,3 @@
 DIST kdnssd-5.74.0.tar.xz 57496 BLAKE2B 7503941e98cbcdd5ebc4b4fe5e7d41ec82ea639c3ef5f53979d4567ef2aea0eadeb3c7ed337092f8a8ed51220c0acfae692be65aa84f7add23d89a9c877b13f4 SHA512 ec9ad5b4c3117accaabec7d02fea28cff503788d3dd8a3696f35478b677925071dbea2d714e5ffceeb76ad898fb66030f0e4c3dfbcc7cf7292e05a0fd5102ccc
 DIST kdnssd-5.75.0.tar.xz 57536 BLAKE2B d7a8e9160f0b9b1bef6d97135f60e1dd4a6c1e0855ddf74e51b06fcd263196c95b7d2fbfb4336f87f316c72ee5dbc1e15186e3fef99fbf2c16e753024d680e77 SHA512 7539345eefc908542e2aafbb371a67d91c0672e00212cffcd68665795ba81870abd08e49eb6c70669549e7fa73953054804823a270a53b44ed78a1ad222e61ac
+DIST kdnssd-5.76.0.tar.xz 57500 BLAKE2B f81c49a80156ee4352e3fc5569dfa0832cc90d5968950090201cb2e0712bbffacc89f591f36e42da7d03180721afbfd1d762837eddb86c25a841045da69553ab SHA512 8693d41134793fcca84d85cefbbf2c90539972df2d44c71d2520f2eedf6bc6a045702128a4de56a4d1b9d16a9a30bccd692746dea3f7ac7f16fbc28780a42a34
diff --git a/kde-frameworks/kdnssd/kdnssd-5.76.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.76.0.ebuild
new file mode 100644
index 000000000000..627451e26e21
--- /dev/null
+++ b/kde-frameworks/kdnssd/kdnssd-5.76.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Framework for network service discovery using Zeroconf"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls zeroconf"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	zeroconf? (
+		>=dev-qt/qtdbus-${QTMIN}:5
+		net-dns/avahi[mdnsresponder-compat]
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_DNSSD=ON
+		$(cmake_use_find_package zeroconf Avahi)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index 5c05a175456d..3678ebcc4372 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -1,2 +1,3 @@
 DIST kdoctools-5.74.0.tar.xz 430240 BLAKE2B 989df1f367721b393079d2cf551f008758e079cc5dd325b1bb22d30268f2ed635f2cfeb0504da5a09e74af320ac8271f72ba8dbe78ebeef1e7787006ed00bb02 SHA512 51a410c7cb9440926b27908be77ea9c26050943e4d3bfc24125b803b4104e22c0ca2963c7ccf968ab0d334846a4a3588fa7ade341cf02ec7d8ede4a06fe20327
 DIST kdoctools-5.75.0.tar.xz 430212 BLAKE2B 9ee86da4c451cbf262cb3c7c3059918ffe926a24af4ca7c6c5eb354f5acb10e2df5e951be0831f383401c06cfae2b633983c06011d441cebc63f4414bcf880d6 SHA512 71aaae59abb3c3d34adac16f02aee298e928542ba543457dd94b2faa5a6791bb6e2aef5ad2e61f206963dfd42af2166191b1ff9b4bcce2f46815769563b96848
+DIST kdoctools-5.76.0.tar.xz 438600 BLAKE2B afb5236924b6a677c4c20fb06dcd1c78955d32d190268269677d096e22b0edb404cfea94d73accbbb3a0e88884a87b2e9fa8281032c3956e90b66916c5bdc747 SHA512 27646f054cd324a277334592541a0a5a44fe2ef794801cdf8fde2e39f370990dbd6114be99453a55883e6f9ed6ccb615fa34b2ae60fdee3ebf652573e679524b
diff --git a/kde-frameworks/kdoctools/kdoctools-5.76.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.76.0.ebuild
new file mode 100644
index 000000000000..1754e1909062
--- /dev/null
+++ b/kde-frameworks/kdoctools/kdoctools-5.76.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+inherit ecm kde.org
+
+DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls"
+
+BDEPEND="
+	dev-lang/perl
+	dev-perl/URI
+	nls? ( >=kde-frameworks/ki18n-${PVCUT}:5 )
+"
+DEPEND="
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	app-text/sgml-common
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	=kde-frameworks/karchive-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.54.0-gentoo-docbundledir.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package nls KF5I18n)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# bug 665622
+	local myctestargs=(
+		-E "(kdoctools_install)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-frameworks/kemoticons/Manifest b/kde-frameworks/kemoticons/Manifest
index ad729a0f0f37..f3b44d7be439 100644
--- a/kde-frameworks/kemoticons/Manifest
+++ b/kde-frameworks/kemoticons/Manifest
@@ -1,2 +1,3 @@
 DIST kemoticons-5.74.0.tar.xz 1697720 BLAKE2B ab83ba6f54a8f81ba9a79589eb077d6b2c893f0b51a992a0c23340ea63e48e3d65fb2608f553bc5f263a3f656ea7c92eaf98962c6da69514b995acb00b4049e1 SHA512 b4f2a232cac9b997d204b8bdc1a217d643091c7bb723208d3f35268997b6eb07dbb9dff1d26c4732c8dd5f96e0c2e37549293532d412f8c175b5498b6d472ea7
 DIST kemoticons-5.75.0.tar.xz 1697704 BLAKE2B d8ddab8e639d318df9ba1ee2768d5fcc407ef7c2c3bd9d4014a922e9fcd474e4410dbc46c439a62e65042a90b333c95d41ce0453dc88353b4fa5fb2025552e2a SHA512 7071b2625ea1dc961abf46bada1d6b596b893f02f71a4ff05de25bc5b12a28f5cf5dfec416da8a85e3a5b4cd23e6099de98d5dc872bb8500665212e43af08d0e
+DIST kemoticons-5.76.0.tar.xz 1698020 BLAKE2B dd619c56c8d5e9372cfe74a4c631f04f1ebe304c309f8692df53013eb92d656df4450eb53742debd3def2b6f194f565c4ded3d3118149a9d0030a83e91e14413 SHA512 319266420c514d2ed5b6f5fcdf7e1ce24eed94efd042bcf5bcec13c53420f02bf90847ad935ca60f94b370bfebbc36d0c9b580686649b7e7fcf85c1a32a3a8fc
diff --git a/kde-frameworks/kemoticons/kemoticons-5.76.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.76.0.ebuild
new file mode 100644
index 000000000000..8434befb757b
--- /dev/null
+++ b/kde-frameworks/kemoticons/kemoticons-5.76.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for converting text emoticons to graphical representations"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+# requires running kde environment
+RESTRICT+=" test"
diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index fcf875940145..f78818b9adce 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,2 +1,3 @@
 DIST kfilemetadata-5.74.0.tar.xz 422312 BLAKE2B 9da6b6573692ed512d4831afea3e84f49e989e9c2b3d6b40a43b3ac42ad87b31eec0f4d5b9ac95574a04bc0e73c093bc65530656364394b0e941b7b3fe5f8605 SHA512 7b07d051f1bd339af6e24450c7ad325685d2ba1e4eda2adb14a25b91536f80d3a045d77501b143a41aa54012b043aed3a324f7c24fef60e72e63f42830034010
 DIST kfilemetadata-5.75.0.tar.xz 422544 BLAKE2B 7aa5229532724eb987453f13faf05596925d712bb0976389fa9c5993ca3a0c3a6543cd5c43016ceea465e7e6cd266b7a649f2409fde140b91da0f8779fba91e2 SHA512 a2ef890021c5aae87b322a6d897ee6bbb0d62852542e5c680bb22f5a20a67525b0fe485f33f2ed6fae585645dc3def375bf28783667e597036c43d97247b4bcb
+DIST kfilemetadata-5.76.0.tar.xz 423944 BLAKE2B d442f2c167008323c8a91fd1468edabd196f934091d801017f96ab950816e241cab5837e2af360d991e9ea80892450592bb198341db0ffa378ba492de9ad5282 SHA512 fe1cb33d3fd65f082602220b10b9885f0fa885a912c86456856be6c275b56541a483f6e43b5edd2c266822b55b238704f71464960c9ec9a82aa7c23fd0e3f667
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.76.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.76.0.ebuild
new file mode 100644
index 000000000000..123aea3e9bf9
--- /dev/null
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.76.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+inherit ecm kde.org optfeature python-any-r1
+
+DESCRIPTION="Library for extracting file metadata"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="epub exif ffmpeg kernel_linux office pdf taglib"
+
+BDEPEND="
+	test? ( ${PYTHON_DEPS} )
+"
+RDEPEND="
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	epub? ( app-text/ebook-tools )
+	exif? ( media-gfx/exiv2:= )
+	ffmpeg? ( media-video/ffmpeg:0= )
+	office? ( =kde-frameworks/karchive-${PVCUT}*:5 )
+	pdf? ( app-text/poppler[qt5] )
+	taglib? ( media-libs/taglib )
+"
+DEPEND="${RDEPEND}
+	kernel_linux? ( sys-apps/attr )
+"
+
+RESTRICT+=" test"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package epub EPub)
+		$(cmake_use_find_package exif LibExiv2)
+		$(cmake_use_find_package ffmpeg FFmpeg)
+		$(cmake_use_find_package office KF5Archive)
+		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package taglib Taglib)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# FIXME: bug 644650, fails on tmpfs (but not for everyone)
+	local myctestargs=( -E "(usermetadatawritertest)" )
+	ecm_src_test
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "Microsoft Word/Powerpoint file indexing" app-text/catdoc
+		optfeature "Microsoft Excel file indexing" dev-libs/libxls
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index f7f7bd21756f..a54220030222 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1,2 +1,3 @@
 DIST kglobalaccel-5.74.0.tar.xz 87272 BLAKE2B b2daf0eb27422254b0dae7e6f6fda9fabc571d1084088261a2851bbff0e51e172880687503350c523e33393788e842fef36778f51b2cc21e37984c953dffa254 SHA512 c97e35d0b2f2932f622dae406d385f2d98504fd5970ac75f48b66277283da2a5957e5d547fe6dc21369631a32827b561139f99307a30343e7bc93f54c8cd5918
 DIST kglobalaccel-5.75.0.tar.xz 87244 BLAKE2B 1bb1fd9f3236c63cc4539194551716040de0afd3c66d6b1ed59eb358307c391317bc28d9c16b7e4e138587ca70916ab797aef9a0eb22abe6cbddb2d086c002f1 SHA512 ded01af795b2842ef0fc6995e67759b54bb8d5ec9d07c5300de215324e6d5ff7333871a97106c2a264e0ed86508f9c45d6e77e989e90a5c4ca450a03ffb5d4de
+DIST kglobalaccel-5.76.0.tar.xz 87504 BLAKE2B ee9a47bb5f3b67da7a86c0da8c97b8d4b61044c64e3af71c77ab0056ca7ac76f0aafa5fb7707c694fcead76d6beba9b75ce0292fea0bc375e61a794c04a7ae17 SHA512 11eb9d1eff270908a5899e956c9ce645641caac77c8d60ba3c7d75e45dde1ed9fcb800df0f3b3abb5590aab417fc9844ff574800cbd76677eadfac4a590d6505
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.76.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.76.0.ebuild
new file mode 100644
index 000000000000..a1348ab3ed0b
--- /dev/null
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.76.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework to handle global shortcuts"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+LICENSE="LGPL-2+"
+IUSE="nls"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5[X]
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest
index 453892c15bf9..c09fb1e8a4af 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -1,2 +1,3 @@
 DIST kguiaddons-5.74.0.tar.xz 51516 BLAKE2B cb92c948aaf3fd0cbba236c893010200bd70f369eba1b2fe0c60aceb30a3ab2b8ffb34571333a30d91207ead61b9a0b95ad1147da751d6251a6222be32e5446a SHA512 9943b908fefc12a82678102f439d79ccf4207dd8ebd00ac9cd23d0428cbdc5fcc41d11c04deaf7d63a76a1be24b28c1998e80098b620d7a9c7476ae412640686
 DIST kguiaddons-5.75.0.tar.xz 51448 BLAKE2B 2effc24168a43cb35068500904e538f3b937dde86f6d63fa711a44e62eaa738431738fca07940f73bd40a25933ba25e718a1bf2401b9e654b8cb10b64c0498b9 SHA512 43a06401d472f9fd2cf7db0231a3c747f096a9b3f80cf18508b68fd9603e0778f034e3811d38cbcd6ac09791bf9ae1695070a61c98833634ea23ea05e4f84c92
+DIST kguiaddons-5.76.0.tar.xz 51456 BLAKE2B 4228acdfe6af384aaa59db0aa49f16d0aecbd3894d1980b62a10257961388d68f7fad0501e5231a7dc8c94a8c6daf35b5a280a3fa58932c324679b1a5e14e2bd SHA512 c058f14efb6d82675edb83c098ebaf98794044cd861914387ba52455128269c8e6d97c9ec55893702e81eda2183308c43b761b4f108ed5d9a7dbd8649df3a5e8
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.76.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.76.0.ebuild
new file mode 100644
index 000000000000..2d9b9372c2ce
--- /dev/null
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.76.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing assorted high-level user interface components"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/libxcb
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kholidays/Manifest b/kde-frameworks/kholidays/Manifest
index 0a729f31d3b9..7b65ce4d5965 100644
--- a/kde-frameworks/kholidays/Manifest
+++ b/kde-frameworks/kholidays/Manifest
@@ -1,2 +1,3 @@
 DIST kholidays-5.74.0.tar.xz 223360 BLAKE2B 84e731e8eae5ce28db12512bf258a34ff75e19fa4a82456ff66137d7581786e8ebd8940854a71f4d105638ac5ea6eb3cebdf735d844f6075b9069ed52f804741 SHA512 f35ba7c9ee42383ff629ed61dbc054656d40c7f59172bde313e897e718ee7151db79c8827582abfeb286f05c5c7b4d875c75d9790800b43c5831eb98a66e2195
 DIST kholidays-5.75.0.tar.xz 224100 BLAKE2B efcb728c4f3c3bf77932beb3ed7b81e509bc31d2e75c270dcc33381f1c6a1e375be86fa242093ebc39f4f754f15bb382ca430587a976ed77ff54add4737744e6 SHA512 faeec888b3440c5a11817328bf8776d4e55d316e5629d09eaa33c81d642e708c0cde3d7cb48118c5366f337a557d53d0e9c985374e7540c039207057d7a9209f
+DIST kholidays-5.76.0.tar.xz 224284 BLAKE2B 0ac430089c4fadfffa6bed84f02c66cb425adebd73fcc76c89467b4dd65b8ac9a7e14feaf19aa73d7dda6a8f3cdfe473b77a2b7daea4906d116997f7c8fcd070 SHA512 79a1e93995ffdbe9c9cb0c6be12203cf398944fbead3c31fdb388c1288e6765b16281820616febc447d35a70ff321d33da07937125a4427d861c31a62c844228
diff --git a/kde-frameworks/kholidays/kholidays-5.76.0.ebuild b/kde-frameworks/kholidays/kholidays-5.76.0.ebuild
new file mode 100644
index 000000000000..693641fd14ca
--- /dev/null
+++ b/kde-frameworks/kholidays/kholidays-5.76.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+ECM_TEST="true"
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Library to determine holidays and other special events for a geographical region"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	# bug 624214
+	mkdir -p "${HOME}/.local/share/kf5/libkholidays" || die
+	cp -r "${S}/holidays/plan2" "${HOME}/.local/share/kf5/libkholidays/" || die
+	ecm_src_test
+}
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index 5165c0015dff..a7d93ef134c8 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,2 +1,3 @@
 DIST khtml-5.74.0.tar.xz 2089032 BLAKE2B bb72c0d67a3a11907f4e0505a9bfdcbd7e7f3fd27a8504f94bb77fcc30906f06a84ca4cbd6732a52cbb2fe85cabe7478bc2e751c07d310890066036dcfc32d18 SHA512 c8c8453d05475196c6d91ec9289d1c396d7dc149d07955912119ce6c9cca44071d9e51676375499b23a923f626e906f18b0bd564db6760e53628985f1b7deb2e
 DIST khtml-5.75.0.tar.xz 2089024 BLAKE2B f76f2849907f97ed6951ccb978c58a6dd0eef3e861be00b68d42d7e11d251415d134dad452a5ef42ce051ef1ab3f9256926e2ededca32c6d44495097d59ec0ef SHA512 fa3559b933501f5f18787f07c444bc46b51390be73d9b8baa0b7925a59c1fd0c99c97f6ccc719944f480ba64bf7216edaaa55935f9488263e3f846273d91284c
+DIST khtml-5.76.0.tar.xz 2089664 BLAKE2B c2282200666f5ab336699f86e05472d0c66b4e28ebd7a5157f7c7cf3812a7ee7e6cfa98d32c895b42b595c9e2d2e611cc2e347f72acce10b74cc5104a8f6ef8e SHA512 39c940c06685f28b3dfb9a48d43eab7cd00744ef5d86c4f37ff90482b7b781946492e89d6157c831b68252f65cf2c2df2f3785bbc97c45b4916b1c5c1f83d7cf
diff --git a/kde-frameworks/khtml/khtml-5.76.0.ebuild b/kde-frameworks/khtml/khtml-5.76.0.ebuild
new file mode 100644
index 000000000000..3d223cd97788
--- /dev/null
+++ b/kde-frameworks/khtml/khtml-5.76.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KHTML web rendering engine"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="libressl X"
+
+BDEPEND="
+	dev-lang/perl
+	dev-util/gperf
+"
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kcodecs-${PVCUT}*:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kglobalaccel-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kjobwidgets-${PVCUT}*:5
+	=kde-frameworks/kjs-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kparts-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/ktextwidgets-${PVCUT}*:5
+	=kde-frameworks/kwallet-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	=kde-frameworks/sonnet-${PVCUT}*:5
+	media-libs/giflib:=
+	media-libs/libpng:0=
+	>=media-libs/phonon-4.11.0
+	sys-libs/zlib
+	virtual/jpeg:0
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+	X? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/ki18n/Manifest b/kde-frameworks/ki18n/Manifest
index ec2c6888c3ba..05483be59430 100644
--- a/kde-frameworks/ki18n/Manifest
+++ b/kde-frameworks/ki18n/Manifest
@@ -1,2 +1,3 @@
 DIST ki18n-5.74.0.tar.xz 589680 BLAKE2B de50a83ea8cd418fbe4f2a2fe4e47ba6f300c8a3f3220651d982cc07d5781d1bd2b258e3833f4b3f75eec45dff00e5869446e7059c245bf456d86dfb8b4a41e2 SHA512 5027dbd316ea429f72aa45ac215675d970ab5625741fe0908c63957646ec4f12b1d21e7649787364d2d716cd1ceab11a505a4271f28b85a0e18dcbc6c3b15ffe
 DIST ki18n-5.75.0.tar.xz 589752 BLAKE2B d3cc51d7b17f4e82d5670784673f5f05d728f704a5b635efda8a53eac267e95c154a1156f59e8bdc564f1b7c978ba874e715b5ff7e4681c9b6e3e975d8ee72f7 SHA512 2827fef364ae122c9e5ae554bfb7fe43999f498c93a53761b1a0b6cdc8b46b23a103ed9b9d83b6e5dc15099bcdf6a8cf556d92dea460aa8e8f314595ddd6ba98
+DIST ki18n-5.76.0.tar.xz 590024 BLAKE2B 7cd9fa7252f156f57af00d13ad6ac78909bc867be50e5c6a9e682cbb6f1ecb0b9018bd8d7301e62416e8d6a2a07d3a905208c71f51fbe7a27e53bb30cc2436f7 SHA512 7c5e8e664cb13996ee7319995470f2d6fe33fa22bb56d6104e38654630b2e3d9caec9f7f0f9ea20c9ff8608fb5794689d8013b7347f19b7d1c88726b5ab108ff
diff --git a/kde-frameworks/ki18n/ki18n-5.76.0.ebuild b/kde-frameworks/ki18n/ki18n-5.76.0.ebuild
new file mode 100644
index 000000000000..04113e2fa4c4
--- /dev/null
+++ b/kde-frameworks/ki18n/ki18n-5.76.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+QTMIN=5.15.1
+inherit ecm kde.org python-single-r1
+
+DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	sys-devel/gettext
+	virtual/libintl
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.57.0-python.patch" )
+
+pkg_setup() {
+	ecm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest
index e74ffb7fc9fd..cb4c6c7b8299 100644
--- a/kde-frameworks/kiconthemes/Manifest
+++ b/kde-frameworks/kiconthemes/Manifest
@@ -1,2 +1,3 @@
 DIST kiconthemes-5.74.0.tar.xz 222188 BLAKE2B 430c12cb3953d1ccf6e4e863c9693e99ac73b8464e113266d7eae48cb80e6769da185138890fffdf8527f5a74f837fef8bdf32acab8e8a5957837df6bba57daf SHA512 1d34c98b2ec7c59f6960aacc222a9478212c5224eee883c4c6082dbfcba312d4fbedf164b11b5fc07d6f19a1bac65a593ed91ca65c38f998274f02c5b4ed2cfb
 DIST kiconthemes-5.75.0.tar.xz 222124 BLAKE2B 912899ff13bda517a8043eb44e771328c87454ed6242f8a039ca7cc6944e2377a00b78b6823b190ed47c99f791e64d30bc196d92ae15c222906a1b69d3d7ab59 SHA512 85518b0d7e3548a7912b9268952a49d3099530c0c9003249c7f291d1bab65eaeb6faab705fd4b6d351f9da31c401032136118eb83c33bda7293e1a720ee1ab00
+DIST kiconthemes-5.76.0.tar.xz 222136 BLAKE2B 90728d0b38ab6b7dd01a4880df73a392dfebd9274df0919fb5fd864603565412e549300797644dd3bd690d25b16136a69e622842865a44e5a634232f55cd1111 SHA512 1895d0ff63d1dd2a20b118b18b5944532a6896ea0f9ecf4c4a3eb527cbdffd4fdef02c6fc3dad54402ae007775618e775a7ce71b83950c49e066e1c01be09014
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.76.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.76.0.ebuild
new file mode 100644
index 000000000000..63fbc686c649
--- /dev/null
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.76.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for icon theming and configuration"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test" # bug 574770
diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest
index 576cd5fbf317..fa52d491f2f7 100644
--- a/kde-frameworks/kidletime/Manifest
+++ b/kde-frameworks/kidletime/Manifest
@@ -1,2 +1,3 @@
 DIST kidletime-5.74.0.tar.xz 25552 BLAKE2B d08e482089acf0b7afab5edc69dc11c92a18f208ad4e8d1948cb4713b03c04267b4622e27d0b973777faeef75391b1f053ab490a062f5cac3a3b4516aa5be90a SHA512 4edc4b6ac3164da38401552bab8645ee2db025d519eadc87d9c2d93284b7e7d5b91410d18f443d64d7b1b0573d9e58b04945e3847e07401d62dd8826accccae3
 DIST kidletime-5.75.0.tar.xz 25544 BLAKE2B 0f7e213170e32d56c95747105bb41ddda806b32d2f7283799efa8de28fbf971abb77cac32c729a3f4086570c7172e4ed04ff1ec347ac38f18291fa2f8b5f2c98 SHA512 59009842f77e9ab55933d40e8d61600fe90396156b5ecb0ffe8c69a73c5bcdc5ae68fced57ad8018274bbafb8e8c310321483c6d8e951fafeb56a37d0e0a4d25
+DIST kidletime-5.76.0.tar.xz 25848 BLAKE2B 9a5c99086750810c6272e9b3e00e716238d31791b46bec8019636fe00e88398c99d68d0b9afce0a89bc76629de8690a66fed78435b2c87720e372d4a3d27875d SHA512 b525b034091daf6303cae8dcfebf1fae6e8fb76eb77f01f9670e73ac611f824b56869a0c5ec9b658d7578042e68ccd2a6e6d2fcb4945368477ea8a33042dbdf8
diff --git a/kde-frameworks/kidletime/kidletime-5.76.0.ebuild b/kde-frameworks/kidletime/kidletime-5.76.0.ebuild
new file mode 100644
index 000000000000..3041634688a6
--- /dev/null
+++ b/kde-frameworks/kidletime/kidletime-5.76.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="false"
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Framework for detection and notification of device idle time"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="X xscreensaver"
+
+REQUIRED_USE="xscreensaver? ( X )"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/libXext
+	)
+	xscreensaver? (
+		>=dev-qt/qtdbus-${QTMIN}:5
+		x11-libs/libXScrnSaver
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	ecm_src_prepare
+	if ! use xscreensaver; then
+		sed -i -e "s/\${X11_Xscreensaver_FOUND}/0/" CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X X11)
+		$(cmake_use_find_package X XCB)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index e5eb4e32884f..13588ac6ee16 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1,2 +1,3 @@
 DIST kimageformats-5.74.0.tar.xz 406584 BLAKE2B 3ea6bc5ef80558e334046368210d8c946584fe6b16b64774b216b75913eb4373c3e8a7f37f12aeb68fb3621f26e4724cd215f357b1019b7101734fa6ab151561 SHA512 08a74183bed30679523993b3b2a170e96f676954d6ad89fda61903c5797fbbf936e5620625f6f382f2a9cbf6c131be779f223603a51e7e2e5e61af6ec818efd1
 DIST kimageformats-5.75.0.tar.xz 406728 BLAKE2B dd89f3b9544ace7e2dadd83bea1b4065501ad4bd1d9026dfd48ccfbba6062a4985ef1e178bcf109290178587c714de2901d1c48aa658b63637a557bb02e6c23e SHA512 06d6cc483793c993baea30b372f6b41207ca1df907901193b46ad6330299e5a33127dae2b621fbfc2c3d2adafa3aeefeccb4a03bc956a075989117d180071673
+DIST kimageformats-5.76.0.tar.xz 548452 BLAKE2B 840eca86815aac64c9508eacc95a6dbff8a06592657446410cfdc630cdaa767f2d2e26f3a1c0f64147aa18ee4d1d4f12e98ce01f9a71bc2c5207d57e3a9b0ffa SHA512 9cb7fcbad9f15f6d1daf1e2218c0adb2722f13683a6627081366cb75d3bb3d40b4bcc569dd5b149d0498a785fb5cced6d63be9fabac31e3843292550223fefdd
diff --git a/kde-frameworks/kimageformats/kimageformats-5.76.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.76.0.ebuild
new file mode 100644
index 000000000000..f0256f4bc0a6
--- /dev/null
+++ b/kde-frameworks/kimageformats/kimageformats-5.76.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="eps openexr"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	eps? ( >=dev-qt/qtprintsupport-${QTMIN}:5 )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr:=
+	)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( src/imageformats/AUTHORS )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package eps Qt5PrintSupport)
+		$(cmake_use_find_package openexr OpenEXR)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest
index 1bce969afc13..199798a50889 100644
--- a/kde-frameworks/kinit/Manifest
+++ b/kde-frameworks/kinit/Manifest
@@ -1,2 +1,3 @@
 DIST kinit-5.74.0.tar.xz 121496 BLAKE2B f31da8f7cbde7a5ec60399ccab81edcbf452defec9fca607959193d524998ece74f2ab721ec45f6757aae8a812531085ac36689adbc6fee0c0ba198e30ed83a4 SHA512 a75e972fc2b4d967c3a7600260b7aef0754b40e0b5ae8803ee29c2186736222fd88b22349431393a9731d59ef7ed9bb184f413a39df82ed735d82130042423a8
 DIST kinit-5.75.0.tar.xz 121476 BLAKE2B 1ad3307dd43a4b4041dcecd8ae836f1fccc5093849d496c4eed6d031d9f87085392de0bd96e68b26cc225a96206b2afd69e442a4da6eb78ae0b15fc78b816d2b SHA512 474735a5716ac89d15e0035139fca3371176e0f52726e324ad901ceb306b0efd31a686e7d86f6ada334c7de10c46e5a7ca7ca85cf3c581537f8433cc1ea66d2d
+DIST kinit-5.76.0.tar.xz 121496 BLAKE2B 7564ccf6620f67a5bc6a635522614b4dc317924a3c22efaaab031f763504f724ca17dc1c57bb8257bcf37bcbbbff7d2732a86b7766d3dcb5c31d0642e363f076 SHA512 5babae011b952855efa9c9c2ac009be85c9bc9ea99efd290b5a928f4967330fa38c1b4980cf6c4bc3ea25bc4be6af247f2b2d4d86173fb479cd480ff095fee6d
diff --git a/kde-frameworks/kinit/kinit-5.76.0.ebuild b/kde-frameworks/kinit/kinit-5.76.0.ebuild
new file mode 100644
index 000000000000..46fecb5d5af1
--- /dev/null
+++ b/kde-frameworks/kinit/kinit-5.76.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Helper library to speed up start of applications on KDE work spaces"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+caps +man X"
+
+BDEPEND="
+	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
+"
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	caps? ( sys-libs/libcap )
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package caps Libcap)
+		$(cmake_use_find_package man KF5DocTools)
+		$(cmake_use_find_package X X11)
+		$(cmake_use_find_package X XCB)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index b397513233b7..056646dc0b36 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,2 +1,3 @@
 DIST kio-5.74.1.tar.xz 3281248 BLAKE2B 584fde1483477b70ee7892bf0de37aedb62672c2ada57d85c9646894606f10b6a03750030e1926441707b12b18ece167fa3a0dbbb75a8155bddfd35342d372f8 SHA512 a563b939d2bc71443c6c748ddf293fab84072efebdcea639707d7aaf2739356a906668be3dca915464ce7c81b63d7482ac024df786e04bbafcf999cde5ebc5e2
 DIST kio-5.75.0.tar.xz 3277424 BLAKE2B ac7d4dafb00ca2c16ddbb6a45d0a5e07d61f5d0a9c2d2b26a8347dee7ff23fabdec2184437e7ad14f02c1def3af5778b599d64e0eff3780ae93aca0a9b43896c SHA512 028e4de5897fb61fda7bf80b0d2ccb022bb7df936648ba3429623708b108df8081bf1b0f416097c3658d1cd4b1a96757010d32ab5a9b382195b6915040ed5a06
+DIST kio-5.76.0.tar.xz 3301808 BLAKE2B 4bb2c7c1d2867155ca35bf9c3b80cef7e96e8ca651adb2fc46d5e7beca44c80e440a7ee2f6caf1f1cacfec15e9c4997f86fa66dc6efed45d99804f8c285de6a9 SHA512 3b7167b7452629ef6f43bf52cf1e1d11daae36dd9a7a0f22844ea08f362e1e40f14ea1983fcf7e10bf12c40fdfcfee9f3eef66b73bd2f34a83d9dd37de23f869
diff --git a/kde-frameworks/kio/kio-5.76.0.ebuild b/kde-frameworks/kio/kio-5.76.0.ebuild
new file mode 100644
index 000000000000..ce4e2aa906ba
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.76.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org xdg-utils
+
+DESCRIPTION="Framework providing transparent file and data management"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="acl +handbook kerberos +kwallet X"
+
+RDEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kauth-${PVCUT}*:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kbookmarks-${PVCUT}*:5
+	=kde-frameworks/kcodecs-${PVCUT}*:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kjobwidgets-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/ktextwidgets-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	=kde-frameworks/solid-${PVCUT}*:5
+	acl? (
+		sys-apps/attr
+		virtual/acl
+	)
+	handbook? ( =kde-frameworks/kdoctools-${PVCUT}*:5 )
+	kerberos? ( virtual/krb5 )
+	kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 )
+	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	test? ( sys-libs/zlib )
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libX11
+		x11-libs/libXrender
+	)
+"
+PDEPEND="
+	>=kde-frameworks/kded-${PVCUT}:5
+"
+
+# tests hang
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package acl ACL)
+		$(cmake_use_find_package handbook KF5DocTools)
+		$(cmake_use_find_package kerberos GSSAPI)
+		$(cmake_use_find_package kwallet KF5Wallet)
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	ecm_pkg_postrm
+	xdg_desktop_database_update
+}
diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index 581c745012a2..d599ad1428bb 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,2 +1,3 @@
 DIST kirigami2-5.74.0.tar.xz 282820 BLAKE2B bd3cbdf3b98ee88518a9347180f59fb7cdb262fa6acf824da1de3103c516213a42cf106425eafaf497cab5be15f91bbf9dc4f3e10c7464cce19f0e0b564b4f4d SHA512 43059bc682e2d729a0a926e26ce5ba68947f275ffdd74836c124d9e063273429ccde8c0cebaef53168c46cfd62f41cb2c33d86f1f515ca619bde604aa7f5da5f
 DIST kirigami2-5.75.0.tar.xz 285656 BLAKE2B 2a70b0092c112ca6bf8e9845b705171d7c127bda61a341d459c005f29ceee0473b6d6a831a6836fa782054412bb53bbcf855fefdde6444e9337f703e5e680285 SHA512 d1b2468bf54a4d890b7797656aaac5357067759b06ba38e1d72c036bc044cfeeb0dd32a125e1a0461b743e3f6c8dc57ebbc826b02ee73e566bd42e86736ef78d
+DIST kirigami2-5.76.0.tar.xz 294552 BLAKE2B e23993deae0af0875f001291ccf4766db9a98376443634cbd9a49c6ecaf0f5fda44d858b74e9ccfed9cb0ee2a34dd566d80e1d5ce8b32f8f7142d332364f2d47 SHA512 1728b77d799fac8727baa9e7678252b8144c4716c752d9659c94c6e6c659a9289c6d41ecdeca00402810b80e34ca0e851a9615c5863bc43e4ea4cda6c92ad245
diff --git a/kde-frameworks/kirigami/kirigami-5.76.0.ebuild b/kde-frameworks/kirigami/kirigami-5.76.0.ebuild
new file mode 100644
index 000000000000..f936381eb1f3
--- /dev/null
+++ b/kde-frameworks/kirigami/kirigami-5.76.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_EXAMPLES="true"
+ECM_QTHELP="false"
+ECM_TEST="true"
+KDE_ORG_NAME="${PN}2"
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
+HOMEPAGE="https://techbase.kde.org/Kirigami"
+EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="
+	>=dev-qt/linguist-tools-${QTMIN}:5
+"
+DEPEND="
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+"
+
+# requires package to already be installed
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(usex examples)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kitemmodels/Manifest b/kde-frameworks/kitemmodels/Manifest
index 8cd29175c449..6229d1ef3cda 100644
--- a/kde-frameworks/kitemmodels/Manifest
+++ b/kde-frameworks/kitemmodels/Manifest
@@ -1,2 +1,3 @@
 DIST kitemmodels-5.74.0.tar.xz 398592 BLAKE2B 354e3b4c84bc07476cfd919885fc366741585153ce6680fe2ad4a44aaab05552ffd31538f0f2e038592b46cb1147c1a9a5cc57b7a22aa1b68c7741302d4004ce SHA512 f160c9dfb81bf1d835aef2930a7274ca22edbedb31a6423d5989661eb84bf958077f0ef24d63fc74f87a2c0d18b8f96abc110e3a40aa062f72d8c407b5f0d9db
 DIST kitemmodels-5.75.0.tar.xz 402820 BLAKE2B 0f1b142cf157a8fce5736e22af6adfd366e7a17ec057b7aae93cbb535d706b4c0f70ce7d9107e75da7f73b44d993a14f85f1ab2fdb9236e9d432396b9c5c2089 SHA512 bc78fd5931758562c6dc3f0f9826d638a81f6ae891fe9a24dffe1b85b04c0ac880a65785ffaa9ca1b1262d27649bf1762021288fbc3b1d9ee87473fe62947b7a
+DIST kitemmodels-5.76.0.tar.xz 403236 BLAKE2B 122e478980327a21f5b1ae661f3f2e0697d1d6b7d30afdffc0df4f20aafe5ebdf375ce0de0eb85856349a9276e0b1d8de51f6b8d0b8cf80eb070d2a94fc763e3 SHA512 7af9ea740501946b3166dbb90b2c3f2fcb0a503e95159e22b57dda7c5cdf9e24f50532025ca8a3f7a5608c3cdb54e5ee8d26f2cff9caab38d6032a103ddc94cc
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.76.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.76.0.ebuild
new file mode 100644
index 000000000000..1d7dce561973
--- /dev/null
+++ b/kde-frameworks/kitemmodels/kitemmodels-5.76.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing data models to help with tasks such as sorting and filtering"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="qml"
+
+RDEPEND="
+	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+		$(cmake_use_find_package qml Qt5Qml)
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	LC_NUMERIC="C" ecm_src_test # bug 708820
+}
diff --git a/kde-frameworks/kitemviews/Manifest b/kde-frameworks/kitemviews/Manifest
index c6d475786dc4..5568929c2867 100644
--- a/kde-frameworks/kitemviews/Manifest
+++ b/kde-frameworks/kitemviews/Manifest
@@ -1,2 +1,3 @@
 DIST kitemviews-5.74.0.tar.xz 75312 BLAKE2B 44237a0f403ed58c1d31038103b81eb31b339c26e729fd4399666b90f8fc59b117ad6dba59abbb2935d4922f71ee9267e8d98c9255aef0785d17fe51b440fc84 SHA512 873786ec95177b29be9456c39fbf77eb04f56b0dc48cc3dd6e6377c77eb5bfea493b9f044920267fc5363d6cff86610ef4a431f45427771aacedc580859d9503
 DIST kitemviews-5.75.0.tar.xz 75200 BLAKE2B f0064fafec5931f5912aa7daefd6cff2743d6087e0bc331d82b92cbf9a150c7b29cac5247277d3c1f82e086dc3f7642608c5f8ecb702e7b4e280c6f0ec23af3a SHA512 7ad9c6d12cf91eefbf16842adbd5b4d1d22fc9263727df11778af6133d0cddffd4f5649976ca8d820410a76d2790efa8049a0f90fb72140f26fba98521d40a52
+DIST kitemviews-5.76.0.tar.xz 75184 BLAKE2B bcece04bf905d779419572c6d6938588b07e888a84151ec8cc2c12be382117c47640b1ebdacebfceab60946c399e6af031d44d7146c2270293f61092cec6f714 SHA512 1dfc3c0a67924ad54bd19b08588c061e9fe5f7b6abc064d00a9954850fc16f8348bde400af91fd0d788a7bec832e3b898f389b313c17067748386609d5ce3fe2
diff --git a/kde-frameworks/kitemviews/kitemviews-5.76.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.76.0.ebuild
new file mode 100644
index 000000000000..f4c547af311d
--- /dev/null
+++ b/kde-frameworks/kitemviews/kitemviews-5.76.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing additional widgets for item models"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest
index 26c36a2a05e1..60d9fe810b9e 100644
--- a/kde-frameworks/kjobwidgets/Manifest
+++ b/kde-frameworks/kjobwidgets/Manifest
@@ -1,2 +1,3 @@
 DIST kjobwidgets-5.74.0.tar.xz 92448 BLAKE2B 329b2ffbd22a80a01750414d83ece87ce3210b88adf9045c01aa78ff399ca238bf533631aab4e7388010180c5183e300e597e6dfeeda22ab614bfe94230eb757 SHA512 0f7c16f360627b133e101e340e67aa22959b8539581f7495bb950e031ba69e931d6a3a2619b5f6f0c0d5164b6397b2edcd4afb8c8b2e4874477547dd200bee48
 DIST kjobwidgets-5.75.0.tar.xz 92304 BLAKE2B a612a024189a7e5f6fa44b8ba87ded01041b6c631a0bcdf717e95d56ec5f27e6f452a3677e297bf72e0217746ce41d3ca50aaeaf1d48da12e252787f5bf41f4e SHA512 2a3d661ae6fdfefa1d66a4d20b85a5694ebe685d47100b7792019674f0cf5bc3e93dd8d0bfa0990e5b831810f202b51e44d03dbefd7ad7331f62d47368b9fd66
+DIST kjobwidgets-5.76.0.tar.xz 92300 BLAKE2B af0ba9f85021ceb4df176a4259ca0bfbf4c8f93baf1280e85d33d05cd04d4b9e4dbfedf14a668dc7c9af22e7e20c1638d38be5ebcf221728880e8ea6c59e2f00 SHA512 9eb2e1ea9509b8892b37ad4e30c3134e61c958c8487c107935de3bea37a43cb2ce2fa4f3a897674c47949fb4013e0854de452e2e66bca2f7af16a6f4b14cce08
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.76.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.76.0.ebuild
new file mode 100644
index 000000000000..61092f71e925
--- /dev/null
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.76.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls X"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libX11
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kjs/Manifest b/kde-frameworks/kjs/Manifest
index 3917f1b30c91..2553ec5ebb50 100644
--- a/kde-frameworks/kjs/Manifest
+++ b/kde-frameworks/kjs/Manifest
@@ -1,2 +1,3 @@
 DIST kjs-5.74.0.tar.xz 337928 BLAKE2B b640441def9c8cd03a960fd0fdb99dc58f80751e7149dc817a8570da3146cf9099ffa6fc5c09fa10be040e7cec818ce05aebdd00c4ddcd4520b6d31290e12b4b SHA512 2b592547048dc7ecd2546e02adeeee20693e5f403e7efb9c8a134aefddb1a105e5baf4c7c55e1d3c3e60072cf0f4c17631c4a7d4c1760641114798a1da0f07e1
 DIST kjs-5.75.0.tar.xz 337932 BLAKE2B 4eabe1f3cb26661870af56a48490c1a714e57f519e1e4cc377b61ebaa78c1832b7cb90d361139431792fb689ef7eb4b38ee0deb381d85a073383a97d8b3f2636 SHA512 7ca5881f7fabc775cfc0c6cfe9365b1973ff4a5b6fb3595e586b9577d3414d894707d3a010469b84a9018dca3ff8fd52f800055fc9c6677b7af9c1b5ad1cfb58
+DIST kjs-5.76.0.tar.xz 338036 BLAKE2B a09556633a94f4a3d6ceeeff61dbc76c07196eb8ab17c8a859a5b0e64a1badfdf0e64ec9be7674c14c6d71bb81ab90be396478b2d6607c26adfb9aef1db55e39 SHA512 5b9d1538e390647f21da6af9d1d7647769011523362c2cb23f651e75cbbc9e2e221fab57a75759c24cda08818876688f851fbd6f6da63d505589c308aed45a9e
diff --git a/kde-frameworks/kjs/kjs-5.76.0.ebuild b/kde-frameworks/kjs/kjs-5.76.0.ebuild
new file mode 100644
index 000000000000..19f013d45495
--- /dev/null
+++ b/kde-frameworks/kjs/kjs-5.76.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_QTHELP="false"
+inherit ecm kde.org
+
+DESCRIPTION="ECMAScipt compatible parser and engine"
+LICENSE="BSD-2 LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="
+	dev-lang/perl
+"
+DEPEND="
+	dev-libs/libpcre
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( src/README )
diff --git a/kde-frameworks/kjsembed/Manifest b/kde-frameworks/kjsembed/Manifest
index 744285414252..7ec5e70f8ed9 100644
--- a/kde-frameworks/kjsembed/Manifest
+++ b/kde-frameworks/kjsembed/Manifest
@@ -1,2 +1,3 @@
 DIST kjsembed-5.74.0.tar.xz 171200 BLAKE2B bd45deaa18851bbbdc1b504dad5e9725ea6877a68e47f44f1ab98664f9bdb9a3279f92d6b81746d83fb0c12953a221a3987e19830d123f33946b08e1e5982509 SHA512 b9a317b62b4605effd59a24b55e37155adfbad0b802c885da666e7e9560ad8f7ed3ce65ac49622f47c185190394d722b73d5888077510e6e616c8ddcb92160f1
 DIST kjsembed-5.75.0.tar.xz 171200 BLAKE2B ee9dbd8ad3a259ac8f965d01c930444d1eb221d0df7290b3e076ad2d51fc39bac95dfb7db030bee7c93d918b39323a2f0f68e576de56b64c5c1541678032da1e SHA512 7c4932585c23431fd7069757d6237d9b612139ef9e2b48040233072b214fc55a183b5ad1dbc90c8f9e637c9d2a12a878445fabc79fdad0b1659d9bba1a3f21a0
+DIST kjsembed-5.76.0.tar.xz 171384 BLAKE2B 22b2593acb3c5cfb08639a8eba34c35953baf0c374f0d679f8668ee2f02d811e33f9ef370d788fbcd1f634e75cbd59e169a729f90e57e1439dcdddf977f4e10f SHA512 fc0c3b08575524b27af59c2d8976749bc2f0aa02f73639d87f1356f8facb6b4b87f9a88b6812be0cc804525742dd79ebf00128956e1bb9d3e5a56285cd3fdecb
diff --git a/kde-frameworks/kjsembed/kjsembed-5.76.0.ebuild b/kde-frameworks/kjsembed/kjsembed-5.76.0.ebuild
new file mode 100644
index 000000000000..493cf0ae1c1e
--- /dev/null
+++ b/kde-frameworks/kjsembed/kjsembed-5.76.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_QTHELP="false"
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Framework binding JavaScript objects to QObjects"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kjs-${PVCUT}*:5
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/designer-${QTMIN}:5
+"
diff --git a/kde-frameworks/kmediaplayer/Manifest b/kde-frameworks/kmediaplayer/Manifest
index 51f6328669fe..a1bc544bd046 100644
--- a/kde-frameworks/kmediaplayer/Manifest
+++ b/kde-frameworks/kmediaplayer/Manifest
@@ -1,2 +1,3 @@
 DIST kmediaplayer-5.74.0.tar.xz 9648 BLAKE2B b0cfe327720e9dc5c13bc1b79be87655ded29fcd1c3d50c49bc13ba31dd26aac2193754f8cbb690e682d6188e4502a0f03642d6ef989b1948c72b15575b93c06 SHA512 e7d0ba3d2720b9d1dc99cf4f4b11ab2f7c949181d6f1a8bd83ab476d248a67c4f6440e7786b26424347c08b3b8e03fbbf3de1184ce09a7071de501be452eec4c
 DIST kmediaplayer-5.75.0.tar.xz 9640 BLAKE2B c57225a612e00b1fc9d3faa07ec76dab68bd6a900e87ed064075179df51700cd6475c3ae22ea7e09c2d829960e905b0be861489a9f1fcaf99e33e550396b51c0 SHA512 cbd2e184e83691784fa7640c24543e3d6857b5b6fa8a1caa5994acde1e46dc341cc442e97661cfd0f95de65231f445f3cda9ac10354990090f8cd09dc5d09df8
+DIST kmediaplayer-5.76.0.tar.xz 9648 BLAKE2B 61831cc8ba31b3ae661e51b74a04e27d8e0c902915141efcfce97e20c8880965358b28a5117e941bccf360e0cba5121132b1909d4f61bef4e1e181b7afbb3a3d SHA512 67c21ce11648438643aa7c76893a378c4eaa46501eb9e07983f316efc9f4e0f0bc73b07c7d23c960780bfe60c8818a2ba635edb39d08ceb70684eb2db40bc0f1
diff --git a/kde-frameworks/kmediaplayer/kmediaplayer-5.76.0.ebuild b/kde-frameworks/kmediaplayer/kmediaplayer-5.76.0.ebuild
new file mode 100644
index 000000000000..b54e793cd875
--- /dev/null
+++ b/kde-frameworks/kmediaplayer/kmediaplayer-5.76.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing a common interface for KParts that can play media files"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kparts-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index 6f026b39787b..7381934d74de 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,2 +1,3 @@
 DIST knewstuff-5.74.0.tar.xz 1143920 BLAKE2B f36956a82bf92960ee78ef61b272363de52b0be4acb2701fa1ad1494a7c05492fac79349b49a998549d2dd7f1c93406daef5e06f8fd28758aea460f667fe3b3a SHA512 038af364cf048035bc2d1a505e4f4c8318fd90efbfdd9c2fdffd9c22b1196a29b0d153643e838a98d472c19094e994a55983f84c63ef50f47574013a8b9f697a
 DIST knewstuff-5.75.0.tar.xz 1142012 BLAKE2B ab648588dd0039ac48194836a6cc572a1d1fccb7d5e2d3a1ad2569d8d89e122edc91581d1babd18d004df528c7efa26dfed208fa9c40f965d4be8cad73c8c2aa SHA512 612562280ff819e1b68cdc5aa7aec7f0b14183e2906e59d08ed038c2c5166a80ce888075c6e0ddb2a7e5c7638fadf430948767c514a64a8d0800e77c66ef3a99
+DIST knewstuff-5.76.0.tar.xz 1143008 BLAKE2B d219af46d136637eef83aedb055a00489c2b13da5fd3b1e382dadfbbe9f2a31dc1555279b070c571ea4e59b00a0ca0f3df8dd316c9c7a48a8656d0255bde1950 SHA512 118e04bcc83187709c8ce2a85974feb3654389cd02955d86955fd36d50613753dfcc178e234155ccdd1f77911b7129a22e05291f108ab5d6025a37e4a32c28fb
diff --git a/kde-frameworks/knewstuff/knewstuff-5.76.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.76.0.ebuild
new file mode 100644
index 000000000000..96d2ca852d9f
--- /dev/null
+++ b/kde-frameworks/knewstuff/knewstuff-5.76.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Framework for downloading and sharing additional application data"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/attica-${PVCUT}*:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kpackage-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/ktextwidgets-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kirigami-${PVCUT}:5
+"
diff --git a/kde-frameworks/knotifications/Manifest b/kde-frameworks/knotifications/Manifest
index c9a63b389da8..f4ee00f3d94c 100644
--- a/kde-frameworks/knotifications/Manifest
+++ b/kde-frameworks/knotifications/Manifest
@@ -1,2 +1,3 @@
 DIST knotifications-5.74.0.tar.xz 120668 BLAKE2B 114978dce5de16aa8c78c59cc844a45bd60df135f918ac8f20a0ed0fc1d65384ce02a1d9f9dc38bbb6a9de58eea953a7152eb2309184973e326b0e454f4782e0 SHA512 a44d0b0ebb7e825adc8c0c5b99f999769149cb3a12c147b81570737736030449136f86b9934b3b2287131f3c41f639c8cba92256ea1ebd39f5083fd6b7158bff
 DIST knotifications-5.75.0.tar.xz 120864 BLAKE2B fdf01b2c33d9b8a32345bf2558f3c142e5059b611c532dc742dfbcb50d0cfc008dfd2f4f4db950c9fb255b5de9e568a9549902f8c39a2ad121c735d0833c20a6 SHA512 26b9599dea6a317e1a838555af19fe0c8ab9bd80a8fc6d6694fb974af32d48f1ae7023b6f58663fe7a176d1c0db9dc8786b600c11b4db9757cd69e07fcda49b8
+DIST knotifications-5.76.0.tar.xz 120212 BLAKE2B 4a412db500736a8fff16b6caa47101c326f32924ad947e72bdd8e816d1c774a47655ba8c38527b358b07b4dd222adb3a33538e49420ab8e67d8e2e9e9c939fac SHA512 daad5e8164c08847c625928d9d126b03c7ba6687daaa1da20e025502a1d66d781a5592181be9d9e9763ca7f20fa635c3376e250e9f206e0295cb54fa5c770b22
diff --git a/kde-frameworks/knotifications/knotifications-5.76.0.ebuild b/kde-frameworks/knotifications/knotifications-5.76.0.ebuild
new file mode 100644
index 000000000000..09c2193bbc46
--- /dev/null
+++ b/kde-frameworks/knotifications/knotifications-5.76.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Framework for notifying the user of an event"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="dbus nls phonon speech X"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] )
+	!phonon? ( media-libs/libcanberra )
+	phonon? ( >=media-libs/phonon-4.11.0 )
+	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+		x11-libs/libXtst
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package dbus dbusmenu-qt5)
+		$(cmake_use_find_package !phonon Canberra)
+		$(cmake_use_find_package speech Qt5TextToSpeech)
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/knotifyconfig/Manifest b/kde-frameworks/knotifyconfig/Manifest
index 791bbc4e1e99..5c482e96878d 100644
--- a/kde-frameworks/knotifyconfig/Manifest
+++ b/kde-frameworks/knotifyconfig/Manifest
@@ -1,2 +1,3 @@
 DIST knotifyconfig-5.74.0.tar.xz 84364 BLAKE2B 3745f0ccacad9f16b05d89a9451d1257a52ccc28b656e83dd7031c5d2951620dc745ca43895213a2b1c2788260387807c1de30712f40ebb93091b5fb2cab59e4 SHA512 73957b4977ebccc47c53fa65c6352ff333af7a170a55a6021e5426df3715c167a43170fc6d82ee7a452246560cc57a976341a013c9ed7afc243b74a18c755ffe
 DIST knotifyconfig-5.75.0.tar.xz 84440 BLAKE2B 335f2f683d8c4fc3bf4b04f89306cff369f98298cbaa17c78e9ffe8fb6a21ddce8668bbb8ef52d0b528a56822f7df74cb083149151081e4434b51129304e8965 SHA512 e3d1d47a7d52532f263b4a8e6e187cdea49d3ba99c48f201678d1c308a678426895fb1fad72716c3988d7fda1c6e4e0697e14b6bc341cb605cc4e1cafd8d4b7e
+DIST knotifyconfig-5.76.0.tar.xz 84452 BLAKE2B 20f837bebfa21edfd9a4333ebeeb867a0b4589bb0c5c42c10f60ca95d9c6d0ef1b3b426fb80001943d4bf511a531fd0429bca07f918b5c57a284abc84db96480 SHA512 96546f84b8e55e620bb9d2d836bd28bcebcc315a9a974b5a3ecf480ddd9d5dae679c11280f18aa0306cdaae722f2fed66a36eada81c21cf3b9720634799c37af
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.76.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.76.0.ebuild
new file mode 100644
index 000000000000..16f33b960e26
--- /dev/null
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.76.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Framework for configuring desktop notifications"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="phonon"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	!phonon? ( media-libs/libcanberra )
+	phonon? ( >=media-libs/phonon-4.11.0 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package !phonon Canberra)
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kpackage/Manifest b/kde-frameworks/kpackage/Manifest
index f6f6baeca895..4ef6362400a4 100644
--- a/kde-frameworks/kpackage/Manifest
+++ b/kde-frameworks/kpackage/Manifest
@@ -1,2 +1,3 @@
 DIST kpackage-5.74.0.tar.xz 140364 BLAKE2B a1e61eb9dc8d70edad144fd8c09ef4a6d86d3bb58835d21e2f95ab4ad92fff593f42699342253ed779dc652719d6ed8bd38e43e84d2d4dbf13f53a6f3946679f SHA512 93790ed0cf527c93b2ba434ce0d4e753dcd31ab027c86e69d65a6f8075771b7d4b9ca9628a5164d1ff5aa4a69f84f11093df8f8d63f284127e2943aa8e443e72
 DIST kpackage-5.75.0.tar.xz 140376 BLAKE2B 3d6291ce647e8527c2a077273614a4311d472e1f6f076cb8bb45949cc232f799e297ad8f81f3370daf69cb462900523a4278b825917d02fa4570cdd266486c02 SHA512 cd424971d7cecd429e2d93acd1cad87e5eef01a97328c3bb5e6f664fed2a05d6834738966de3f0919c1afa81069041936646bd2b662345bd86252111c8fd85d4
+DIST kpackage-5.76.0.tar.xz 140352 BLAKE2B 0784c0694d262cacf505d8e37a051ff2a7b6d5335e38ebfb97c204bb65d2471f93d08a0c64d6a59e4e9f4c40ce7551c20387097ba7ef8f03523f7ddce6343c45 SHA512 edee46213f94dbe63a069b04624b7f634b2203f7feee5b6749a88a6af37000b94344acabf62d0b99fc481b510a98a2abc8e7e4861b0d46fc630e7a38b81c6d7c
diff --git a/kde-frameworks/kpackage/kpackage-5.76.0.ebuild b/kde-frameworks/kpackage/kpackage-5.76.0.ebuild
new file mode 100644
index 000000000000..ea6080139d80
--- /dev/null
+++ b/kde-frameworks/kpackage/kpackage-5.76.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Framework to install and load packages of non binary content"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="man"
+
+BDEPEND="
+	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
+"
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package man KF5DocTools)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	#bug 650214
+	local myctestargs=( -E "(plasma-plasmoidpackagetest)" )
+	ecm_src_test
+}
diff --git a/kde-frameworks/kparts/Manifest b/kde-frameworks/kparts/Manifest
index bfea4587815b..70363328194a 100644
--- a/kde-frameworks/kparts/Manifest
+++ b/kde-frameworks/kparts/Manifest
@@ -1,2 +1,3 @@
 DIST kparts-5.74.0.tar.xz 190144 BLAKE2B a78bffe9807a7cf6c2368578c94dfe1056e3ed11b93f81406b0bf849ce2a6bea76eb4d5a46282941a5d43710a44b9965a5d9a46492a5c48a7fc5dafaf854e902 SHA512 477dc2bbb9f66ad9064d362e898072c3b33a59267ec46627c140cd0784858b1d2b1c2eddfe7addf50356523e86e37f1cc138c4e73ce80c61eb96711fceec86b0
 DIST kparts-5.75.0.tar.xz 190104 BLAKE2B 4945038727928ef08650deca7a3c7a9ca15fba21cc36c3da7cb2a2980d2e8744a3b14f2c13d8ea55aac96df87cb48d833c50d27ae5cb1c935351bb07550b5c24 SHA512 b7e232c00f6d6be6b0ed0a65b17f857b1e11fe3da3fd6d0cc836e06423c163cac4a56c8b00e48df11e1917e00567cad01eece994b1e4e14cfd7f7ad1215d73d1
+DIST kparts-5.76.0.tar.xz 190236 BLAKE2B 67f479a0bfa84a988182e7aa00b6a5b2217c01279978f78f22d9759ab27859b5763599091860f2d9e34eeeb64176f35bc41e299687cd5773f2c183790a13913f SHA512 4a419f7bbb30616681818ba69c07938bc36ed2b911a69c6d660b1f633f42fb712d97c7fbed2a43ce23901fdd0aec1fb89a08b6c503c95aa352836efb3a210724
diff --git a/kde-frameworks/kparts/kparts-5.76.0.ebuild b/kde-frameworks/kparts/kparts-5.76.0.ebuild
new file mode 100644
index 000000000000..9622cfea1f56
--- /dev/null
+++ b/kde-frameworks/kparts/kparts-5.76.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing elaborate user-interface components"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kjobwidgets-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/ktextwidgets-${PVCUT}:5
+"
diff --git a/kde-frameworks/kpeople/Manifest b/kde-frameworks/kpeople/Manifest
index 889eee7e09e0..9e150fd2e63b 100644
--- a/kde-frameworks/kpeople/Manifest
+++ b/kde-frameworks/kpeople/Manifest
@@ -1,2 +1,3 @@
 DIST kpeople-5.74.0.tar.xz 61664 BLAKE2B 96155d2501dad4431dfb372c5fa78cecfd95bf17251bae489d272ddcddceb5c4ae7aa564484fe9e3d3d73b83d265c98246ef9bfbce5f523e70cd85ec52489907 SHA512 c85ed5e3010d25153957159f6bda46882dbe806b9029aeeb5326ecde6b8e4f3a43bd37a57104757563f1ee7014fb216385c962a25bc0438cf4633bb4b41016cc
 DIST kpeople-5.75.0.tar.xz 61624 BLAKE2B 46861e64b6018df6b560435a50d8c9f4033c430485bc7915cb53e806a708670a8d6aa53b3fec404065dec065c59b749dca3fb591b894434042deb073ad7bec7a SHA512 09e29020ce50c975556cf2488c172778a8f653b370ec9de9e294a9a795c8221387d8186dc68b8c80f8bb8adcc128d9a4109348184684f0d4af70ea55cf595e64
+DIST kpeople-5.76.0.tar.xz 61648 BLAKE2B e55c8983a1baf9ee433e0fef26586abe04e30d9a849b82257c8e52b0d3dd9ff16c2f26cd82686677df71f233ffb368b921e05e4ef1f8486df0879e5b12461173 SHA512 74f2448c3f26ff16d52a0f72a6ba5748a8f46dcc41a131795c8fbe78086bbcae4f9def512f36308a6708bf0c1dcda0886149daec73c4100764dc87be0acf2e0a
diff --git a/kde-frameworks/kpeople/kpeople-5.76.0.ebuild b/kde-frameworks/kpeople/kpeople-5.76.0.ebuild
new file mode 100644
index 000000000000..ebc429ee5578
--- /dev/null
+++ b/kde-frameworks/kpeople/kpeople-5.76.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE contact person abstraction library"
+HOMEPAGE="https://invent.kde.org/frameworks/kpeople"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	# personsmodeltest segfaults, bug 668192
+	local myctestargs=(
+		-j1
+		-E "(persondatatest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-frameworks/kplotting/Manifest b/kde-frameworks/kplotting/Manifest
index 7e4e481c1e37..6761a25f2f16 100644
--- a/kde-frameworks/kplotting/Manifest
+++ b/kde-frameworks/kplotting/Manifest
@@ -1,2 +1,3 @@
 DIST kplotting-5.74.0.tar.xz 31104 BLAKE2B 63434d36d0b67eddefb16b136cf9d608ba3ba0cfc1d9901bc8ee8b621fe18a0749f9522355d6d76130f41f5fd4ea6b6457850d715f3779fd7fe48cdb06a9f7e0 SHA512 54559904c8d2a5ce6827aee23587838c97aff173682652e192e0e180d6643ec98d4dff6e85e89baa7fdbb92e5b8f99079beb300c3f71c589bad8cc2f21bd7426
 DIST kplotting-5.75.0.tar.xz 31104 BLAKE2B a217f06dce8777234894000c6b7f123d89d83ea6397115efe3bdb4393b0398f8ef62c782c003d82415678f3385a2f953ca2f62b4b4b343502a54068a2725cd47 SHA512 ee69491a9326169b032b70de5bad6eda164786b492a81854ec70caf3b6e548acc784d5d89aea26e4682845540cd0457ac4598da4558b879478ffc829b4744d95
+DIST kplotting-5.76.0.tar.xz 31092 BLAKE2B b142b53b5b74b31339adb725a9a3c345c4c8ef318340eb1106c310f6b0065a2e65ebbce09e30198f735e2902814a27d382ca44c655cc23fd7384a1e478e7b746 SHA512 1b2c658cdf00dc1220bd75622547b0012684ee59c062040a26a69325f68e3757946ccf5f5cf22442491f6d611781e0e6c1b56bd44007925bb774bc138337676f
diff --git a/kde-frameworks/kplotting/kplotting-5.76.0.ebuild b/kde-frameworks/kplotting/kplotting-5.76.0.ebuild
new file mode 100644
index 000000000000..d52280ca197c
--- /dev/null
+++ b/kde-frameworks/kplotting/kplotting-5.76.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing easy data-plotting functions"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kpty/Manifest b/kde-frameworks/kpty/Manifest
index 66a592e4341b..2b45083d84bc 100644
--- a/kde-frameworks/kpty/Manifest
+++ b/kde-frameworks/kpty/Manifest
@@ -1,2 +1,3 @@
 DIST kpty-5.74.0.tar.xz 57000 BLAKE2B 92e1f24eaf0002e6a0a255dc9f32488868c1b0597702bdc64f3c66f944717e6bf669a33a1e2432a76a765ad020adb4f1a4244a4af91a8adbdb79bb486eff4468 SHA512 2fda1f9598401e3993d4a0ad1988e92856e4c6b3b682aec0e57cd6434256274a31da43d44b0141531d61fee64120511dbe844dbef9ccf805307f33c9a0d60172
 DIST kpty-5.75.0.tar.xz 56972 BLAKE2B 102b7901ea509c42a35614cbe3ea3e247c5e881d113c6567a39b513cad50cc4e100ac0729239ff0ae97356f67633c4e4f5d8bebd222b9ba65451a8f3593d7a70 SHA512 4562258eae82093e0d3e4f3bd0762170167b49f3af50eef06bbd9581fde152cb5834e653db8947d5afc9e8ebd3657d7b7b22fdffb090d94eb310809352bcb144
+DIST kpty-5.76.0.tar.xz 56152 BLAKE2B ad5516856515b4053ab1f9022e4004d889663b5579fdd10bb29b8941ec88ec6bb2218ef541c5a90a7ce7b418508605c7112173a95b6b1a0bc06110b498c83d6d SHA512 b6666001ad07299f88f62c9c43c42efc14d94894fea7b95d6280b68960cfd27bedfe2a099fca25f16cea16570275a4c7a843fbfe54be39f0cfb087bf41a70fb7
diff --git a/kde-frameworks/kpty/kpty-5.76.0.ebuild b/kde-frameworks/kpty/kpty-5.76.0.ebuild
new file mode 100644
index 000000000000..11aa24e729ea
--- /dev/null
+++ b/kde-frameworks/kpty/kpty-5.76.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+inherit ecm kde.org
+
+DESCRIPTION="Framework for pseudo terminal devices and running child processes"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	sys-libs/libutempter
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUTEMPTER_EXECUTABLE="${EPREFIX}/usr/sbin/utempter"
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kquickcharts/Manifest b/kde-frameworks/kquickcharts/Manifest
index cf1bc7597b2e..58015f97283f 100644
--- a/kde-frameworks/kquickcharts/Manifest
+++ b/kde-frameworks/kquickcharts/Manifest
@@ -1,2 +1,3 @@
 DIST kquickcharts-5.74.0.tar.xz 96148 BLAKE2B c5a18d1a74ccc545d8f71736e8fa1ebf05114cbf466f980e722622417df0770eccaa8d086cf0ed4097e67cc36cf6264d38bc2c72a0b1e162a1d01cd5e9d2b7fa SHA512 873b5d40b20c995c5cd0ad7e5303dcf29083a8e7bef42f7e5370638e5589728df95fd074de00f7f5276c46a37a37b9b31c9722229d660e024041a8d99ec29e2b
 DIST kquickcharts-5.75.0.tar.xz 96208 BLAKE2B b9a09f2657ed08fd9fe2937d940a390b810e68022f682abbbc10731d6b85219e25ba1cc7bf4d0501e7a931de133cb914547eb4da38760309948a50a251b88f94 SHA512 12e9fa5f26ead139eb6ded98185263e60a3e4cf480eb5b5fa9987b241e52b8bee7055aeeb91b9e53def2c1c9c9f3f1e7fd69ac17383bba51112d600269eaf317
+DIST kquickcharts-5.76.0.tar.xz 96180 BLAKE2B 3ff7f82c08586e603fa52e4d71befd91c4cd18d6484c9e4b2299ee358a95307fc0ae3944cb0ba9aa8f0da4a71a2c4fa3d10754be10da0f4c92a3ff75ec67c6d0 SHA512 78f12114682760cd3dd6f2191130381130dcf7aa05320112be5145bbcda729b30d09da106cc68473bbe7a2a9e81ed9f0bc8c8eb5ba116e3dc9166ceecc572ead
diff --git a/kde-frameworks/kquickcharts/kquickcharts-5.76.0.ebuild b/kde-frameworks/kquickcharts/kquickcharts-5.76.0.ebuild
new file mode 100644
index 000000000000..5a8964f9cd78
--- /dev/null
+++ b/kde-frameworks/kquickcharts/kquickcharts-5.76.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_EXAMPLES="true"
+ECM_QTHELP="false"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="QtQuick plugin providing high-performance charts"
+HOMEPAGE="https://invent.kde.org/frameworks/kquickcharts"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	examples? (
+		>=dev-qt/qtwidgets-${QTMIN}:5
+		=kde-frameworks/kdeclarative-${PVCUT}*:5
+		=kde-frameworks/kirigami-${PVCUT}*:5
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(usex examples)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kross/Manifest b/kde-frameworks/kross/Manifest
index 60ce0644ed48..408579194b11 100644
--- a/kde-frameworks/kross/Manifest
+++ b/kde-frameworks/kross/Manifest
@@ -1,2 +1,3 @@
 DIST kross-5.74.0.tar.xz 128440 BLAKE2B 33a8f033e9288b7980162a80dd0d6f3d3b011082847e1e2592a93898f508566511bd50d82595406198cc8d8bc6d2c44d62741526237efb36567d0ea73465f258 SHA512 0fd08d620d90f78ad0ce62aaea372dab4ad4df17533aa29fc1d86b718d0c7ca19a691298498b59a1d0d057eae902ec838f68f5238b482c91d568595543964456
 DIST kross-5.75.0.tar.xz 128444 BLAKE2B 75d314d7712649865407934e5977b007f37d4e4c377c04f7270cec02ddbe0e3be976be2462d7aea41947003c436d1502f38fce2e5dc2c3160d81a18d9d822e41 SHA512 0acd67a68420b17e6030f3f08098e71e37a8d1e826b15038ffbb844782061167ab66e976a7a577da1180e62b75ffcaa1b24dc65e65ea5cc89491ecbedb0550fc
+DIST kross-5.76.0.tar.xz 128592 BLAKE2B ad806266769c768198030c546260d43163a352f7efcadc241d60622ca2f9041e256220f9e0b1edfea0dc7d2454c82bb641d233d9c388504e1d8797b83892ff7b SHA512 2e8c071eae816ba8f8426cdb57844fe06909382946cf46f3a553a393eefb7c16452a5d3d39059a763e6eaa3b682ddee2a0218c6f7f962879ca61f2e5db27f1c5
diff --git a/kde-frameworks/kross/kross-5.76.0.ebuild b/kde-frameworks/kross/kross-5.76.0.ebuild
new file mode 100644
index 000000000000..36bf6f6b090c
--- /dev/null
+++ b/kde-frameworks/kross/kross-5.76.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for embedding scripting into applications"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtscript-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kparts-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/designer-${QTMIN}:5
+"
diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index a5dcdc316e98..318fd05fa128 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -1,2 +1,3 @@
 DIST krunner-5.74.0.tar.xz 67892 BLAKE2B a64ade87c1785781e1b73aa0c7c150bcca75eed66699111b23470764602675ed53753dbbf31f895789c9ba51113092b76bd0ef27ba786d6ebd9848addbbaea1b SHA512 504fb43acff3337920477a8f67e995a79bdc9e3816e8a92ff5f259a6e50201e4a4edb90cc483a7496daa87c26e39597ffec2b91fd9b315850ace4677f9ac0796
 DIST krunner-5.75.0.tar.xz 69792 BLAKE2B f24e6ca6d53936ec4f764cbde4352b58d395e09036a93bbe6ec9cf7e0984b7e0e3f0594aaea616e3ba302286d5f8876ac60cc4ded04cec34da6f0f56f6bb7a3e SHA512 885577623a529aca79d4b6dae1224c3a4e47f3f88a80a2c9065603b8305a8eed1239feb413961f54b49d0cdf7cdddd74990f577e4a716cf8959a44c0269ed581
+DIST krunner-5.76.0.tar.xz 70132 BLAKE2B 1f2f8dd0c1ce581ce36ab871fc45193e023becc1eea1f03055e6a894f0ae9a5626ec14a6efa96e4cd55029817ae9c42ad4f87b0e2b6477065428660b9234facd SHA512 93a4992f7fa462dcbc86db53e292ea49ae6b080cddc5d02bcd035e818464389f0212ab8d5d5f2a5a23a617b7bc3b3dcac77e8b8b4f81469b36ffd411579f310d
diff --git a/kde-frameworks/krunner/krunner-5.76.0.ebuild b/kde-frameworks/krunner/krunner-5.76.0.ebuild
new file mode 100644
index 000000000000..6ea17684feed
--- /dev/null
+++ b/kde-frameworks/krunner/krunner-5.76.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for providing different actions given a string query"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/plasma-${PVCUT}*:5
+	=kde-frameworks/solid-${PVCUT}*:5
+	=kde-frameworks/threadweaver-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	# requires virtual dbus #630672
+	local myctestargs=(
+		-E "(dbusrunnertest)"
+	)
+	ecm_src_test
+}
diff --git a/kde-frameworks/kservice/Manifest b/kde-frameworks/kservice/Manifest
index a7e7c857b347..931acd113516 100644
--- a/kde-frameworks/kservice/Manifest
+++ b/kde-frameworks/kservice/Manifest
@@ -1,2 +1,3 @@
 DIST kservice-5.74.0.tar.xz 258552 BLAKE2B 16400aa4f21a093c66c21d7911f9082c094f27ac559ad66b94c68a43a0f1cff6627ae3ad32e75fbaac6c93c1c6cd6cb37bc9be4a6051b670c104785cd82aa9cc SHA512 7756047069ff22d1e78494770ec3fb56a07ce96459a759b8275188f75a9e9e5d334df0f7bc7c09fdf6f357c0e144cc115ba077a15079f8598bb042f37e5ce490
 DIST kservice-5.75.0.tar.xz 258632 BLAKE2B e15e9f2b428f6c48652bf629b3a639327883471cdc743bb479e08561d6dbd5afbeda91945915d1c07a90d54bfef1d6342061c4a60e058f2485e9d422b296586a SHA512 13b99249ca88393eb9129a728ce718f33949711850ad3710ada9f5da2d0ea6f1f90dba609b8a8f0c741317e76c18a0fc39403205bfc3fb57bfe0680823a985e4
+DIST kservice-5.76.0.tar.xz 259908 BLAKE2B fba7596bd4dcbe5a75275057117dc8eb72f4ba17e8af296668694119eaeb3982b90262d6caac42bb55ba676db7af3dcdcf91338a6dcbda8f65a590b573a6218c SHA512 b3f5d6871aa76cd4d04b49a0b19f24f3eaf529a98e6bbd2d9bfa03df3a59a8621bc9d82912728a297a2ce45a38ff4ab65a75ad4702611dae7e9ae6fa71dc98fa
diff --git a/kde-frameworks/kservice/kservice-5.76.0.ebuild b/kde-frameworks/kservice/kservice-5.76.0.ebuild
new file mode 100644
index 000000000000..ac64e7b5b16b
--- /dev/null
+++ b/kde-frameworks/kservice/kservice-5.76.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Advanced plugin and service introspection"
+
+LICENSE="LGPL-2 LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+man"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
+"
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
+"
+
+# requires running kde environment
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DAPPLICATIONS_MENU_NAME=kf5-applications.menu
+		$(cmake_use_find_package man KF5DocTools)
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	# bug 596316
+	dosym kf5-applications.menu /etc/xdg/menus/applications.menu
+}
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 2472c8773102..4fdbcd7abc91 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,2 +1,3 @@
 DIST ktexteditor-5.74.0.tar.xz 2380320 BLAKE2B f316776513996857b1e59540b9a7850ac4a810b734ccac2895cd7565e21cf69cdb0322ae8bfdbf972d3fa69c3b1b02bd55ee6115a4f9d2fbc237f716e5217245 SHA512 d37d8f132cd33d403f0c4dc3b8773661dc4e708ffea17a37344534f5370c9d41ce947f6a3045fa740bda7ca0021de0f4519be5a21e8cbd2038bca6ff4b9e8e3c
 DIST ktexteditor-5.75.0.tar.xz 2351624 BLAKE2B 18e521f776b705256372c8fb23095381774e34ed857021cb5d1dd466add1c943b39213a00513eebe8afa473f5c0756e909ee757b229522f0e87a2005d8d0f3ba SHA512 3cedd749a605ab4f6f4b1a5d71ee5b0ed3465d34903ba7d0b3ccff349612e682ae3e4e547674d4ef3ebaabd8c040a53920a42444116f7271e3b1d6f9d469a165
+DIST ktexteditor-5.76.0.tar.xz 2351744 BLAKE2B 909e808458184e630318ece14ffc261b7d7f8fd61cb578e2ff1056a60241ac1904d31de172ed8d22da5d694311b9dcb5fba60f8c2add13f297ee091513b8f694 SHA512 bc6a0e0859a5e3e82c12c06fbc032dc1d6e529400f99805279bff894ac548d388f8f36a5e7aec471546fc70acacc1ae379cfa16958436898e87ad2d6c030265c
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.76.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.76.0.ebuild
new file mode 100644
index 000000000000..fe79e0f10431
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.76.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing a full text editor component"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+editorconfig git"
+
+BDEPEND="
+	test? ( >=kde-frameworks/kservice-${PVCUT}:5 )
+"
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kauth-${PVCUT}*:5
+	=kde-frameworks/kcodecs-${PVCUT}*:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kguiaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kjobwidgets-${PVCUT}*:5
+	=kde-frameworks/kparts-${PVCUT}*:5
+	=kde-frameworks/ktextwidgets-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	=kde-frameworks/sonnet-${PVCUT}*:5
+	=kde-frameworks/syntax-highlighting-${PVCUT}*:5
+	editorconfig? ( app-text/editorconfig-core-c )
+	git? ( dev-libs/libgit2:= )
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package editorconfig EditorConfig)
+		$(cmake_use_find_package git LibGit2)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/ktextwidgets/Manifest b/kde-frameworks/ktextwidgets/Manifest
index 07516001d92d..bc96f355b48c 100644
--- a/kde-frameworks/ktextwidgets/Manifest
+++ b/kde-frameworks/ktextwidgets/Manifest
@@ -1,2 +1,3 @@
 DIST ktextwidgets-5.74.0.tar.xz 324896 BLAKE2B f90a7426f6f76f3869738e6c86bd3b1951c096f69cecb582433df4cc5b100e70f4203d8b3cbe731cfc77739c541efb9a96fd85563817fda505ade6e98bba57f6 SHA512 f471ea1b09cb73f2e32d506139e45a3f928d834d559f6d25df5bf05e74dcee5b756ba3b87a38eb2de3fc69c9248a8982e1bfec8c9fc5cba6061e24f8ff62ce5c
 DIST ktextwidgets-5.75.0.tar.xz 324468 BLAKE2B 0df1b6a32a202fd0af395f1399c390d20b11b874297fb6632e7993258b4bca33cdad66235a416157dca2fc22490330ea495015c6f571cdc941ef0db10dabf60b SHA512 c85c226c25d74b562012ef6d80e55f301f374ceaf4e4a1e0880a4a67926bb150cb1b736c1ba87edf0a45932034c08b4160090794fe443df366383d019455f31c
+DIST ktextwidgets-5.76.0.tar.xz 324396 BLAKE2B 251a7b73871025452d8ce6480a8214ae6fd6cd55080fb7a1df11970d85f0195a16613192284645b99aa84a19d191714fe1cb59b1e13e238dc913f930d417af1e SHA512 8e4a754b3926f8a9a9c2ee675a9089bc30a4522efa6496a6a3a9ad6793a3c3de0df8936c1c37c797b3df0abbbd5f850a13099c1273620411aaedfa90519ba279
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.76.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.76.0.ebuild
new file mode 100644
index 000000000000..5d3fee2dbb97
--- /dev/null
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-5.76.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text"
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="speech"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/sonnet-${PVCUT}*:5
+	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package speech Qt5TextToSpeech)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kunitconversion/Manifest b/kde-frameworks/kunitconversion/Manifest
index c32c4f55ddb7..cbfd3bf348e7 100644
--- a/kde-frameworks/kunitconversion/Manifest
+++ b/kde-frameworks/kunitconversion/Manifest
@@ -1,2 +1,3 @@
 DIST kunitconversion-5.74.0.tar.xz 854944 BLAKE2B 4460a5c7a2aef3d007105785d69a5f2216860830e6eadcf0bbfda752721d4ddd905c3fae71145d052c7438614bacfe51eaa31300c6e5aeed055a1332f148ee78 SHA512 065e6f5e48e1c76996d46bddf030edfd7ff3a5d221d93599030874779492ee4d6df89cd736e565ef9a7b0ece1068ea5fcf3f59bdc6dc65ca9fcd94806955c598
 DIST kunitconversion-5.75.0.tar.xz 855188 BLAKE2B 033e41eab6b00821d471c05f703cfe490c7c798be9e8b1577e596f4f8686942e9322b3945daa9d9261f8b0cf52f26502482a689f3e9ed417ba2dfaac15745e86 SHA512 a0f78ac5bddfddbecaef68e338640aeb6c5416c2db8d4c66b2fecb62c7ee11feed335fdf8b23fd7c98b19ac7dc78612e73f2d93c0223895ab192850984cb48d8
+DIST kunitconversion-5.76.0.tar.xz 855004 BLAKE2B f9e446509be15579fe18415eff986e45c1ec77b35878388cc7d3d2f15939b9e0c1f1bdd0a75b02496aa3e86534d138009959981a552f591f5a55dea2f7145f94 SHA512 4a552e71f28ede81fc008620294edef2d9a8a2207b722e2555b54094c14b4eba0396482a4c6b6b39179964e0924f102c9f198a1bd8da20b32b987c62aff7a877
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.76.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.76.0.ebuild
new file mode 100644
index 000000000000..944596e9fed7
--- /dev/null
+++ b/kde-frameworks/kunitconversion/kunitconversion-5.76.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Framework for converting units"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	# bug 623938 - needs internet connection
+	local myctestargs=(
+		-E "(convertertest)"
+	)
+
+	LC_NUMERIC="C" ecm_src_test # bug 694804
+}
diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest
index 1aa2cc4ddf97..aea7c686440a 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1,2 +1,3 @@
 DIST kwallet-5.74.0.tar.xz 299812 BLAKE2B 8c38fc467440b241ce8a0c509ef75e3196303d6001bc74a2b347a3f6dcba6e80fc6d49068002a5317921d46fb60f0f033c79b99a5c583933ed39789e334fd770 SHA512 e18de73657c4b51c3150de88e2d764f710932527dc6e9fbfc8778e853b66e0776619fc5d8918cbf8fb6384f92d7b74836797c374d45a50223aa7d543cf743fa2
 DIST kwallet-5.75.0.tar.xz 299708 BLAKE2B ef9eabf569dc215a5a55e09901fc2e5910d6f7a53ecbf5b99de82e084404e479c48e78629d4751f488cf3033950e8a27a2ee271d0c4b897e931c27c00722a420 SHA512 51955dfb44f89c1793bba0478461efad00c93080a7168c9aa1d5ecdf427896419625d0ee1f68d7508dcdcb64ff5af4c7bd796c1bd571f3fd8f811a57811b5df7
+DIST kwallet-5.76.0.tar.xz 299996 BLAKE2B 9a61292ddd13a87960340e15c24fa8a7d3a304157d854e6e481acf4fef233dec618a5817424f6de790b04af11d39108a5fb8e787894fbd53aaf8917fabe9ca53 SHA512 a4b9bda4d5d466a8afce0b4fe4ad2720a3a0a88b4ff90119c3e141e01387c5a4b90c83cfd85b9249f158823be08fae9b9cc6d7c03bbe439d3195fc4f0c5e9bff
diff --git a/kde-frameworks/kwallet/kwallet-5.76.0.ebuild b/kde-frameworks/kwallet/kwallet-5.76.0.ebuild
new file mode 100644
index 000000000000..1541181cc97d
--- /dev/null
+++ b/kde-frameworks/kwallet/kwallet-5.76.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Framework providing desktop-wide storage for passwords"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="gpg +man"
+
+BDEPEND="
+	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
+"
+DEPEND="
+	dev-libs/libgcrypt:0=
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package gpg Gpgmepp)
+		$(cmake_use_find_package man KF5DocTools)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "Auto-unlocking after account login" kde-plasma/kwallet-pam
+		optfeature "KWallet management" kde-apps/kwalletmanager:5
+		elog "For more information, read https://wiki.gentoo.org/wiki/KDE#KWallet"
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-frameworks/kwayland/Manifest b/kde-frameworks/kwayland/Manifest
index db2cc2988226..b2985e3553c4 100644
--- a/kde-frameworks/kwayland/Manifest
+++ b/kde-frameworks/kwayland/Manifest
@@ -1,2 +1,3 @@
 DIST kwayland-5.74.0.tar.xz 344496 BLAKE2B 234b90876d45dc340b196e1416694af8b799fd88aa576e824a0e76f970691247d01e3bacb1be78aa5a5bf6f65b023ca2bb83ca7702da37a3a9120f6669b6e660 SHA512 347841dd5dabedd9de13e92275a2b6edb201a45c177c757b69af681e2f3b60c261087c5387c97305869c0a125a5f07de08113208a174ccb946f6ace310445ebd
 DIST kwayland-5.75.0.tar.xz 344572 BLAKE2B ef0e194787d1c874919b1ffb946453f05c2c3b1fdfaedccd365798f8e9093f93faf38a1a163f206c1fffd70cc3a2f7b84c428e6b476f5f4ffd06bb2828a5967a SHA512 8f77ccdf4f30bea2d6974d930734479c0f81f5309807b28f51bbcfda91977e27d5311b4718e4685609da0368c1e1bb060eaa765628a0ed9560f5774dcc357d8a
+DIST kwayland-5.76.0.tar.xz 344656 BLAKE2B 155d41758e1a156a253f69af7fdaa2417ce19f2793c9c1c63e0a2c50ee657a54dcb1165a163a82395be2ea8edaffd314348d28644917f289c559e701705c3946 SHA512 b5bc6b759a90069d14cc0d5fd57dd0ac18948bc555b612d17f10bf15c4fb1a8f0ab2fabad95f6cef4f2a143ddc346e0b6184fb4028f6a88c1b1dbca24de20a3b
diff --git a/kde-frameworks/kwayland/kwayland-5.76.0.ebuild b/kde-frameworks/kwayland/kwayland-5.76.0.ebuild
new file mode 100644
index 000000000000..c0bd6cb19b42
--- /dev/null
+++ b/kde-frameworks/kwayland/kwayland-5.76.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
+HOMEPAGE="https://invent.kde.org/frameworks/kwayland"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/wayland-1.15.0
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[egl]
+	>=dev-qt/qtwayland-${QTMIN}:5
+	media-libs/mesa[egl]
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.1.1
+	>=dev-libs/wayland-protocols-1.15
+"
+
+# All failing, I guess we need a virtual wayland server
+RESTRICT+=" test"
diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index 34946888ddf1..b21180161263 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1,2 +1,3 @@
 DIST kwidgetsaddons-5.74.0.tar.xz 2363028 BLAKE2B 74645d26b8dc3aabe32fb591ad97b0c2e55acb76db5edcf36ba631c2a974652f926c7b986c160814fe818f3d32b803eab30f022edc0b408bbcebe062a4eb41dc SHA512 90e8d0806933b3735fd510e497b3ce7dae1c017265931799ec2c2012b9c4576a251739b7f7da69aa8dfae1b688322305fd95b94fa0baa49c254c5bc73caaf079
 DIST kwidgetsaddons-5.75.0.tar.xz 2359680 BLAKE2B 663cc8af041c1e6692fc86af18f4694333854ff3cb0f135620fafa8b5192f3d884283c4078ba6b3b3107e56d0f6e4e2b212f2e093426ffb745ced22a8ce73c0a SHA512 ccbed24b53619826130498c1ac1933d923bd5a9d491e3320ded741a4825222abb6268f1e7a3d5117aa2515c83e658228a040dfb870ad2cf04db5f7bbc3913c4e
+DIST kwidgetsaddons-5.76.0.tar.xz 2361736 BLAKE2B 54f5ebce20794d213ceea8c07e72caad6c8c90865a693630267eb6062ad3483703c0ecc4ef075ae51f1be5f6de552955327afc8686a4edaeef4ebe851f4a8842 SHA512 fb94f8bb77bdadf79c233e2c28a4ab731830d253a00fa8bd91394dd1d0f42a947636378c28789bc81d83380da107594a66252beb80907f8a618a5419791b7ced
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.76.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.76.0.ebuild
new file mode 100644
index 000000000000..4243a7431dfc
--- /dev/null
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.76.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="An assortment of high-level widgets for common tasks"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	# bug 650216, 653186, 697866
+	local myctestargs=( -E "(kdatecomboboxtest|ksqueezedtextlabelautotest)" )
+	ecm_src_test
+}
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index 4308a20e0b3d..519b9d18998a 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1,2 +1,3 @@
 DIST kwindowsystem-5.74.0.tar.xz 177952 BLAKE2B a4db6407306dc8d4dd1abc56b79481b0ac9762925a241e971ab7e390226b9e2fb5a0044d18bc9a3d2b77a48e16e50ffaa8f02c5d30bc910adea9e706de6adf54 SHA512 f27c2676a2b21ed0cb8b876aa75c9beeebef0403288af8e354a444c63cb653bb8e9b9d349cd06352699a749488441b0a05344c876724f20fd86f06a40ec71fda
 DIST kwindowsystem-5.75.0.tar.xz 176888 BLAKE2B 36c9fbcaa39c65a4f7e403286ac1b04ecad54a5804bcd6b00a7b3b39314538390df40ec62d5b2c428fb2622e2c01f16fe879d66f9d75cb1e9109bf491d116e22 SHA512 2867edd24bf8be325a890b3141e6f2c5ae2f1ff07db4eb8bb3d2fa0025ed4d2e01a25447f5abbec2f961dd092c5a2a34818008dfb5a3614c43864da7938546ef
+DIST kwindowsystem-5.76.0.tar.xz 176888 BLAKE2B 64e351950ffdc7f8aaa47020d35eaeaf529bafdb0663ee64eff59fcf67a35728a35e5e9a9ae9518c8f11d22d1327fc61b18741d556e711fb84976a3ed45e565c SHA512 9e6f0ff4dc6feb75f012e75dd6717ea20e46e93f325654b32972bccace6e04745a34a22eafd75ef8c4c282606483605ea4effeb5d0bf615d55d21e312f99f071
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.76.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.76.0.ebuild
new file mode 100644
index 000000000000..caca1fc10710
--- /dev/null
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.76.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing access to properties and features of the window manager"
+LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls X"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+		x11-libs/libXfixes
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+RESTRICT+=" test"
+
+DOCS=( docs/README.kstartupinfo )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index 2c72f867aa57..51928ad011a5 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,2 +1,3 @@
 DIST kxmlgui-5.74.0.tar.xz 864784 BLAKE2B d6cc88603f0036415981411bbaeca6ba7877df085d5b5095b04b7d5567d0e1f23ad3d8c8b1472a365018e9360ee4351c7523fd791d4e53ecca3e9143cc8f2b72 SHA512 98f3e65c30a095d17c0512894bbba0bb172b2044652a0d23324f843489f5bb726359be40a9d68a7916d45a2a6e135f0bbbf7924b35a1939611b75ad6d44ccd92
 DIST kxmlgui-5.75.0.tar.xz 864232 BLAKE2B e249193c73c7cac626ff934e3fe6e7fe8cd0bfbafadf573d22216c87fb0648715afc92b232833269193db9ed9500c1b95910a572773c6dd394b8ec6c2e71ef0c SHA512 b286ee8d2b241e6bf407dcf89e1bed79bb9ae2f83a2c59ca41f61b3b2c80148b205f481641e57e41fdda8d70380af5496faf6f294800b5aeeeb66fbda95c2246
+DIST kxmlgui-5.76.0.tar.xz 864484 BLAKE2B ed0d651641413f5539c92a876751e4a1744a1a5e1e6d9b4ca3d051085b5acbae47c04d8bde47d76930923631ae1dc0751b4708dfb619b8967ab295dea9c71b52 SHA512 eb2761f557a7ed6169e93a3266416e22e2a3d66c6aa58340aa831078d3b9a1a1c0ae14f7efc122b6c239dfaf6875b8fa9fac107d9d96ec584f0a129ad03aa3ce
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.76.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.76.0.ebuild
new file mode 100644
index 000000000000..91e0c9a2ebc9
--- /dev/null
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.76.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+LICENSE="LGPL-2+"
+IUSE=""
+
+# slot op: includes QtCore/private/qlocale_p.h
+DEPEND="
+	>=dev-qt/qtcore-${QTMIN}:5=
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kglobalaccel-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Attica=ON
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# Files are missing; whatever. Bugs 650290, 668198
+	local myctestargs=(
+		-E "(ktoolbar_unittest|kxmlgui_unittest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-frameworks/kxmlrpcclient/Manifest b/kde-frameworks/kxmlrpcclient/Manifest
index c99ca6fa115c..2d05aa20f506 100644
--- a/kde-frameworks/kxmlrpcclient/Manifest
+++ b/kde-frameworks/kxmlrpcclient/Manifest
@@ -1,2 +1,3 @@
 DIST kxmlrpcclient-5.74.0.tar.xz 29296 BLAKE2B 0d983e66a41e8df356bb83d10d06106dab74c5c9f40148b131e4ae68403c212936e91fbddd9c92cca02271a9ea4ee45289cb208d35c00f72f3cfa46478ec5274 SHA512 87221fc5166312030af1c40d95ccbbdc68c791d0278d9ac181f98aa37328fa713e82bb178932a18d23f1bb1483c0571b4267ec0ae5970046e23426b3a93bf135
 DIST kxmlrpcclient-5.75.0.tar.xz 29272 BLAKE2B d08f2c87dec959a19761f811823d23349a484c42b9389c2995098833f1351be8554ef18d58088944c14a3cd213a88bb2e0947e5490ed2212ee8eee10df1961c2 SHA512 1a221b143f50b312e26d0e3a8c00385e1de55af57c9023ec3e2d10447b34175db63200d16db48fd76172cb41c8245e16f19a10b3bc94ba10b77c3eb2a027fcfc
+DIST kxmlrpcclient-5.76.0.tar.xz 29296 BLAKE2B 93c58b4128ff52afeba8536e5bbaa4d3a619e41ed17bcb65a47d08f6bc873d9ed5a840320c3556733305cca8b704b4c1ce7b3b997769828b75b1180f5cea802b SHA512 43846c623251090ab3a915a5219ca9a7725df5eacbad58cff19112499bdeeb9e0fefba68bf4f70e8db91bab6e4719560a644de58faacb27340c3f6cc5d239ae2
diff --git a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.76.0.ebuild b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.76.0.ebuild
new file mode 100644
index 000000000000..985c407bd5c9
--- /dev/null
+++ b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.76.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing client-side support for the XML-RPC protocol"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/modemmanager-qt/Manifest b/kde-frameworks/modemmanager-qt/Manifest
index 3a02b8453357..48a8f9e470c1 100644
--- a/kde-frameworks/modemmanager-qt/Manifest
+++ b/kde-frameworks/modemmanager-qt/Manifest
@@ -1,2 +1,3 @@
 DIST modemmanager-qt-5.74.0.tar.xz 112348 BLAKE2B 4a95ab9d303d3f2a43802938843f4130fa700101d91033d2d20a5158f95e9763483e8a40c889d6b4572c7ccb6051cf07ed61956e42f048de6857867e471312bd SHA512 c8dfaeca27a81b5a779f774b0edb4e4c670d1f92fc52f9e4863bacf725ae42f7d4b9dd813e47f56996a3427f0d813fb21162c609615e3523467e4fae0c4b6c1a
 DIST modemmanager-qt-5.75.0.tar.xz 112312 BLAKE2B 4e4e89482f2f22e933c6228046075bfa80cd0561cfa4ba0e04a540904f090ede603383a6fe52a01f7256e95ceaae2c1d76f08346ff0a19b3baf4b1f681052fb1 SHA512 6b0da1652fdcd62d3fe4cd8fb57c15ad6afc73d6f7fe19cc1987e49d08260f782ad0e1a0e9c39e15e6c6ff635289b3d2db90f866c9953fea62a075892d8b7485
+DIST modemmanager-qt-5.76.0.tar.xz 112344 BLAKE2B 9b54e25ccc34ff18de194dae4f32a41b65682f78e4bd277f8b4641b77e431e30a78d58d52ba791a59ff956da4ecbbcb3b62a9f0310e603228e57396bea0f084a SHA512 7c4e3004b33e0f472e043555b183c6e34662ec9574d65e18803d22c579407b174bb23fc684a66772ae0409262637add727326eb7120cd043d3328ac1f2766e92
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.76.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.76.0.ebuild
new file mode 100644
index 000000000000..57cec01f1c08
--- /dev/null
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.76.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="ModemManager bindings for Qt"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	net-misc/modemmanager
+"
+RDEPEND="${DEPEND}"
+
+# requires running environment
+RESTRICT+=" test"
diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest
index 3960f0bba74a..0d0f7b01923f 100644
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ b/kde-frameworks/networkmanager-qt/Manifest
@@ -1,2 +1,3 @@
 DIST networkmanager-qt-5.74.0.tar.xz 194888 BLAKE2B ae162e629235af4d87ec9b9f3df9629d5fe532d49f836980841c98bf2364c58c33672a0189d9447368e35bac016d47f10c271e098f519ddc454fc8c190cbdd9c SHA512 62953a2738cf15633733cd0ae9930c640abe90523495d1481893fc8bd3f2de7ace6f683e541c24f641731e014aff8b2f02520c2644dda4b25fa0460c57110cf3
 DIST networkmanager-qt-5.75.0.tar.xz 194960 BLAKE2B 80aa547c8479dfe812701452fbb5cea4b8fd14887db8d2e5119eb9548a0e6ea1b0a9edae56174f8d290c24f4acac746f6eefc37b365880fd348653df3c0cc075 SHA512 0948d6fa379166dbf64716d0175705074595ca7cc65fc90ab86880d14b7430162a9e20fb620f6bbed0d4c1d08e52698c67df3e4bb53116d32f757fe5d10000b5
+DIST networkmanager-qt-5.76.0.tar.xz 195056 BLAKE2B bc666a2ad4b885173bf5d45deaa61a1fa8efb2c026d3be79cdf0eaa7bfffbd0761261286af5a221df82f6de5087ba228d0e0b3d6fef3037294530342d9c6070d SHA512 22f8382c82d24a312eb19603eba60578921890b9a2481e6f2708d890f1ecb46512a272f9545891fa17a1fb27ed84163f2670146d76b14cedbc5923a7a0f6d78d
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.76.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.76.0.ebuild
new file mode 100644
index 000000000000..0da005bfb23e
--- /dev/null
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.76.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="NetworkManager bindings for Qt"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="teamd"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=net-misc/networkmanager-1.4.0-r1[teamd=]
+"
+RDEPEND="${DEPEND}
+	|| (
+		>=net-misc/networkmanager-1.4.0-r1[elogind]
+		>=net-misc/networkmanager-1.4.0-r1[systemd]
+	)
+"
+
+src_test() {
+	# bug: 625276
+	local myctestargs=( -E "(managertest|settingstest|activeconnectiontest)" )
+
+	ecm_src_test
+}
diff --git a/kde-frameworks/oxygen-icons/Manifest b/kde-frameworks/oxygen-icons/Manifest
index c68a96b01d2e..9a2943198b72 100644
--- a/kde-frameworks/oxygen-icons/Manifest
+++ b/kde-frameworks/oxygen-icons/Manifest
@@ -1,2 +1,3 @@
 DIST oxygen-icons5-5.74.0.tar.xz 236040524 BLAKE2B 67e5173affa60a18acd30203858514039f14d7d35824ef0354b7d4219d06ab45fd944504bc1f7f98b903974d455ccef3728309c1f61bd6173f9c83e6712f504d SHA512 bc00190778edd4b5b154f210ad3e3479f84d6f65b8114f0901966cebb4bfd0f6cabb7d68b1ac2759d7553360167fa620f258078c3c60437a04ef6fbe84243284
 DIST oxygen-icons5-5.75.0.tar.xz 236041872 BLAKE2B 0cd4329ab9048b42f701986d9389a669228615d5515fff8e7c825685e0816c2b925944326e8e4ee37158afbb44bb97831ddc115957ea0e532da99294570fd0d6 SHA512 7f7fea283151d43342473392fbac0c345556f4780b9156e7ddf31b9ed072fe39133007d6032c4f7af7f2a09740a04dfe98a74901333c2c418f9163dfc570dd99
+DIST oxygen-icons5-5.76.0.tar.xz 236039012 BLAKE2B e4bc9cd082a2ea074a59be135eb2e7efcaffaec6d418df367998745c485532b910abe371b6680082d358027d60b97a5b32a2db97c6fb57f772d5b13fde00445b SHA512 5a163b51e10f63e3738854e33ae7f9d185e655d1290a2261c5e571adabc5e18fd25f074de6159c23a4c4ad29300910cfd859a89a8c05556c7bd7144ecf96afb9
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.76.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.76.0.ebuild
new file mode 100644
index 000000000000..1501bcd778b3
--- /dev/null
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-5.76.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_ORG_NAME="oxygen-icons5"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+inherit cmake kde.org xdg-utils
+
+DESCRIPTION="Oxygen SVG icon theme"
+
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+BDEPEND="
+	>=dev-qt/qtcore-${QTMIN}:5
+	>=kde-frameworks/extra-cmake-modules-${PVCUT}:5
+	test? ( app-misc/fdupes )
+"
+DEPEND="test? ( >=dev-qt/qttest-${QTMIN}:5 )"
+
+RESTRICT+=" !test? ( test )"
+
+src_prepare() {
+	cmake_src_prepare
+	use test || cmake_comment_add_subdirectory autotests
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index fb2861f6b5f4..b48a574883b9 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-framework-5.74.0.tar.xz 3140648 BLAKE2B dfc8df92d351446a146204f48c42cd4d6325f2652b5b61e0a530b27763fb3b6f07bf14319c86a54f933a58329d214977545e00f261cc784c0d8659eebd8cddb0 SHA512 7aae44d94a175dcdbd779a6801626d20e8d986597d1d05c82c5c035997b874ebb9b4412191e1fa7a26aa4e045ceaf22a7ef359d3e817d812357d51219eb5fb46
 DIST plasma-framework-5.75.0.tar.xz 3146028 BLAKE2B cfce54f3cdd7dbe0efa16705d7d22b428342aea05a462bb87fad783f87c40af611080557b7e54387fb1507508a9db8bd2738d45912619b0056bf3d77b3c007f3 SHA512 951503ae1472f0713179d5f668451487d496c6b88c3266639451bfd869240cd065ef47889a36acb327a34ffe0a669385de347556a506f386ec8b3e3af892e045
+DIST plasma-framework-5.76.0.tar.xz 3146848 BLAKE2B 54217dcd1ecd73e4006f70726b6c9417ae1622880734a9ebe56740bfa7075538f9c8f2f09612e992260124e3b4ec63ff7cf2a0fd10192dbc500befa501404962 SHA512 ac42cdafc029bd422274f5d70e3dca89ef24016cd55c7f472dde74c5a3b72540c5c09f48867593017fd229a349df1e5dc0879d93678e0fcb25fad314e29de768
diff --git a/kde-frameworks/plasma/plasma-5.76.0.ebuild b/kde-frameworks/plasma/plasma-5.76.0.ebuild
new file mode 100644
index 000000000000..3e2958b66620
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.76.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_ORG_NAME="${PN}-framework"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plasma framework"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="gles2-only wayland X"
+
+BDEPEND="
+	>=kde-frameworks/kdoctools-${PVCUT}:5
+"
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kactivities-${PVCUT}*:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kdeclarative-${PVCUT}*:5
+	=kde-frameworks/kglobalaccel-${PVCUT}*:5
+	=kde-frameworks/kguiaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kirigami-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kpackage-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		=kde-frameworks/kwayland-${PVCUT}*:5
+		media-libs/mesa[egl]
+	)
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package !gles2-only OpenGL)
+		$(cmake_use_find_package wayland EGL)
+		$(cmake_use_find_package wayland KF5Wayland)
+		$(cmake_use_find_package X X11)
+		$(cmake_use_find_package X XCB)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/prison/Manifest b/kde-frameworks/prison/Manifest
index 699ffae57c6d..cd0bcce48bdf 100644
--- a/kde-frameworks/prison/Manifest
+++ b/kde-frameworks/prison/Manifest
@@ -1,2 +1,3 @@
 DIST prison-5.74.0.tar.xz 40972 BLAKE2B 5e6b83d682ba7f64ccca649308899e03342f2a454e4e8e00c684dd34f8c0972b7ec5f5e5a77b7b0cca6a2682234be4403bb2f8ce6e9a36c6c01f31e537a46db8 SHA512 3d7ed0517a36e8cf3ff6956f61502ee02f9cf06876e842c3575e469701495b3ffaa05fb992d635573a43070ae6c7a5e7bad7c2073eb69c8d6bb6c2b5256c0b62
 DIST prison-5.75.0.tar.xz 40948 BLAKE2B 994de4b1a284940f362b8f5cc91125bae906b1ce2678e80a599c3c4f9dad293f5aefe7bd4360d114a91c127be50f125e6126388206d117c44bdcf8e30e699f77 SHA512 948fd29006f6f38ac3a9a831a4b97b8b9e75b41f9ff092e13fef8633540dd34db6282213ef854f4ea4dc33f52d1d484e8f636e2e680261822fca15ef93ddbe0e
+DIST prison-5.76.0.tar.xz 40972 BLAKE2B 11d6cdbacd57079109d9a3d04ce4840244b38a3fd694d20934376e6ebc3833e9c9a8ced139f659d8cc9019b808a70e4dc7366e6f91d40ab68b81114b78979819 SHA512 7f5824c1c0e1e0d9588c0f9781b4921844c2bd5c2a7807098c993f58c2b27ab6c3d58a5dc69e9162f22e7bd169de07c7e0521a9056c6af5f0fc3e96eb834a87a
diff --git a/kde-frameworks/prison/prison-5.76.0.ebuild b/kde-frameworks/prison/prison-5.76.0.ebuild
new file mode 100644
index 000000000000..8d022befccfc
--- /dev/null
+++ b/kde-frameworks/prison/prison-5.76.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="QRCode and data matrix barcode library"
+HOMEPAGE="https://invent.kde.org/frameworks/prison"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="qml"
+
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	media-gfx/qrencode:=
+	media-libs/libdmtx
+	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt5Quick)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/purpose/Manifest b/kde-frameworks/purpose/Manifest
index 2e2a7a2194bc..395c3bab05be 100644
--- a/kde-frameworks/purpose/Manifest
+++ b/kde-frameworks/purpose/Manifest
@@ -1,2 +1,3 @@
 DIST purpose-5.74.0.tar.xz 156216 BLAKE2B 7d810f2d3b1af7cd041b8e9449fc5934bca7b739b5edf7fe1f5da553f264f189cfac0dd715dddf66a6f46be0a9389dae5d9eb35558b0c41b89dd36e53d945ccd SHA512 dea52fd5d10cc0c34ecab742b691675076ddf1346e2b352cd5f74cd266576f85eb9d721bf68a29cea62f9879b826bf375b70580451c31bdd33509f57ae3cf23a
 DIST purpose-5.75.0.tar.xz 156260 BLAKE2B 907722db174faeb48bb7513a5b0e7705a4685ec3dd8667cdfe40bff3a66929d235dd832b7c335a7d6ed66ebf18ee8763ff37ace2f24950bc43548a849e5a2cd6 SHA512 21e4b6649e953e910653eb045ed485823f857acb2fa48a864ff20a716ef34471fd1e8a5d3984f7c0b7d7516757943aa2ee965a1fc40390d5def3890ccda99a2e
+DIST purpose-5.76.0.tar.xz 157920 BLAKE2B 38e55b8b4137c82b3d36d5ffd2a9519e98df66e226ad0d23f20e1f67c7b1973769bf28cfdd2d39cfec1a23a98844d19a5dac247413afdb2a8a88d76e1bfdfd35 SHA512 9d73b299894ee6fbaca73740c0901955d040ff867cacd0c18f3808f6437d5898a5a501e5a07205ea6a1608e32be7a0b910990fe9d5b693ae610bbbbbecb90d40
diff --git a/kde-frameworks/purpose/purpose-5.76.0.ebuild b/kde-frameworks/purpose/purpose-5.76.0.ebuild
new file mode 100644
index 000000000000..6e6ea9578b6d
--- /dev/null
+++ b/kde-frameworks/purpose/purpose-5.76.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+inherit ecm kde.org optfeature xdg-utils
+
+DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="bluetooth +dolphin +kaccounts"
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kirigami-${PVCUT}*:5
+	dolphin? ( =kde-frameworks/knotifications-${PVCUT}*:5 )
+	kaccounts? (
+		>=kde-apps/kaccounts-integration-19.04.3:5
+		net-libs/accounts-qt
+	)
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kdeclarative-${PVCUT}:5
+	bluetooth? ( =kde-frameworks/bluez-qt-${PVCUT}*:5 )
+	kaccounts? ( net-libs/accounts-qml )
+"
+
+# requires running environment
+RESTRICT+=" test"
+
+src_prepare() {
+	ecm_src_prepare
+	cmake_run_in src/plugins cmake_comment_add_subdirectory bluetooth
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package dolphin KF5Notifications)
+		$(cmake_use_find_package kaccounts KAccounts)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "Send through KDE Connect" kde-misc/kdeconnect
+	fi
+	ecm_pkg_postinst
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index 54789ada31eb..e51a49db00c6 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1,2 +1,3 @@
 DIST qqc2-desktop-style-5.74.0.tar.xz 58632 BLAKE2B a4f3545d83f03eb57cd7dd9ee81db59bd56a22b7907af4eb00a50a9fa1d2a5e507a271fcb4d2a2e7465691076122251f48c0baed05e7c30042489f6dd93e60ee SHA512 88c91d5933bc2c0020a574be05a851aea54382b6c1dd5f459cba792e4ac784782bc88a36670c28f2df29188cf001bf2c9af98b3e9bc84dd59c110fd7bf936258
 DIST qqc2-desktop-style-5.75.0.tar.xz 58704 BLAKE2B 7ef0e20c207804fe1293c8507a61c980a1efa516d4b31f2dfb9376d2c52df9a43b1dc51a49724a0b3c2c74a229324fb812a0dc1377bcb8f59973b93a7e3d907a SHA512 bcf9c41bf286ee5a8a533dd9ce392848c91f9ec797ac7c8851a1eb462739b9b114583cdce8485e8f5b91787d17327145d112f9ea429e383b798b98433c7651a6
+DIST qqc2-desktop-style-5.76.0.tar.xz 59756 BLAKE2B 1e2c313339ca046a27134f664b8eb060e96e0f82c68c747515786b022749b5768a9ac2a89d29bd525fa55623f4b60e0639c2ea2d1f6ea61882aee4375feba947 SHA512 6cdad05c5e5a6639419a8862f5236223f5361fa95bf12692bfd2db836c4474a2a31de2381378da64d19e80031a6b0cc260b154f8646e7fdcdd1cf425bf1c56c2
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.76.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.76.0.ebuild
new file mode 100644
index 000000000000..ed3615bd08c1
--- /dev/null
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.76.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
+
+LICENSE="|| ( GPL-2+ LGPL-3+ )"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5=
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kirigami-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 8eefc418d3ea..eb5645b00ae2 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,2 +1,3 @@
 DIST solid-5.74.0.tar.xz 268820 BLAKE2B 60bbbaebb2bbb5a983de2a92444902b7d7e16af2e7a2e3893b881d4b03219077088acd4298f55802ae866f9c909c4fc82dfe04c7b7209306c9328e97b9aaf022 SHA512 cc0190327552c63bca8627b96d9f59ec9fb4e4c1842d36c42455e8a458f97f972274765a94b70f311a4105d33f0abbd921b10a2db2b1e7f4c492e92268ca68b1
 DIST solid-5.75.0.tar.xz 268856 BLAKE2B 3f33ad93088d400f0ea526d163fe0251233b3d3b5bb4da6c52a0976e537f09c122b06b8d56e581fb9ace404744e635ff43b99e50a2353e137bde8c17e2db7dc9 SHA512 6fffe1f52e68499d4f6b40b235ebd0f3597c88c918db4bb90fd5e75f057571fe60ea37dca5f1fbfc5bf82f60a3b3c16b4a1e91b1f2a6b64f228ab31539c1d24c
+DIST solid-5.76.0.tar.xz 273688 BLAKE2B 9756b9fa6052e12699599cfc99fa0bcf9f1a309eb9d0d5cbc0e415858e0c2cc7fa90cb713706059046eae110442becf549b53b6bbc4901e2dc62dee6226cf59c SHA512 0219364d225befee1349ff0150648c35f5805d735ced67bec88b0f43ca372b721a34c3a37e4d2b1e05a4b13e47db9bbacfd151d34e61fcbd5426da02dbf88523
diff --git a/kde-frameworks/solid/solid-5.76.0.ebuild b/kde-frameworks/solid/solid-5.76.0.ebuild
new file mode 100644
index 000000000000..f961d106b7e8
--- /dev/null
+++ b/kde-frameworks/solid/solid-5.76.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="ios nls"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	sys-fs/udisks:2
+	virtual/libudev:=
+	ios? (
+		app-pda/libimobiledevice:=
+		app-pda/libplist:=
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package ios IMobileDevice)
+		$(cmake_use_find_package ios PList)
+	)
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "Media player devices support" app-misc/media-player-info
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest
index 1c80cf8485eb..65a79a3269fc 100644
--- a/kde-frameworks/sonnet/Manifest
+++ b/kde-frameworks/sonnet/Manifest
@@ -1,2 +1,3 @@
 DIST sonnet-5.74.0.tar.xz 293316 BLAKE2B 55f73f617b98c85a4f63abea6eb327ee2f017ee2d63f3c739269afb5311e392b153d8c6a7f29dc9be095450c48d7a220cc387d6d842175a345044c084bc868bb SHA512 80f19d6f7c168f6daed208769c5abe1c664b48cd5d8f3ddd75f3992f917859d14281ed12b819b5bc9f501849243de639388a8e47dc60e0d3bda0e5b8426a54e6
 DIST sonnet-5.75.0.tar.xz 293896 BLAKE2B 95a6532cc3c68f97b1bf4c97196320f73c46bc35ed0b422add51d6b75de7629c18405d7f841b88fd69c1af44fe2de623a24ed1f60297e2039dbe89d9f03e9432 SHA512 8ce91c819142f7546d37ffccbcce13a56109ec23767f2af14713a84102b04889ea0bfd4bd3d3b332df8946e0a161d2af8b8f11799afa893dfd9fc2839e013142
+DIST sonnet-5.76.0.tar.xz 294000 BLAKE2B f777d3877c404bc7fe612f66992365c18a68f7e14244887d246c2c7b28b14a7c9b5f60aeb9de31c7df4af8bb500a098815de2fdd48c4705fd061ac58a52aa941 SHA512 b012f5d6e85588d510ab795bcfaf1938b5f4b5c0a02bb2c04814d3878dfcc6968e1c494e92fd793b5ac096fe6c2547f0d27325dfe17aa424cb1346ce63e3440e
diff --git a/kde-frameworks/sonnet/sonnet-5.76.0.ebuild b/kde-frameworks/sonnet/sonnet-5.76.0.ebuild
new file mode 100644
index 000000000000..cb3fec464eca
--- /dev/null
+++ b/kde-frameworks/sonnet/sonnet-5.76.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for providing spell-checking through abstraction of popular backends"
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="aspell +hunspell nls"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	aspell? ( app-text/aspell )
+	hunspell? ( app-text/hunspell:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package aspell ASPELL)
+		$(cmake_use_find_package hunspell HUNSPELL)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# bugs: 680032
+	local myctestargs=(
+		-E "(sonnet-test_settings|sonnet-test_highlighter)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-frameworks/syndication/Manifest b/kde-frameworks/syndication/Manifest
index 32438414d7ae..7377ff5c9037 100644
--- a/kde-frameworks/syndication/Manifest
+++ b/kde-frameworks/syndication/Manifest
@@ -1,2 +1,3 @@
 DIST syndication-5.74.0.tar.xz 508876 BLAKE2B 231a86a83735fe295a61fa605070e5672142e3842e335cb6b1fccdd908d58a113bfbb42ef41aa1f9066dc738ce329a3411d5015c0e0eb79682737f350bf18c10 SHA512 c524ea90c4fbe80040a772e967dc024707ed32c124b0efcf4324e5bc60093472762f7b48fcadd1f288747464defd16abe185fdff00c8e414db37a00bc1e6fe53
 DIST syndication-5.75.0.tar.xz 508832 BLAKE2B 43a4165563d6e49430b50b9b73c9e68e6fed7f85921f29ca87220e5bf259e7535205a68389ccb6ade741e097107cdac8e5cf26974d3f423817d6ecc27118eaa8 SHA512 1f16527c456803048a5ea37efcac23c1cd756d22db657d5d0e8483d61e49b4ce6aaa2d4d1907137b2a5fbc97425bb59a92c9b1ea679319786129e89269711408
+DIST syndication-5.76.0.tar.xz 508716 BLAKE2B f76218fc27abeec202b583a557c106fb56f5001ad72509854cd803e6b724f521b24acfaa86c27e51d42fce159f42e3082ee80d4f4237de8db64a6d559f02e4ea SHA512 0fd821edafdf934120002e47e3b0e13946c44f5508c50bf4fb937c71aa69f1e2c57c39fd3f4278e9db7e957845d9a3e988ab9b92e8e51914e5fce3219bcc8783
diff --git a/kde-frameworks/syndication/syndication-5.76.0.ebuild b/kde-frameworks/syndication/syndication-5.76.0.ebuild
new file mode 100644
index 000000000000..af0a3390dd90
--- /dev/null
+++ b/kde-frameworks/syndication/syndication-5.76.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Library for parsing RSS and Atom feeds"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kcodecs-${PVCUT}*:5
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		>=dev-qt/qtnetwork-${QTMIN}:5
+		>=dev-qt/qtwidgets-${QTMIN}:5
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/syndication
+"
diff --git a/kde-frameworks/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest
index 26e5425d47cf..c32cbde0b1b6 100644
--- a/kde-frameworks/syntax-highlighting/Manifest
+++ b/kde-frameworks/syntax-highlighting/Manifest
@@ -1,2 +1,3 @@
 DIST syntax-highlighting-5.74.0.tar.xz 2028848 BLAKE2B b4641cd116b851564650a59a1354590b1fcca551a28fd0ea4034b5c95369a39084d0de83370416f10e2f4e51f724ab4bce5f22e97259013358aab54b980ca5b1 SHA512 6dfc9540ca4ec2c76c9b96a864a24bba6923529d72605dcd36136809250be12c366f52bf3dda02564169744729172eec2f0d3f69137d374d81af826ec97bc3b7
 DIST syntax-highlighting-5.75.0.tar.xz 2054716 BLAKE2B d2c01653fdb11dce93ebde022677b5f83eee9bad012a9c7ed2f4b7f94440cdb5eeadbff56ec963b9983cb958547e680b36b4f97ebceb2821108527d2ad899e4f SHA512 723d41954a6eb7b7f00c378c52f8bd52dc13389d1bfd5c099320d6591c3337d6b3fb2c375eb917779ebb22c7bd2f8df2370cd05291c7cf11b92434b353229aa5
+DIST syntax-highlighting-5.76.0.tar.xz 2124128 BLAKE2B 4617a01022175da1952e1dacede7f1abcc0c1e049d666bff64fb7a100281b7cb8f7eb147589ddc25db2558c0c1d2e0ed5da30800dd889ba1b7f058b424114890 SHA512 7098d82110e8e355198fdce9081c8a1aadc322b2e0fd168585b1cca6535666c96cf1f52b894ac99fb051a8ee0a690d8ddd5c91ed0648057c63447ac10d0e8c59
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.76.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.76.0.ebuild
new file mode 100644
index 000000000000..623fd1d5fdf9
--- /dev/null
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.76.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Framework for syntax highlighting"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls"
+
+BDEPEND="
+	dev-lang/perl
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtxmlpatterns-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	ecm_src_install
+	dobin "${BUILD_DIR}"/bin/katehighlightingindexer
+}
diff --git a/kde-frameworks/threadweaver/Manifest b/kde-frameworks/threadweaver/Manifest
index fa0846eb005f..89647ad1d8de 100644
--- a/kde-frameworks/threadweaver/Manifest
+++ b/kde-frameworks/threadweaver/Manifest
@@ -1,2 +1,3 @@
 DIST threadweaver-5.74.0.tar.xz 1410804 BLAKE2B d54888a01ca70354445be7bc3f2fea9c2afbe204fde614afc6f5fd28678b2a796fad585a46ee041253a61d7a456f6ec49f6c6b543509b6c87862c16324845479 SHA512 b419a80eb13366d3a71cd2d894a57f7834a9afb8472f88603fb9b24d678fa546da9fc96ff3a0af5e4db14f5bbbb52e2eb00f7ef2429a94b3b413a0026b69d899
 DIST threadweaver-5.75.0.tar.xz 1410792 BLAKE2B bc080f5115416cfeff634be1f3e2532d4d5472a5b3e403cdb59226f251bf7ee681c5e3293bbe5f1eb1afa2ff714d8e5ce92b15518fea4b75d83f392fac5250cc SHA512 901bec9d7befa8dd96076abe4ebe9863d97dab49477562679ae652073710e4fa8bc83bd5f787d08ab065265338a985448ffa42de0a2dad3e3c6386545b7b0e5a
+DIST threadweaver-5.76.0.tar.xz 1410720 BLAKE2B e01a89ece8221ed41a85d7e5f5a98b09c42eee1be8b2f6eb45827745689429dcc07bf1f2e4e54bfdde27510a71ea0d9ef0a529e6586e15f18572de60a23078e2 SHA512 42b9316b1629a2b8fdeba24dc9ff0e7d1ddf3d5417901d87a4b1b2eb3d884594e043cbc696c5bbbae364034f998731dd101b310377c9105e78ad7f2922010ce3
diff --git a/kde-frameworks/threadweaver/threadweaver-5.76.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.76.0.ebuild
new file mode 100644
index 000000000000..62f7250b169a
--- /dev/null
+++ b/kde-frameworks/threadweaver/threadweaver-5.76.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit ecm kde.org
+
+DESCRIPTION="Framework for managing threads using job and queue-based interfaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+src_prepare() {
+	cmake_comment_add_subdirectory benchmarks
+	ecm_src_prepare
+}
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 5a93dde4f64a..50ffef48dff9 100644
Binary files a/kde-misc/Manifest.gz and b/kde-misc/Manifest.gz differ
diff --git a/kde-misc/markdownpart/markdownpart-0.1.1.ebuild b/kde-misc/markdownpart/markdownpart-0.1.1.ebuild
index 956e381496d0..1fae292f0793 100644
--- a/kde-misc/markdownpart/markdownpart-0.1.1.ebuild
+++ b/kde-misc/markdownpart/markdownpart-0.1.1.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Markdown viewer KParts plugin based on QTextDocument"
diff --git a/licenses/EPSON-2018 b/licenses/EPSON-2018
deleted file mode 100644
index 3b1dce3e4a28..000000000000
--- a/licenses/EPSON-2018
+++ /dev/null
@@ -1,476 +0,0 @@
-Please read out COPYING.EPSON and Privacy Statement 
-(http://download.ebz.epson.net/ps/linux/).
-
-EPSON END USER SOFTWARE LICENSE AGREEMENT
-
-NOTICE TO USER: PLEASE READ THIS AGREEMENT CAREFULLY BEFORE INSTALLING OR USING 
-THIS PRODUCT. IF YOU ARE LOCATED IN THE UNITED STATES, SECTIONS 19-23 OF THIS 
-DOCUMENT APPLY TO YOU. SECTION 22 CONTAINS A BINDING ARBITRATION PROVISION THAT 
-LIMITS YOUR ABILITY TO SEEK RELIEF IN A COURT BEFORE A JUDGE OR JURY, AND WAIVES 
-YOUR RIGHT TO PARTICIPATE IN CLASS ACTIONS OR CLASS ARBITRATIONS FOR CERTAIN 
-DISPUTES. AN “OPT-OUT” IS AVAILABLE UNDER SECTION 22.7 FOR THOSE WHO WISH TO BE 
-EXCLUDED FROM THE ARBITRATION AND CLASS WAIVER.
-
-This is a legal agreement (“Agreement”) between you (an individual or entity, 
-referred to hereinafter as “you”) and Seiko Epson Corporation (including its 
-affiliates, “Epson”) for the enclosed software programs, including any related 
-documentation, firmware, or updates (collectively referred to hereinafter as the 
-“Software”). The Software is provided by Epson and its suppliers for use only 
-with the corresponding Epson brand computer peripheral product (the “Epson 
-Hardware”). BEFORE INSTALLING, COPYING OR OTHERWISE USING THE SOFTWARE, YOU NEED 
-TO REVIEW AND AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT INCLUDING THE 
-EPSON PRIVACY POLICY stated in Section 17.  If you agree, click on the Agree 
-(“ACCEPT”, “OK” or any similar representation of agreement) button below.  If 
-you do not agree with the terms and conditions of this Agreement, click on the 
-Disagree (“EXIT”, “Cancel” or any similar representation of disagreement) button 
-and return the Software, along with the packaging and related materials, to 
-Epson or the place of purchase for a full refund.
-
-1.	Grant of License.  Epson grants you a limited, nonexclusive license to (i) 
-download, install and use the Software for your personal and internal business 
-use on hard disks or other computer storage devices, or in the case of a 
-software application (also referred to as “Software”), on the smartphone, 
-tablet, or other mobile device (collectively, “Device”), provided that the 
-Software is used (i) only in a single location (e.g., a home or office or place 
-of business), or in the case of a mobile device, on a Device owned or otherwise 
-controlled by you, and (ii) only in connection with Epson Hardware owned by you. 
- You may allow other users of the Epson Hardware connected to your network to 
-use the Software, provided that you shall ensure that such users use the 
-Software only in accordance with this Agreement.  You agree to be responsible 
-for and indemnify Epson for liabilities incurred as a consequence of use by such 
-users. You may make backup copies of the Software, as necessary, provided the 
-backup is only used to support your use of the Epson Hardware. 
-
-2.	Upgrades and Updates.  If you acquire an upgrade, updated version, modified 
-version, or additions to or for the Software from Epson, the upgrade, updated 
-version, modified version, or addition, shall be included in the defined term 
-Software and governed by this Agreement.  You acknowledge that Epson has no 
-obligation to provide you with any Updates (as defined below in this Section 2) 
-to the Software. Epson may, however, from time to time, issue updated versions 
-of the Software and the Software may automatically connect to Epson or 
-third-party servers via the Internet to check for available updates to the 
-Software, such as bug fixes, patches, upgrades, additional or enhanced 
-functions, plug-ins and new versions (collectively, “Updates”) and may either 
-(a) automatically electronically update the version of the Software that you are 
-using on your personal device or (b) give you the option of manually downloading 
-applicable Updates.  If you installed the EPSON Software Updater and do not wish 
-to allow Epson to check for available updates to the Software, you may disable 
-this feature by uninstalling EPSON Software Updater.  By installing the Software 
-and not disabling any automated check for Updates, if applicable, you hereby 
-agree and consent to automatically request and receive Updates from Epson or 
-third-party servers, and that the terms and conditions of this Agreement shall 
-apply to all of these Updates. 
-
-3.	Other Rights and Limitations.  You agree not to modify, adapt or translate 
-the Software and further agree not to attempt to reverse engineer, decompile, 
-disassemble or otherwise attempt to discover the source code of the Software.  
-You may not rent, lease, distribute, lend the Software to third parties or 
-incorporate the Software into a revenue generating product or service.  You may, 
-however, transfer all of your rights to use the Software to another person or 
-legal entity, provided that the recipient also agrees to the terms of this 
-Agreement and you transfer the Software, including all copies, updates and prior 
-versions, and the Epson Hardware, to such person or entity.  The Software is 
-licensed as a single unit, and its component programs may not be separated for 
-some other use.  Further, you agree not to place the Software onto or into a 
-shared environment accessible via a public network such as the Internet or 
-otherwise accessible by others outside the single location referred to in 
-Section 1 above.
-
-4.	Ownership.  Title, ownership rights, and intellectual property rights in and 
-to the Software shall remain with Epson or its licensors and suppliers.  The 
-Software is protected by United States Copyright Law, copyright laws of Japan 
-and international copyright treaties, as well as other intellectual property 
-laws and treaties.  There is no transfer to you of any title to or ownership of 
-the Software and this License shall not be construed as a sale of any rights in 
-the Software.  You agree not to remove or alter any copyright, trademark, 
-registered mark and other proprietary notices on any copies of the Software.  
-Epson and/or its licensors and suppliers reserve all rights not granted.  The 
-Software may also contain images, illustrations, designs and photos 
-(“Materials”), and the copyright of such material belongs to Epson and/or its 
-licensors and suppliers, protected by national and/or international intellectual 
-property laws, conventions and treaties.  For clarity, (1) the Materials shall 
-be used for non-commercial purposes only, (2) the Materials shall be edited, 
-adjusted and copied only in the manner designated by the Software, and (3) you 
-may use the Materials only for lawful personal use, home use or as otherwise 
-legally permitted. 
-
-5.	Open Source and Other Third-Party Components. Notwithstanding the foregoing 
-license grant, you acknowledge that certain components of the Software may be 
-covered by third-party licenses, including so-called “open source” software 
-licenses, which means any software licenses approved as open source licenses by 
-the Open Source Initiative or any substantially similar licenses, including 
-without limitation any license that, as a condition of distribution of the 
-software licensed under such license, requires that the distributor make the 
-software available in source code format (such third-party components, 
-“Third-Party Components”).  A list of Third-Party Components, and associated 
-license terms (as required), for particular versions of the Software is 
-indicated at the end of this Agreement, relevant user manual/CD, or the license 
-information displayed on your Device/in Software.  To the extent required by the 
-licenses covering Third-Party Components, the terms of such licenses will apply 
-in lieu of the terms of this Agreement.  To the extent the terms of the licenses 
-applicable to Third-Party Components prohibit any of the restrictions in this 
-Agreement with respect to such Third-Party Components, such restrictions will 
-not apply to such Third-Party Component.
-
-6.	Multiple Versions of Software.  You may receive or obtain the Software in 
-more than one version (e.g. for different operating environments; two or more 
-language translation versions; downloaded from an Epson server or on a CD-ROM), 
-however, regardless of the type or number of copies you receive, you still may 
-use only the media or version appropriate for the license granted in Section 1 
-above.
-
-7.	Disclaimer of Warranty and Remedy.  If you obtained the Software by media 
-from Epson or a dealer, Epson warrants that the media on which the Software is 
-recorded will be free from defects in workmanship and materials under normal use 
-for a period of 90 days from the date of delivery to you.  If the media is 
-returned to Epson or the dealer from which the media was obtained within 90 days 
-of the date of delivery to you, and if Epson determines the media to be 
-defective and provided the media was not subject to misuse, abuse, 
-misapplication or use in defective equipment, Epson will replace the media, upon 
-your return to Epson of the Software, including all copies of any portions 
-thereof.  You acknowledge and agree that the use of the Software is at your sole 
-risk.  THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY WARRANTY OF ANY KIND.  
-EPSON AND ITS SUPPLIERS DO NOT AND CANNOT WARRANT THE PERFORMANCE OR RESULTS YOU 
-MAY OBTAIN BY USING THE SOFTWARE.  Epson does not warrant that the operation of 
-the Software will be uninterrupted, error free, free from viruses or other 
-harmful components or vulnerabilities, or that the functions of the Software 
-will meet your needs or requirements. Epson’s sole and exclusive liability and 
-your exclusive remedy for breach of warranty shall be limited to either, at 
-Epson’s option, the replacement of the media for the Software or to refund your 
-money upon returning the Software and Epson Hardware.  Any replacement Software 
-will be warranted for the remainder of the original warranty period or thirty 
-(30) days, whichever is longer.  If the above remedy fails for any reason, 
-Epson’s entire liability for a breach of warranty shall be limited to a refund 
-of the price paid for the Epson Hardware.  Epson is not liable for performance 
-delays or for nonperformance due to causes beyond its reasonable control.  This 
-Limited Warranty is void if failure of the Software resulted from accident, 
-abuse, or misapplication.  THE STATED LIMITED WARRANTIES AND REMEDY ARE 
-EXCLUSIVE AND IN LIEU OF ALL OTHERS. EPSON DISCLAIMS ALL OTHER WARRANTIES, 
-EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION, ALL WARRANTIES OF 
-NON-INFRINGEMENT, MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.  SOME 
-STATES OR JURISDICTIONS, HOWEVER, DO NOT ALLOW EXCLUSIONS OR LIMITATIONS OF 
-IMPLIED WARRANTIES, AND IN SUCH STATES, THE ABOVE LIMITATION MAY NOT APPLY TO 
-YOU.
-
-8.	Limitation of Liability.  TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, 
-IN NO EVENT WILL EPSON OR ITS SUPPLIERS BE LIABLE FOR ANY DAMAGES, WHATSOEVER, 
-WHETHER DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER 
-ARISING UNDER CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY, BREACH OF 
-WARRANTY, MISREPRESENTATION, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, DAMAGES 
-FOR LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS 
-INFORMATION, OR OTHER PECUNIARY LOSS, ARISING OUT OF THE USE OF OR INABILITY TO 
-USE THE SOFTWARE, OR ARISING OUT OF THIS AGREEMENT, EVEN IF EPSON OR ITS 
-REPRESENTATIVE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.  SOME STATES 
-DO NOT ALLOW THE EXCLUSION OR LIMITATION OF DAMAGES IN CERTAIN TRANSACTIONS, AND 
-IN SUCH STATES, THE ABOVE LIMITATIONS AND EXCLUSIONS MAY NOT APPLY.  
-
-9.	U.S. Government Acquisition of the Software.  This Section applies to all 
-acquisitions of the Software by or for the U.S. Government (“Government”), or by 
-any prime contractor or subcontractor (at any tier) under any contract, grant, 
-cooperative agreement, “other transaction” (“OT”), or other activity with the 
-Government.  By accepting delivery of the Software, the Government, any prime 
-contractor, and any subcontractor agree that the Software qualifies as 
-“commercial” computer software within the meaning of FAR Part 12, paragraph (b) 
-of FAR Subpart 27.405, or DFARS Subpart 227.7202, as applicable, and that no 
-other regulation, or FAR or DFARS data rights clause, applies to the delivery of 
-this Software to the Government.  Accordingly, the terms and conditions of this 
-Agreement govern the Government’s (and the prime contractor and subcontractor’s) 
-use and disclosure of the Software, and supersede any conflicting terms and 
-conditions of the contract, grant, cooperative agreement, OT, or other activity 
-pursuant to which the Software is delivered to the Government.  If this Software 
-fails to meet the Government’s needs, if this Agreement is inconsistent in any 
-respect with Federal law, or if the above cited FAR and DFARS provisions do not 
-govern, the Government agrees to return the Software, unused, to Epson.
-
-10.	Export Restriction.  You agree that the Software will not be shipped, 
-transferred or exported into any country or used in any manner prohibited by the 
-United States Export Administration Act or any other export laws, restrictions 
-or regulations. 
-
-11.	Entire Agreement.  This Agreement is the entire agreement between the 
-parties related to the Software and supersedes any purchase order, 
-communication, advertisement, or representation concerning the Software.  
-
-12.	Binding Agreement; Assignees.  This Agreement shall be binding upon, and 
-inure to the benefit of, the parties hereto and their respective successors, 
-assigns and legal representatives.  
-
-13.	Severability; Modifications.  If any provision herein is found void or 
-unenforceable by a court of competent jurisdiction (subject to Section 22.8 and 
-22.9 if you are a located in the U.S.), it will not affect the validity of the 
-balance of the Agreement, which shall remain valid and enforceable according to 
-its terms.  This Agreement may only be modified in writing signed by an 
-authorized representative of Epson.  
-
-14.	Indemnification.  You agree that you will indemnify and hold harmless, and 
-upon Epson’s request, defend Epson and its directors, officers, shareholders, 
-employees and agents from and against any and all losses, liabilities, damages, 
-costs, expenses (including reasonable attorneys’ fees), actions, suits, and 
-claims arising from (i) any breach of any of your obligations in this Agreement 
-or (ii) any use of the Software or the Epson Hardware.  If Epson asks you to 
-defend any such action, suit or claim, Epson will have the right, at its own 
-expense, to participate in the defense thereof with counsel of its choice.  You 
-will not settle any third-party claims for which Epson is entitled to 
-indemnification without the prior written approval of Epson.
-
-15.	Termination.  Without prejudice to any other rights Epson has, your license 
-rights under Section 1 above and your warranty rights under Section 7 above, 
-shall automatically terminate upon failure by you to comply with this Agreement. 
- Upon termination of such rights, you agree that the Software, and all copies 
-thereof, will be immediately destroyed.
-
-16.	Capacity and Authority to Contract.  You represent that you are of the legal 
-age of majority in your state or jurisdiction of residence and have all 
-necessary authority to enter into this Agreement, including, if applicable, due 
-authorization by your employer to enter into this Agreement.
-
-17.	Privacy, Information Processing.  The Software may have the ability to 
-connect over the Internet to transmit data to and from your Device.  For 
-example, if you install the Software, the Software may cause your Device to send 
-information about your Epson Hardware such as model and serial number, country 
-identifier, language code, operating system information, and Epson Hardware 
-usage information to an Epson Internet site which may return promotional or 
-service information to your Device for display.  Any processing of information 
-provided through the Software, shall be according to applicable data protection 
-laws and the Epson Privacy Policy located at 
-https://global.epson.com/privacy/area_select_confirm_eula.html.  To the extent 
-permitted by applicable laws, by agreeing to the terms of this Agreement and by 
-installing the Software, you consent to the processing and storage of your 
-information in and/or outside your country of residence.  If there is a specific 
-privacy policy incorporated into the Software and/or displayed when you use the 
-Software (for example, in the case of certain software application software), 
-such specific privacy policy shall prevail over the Epson Privacy Policy stated 
-above.
-
-18.	Third Party Websites.  You may, through hypertext or other computer links 
-from the Software, gain access to websites and use certain services that are not 
-under the control of or operated by Epson, but rather are controlled by third 
-parties.  You acknowledge and agree that Epson is not responsible for such third 
-party sites or services, including their accuracy, completeness, timeliness, 
-validity, copyright compliance, legality, decency, quality, or any other aspect 
-thereof.  These third party websites/services are subject to different terms and 
-conditions and when you access and use third party websites/services, you will 
-be legally bound by the terms and conditions of those websites/services.  If 
-there is a conflict between this Agreement and terms and conditions of third 
-party websites/services, the third party websites’/services’ terms and 
-conditions will govern with respect to your access and use of those 
-websites/services.  Although Epson may provide a link to a third party 
-website/service from the Software, such a link is not an authorization, 
-endorsement, sponsorship or affiliation by Epson with respect to such 
-website/services, its content, its owners or its providers.  Epson provides such 
-links for your reference and convenience only.  Accordingly, Epson makes no 
-representations whatsoever concerning such websites/services and does not 
-provide any support related to such third party sites or services.  Epson has 
-not tested any information, products or software found on such websites/services 
-and therefore cannot make any representations whatsoever with respect thereto.  
-You agree that Epson is not responsible for the content or operation of such 
-websites/services, and it is up to you to take precautions to ensure that 
-whatever you select is free of items such as viruses, worms, Trojan horses and 
-other items of a destructive nature.  You are solely responsible for determining 
-the extent to which you may use any content at any other websites/services to 
-which you link from this Software.
-
-(IF YOU ARE LOCATED IN THE UNITED STATES, THE FOLLOWING SECTIONS 19 - 23 APPLY 
-TO YOU)
-
-19.	Ink Purchases.  For certain Epson printer products sold in North America, 
-the Software may also display an option to buy ink from Epson.  If you click on 
-the buy button, the Software will cause your Device to display Epson Hardware 
-cartridge types and ink levels and provide other information about your 
-cartridges, such as the colors, available cartridge sizes, and prices for 
-replacement ink cartridges, which you may purchase online from Epson. 
-
-20.	Downloadable Updates.  You may also be able to download from an Epson 
-Internet site updates or upgrades to the Software if such updates or upgrades 
-are made available.  If you agree to install the Software, any transmissions to 
-or from the Internet, and data collection and use, will be in accordance with 
-Epson’s then-current Privacy Policy, and by installing the Software you agree 
-that such then-current Privacy Policy shall govern such activities.  
-
-21.	Epson Accounts and Promotional Messages.  In addition, if you install the 
-Software and register your Epson Hardware with Epson, and/or you create an 
-account at the Epson Store, and provided your consent to such use, you agree 
-that Epson may merge the data collected in connection with installation of the 
-Software, registration of your Epson Hardware and/or creation of your Epson 
-Store account, consisting of personal information and non-personally 
-identifiable information, and use such merged data to send you Epson promotional 
-or service information.  If you do not wish to send information about your Epson 
-Hardware or receive promotional or service information, you will be able to 
-disable these features on a Windows system through the Monitoring Preferences 
-section in the driver.  On a Mac operating system, you can disable these 
-features by uninstalling the Epson Customer Research Participation and Low Ink 
-Reminder software.
-
-22.	DISPUTES, BINDING INDIVIDUAL ARBITRATION, AND WAIVER OF CLASS ACTIONS AND 
-CLASS ARBITRATIONS 
-
-22.1	Disputes.  The terms of this Section 22 shall apply to all Disputes 
-between you and Epson. The term “Dispute” is meant to have the broadest meaning 
-permissible under law and includes any dispute, claim, controversy or action 
-between you and Epson arising out of or relating to this Agreement, the 
-Software, Epson Hardware, or other transaction involving you and Epson, whether 
-in contract, warranty, misrepresentation, fraud, tort, intentional tort, 
-statute, regulation, ordinance, or any other legal or equitable basis.  
-“DISPUTE” DOES NOT INCLUDE IP CLAIMS, or more specifically, a claim or cause of 
-action for (a) trademark infringement or dilution, (b) patent infringement, (c) 
-copyright infringement or misuse, or (d) trade secret misappropriation (an “IP 
-Claim”).  You and Epson also agree, notwithstanding Section 22.6, that a court, 
-not an arbitrator, may decide if a claim or cause of action is for an IP Claim. 
-
-22.2	Binding Arbitration.  You and Epson agree that all Disputes shall be 
-resolved by binding arbitration according to this Agreement.  ARBITRATION MEANS 
-THAT YOU WAIVE YOUR RIGHT TO A JUDGE OR JURY IN A COURT PROCEEDING AND YOUR 
-GROUNDS FOR APPEAL ARE LIMITED.  Pursuant to this Agreement, binding arbitration 
-shall be administered by JAMS, a nationally recognized arbitration authority, 
-pursuant to its code of procedures then in effect for consumer related disputes, 
-but excluding any rules that permit joinder or class actions in arbitration (for 
-more detail on procedure, see Section 22.6 below).  You and Epson understand and 
-agree that (a) the Federal Arbitration Act (9 U.S.C. §1, et seq.) governs the 
-interpretation and enforcement of this Section 22, (b) this Agreement 
-memorializes a transaction in interstate commerce, and (c) this Section 22 shall 
-survive termination of this Agreement. 
-
-22.3	Pre-Arbitration Steps and Notice.  Before submitting a claim for 
-arbitration, you and Epson agree to try, for sixty (60) days, to resolve any 
-Dispute informally.  If Epson and you do not reach an agreement to resolve the 
-Dispute within the sixty (60) days, you or Epson may commence an arbitration. 
-Notice to Epson must be addressed to: Epson America, Inc., ATTN: Legal 
-Department, 3840 Kilroy Airport Way, Long Beach, CA 90806 (the “Epson Address”). 
- The Dispute Notice to you will be sent to the most recent address Epson has in 
-its records for you.  For this reason, it is important to notify us if your 
-address changes by emailing us at EAILegal@ea.epson.com or writing us at the 
-Epson Address above.  Notice of the Dispute shall include the sender’s name, 
-address and contact information, the facts giving rise to the Dispute, and the 
-relief requested (the “Dispute Notice”).  Following receipt of the Dispute 
-Notice, Epson and you agree to act in good faith to resolve the Dispute before 
-commencing arbitration. 
-
-22.4	Small Claims Court.  Notwithstanding the foregoing, you may bring an 
-individual action in the small claims court of your state or municipality if the 
-action is within that court’s jurisdiction and is pending only in that court. 
-
-22.5	WAIVER OF CLASS ACTIONS AND CLASS ARBITRATIONS.  YOU AND EPSON AGREE 
-THAT EACH PARTY MAY BRING DISPUTES AGAINST THE OTHER PARTY ONLY IN AN INDIVIDUAL 
-CAPACITY, AND NOT AS A PLAINTIFF OR CLASS MEMBER IN ANY CLASS OR REPRESENTATIVE 
-PROCEEDING, INCLUDING WITHOUT LIMITATION FEDERAL OR STATE CLASS ACTIONS, OR 
-CLASS ARBITRATIONS. CLASS ACTION LAWSUITS, CLASS-WIDE ARBITRATIONS, PRIVATE 
-ATTORNEY-GENERAL ACTIONS, AND ANY OTHER PROCEEDING WHERE SOMEONE ACTS IN A 
-REPRESENTATIVE CAPACITY ARE NOT ALLOWED.  ACCORDINGLY, UNDER THE ARBITRATION 
-PROCEDURES OUTLINED IN THIS SECTION, AN ARBITRATOR SHALL NOT COMBINE OR 
-CONSOLIDATE MORE THAN ONE PARTY’S CLAIMS WITHOUT THE WRITTEN CONSENT OF ALL 
-AFFECTED PARTIES TO AN ARBITRATION PROCEEDING. 
-
-22.6	Arbitration Procedure.   If you or Epson commences arbitration, the 
-arbitration shall be governed by the rules of JAMS that are in effect when the 
-arbitration is filed, excluding any rules that permit arbitration on a class or 
-representative basis (the “JAMS Rules”), available at http://www.jamsadr.com or 
-by calling 1-800-352-5267, and under the rules set forth in this Agreement.  All 
-Disputes shall be resolved by a single neutral arbitrator, and both parties 
-shall have a reasonable opportunity to participate in the selection of the 
-arbitrator.  The arbitrator is bound by the terms of this Agreement.  The 
-arbitrator, and not any federal, state or local court or agency, shall have 
-exclusive authority to resolve all disputes arising out of or relating to the 
-interpretation, applicability, enforceability or formation of this Agreement, 
-including any claim that all or any part of this Agreement is void or voidable.  
-Notwithstanding this broad delegation of authority to the arbitrator, a court 
-may determine the limited question of whether a claim or cause of action is for 
-an IP Claim, which is excluded from the definition of “Disputes” in Section 22.1 
-above.  The arbitrator shall be empowered to grant whatever relief would be 
-available in a court under law or in equity.  The arbitrator may award you the 
-same damages as a court could, and may award declaratory or injunctive relief 
-only in favor of the individual party seeking relief and only to the extent 
-necessary to provide relief warranted by that party’s individual claim.  In some 
-instances, the costs of arbitration can exceed the costs of litigation and the 
-right to discovery may be more limited in arbitration than in court.  The 
-arbitrator’s award is binding and may be entered as a judgment in any court of 
-competent jurisdiction. 
-
-You may choose to engage in arbitration hearings by telephone.  Arbitration 
-hearings not conducted by telephone shall take place in a location reasonably 
-accessible from your primary residence, or in Orange County, California, at your 
-option.
-
-a)	Initiation of Arbitration Proceeding.  If either you or Epson decides to 
-arbitrate a Dispute, both parties agree to the following procedure: 
-
-(i)	Write a Demand for Arbitration.  The demand must include a description of 
-the Dispute and the amount of damages sought to be recovered.  You can find a 
-copy of a Demand for Arbitration at http://www.jamsadr.com (“Demand for 
-Arbitration”). 
-
-(ii)	Send three copies of the Demand for Arbitration, plus the appropriate 
-filing fee, to: JAMS, 500 North State College Blvd., Suite 600 Orange, CA 92868, 
-U.S.A.
-
-(iii)	Send one copy of the Demand for Arbitration to the other party (same 
-address as the Dispute Notice), or as otherwise agreed by the parties. 
-
-b)	Hearing Format.  During the arbitration, the amount of any settlement offer 
-made shall not be disclosed to the arbitrator until after the arbitrator 
-determines the amount, if any, to which you or Epson is entitled.  The discovery 
-or exchange of non-privileged information relevant to the Dispute may be allowed 
-during the arbitration.
-
-c)	Arbitration Fees.  Epson shall pay, or (if applicable) reimburse you for, 
-all JAMS filings and arbitrator fees for any arbitration commenced (by you or 
-Epson) pursuant to provisions of this Agreement. 
-
-d)	Award in Your Favor.  For Disputes in which you or Epson seeks $75,000 or 
-less in damages exclusive of attorney’s fees and costs, if the arbitrator’s 
-decision results in an award to you in an amount greater than Epson’s last 
-written offer, if any, to settle the Dispute, Epson will: (i) pay you $1,000 or 
-the amount of the award, whichever is greater; (ii) pay you twice the amount of 
-your reasonable attorney’s fees, if any; and (iii) reimburse you for any 
-expenses (including expert witness fees and costs) that your attorney reasonably 
-accrues for investigating, preparing, and pursuing the Dispute in arbitration.  
-Except as agreed upon by you and Epson in writing, the arbitrator shall 
-determine the amount of fees, costs, and expenses to be paid by Epson pursuant 
-to this Section 22.6d).
-
-e)	Attorney’s Fees.  Epson will not seek its attorney’s fees and expenses for 
-any arbitration commenced involving a Dispute under this Agreement.  Your right 
-to attorney’s fees and expenses under Section 22.6(d) above does not limit your 
-rights to attorney’s fees and expenses under applicable law; notwithstanding the 
-foregoing, the arbitrator may not award duplicative awards of attorney’s fees 
-and expenses. 
-
-22.7	Opt-out.  You may elect to opt-out (exclude yourself) from the final, 
-binding, individual arbitration procedure and waiver of class and representative 
-proceedings specified in this Agreement by sending a written letter to the Epson 
-Address within thirty (30) days of your assent to this Agreement (including 
-without limitation the purchase, download, installation of the Software or other 
-applicable use of Epson Hardware, products and services) that specifies (i) your 
-name, (ii) your mailing address, and (iii) your request to be excluded from the 
-final, binding individual arbitration procedure and waiver of class and 
-representative proceedings specified in this Section 22.  In the event that you 
-opt-out consistent with the procedure set forth above, all other terms shall 
-continue to apply, including the requirement to provide notice prior to 
-litigation. 
-
-22.8	Amendments to Section 22.  Notwithstanding any provision in this 
-Agreement to the contrary, you and Epson agree that if Epson makes any future 
-amendments to the dispute resolution procedure and class action waiver 
-provisions (other than a change to Epson’s address) in this Agreement, Epson 
-will obtain your affirmative assent to the applicable amendment.  If you do not 
-affirmatively assent to the applicable amendment, you are agreeing that you will 
-arbitrate any Dispute between the parties in accordance with the language of 
-this Section 22 (or resolve disputes as provided for in Section 22.7, if you 
-timely elected to opt-out when you first assented to this Agreement).
-
-22.9	Severability.  If any provision in this Section 22 is found to be 
-unenforceable, that provision shall be severed with the remainder of this 
-Agreement remaining in full force and effect.  The foregoing shall not apply to 
-the prohibition against class or representative actions as provided in Section 
-22.5.  This means that if Section 22.5 is found to be unenforceable, the entire 
-Section 22 (but only Section 22) shall be null and void. 
-
-23.	For New Jersey Residents.  NOTWITHSTANDING ANY TERMS SET FORTH IN THIS 
-AGREEMENT, IF ANY OF THE PROVISIONS SET FORTH IN SECTIONS 7 OR 8 ARE HELD 
-UNENFORCEABLE, VOID OR INAPPLICABLE UNDER NEW JERSEY LAW, THEN ANY SUCH 
-PROVISION SHALL NOT APPLY TO YOU BUT THE REST OF THE AGREEMENT SHALL REMAIN 
-BINDING ON YOU AND EPSON.  NOTWITHSTANDING ANY PROVISION IN THIS AGREEMENT, 
-NOTHING IN THIS AGREEMENT IS INTENDED TO, NOR SHALL IT BE DEEMED OR CONSTRUED 
-TO, LIMIT ANY RIGHTS AVAILABLE TO YOU UNDER THE TRUTH-IN-CONSUMER CONTRACT, 
-WARRANTY AND NOTICE ACT.  
-
-Rev. December 2018
diff --git a/licenses/Manifest.gz b/licenses/Manifest.gz
index 637061d7c168..7e9d0151df58 100644
Binary files a/licenses/Manifest.gz and b/licenses/Manifest.gz differ
diff --git a/licenses/Subversion b/licenses/Subversion
deleted file mode 100644
index bad35d9d8f49..000000000000
--- a/licenses/Subversion
+++ /dev/null
@@ -1,57 +0,0 @@
-This license applies to all portions of Subversion which are not
-externally-maintained libraries (e.g. apr/, apr-util/, and neon/).
-Such libraries have their own licenses; we recommend you read them, as
-their terms may differ from the terms below.
-
-This is version 1 of this license.  It is also available online at
-http://subversion.tigris.org/license-1.html.  If newer versions of
-this license are posted there (the same URL, but with the version
-number incremented: .../license-2.html, .../license-3.html, and so
-on), you may use a newer version instead, at your option.
-
-================================================================
-Copyright (c) 2000-2006 CollabNet.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. The end-user documentation included with the redistribution,
-   if any, must include the following acknowledgment:
-      "This product includes software developed by
-       CollabNet (http://www.Collab.Net/)."
-   Alternately, this acknowledgment may appear in the software itself,
-   if and wherever such third-party acknowledgments normally appear.
-
-4. The hosted project names must not be used to endorse or promote
-   products derived from this software without prior written
-   permission. For written permission, please contact info@collab.net.
-
-5. Products derived from this software may not use the "Tigris" name
-   nor may "Tigris" appear in their names without prior written
-   permission of CollabNet.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL COLLABNET OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-====================================================================
-
-This software consists of voluntary contributions made by many
-individuals on behalf of CollabNet.
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 875487ecc1fd..549e4211cfaa 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/libsieve/libsieve-2.2.7.ebuild b/mail-filter/libsieve/libsieve-2.2.7.ebuild
index 828b84ce2820..8a912109ef1e 100644
--- a/mail-filter/libsieve/libsieve-2.2.7.ebuild
+++ b/mail-filter/libsieve/libsieve-2.2.7.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit autotools
+
 DESCRIPTION="A library for parsing, sorting and filtering your mail"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://libsieve.sourceforge.net/"
@@ -10,9 +12,22 @@ HOMEPAGE="http://libsieve.sourceforge.net/"
 SLOT="0"
 LICENSE="MIT LGPL-2.1"
 KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
-IUSE=""
 
-DEPEND=""
 RDEPEND="!<net-mail/mailutils-2.1"
 
 S=${WORKDIR}/${P}/src
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 4070d990a833..7f1dc8445369 100644
Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index ac4966532534..defa014f0cb6 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -1,4 +1,3 @@
-DIST msmtp-1.8.10.tar.xz 355364 BLAKE2B b70143e28da8b64035448cbb61e133a5a1d35bc472316a3e164f2f168d67ef71455c583610afdfe522d33b77dea1a7ff55f9d6c200c6b1d9b3e2fcadb4fa10c1 SHA512 0d2280772ded3ed33036f7a9047c054f413e34f8264a82df26b85dc48000fa318d5400201ce0b888f3d821c629e25e17e5cf6b69b3e452b14e6883904b4ad83b
-DIST msmtp-1.8.11.tar.xz 356492 BLAKE2B 0ee4b9ee859b21c35776c037fa93a3b104a86103a5543b0a0c035d3c3a285d7e6cf7eb38e56b172c4dcd6cc536274b6d6661297b2e160b1e9eed659fadfb5e17 SHA512 77595ca3d06781aa908677edae08bef92840e69dde5db8eedb555327b671d87cde441181fa17342f5b9492e76f0520a49bfa86dafce9d93844137ae7f96eac16
 DIST msmtp-1.8.12.tar.xz 364712 BLAKE2B 94707d18d9be71e8e51413cdcc55887fc15bd7d0f059d54cfcf4e07b5589febbb9ed4025206e3b82d1b12edad45086d3ad8a47fb3d37488a49e46984d7b7bc32 SHA512 8620e5e9a88a49769cfdbf2aa83842b230b3fd1584641d17129cb404e3c9696edd5a28237ef46a115ca82d2a846c0f653eaa837ba6f8512f8b57493d64451df8
+DIST msmtp-1.8.13.tar.xz 359536 BLAKE2B 824d88b571ac1dfd78046f1939fa83c4fad9679bce993c20d073df5cd431deee1ca36119123d307d788be13d700901c13c54ba47496f2148cb9fbf9e2308698c SHA512 1b466fc518d0468a8febdf238a6d422fabb95be8158d2e52e38aeb5e5b21661af9791ff8ed82f72f111cebe2ce1b93deabeb91dca4f06f09cf765152095a1cfd
 DIST msmtp-1.8.7.tar.xz 340908 BLAKE2B 5241acf54d5a6af6ccf2c3bfd33954a5235af2d2cb467e4134401538e60e1847489a7a599359e2d13202ea9637c32a67ec5180372b139e06f6d47f060cba6c8f SHA512 5a079cb90b48853ad812125e8b341f5bcd5f5ba4725d62c37210050896527b63f993aa6393f1d4107636153bf0ed84b0288e88a7e78a119c66b2d58f1e69a67d
diff --git a/mail-mta/msmtp/msmtp-1.8.10.ebuild b/mail-mta/msmtp/msmtp-1.8.10.ebuild
deleted file mode 100644
index 9c112ec7abde..000000000000
--- a/mail-mta/msmtp/msmtp-1.8.10.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 2004-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps multilib
-
-DESCRIPTION="An SMTP client and SMTP plugin for mail user agents such as Mutt"
-HOMEPAGE="https://marlam.de/msmtp/"
-SRC_URI="https://marlam.de/msmtp/releases/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="daemon doc gnome-keyring idn +mta nls sasl ssl vim-syntax"
-
-# fcaps.eclass unconditionally defines "filecaps" USE flag which we need for
-# USE="daemon" in order to set the caps we need.
-REQUIRED_USE="daemon? ( filecaps )"
-
-# Upstream discourages usage of openssl. See also
-# https://marlam.de/msmtp/news/openssl-discouraged/
-DEPEND="
-	gnome-keyring? ( app-crypt/libsecret )
-	nls? ( virtual/libintl )
-	sasl? ( virtual/gsasl )
-	ssl? ( net-libs/gnutls[idn?] )
-	!ssl? ( idn? ( net-dns/libidn2:= ) )
-"
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase
-	daemon? (
-		acct-group/msmtpd
-		acct-user/msmtpd
-	)
-	mta? (
-		!mail-mta/courier
-		!mail-mta/esmtp
-		!mail-mta/exim
-		!mail-mta/mini-qmail
-		!mail-mta/netqmail
-		!mail-mta/nullmailer
-		!mail-mta/postfix
-		!mail-mta/qmail-ldap
-		!mail-mta/sendmail
-		!mail-mta/opensmtpd
-		!<mail-mta/ssmtp-2.64-r2
-		!>=mail-mta/ssmtp-2.64-r2[mta]
-	)
-"
-
-BDEPEND="
-	doc? ( virtual/texi2dvi )
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-DOCS="AUTHORS ChangeLog NEWS README THANKS doc/msmtprc*"
-
-src_prepare() {
-	# Use default Gentoo location for mail aliases
-	sed 's:/etc/aliases:/etc/mail/aliases:' \
-		-i scripts/find_alias/find_alias_for_msmtp.sh || die
-
-	default
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-gai-idn
-		$(use_enable nls)
-		$(use_with daemon msmtpd)
-		$(use_with gnome-keyring libsecret)
-		$(use_with idn libidn)
-		$(use_with sasl libgsasl)
-		$(use_with ssl tls gnutls)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc ; then
-		cd doc || die
-		emake html pdf
-	fi
-}
-
-src_install() {
-	default
-
-	if use daemon ; then
-		fcaps CAP_NET_BIND_SERVICE usr/bin/msmtpd
-		newinitd "${FILESDIR}"/msmtpd.init msmtpd
-		newconfd "${FILESDIR}"/msmtpd.confd msmtpd
-	fi
-
-	if use doc ; then
-		dodoc doc/msmtp.{html,pdf}
-	fi
-
-	if use mta ; then
-		dosym ../bin/msmtp /usr/sbin/sendmail
-		dosym ../bin/msmtp /usr/$(get_libdir)/sendmail
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/vim/msmtp.vim
-	fi
-
-	insinto /etc
-	newins doc/msmtprc-system.example msmtprc
-
-	src_install_contrib find_alias find_alias_for_msmtp.sh
-	src_install_contrib msmtpqueue "*.sh" "README ChangeLog"
-	src_install_contrib msmtpq "msmtpq msmtp-queue" README.msmtpq
-	src_install_contrib set_sendmail set_sendmail.sh set_sendmail.conf
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		einfo "Please edit ${EROOT}/etc/msmtprc before first use."
-		einfo "In addition, per user configuration files can be placed"
-		einfo "as '~/.msmtprc'.  See the msmtprc-user.example file under"
-		einfo "/usr/share/doc/${PF}/ for an example."
-	fi
-}
-
-src_install_contrib() {
-	subdir="$1"
-	bins="$2"
-	docs="$3"
-	local dir=/usr/share/${PN}/${subdir}
-	insinto ${dir}
-	exeinto ${dir}
-	for i in ${bins} ; do
-		doexe scripts/${subdir}/${i}
-	done
-	for i in ${docs} ; do
-		newdoc scripts/${subdir}/${i} ${subdir}.${i}
-	done
-}
diff --git a/mail-mta/msmtp/msmtp-1.8.12.ebuild b/mail-mta/msmtp/msmtp-1.8.12.ebuild
index 9c112ec7abde..81fb1674438d 100644
--- a/mail-mta/msmtp/msmtp-1.8.12.ebuild
+++ b/mail-mta/msmtp/msmtp-1.8.12.ebuild
@@ -22,10 +22,10 @@ REQUIRED_USE="daemon? ( filecaps )"
 # https://marlam.de/msmtp/news/openssl-discouraged/
 DEPEND="
 	gnome-keyring? ( app-crypt/libsecret )
+	idn? ( net-dns/libidn2:= )
 	nls? ( virtual/libintl )
 	sasl? ( virtual/gsasl )
 	ssl? ( net-libs/gnutls[idn?] )
-	!ssl? ( idn? ( net-dns/libidn2:= ) )
 "
 
 RDEPEND="${DEPEND}
diff --git a/mail-mta/msmtp/msmtp-1.8.11.ebuild b/mail-mta/msmtp/msmtp-1.8.13.ebuild
similarity index 98%
rename from mail-mta/msmtp/msmtp-1.8.11.ebuild
rename to mail-mta/msmtp/msmtp-1.8.13.ebuild
index 9c112ec7abde..81fb1674438d 100644
--- a/mail-mta/msmtp/msmtp-1.8.11.ebuild
+++ b/mail-mta/msmtp/msmtp-1.8.13.ebuild
@@ -22,10 +22,10 @@ REQUIRED_USE="daemon? ( filecaps )"
 # https://marlam.de/msmtp/news/openssl-discouraged/
 DEPEND="
 	gnome-keyring? ( app-crypt/libsecret )
+	idn? ( net-dns/libidn2:= )
 	nls? ( virtual/libintl )
 	sasl? ( virtual/gsasl )
 	ssl? ( net-libs/gnutls[idn?] )
-	!ssl? ( idn? ( net-dns/libidn2:= ) )
 "
 
 RDEPEND="${DEPEND}
diff --git a/mail-mta/protonmail-bridge-bin/Manifest b/mail-mta/protonmail-bridge-bin/Manifest
index 973239097548..a03fcbf58c38 100644
--- a/mail-mta/protonmail-bridge-bin/Manifest
+++ b/mail-mta/protonmail-bridge-bin/Manifest
@@ -1,2 +1,2 @@
-DIST protonmail-bridge-1.4.4-1.x86_64.rpm 55354116 BLAKE2B 17365d5e431595768ad703cb72713d68c1f59fcada9081a490c3d6e4ebe1863d125073fdc4866cc0e61cb2eb3eb29fd7929529b0d6975925e95b00af576bb80a SHA512 d5fe05df70df42cf117e0e4eea893324ea831a33b89c82c317a2a36c179b836336b7acc3f57429833b875a6c380882c06ce262579019c6a01de5611ebf93197c
 DIST protonmail-bridge-1.4.5-1.x86_64.rpm 55357615 BLAKE2B f3ba298bdab26df9d7bebe65f974fde01962890c174dab91d6fb32f4349655bc8561009321f1b4906370bc9cd8a8946f094f215fb38a3aa0b6c8d633e2c44232 SHA512 80273ab2a679bedd6c6a2dc906545d15b4aee281303b255a749c5de15286ce8b49e6c3805ab594057d5c3af7dfedeb8b9acefab4be83e0f7728d06523d64143e
+DIST protonmail-bridge-1.5.0-1.x86_64.rpm 55971031 BLAKE2B 072a0fb93a669a22818c6c635ee2306a81ec814b546d8b5ffa3c1f8b3662a3e6c58f99bed5eca76ccdc99a4ee73f9a969afa63c5c3b43da72bb1b12c19218e96 SHA512 a17d68630781cd02589b9f3758d9d0c56641dae256a6edf496247fdb91524a508ece0ca553ae207bea119322a76fa2bc89aa2455cbea8dfc5c3f3182b3508670
diff --git a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.4.4.ebuild b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.5.0.ebuild
similarity index 100%
rename from mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.4.4.ebuild
rename to mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.5.0.ebuild
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 5d742df2fb6d..9a02b927a955 100644
Binary files a/media-fonts/Manifest.gz and b/media-fonts/Manifest.gz differ
diff --git a/media-fonts/cantarell/cantarell-0.201.ebuild b/media-fonts/cantarell/cantarell-0.201.ebuild
index d444f6faff92..787f8046f885 100644
--- a/media-fonts/cantarell/cantarell-0.201.ebuild
+++ b/media-fonts/cantarell/cantarell-0.201.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/CantarellFonts"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 433c41252052..7cee5e74a144 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/darktable/darktable-3.2.1-r1.ebuild b/media-gfx/darktable/darktable-3.2.1-r1.ebuild
index 06f7a8f31b94..05d2a6634f26 100644
--- a/media-gfx/darktable/darktable-3.2.1-r1.ebuild
+++ b/media-gfx/darktable/darktable-3.2.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_P
 
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 LANGS=" de es fr he it pl pt-BR ru sl"
 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
 	lto lua nls opencl openmp openexr system-lua tools webp
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index d5e989988676..74c0099dc368 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -1 +1,2 @@
 DIST fontforge-20200314.tar.xz 13850076 BLAKE2B 5e6ae3b7940a5b3b08811abdfc9d151f231e6d457b219eb0c666e1b831db815b696f345eda0d4d423b7e340f56fca67205734ae19903b3815381080d34b5e95c SHA512 09f5dc93f87ca63668d72d108690604489d6b3cec7eedff1c07ad6d1ce5eae442ab60e79e71ae8b99e9808f3551011788025a86ffc3a9738518d99761d849975
+DIST fontforge-20201107.tar.xz 14163424 BLAKE2B 8ce9148eef6e5b7206ab5c70310ff36fac67c392117e3c0b28060803a54306bf21c179b62b98734e11253739eac29e2ea8bcf3014c09432bb3a0b2b0f3ec631a SHA512 cf9666395405ab02943f0160959f04251bd2a80e279a8f60431089ad19a4c5a232efd42097050ed9f6c1fb39d01488176262949fd81f5f0960fe853b497437dc
diff --git a/media-gfx/fontforge/files/fontforge-20200314-freetype-2.10.3.patch b/media-gfx/fontforge/files/fontforge-20200314-freetype-2.10.3.patch
new file mode 100644
index 000000000000..0a07423ab626
--- /dev/null
+++ b/media-gfx/fontforge/files/fontforge-20200314-freetype-2.10.3.patch
@@ -0,0 +1,60 @@
+https://bugs.gentoo.org/753788
+https://github.com/fontforge/fontforge/commit/7837530190a3b666109ba4eb9b3b76f09799057c
+----
+From 7837530190a3b666109ba4eb9b3b76f09799057c Mon Sep 17 00:00:00 2001
+From: Jeremy Tan <jtanx@outlook.com>
+Date: Tue, 3 Nov 2020 21:27:26 +1100
+Subject: [PATCH] Fix FreeType debugger compilation with FreeType >= 2.10.3
+
+Fixes #4477
+---
+ fontforge/fffreetype.h  | 4 +++-
+ fontforgeexe/cvdebug.c  | 4 +++-
+ fontforgeexe/cvdgloss.c | 4 +++-
+ 3 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/fontforge/fffreetype.h b/fontforge/fffreetype.h
+index 7757b7bf3b..11070fc916 100644
+--- a/fontforge/fffreetype.h
++++ b/fontforge/fffreetype.h
+@@ -39,7 +39,9 @@
+ #endif
+ 
+ #if defined(FREETYPE_HAS_DEBUGGER)
+-# include <internal/internal.h>
++#if FREETYPE_MAJOR == 2 && (FREETYPE_MINOR < 10 || (FREETYPE_MINOR == 10 && FREETYPE_PATCH < 3))
++#  include <internal/internal.h>
++# endif
+ # include <ttdriver.h>
+ # include <ttinterp.h>
+ # include <ttobjs.h>
+diff --git a/fontforgeexe/cvdebug.c b/fontforgeexe/cvdebug.c
+index 9fb7db6112..a891902a06 100644
+--- a/fontforgeexe/cvdebug.c
++++ b/fontforgeexe/cvdebug.c
+@@ -59,7 +59,9 @@ void CVDebugPointPopup(CharView *cv) {
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
+ 
+-#include <internal/internal.h>
++#if FREETYPE_MAJOR == 2 && (FREETYPE_MINOR < 10 || (FREETYPE_MINOR == 10 && FREETYPE_PATCH < 3))
++# include <internal/internal.h>
++#endif
+ #include <ttinterp.h>
+ 
+ # define PPEMX(exc)	((exc)->size->root.metrics.x_ppem)
+diff --git a/fontforgeexe/cvdgloss.c b/fontforgeexe/cvdgloss.c
+index 33cc5c71e1..c1ad97790b 100644
+--- a/fontforgeexe/cvdgloss.c
++++ b/fontforgeexe/cvdgloss.c
+@@ -42,7 +42,9 @@ extern GBox _ggadget_Default_Box;
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
+ 
+-#include <internal/internal.h>
++#if FREETYPE_MAJOR == 2 && (FREETYPE_MINOR < 10 || (FREETYPE_MINOR == 10 && FREETYPE_PATCH < 3))
++# include <internal/internal.h>
++#endif
+ #include <ttinterp.h>
+ 
+ #define PPEMX(exc)	((exc)->size->root.metrics.x_ppem)
diff --git a/media-gfx/fontforge/fontforge-20200314.ebuild b/media-gfx/fontforge/fontforge-20200314.ebuild
index 0a66fa3ce0b2..613e6a7f4259 100644
--- a/media-gfx/fontforge/fontforge-20200314.ebuild
+++ b/media-gfx/fontforge/fontforge-20200314.ebuild
@@ -58,6 +58,7 @@ PATCHES=(
 	"${FILESDIR}"/20200314-big-endian.patch
 	"${FILESDIR}"/fontforge-doc-no-warn-error.patch
 	"${FILESDIR}"/20200314-MacServiceReadFDs.patch
+	"${FILESDIR}"/${P}-freetype-2.10.3.patch
 )
 
 pkg_setup() {
diff --git a/media-gfx/fontforge/fontforge-20201107.ebuild b/media-gfx/fontforge/fontforge-20201107.ebuild
new file mode 100644
index 000000000000..96f32a9698ba
--- /dev/null
+++ b/media-gfx/fontforge/fontforge-20201107.ebuild
@@ -0,0 +1,112 @@
+# Copyright 2004-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit python-single-r1 xdg cmake
+
+DESCRIPTION="postscript font editor and converter"
+HOMEPAGE="https://fontforge.org/"
+SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforge-${PV}.tar.xz"
+
+LICENSE="BSD GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode woff2 X"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libltdl:0
+	dev-libs/libxml2:2=
+	>=media-libs/freetype-2.3.7:2=
+	gif? ( media-libs/giflib:0= )
+	jpeg? ( virtual/jpeg:0 )
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0= )
+	truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] )
+	gtk? ( >=x11-libs/gtk+-3.10:3 )
+	!gtk? (
+		X? (
+			>=x11-libs/cairo-1.6:0=
+			>=x11-libs/pango-1.10:0=[X]
+			x11-libs/libX11:0=
+			x11-libs/libXi:0=
+		)
+	)
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	unicode? ( media-libs/libuninameslist:0= )
+	woff2? ( media-libs/woff2:0= )
+"
+DEPEND="${RDEPEND}
+	!gtk? ( X? ( x11-base/xorg-proto ) )
+"
+BDEPEND="
+	sys-devel/gettext
+	doc? ( >=dev-python/sphinx-2 )
+	python? ( ${PYTHON_DEPS} )
+	test? ( ${RDEPEND} )
+"
+
+PATCHES=(
+	"${FILESDIR}"/fontforge-doc-no-warn-error.patch
+)
+
+pkg_setup() {
+	:
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOCS=$(usex doc ON OFF)
+		-DENABLE_LIBGIF=$(usex gif ON OFF)
+		-DENABLE_LIBJPEG=$(usex jpeg ON OFF)
+		-DENABLE_LIBPNG=$(usex png ON OFF)
+		-DENABLE_LIBREADLINE=$(usex readline ON OFF)
+		-DENABLE_LIBSPIRO=OFF # No package in Gentoo
+		-DENABLE_LIBTIFF=$(usex tiff ON OFF)
+		-DENABLE_LIBUNINAMESLIST=$(usex unicode ON OFF)
+		-DENABLE_MAINTAINER_TOOLS=OFF
+		-DENABLE_PYTHON_EXTENSION=$(usex python ON OFF)
+		-DENABLE_PYTHON_SCRIPTING=$(usex python ON OFF)
+		-DENABLE_TILE_PATH=ON
+		-DENABLE_WOFF2=$(usex woff2 ON OFF)
+	)
+
+	if use gtk || use X; then
+		mycmakeargs+=(
+			-DENABLE_GUI=ON
+			# Prefer GTK over X11 if both USE flage are enabled
+			-DENABLE_X11=$(usex gtk OFF ON)
+		)
+	else
+		mycmakeargs+=( -DENABLE_GUI=OFF )
+	fi
+
+	if use python; then
+		python_setup
+		mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
+	fi
+
+	if use truetype-debugger ; then
+		local ft2="${ESYSROOT}/usr/include/freetype2"
+		local ft2i="${ft2}/internal4fontforge"
+		mycmakeargs+=(
+			-DENABLE_FREETYPE_DEBUGGER="${ft2}"
+			-DFreeTypeSource_INCLUDE_DIRS="${ft2};${ft2i}/include;${ft2i}/include/freetype;${ft2i}/src/truetype"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	docompress -x /usr/share/doc/${PF}/html
+	einstalldocs
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/media-gfx/xsane/xsane-0.999-r3.ebuild b/media-gfx/xsane/xsane-0.999-r3.ebuild
index 21fc69c48587..08d3756194f8 100644
--- a/media-gfx/xsane/xsane-0.999-r3.ebuild
+++ b/media-gfx/xsane/xsane-0.999-r3.ebuild
@@ -76,14 +76,14 @@ src_install() {
 	# link xsane so it is seen as a plugin in gimp
 	if use gimp; then
 		local plugindir
-		local gimptool=$(ls "${EPREFIX}"/usr/bin/gimptool* | head -n1)
-		if [ -n "${gimptool}" ]; then
-			plugindir="$(${gimptool} --gimpplugindir)/plug-ins"
+		local gimptool=( "${EPREFIX}"/usr/bin/gimptool* )
+		if [[ ${#gimptool[@]} -gt 0 ]]; then
+			plugindir="$("${gimptool[0]}" --gimpplugindir)/plug-ins"
 		else
 			die "Can't find GIMP plugin directory."
 		fi
-		dodir "${plugindir#${EPREFIX}}"
-		dosym "${EPREFIX}/usr/bin/xsane" "${plugindir#${EPREFIX}}"/xsane
+		mkdir -p "${D}${plugindir}" || die
+		ln -s ../../../../bin/xsane "${D}${plugindir}"/xsane || die
 	fi
 
 	newicon "${DISTDIR}/${PN}-256x256.png" "${PN}".png
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index cc7daf8a072d..b8770f289778 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/ampache_browser/ampache_browser-1.0.3.ebuild b/media-libs/ampache_browser/ampache_browser-1.0.3.ebuild
index 9dac8716a55c..d60c2d49f48f 100644
--- a/media-libs/ampache_browser/ampache_browser-1.0.3.ebuild
+++ b/media-libs/ampache_browser/ampache_browser-1.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ampache-browser/ampache_browser/archive/v${PV}.tar.g
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="debug nls"
 
 RDEPEND="dev-qt/qtconcurrent:5
diff --git a/media-libs/bio2jack/bio2jack-0.9-r2.ebuild b/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
index 430eff7e8424..abd96bd163f8 100644
--- a/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
+++ b/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/bio2jack/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static-libs"
 
 BDEPEND="
diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest
index 292f9ee3c9d8..9ea430da12af 100644
--- a/media-libs/freeimage/Manifest
+++ b/media-libs/freeimage/Manifest
@@ -1,2 +1,3 @@
 DIST FreeImage3180.pdf 1665541 BLAKE2B 5d40ee6fa0a1e73df0cc961edbd70a2835ef88fb540f123fd81f2bb826d4c949d2a60dfe3fc02406ce632a389935abac0d471c963c9803b8c2aece2b48afb003 SHA512 632f68b14f7a5916a1b95bbf86c268d0afe786a2537472301bb002254aa3195f046efb41f073133633211e985e90edbb99285ab6f42bc55501c756292a3c4c03
 DIST FreeImage3180.zip 7415716 BLAKE2B b695271f4e80eb304eccde66e38b5095eceae51fbe0dd97df69c55f364f8440d8c97139b8edc2f01c400f5c53a7336fdfab1e28aa3ea04f485901d5def443d25 SHA512 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818
+DIST freeimage-3.18.0-unbundling.patch 20960 BLAKE2B 61ee63e7be0d5db7bf4a3bc053bb67f5a6ce6949ed252b1729e7542addd432d1105b7e70d834f05210be3c5c81a5378a2cb00d5b9d8e21590672a1ac6e1135fa SHA512 c56062099e17e8a16447fccc4bdf3089e7992273f1a09a2ff7f591b3bd68a8d1e80842400aaffdc8394ed64273e26a4f01e12fc8c55bb40d346db96eb5dcbe30
diff --git a/media-libs/freeimage/files/freeimage-3.18.0-unbundling.patch b/media-libs/freeimage/files/freeimage-3.18.0-unbundling.patch
deleted file mode 100644
index ab2e0341b324..000000000000
--- a/media-libs/freeimage/files/freeimage-3.18.0-unbundling.patch
+++ /dev/null
@@ -1,724 +0,0 @@
-From 03a713e62529d1bcb45aedf767c7cb33ddd6e1a7 Mon Sep 17 00:00:00 2001
-From: Patrick Nicolas <xytovl@laposte.net>
-Date: Tue, 13 Nov 2018 19:40:58 +0100
-Subject: [PATCH 1/4] unbundling
-
-diff --git a/Makefile.fip b/Makefile.fip
-index b59c419..c6b82bb 100644
---- a/Makefile.fip
-+++ b/Makefile.fip
-@@ -11,7 +11,26 @@ INSTALLDIR ?= $(DESTDIR)/usr/lib
- # Converts cr/lf to just lf
- DOS2UNIX = dos2unix
- 
--LIBRARIES = -lstdc++
-+PKG_CONFIG ?= pkg-config
-+
-+USE_EXR ?= yes
-+USE_JPEG ?= yes
-+USE_JPEG2K ?= yes
-+USE_MNG ?= yes
-+USE_PNG ?= yes
-+USE_TIFF ?= yes
-+USE_RAW ?= yes
-+USE_WEBP ?= yes
-+
-+LIBRARIES-yes = $(shell $(PKG_CONFIG) --libs zlib)
-+LIBRARIES-$(USE_EXR)    += $(shell $(PKG_CONFIG) --libs OpenEXR)
-+LIBRARIES-$(USE_JPEG)   += -ljpeg
-+LIBRARIES-$(USE_JPEG2K) += $(shell $(PKG_CONFIG) --libs libopenjp2)
-+LIBRARIES-$(USE_MNG)    += -lmng
-+LIBRARIES-$(USE_PNG)    += $(shell $(PKG_CONFIG) --libs libpng)
-+LIBRARIES-$(USE_TIFF)   += $(shell $(PKG_CONFIG) --libs libtiff-4 IlmBase)
-+LIBRARIES-$(USE_RAW)    += $(shell $(PKG_CONFIG) --libs libraw)
-+LIBRARIES-$(USE_WEBP)    += $(shell $(PKG_CONFIG) --libs libwebp libwebpmux)
- 
- MODULES = $(SRCS:.c=.o)
- MODULES := $(MODULES:.cpp=.o)
-@@ -68,16 +87,18 @@ $(STATICLIB): $(MODULES)
- 	$(AR) r $@ $(MODULES)
- 
- $(SHAREDLIB): $(MODULES)
--	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
-+	$(CXX) $(CXXFLAGS) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES-yes)
- 
- install:
- 	install -d $(INCDIR) $(INSTALLDIR)
--	install -m 644 -o root -g root $(HEADER) $(INCDIR)
--	install -m 644 -o root -g root $(HEADERFIP) $(INCDIR)
--	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
--	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
-+	install -m 644 $(HEADER) $(INCDIR)
-+	install -m 644 $(HEADERFIP) $(INCDIR)
-+ifneq ($(STATICLIB),)
-+	install -m 644 $(STATICLIB) $(INSTALLDIR)
-+endif
-+	install -m 755 $(SHAREDLIB) $(INSTALLDIR)
- 	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
--	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	
-+	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
- 
- clean:
- 	rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
-diff --git a/Makefile.gnu b/Makefile.gnu
-index 92f6358..345f0db 100644
---- a/Makefile.gnu
-+++ b/Makefile.gnu
-@@ -11,7 +11,26 @@ INSTALLDIR ?= $(DESTDIR)/usr/lib
- # Converts cr/lf to just lf
- DOS2UNIX = dos2unix
- 
--LIBRARIES = -lstdc++
-+PKG_CONFIG ?= pkg-config
-+
-+USE_EXR ?= yes
-+USE_JPEG ?= yes
-+USE_JPEG2K ?= yes
-+USE_MNG ?= yes
-+USE_PNG ?= yes
-+USE_TIFF ?= yes
-+USE_RAW ?= yes
-+USE_WEBP ?= yes
-+
-+LIBRARIES-yes = $(shell $(PKG_CONFIG) --libs zlib)
-+LIBRARIES-$(USE_EXR)    += $(shell $(PKG_CONFIG) --libs OpenEXR)
-+LIBRARIES-$(USE_JPEG)   += -ljpeg
-+LIBRARIES-$(USE_JPEG2K) += $(shell $(PKG_CONFIG) --libs libopenjp2)
-+LIBRARIES-$(USE_MNG)    += -lmng
-+LIBRARIES-$(USE_PNG)    += $(shell $(PKG_CONFIG) --libs libpng)
-+LIBRARIES-$(USE_TIFF)   += $(shell $(PKG_CONFIG) --libs libtiff-4 IlmBase)
-+LIBRARIES-$(USE_RAW)    += $(shell $(PKG_CONFIG) --libs libraw)
-+LIBRARIES-$(USE_WEBP)    += $(shell $(PKG_CONFIG) --libs libwebp libwebpmux)
- 
- MODULES = $(SRCS:.c=.o)
- MODULES := $(MODULES:.cpp=.o)
-@@ -67,13 +86,15 @@ $(STATICLIB): $(MODULES)
- 	$(AR) r $@ $(MODULES)
- 
- $(SHAREDLIB): $(MODULES)
--	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
-+	$(CXX) $(CXXFLAGS) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES-yes)
- 
- install:
- 	install -d $(INCDIR) $(INSTALLDIR)
--	install -m 644 -o root -g root $(HEADER) $(INCDIR)
--	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
--	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
-+	install -m 644 $(HEADER) $(INCDIR)
-+ifneq ($(STATICLIB),)
-+	install -m 644 $(STATICLIB) $(INSTALLDIR)
-+endif
-+	install -m 755 $(SHAREDLIB) $(INSTALLDIR)
- 	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
- 	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	
- #	ldconfig
-diff --git a/Makefile.srcs b/Makefile.srcs
-index de25754..cb41903 100644
---- a/Makefile.srcs
-+++ b/Makefile.srcs
-@@ -1,6 +1,15 @@
-+USE_EXR ?= yes
-+USE_JPEG ?= yes
-+USE_JPEG2K ?= yes
-+USE_MNG ?= yes
-+USE_PNG ?= yes
-+USE_TIFF ?= yes
-+USE_RAW ?= yes
-+USE_WEBP ?= yes
-+
- VER_MAJOR = 3
- VER_MINOR = 18.0
--SRCS = \
-+SRCS-yes = \
- 	Source/FreeImage/BitmapAccess.cpp \
- 	Source/FreeImage/ColorLookup.cpp \
- 	Source/FreeImage/ConversionRGBA16.cpp \
-@@ -12,39 +21,80 @@ SRCS = \
- 	Source/FreeImage/LFPQuantizer.cpp \
- 	Source/FreeImage/MemoryIO.cpp \
- 	Source/FreeImage/PixelAccess.cpp \
-+
-+SRCS-$(USE_JPEG2K) += \
- 	Source/FreeImage/J2KHelper.cpp \
-+
-+SRCS-$(USE_MNG) += \
- 	Source/FreeImage/MNGHelper.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/Plugin.cpp \
- 	Source/FreeImage/PluginBMP.cpp \
- 	Source/FreeImage/PluginCUT.cpp \
- 	Source/FreeImage/PluginDDS.cpp \
-+
-+SRCS-$(USE_EXR) += \
- 	Source/FreeImage/PluginEXR.cpp \
-+
-+SRCS-$(USE_TIFF) += \
- 	Source/FreeImage/PluginG3.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginGIF.cpp \
- 	Source/FreeImage/PluginHDR.cpp \
- 	Source/FreeImage/PluginICO.cpp \
- 	Source/FreeImage/PluginIFF.cpp \
-+
-+SRCS-$(USE_JPEG2K) += \
- 	Source/FreeImage/PluginJ2K.cpp \
-+
-+SRCS-$(USE_MNG) += \
- 	Source/FreeImage/PluginJNG.cpp \
-+
-+SRCS-$(USE_JPEG2K) += \
- 	Source/FreeImage/PluginJP2.cpp \
-+
-+SRCS-$(USE_JPEG) += \
- 	Source/FreeImage/PluginJPEG.cpp \
--	Source/FreeImage/PluginJXR.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginKOALA.cpp \
-+
-+SRCS-$(USE_MNG) += \
- 	Source/FreeImage/PluginMNG.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginPCD.cpp \
- 	Source/FreeImage/PluginPCX.cpp \
- 	Source/FreeImage/PluginPFM.cpp \
- 	Source/FreeImage/PluginPICT.cpp \
-+
-+SRCS-$(USE_PNG) += \
- 	Source/FreeImage/PluginPNG.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginPNM.cpp \
- 	Source/FreeImage/PluginPSD.cpp \
- 	Source/FreeImage/PluginRAS.cpp \
-+
-+SRCS-$(USE_RAW) += \
- 	Source/FreeImage/PluginRAW.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginSGI.cpp \
- 	Source/FreeImage/PluginTARGA.cpp \
-+
-+SRCS-$(USE_TIFF) += \
- 	Source/FreeImage/PluginTIFF.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginWBMP.cpp \
-+
-+SRCS-$(USE_WEBP) += \
- 	Source/FreeImage/PluginWebP.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginXBM.cpp \
- 	Source/FreeImage/PluginXPM.cpp \
- 	Source/FreeImage/PSDParser.cpp \
-@@ -78,7 +128,11 @@ SRCS = \
- 	Source/Metadata/IPTC.cpp \
- 	Source/Metadata/TagConversion.cpp \
- 	Source/Metadata/TagLib.cpp \
-+
-+SRCS-$(USE_TIFF) += \
- 	Source/Metadata/XTIFF.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImageToolkit/Background.cpp \
- 	Source/FreeImageToolkit/BSplineRotate.cpp \
- 	Source/FreeImageToolkit/Channels.cpp \
-@@ -87,11 +141,19 @@ SRCS = \
- 	Source/FreeImageToolkit/CopyPaste.cpp \
- 	Source/FreeImageToolkit/Display.cpp \
- 	Source/FreeImageToolkit/Flip.cpp \
-+
-+SRCS-$(USE_JPEG) += \
- 	Source/FreeImageToolkit/JPEGTransform.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImageToolkit/MultigridPoissonSolver.cpp \
- 	Source/FreeImageToolkit/Rescale.cpp \
- 	Source/FreeImageToolkit/Resize.cpp \
- 
-+SRCS-$(USE_JPEG) += \
-+	Source/transupp.c
-+SRCS = $(SRCS-yes)
-+
- INCLS = Dist/FreeImage.h \
- 	Examples/OpenGL/TextureManager/TextureManager.h \
- 	Examples/Plugin/PluginCradle.h \
-@@ -117,7 +179,18 @@ INCLS = Dist/FreeImage.h \
- 	Wrapper/FreeImagePlus/test/fipTest.h \
- 	TestAPI/TestSuite.h
- 
--INCLUDE = -I. \
-+INCLUDE-yes = -I. \
- 	-ISource \
- 	-ISource/Metadata \
- 	-ISource/FreeImageToolkit \
-+
-+INCLUDE-yes += $(shell $(PKG_CONFIG) --cflags-only-I zlib)
-+INCLUDE-$(USE_EXR)    += -DUSE_EXR    $(shell $(PKG_CONFIG) --cflags-only-I OpenEXR)
-+INCLUDE-$(USE_JPEG)   += -DUSE_JPEG
-+INCLUDE-$(USE_JPEG2K) += -DUSE_JPEG2K $(shell $(PKG_CONFIG) --cflags-only-I libopenjp2)
-+INCLUDE-$(USE_MNG)    += -DUSE_MNG
-+INCLUDE-$(USE_PNG)    += -DUSE_PNG    $(shell $(PKG_CONFIG) --cflags-only-I libpng)
-+INCLUDE-$(USE_TIFF)   += -DUSE_TIFF   $(shell $(PKG_CONFIG) --cflags-only-I libtiff-4 IlmBase)
-+INCLUDE-$(USE_RAW)    += -DUSE_RAW    $(shell $(PKG_CONFIG) --cflags-only-I libraw)
-+INCLUDE-$(USE_WEBP)   += -DUSE_WEBP   $(shell $(PKG_CONFIG) --cflags-only-I libwebp libwebpmux)
-+INCLUDE = $(INCLUDE-yes)
-diff --git a/Source/FreeImage/J2KHelper.cpp b/Source/FreeImage/J2KHelper.cpp
-index 1776c3b..538f1c5 100644
---- a/Source/FreeImage/J2KHelper.cpp
-+++ b/Source/FreeImage/J2KHelper.cpp
-@@ -21,7 +21,7 @@
- 
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../LibOpenJPEG/openjpeg.h"
-+#include <openjpeg.h>
- #include "J2KHelper.h"
- 
- // --------------------------------------------------------------------------
-diff --git a/Source/FreeImage/Plugin.cpp b/Source/FreeImage/Plugin.cpp
-index 11e7294..7768a32 100644
---- a/Source/FreeImage/Plugin.cpp
-+++ b/Source/FreeImage/Plugin.cpp
-@@ -238,23 +238,33 @@ FreeImage_Initialise(BOOL load_local_plugins_only) {
- 			*/
- 			s_plugins->AddNode(InitBMP);
- 			s_plugins->AddNode(InitICO);
-+#ifdef USE_JPEG
- 			s_plugins->AddNode(InitJPEG);
-+#endif
-+#ifdef USE_MNG
- 			s_plugins->AddNode(InitJNG);
-+#endif
- 			s_plugins->AddNode(InitKOALA);
- 			s_plugins->AddNode(InitIFF);
-+#ifdef USE_MNG
- 			s_plugins->AddNode(InitMNG);
-+#endif
- 			s_plugins->AddNode(InitPNM, NULL, "PBM", "Portable Bitmap (ASCII)", "pbm", "^P1");
- 			s_plugins->AddNode(InitPNM, NULL, "PBMRAW", "Portable Bitmap (RAW)", "pbm", "^P4");
- 			s_plugins->AddNode(InitPCD);
- 			s_plugins->AddNode(InitPCX);
- 			s_plugins->AddNode(InitPNM, NULL, "PGM", "Portable Greymap (ASCII)", "pgm", "^P2");
- 			s_plugins->AddNode(InitPNM, NULL, "PGMRAW", "Portable Greymap (RAW)", "pgm", "^P5");
-+#ifdef USE_PNG
- 			s_plugins->AddNode(InitPNG);
-+#endif
- 			s_plugins->AddNode(InitPNM, NULL, "PPM", "Portable Pixelmap (ASCII)", "ppm", "^P3");
- 			s_plugins->AddNode(InitPNM, NULL, "PPMRAW", "Portable Pixelmap (RAW)", "ppm", "^P6");
- 			s_plugins->AddNode(InitRAS);
- 			s_plugins->AddNode(InitTARGA);
-+#ifdef USE_TIFF
- 			s_plugins->AddNode(InitTIFF);
-+#endif
- 			s_plugins->AddNode(InitWBMP);
- 			s_plugins->AddNode(InitPSD);
- 			s_plugins->AddNode(InitCUT);
-@@ -263,16 +273,26 @@ FreeImage_Initialise(BOOL load_local_plugins_only) {
- 			s_plugins->AddNode(InitDDS);
- 	        s_plugins->AddNode(InitGIF);
- 	        s_plugins->AddNode(InitHDR);
-+#ifdef USE_TIFF
- 			s_plugins->AddNode(InitG3);
-+#endif
- 			s_plugins->AddNode(InitSGI);
-+#ifdef USE_EXR
- 			s_plugins->AddNode(InitEXR);
-+#endif
-+#ifdef USE_JPEG2K
- 			s_plugins->AddNode(InitJ2K);
- 			s_plugins->AddNode(InitJP2);
-+#endif
- 			s_plugins->AddNode(InitPFM);
- 			s_plugins->AddNode(InitPICT);
-+#ifdef USE_RAW
- 			s_plugins->AddNode(InitRAW);
-+#endif
-+#ifdef USE_WEBP
- 			s_plugins->AddNode(InitWEBP);
--#if !(defined(_MSC_VER) && (_MSC_VER <= 1310))
-+#endif
-+#if 0
- 			s_plugins->AddNode(InitJXR);
- #endif // unsupported by MS Visual Studio 2003 !!!
- 			
-diff --git a/Source/FreeImage/PluginEXR.cpp b/Source/FreeImage/PluginEXR.cpp
-index b286430..faa8037 100644
---- a/Source/FreeImage/PluginEXR.cpp
-+++ b/Source/FreeImage/PluginEXR.cpp
-@@ -28,16 +28,16 @@
- #pragma warning (disable : 4800) // ImfVersion.h - 'const int' : forcing value to bool 'true' or 'false' (performance warning)
- #endif 
- 
--#include "../OpenEXR/IlmImf/ImfIO.h"
--#include "../OpenEXR/Iex/Iex.h"
--#include "../OpenEXR/IlmImf/ImfOutputFile.h"
--#include "../OpenEXR/IlmImf/ImfInputFile.h"
--#include "../OpenEXR/IlmImf/ImfRgbaFile.h"
--#include "../OpenEXR/IlmImf/ImfChannelList.h"
--#include "../OpenEXR/IlmImf/ImfRgba.h"
--#include "../OpenEXR/IlmImf/ImfArray.h"
--#include "../OpenEXR/IlmImf/ImfPreviewImage.h"
--#include "../OpenEXR/Half/half.h"
-+#include <ImfIO.h>
-+#include <Iex.h>
-+#include <ImfOutputFile.h>
-+#include <ImfInputFile.h>
-+#include <ImfRgbaFile.h>
-+#include <ImfChannelList.h>
-+#include <ImfRgba.h>
-+#include <ImfArray.h>
-+#include <ImfPreviewImage.h>
-+#include <half.h>
- 
- 
- // ==========================================================
-diff --git a/Source/FreeImage/PluginG3.cpp b/Source/FreeImage/PluginG3.cpp
-index 0a083b4..b3a9bd7 100644
---- a/Source/FreeImage/PluginG3.cpp
-+++ b/Source/FreeImage/PluginG3.cpp
-@@ -20,7 +20,7 @@
- // Use at your own risk!
- // ==========================================================
- 
--#include "../LibTIFF4/tiffiop.h"
-+#include "tiffiop.h"
- 
- #include "FreeImage.h"
- #include "Utilities.h"
-diff --git a/Source/FreeImage/PluginJ2K.cpp b/Source/FreeImage/PluginJ2K.cpp
-index b8bcfc8..621a903 100644
---- a/Source/FreeImage/PluginJ2K.cpp
-+++ b/Source/FreeImage/PluginJ2K.cpp
-@@ -21,7 +21,7 @@
- 
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../LibOpenJPEG/openjpeg.h"
-+#include <openjpeg.h>
- #include "J2KHelper.h"
- 
- // ==========================================================
-diff --git a/Source/FreeImage/PluginJP2.cpp b/Source/FreeImage/PluginJP2.cpp
-index 742fe2c..c57f626 100644
---- a/Source/FreeImage/PluginJP2.cpp
-+++ b/Source/FreeImage/PluginJP2.cpp
-@@ -21,7 +21,7 @@
- 
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../LibOpenJPEG/openjpeg.h"
-+#include <openjpeg.h>
- #include "J2KHelper.h"
- 
- // ==========================================================
-diff --git a/Source/FreeImage/PluginJPEG.cpp b/Source/FreeImage/PluginJPEG.cpp
-index 8db177d..dd97e63 100644
---- a/Source/FreeImage/PluginJPEG.cpp
-+++ b/Source/FreeImage/PluginJPEG.cpp
-@@ -35,11 +35,15 @@ extern "C" {
- #undef FAR
- #include <setjmp.h>
- 
--#include "../LibJPEG/jinclude.h"
--#include "../LibJPEG/jpeglib.h"
--#include "../LibJPEG/jerror.h"
-+#include <string.h>
-+#include <stdio.h>
-+#include <jconfig.h>
-+#include <jpeglib.h>
-+#include <jerror.h>
- }
- 
-+#define SIZEOF(object)        ((size_t) sizeof(object))
-+
- #include "FreeImage.h"
- #include "Utilities.h"
- 
-diff --git a/Source/FreeImage/PluginPNG.cpp b/Source/FreeImage/PluginPNG.cpp
-index 661f160..504fafe 100644
---- a/Source/FreeImage/PluginPNG.cpp
-+++ b/Source/FreeImage/PluginPNG.cpp
-@@ -40,8 +40,8 @@
- 
- // ----------------------------------------------------------
- 
--#include "../ZLib/zlib.h"
--#include "../LibPNG/png.h"
-+#include <zlib.h>
-+#include <png.h>
- 
- // ----------------------------------------------------------
- 
-diff --git a/Source/FreeImage/PluginRAW.cpp b/Source/FreeImage/PluginRAW.cpp
-index e9bd5bf..680e634 100644
---- a/Source/FreeImage/PluginRAW.cpp
-+++ b/Source/FreeImage/PluginRAW.cpp
-@@ -19,7 +19,7 @@
- // Use at your own risk!
- // ==========================================================
- 
--#include "../LibRawLite/libraw/libraw.h"
-+#include <libraw.h>
- 
- #include "FreeImage.h"
- #include "Utilities.h"
-diff --git a/Source/FreeImage/PluginTIFF.cpp b/Source/FreeImage/PluginTIFF.cpp
-index 67fab0b..36f99e8 100644
---- a/Source/FreeImage/PluginTIFF.cpp
-+++ b/Source/FreeImage/PluginTIFF.cpp
-@@ -37,9 +37,9 @@
- 
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../LibTIFF4/tiffiop.h"
-+#include "tiffiop.h"
- #include "../Metadata/FreeImageTag.h"
--#include "../OpenEXR/Half/half.h"
-+#include <half.h>
- 
- #include "FreeImageIO.h"
- #include "PSDParser.h"
-diff --git a/Source/FreeImage/PluginWebP.cpp b/Source/FreeImage/PluginWebP.cpp
-index 7c9f62f..c401447 100644
---- a/Source/FreeImage/PluginWebP.cpp
-+++ b/Source/FreeImage/PluginWebP.cpp
-@@ -24,9 +24,9 @@
- 
- #include "../Metadata/FreeImageTag.h"
- 
--#include "../LibWebP/src/webp/decode.h"
--#include "../LibWebP/src/webp/encode.h"
--#include "../LibWebP/src/webp/mux.h"
-+#include <webp/decode.h>
-+#include <webp/encode.h>
-+#include <webp/mux.h>
- 
- // ==========================================================
- // Plugin Interface
-diff --git a/Source/FreeImage/ZLibInterface.cpp b/Source/FreeImage/ZLibInterface.cpp
-index 3ab6d32..7e32110 100644
---- a/Source/FreeImage/ZLibInterface.cpp
-+++ b/Source/FreeImage/ZLibInterface.cpp
-@@ -19,10 +19,10 @@
- // Use at your own risk!
- // ==========================================================
- 
--#include "../ZLib/zlib.h"
-+#include <zlib.h>
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../ZLib/zutil.h"	/* must be the last header because of error C3163 in VS2008 (_vsnprintf defined in stdio.h) */
-+#define OS_CODE 0x03
- 
- /**
- Compresses a source buffer into a target buffer, using the ZLib library. 
-diff --git a/Source/FreeImageToolkit/JPEGTransform.cpp b/Source/FreeImageToolkit/JPEGTransform.cpp
-index 6f9ba8e..988d777 100644
---- a/Source/FreeImageToolkit/JPEGTransform.cpp
-+++ b/Source/FreeImageToolkit/JPEGTransform.cpp
-@@ -26,10 +26,11 @@ extern "C" {
- #undef FAR
- #include <setjmp.h>
- 
--#include "../LibJPEG/jinclude.h"
--#include "../LibJPEG/jpeglib.h"
--#include "../LibJPEG/jerror.h"
--#include "../LibJPEG/transupp.h"
-+#include <string.h>
-+#include <stdio.h>
-+#include <jpeglib.h>
-+#include <jerror.h>
-+#include "transupp.h"
- }
- 
- #include "FreeImage.h"
-diff --git a/Source/Metadata/XTIFF.cpp b/Source/Metadata/XTIFF.cpp
-index d5be902..7f2be42 100644
---- a/Source/Metadata/XTIFF.cpp
-+++ b/Source/Metadata/XTIFF.cpp
-@@ -29,7 +29,7 @@
- #pragma warning (disable : 4786) // identifier was truncated to 'number' characters
- #endif
- 
--#include "../LibTIFF4/tiffiop.h"
-+#include "tiffiop.h"
- 
- #include "FreeImage.h"
- #include "Utilities.h"
-diff --git a/Source/tiffiop.h b/Source/tiffiop.h
-index 2fe7556..1642582 100644
---- a/Source/tiffiop.h
-+++ b/Source/tiffiop.h
-@@ -28,7 +28,10 @@
-  * ``Library-private'' definitions.
-  */
- 
--#include "tif_config.h"
-+#include <tiffconf.h>
-+#define HAVE_SEARCH_H
-+#define HAVE_FCNTL_H
-+#define HAVE_SNPRINTF
- 
- #ifdef HAVE_FCNTL_H
- # include <fcntl.h>
-diff --git a/Source/transupp.c b/Source/transupp.c
-index d10f57b..d50216c 100644
---- a/Source/transupp.c
-+++ b/Source/transupp.c
-@@ -15,8 +15,7 @@
- /* Although this file really shouldn't have access to the library internals,
-  * it's helpful to let it call jround_up() and jcopy_block_row().
-  */
--#define JPEG_INTERNALS
--
-+#include <jerror.h>
- #include "jinclude.h"
- #include "jpeglib.h"
- #include "transupp.h"		/* My own external interface */
-diff --git a/fipMakefile.srcs b/fipMakefile.srcs
-index d271b4b..e58f046 100644
---- a/fipMakefile.srcs
-+++ b/fipMakefile.srcs
-@@ -1,6 +1,15 @@
-+USE_EXR ?= yes
-+USE_JPEG ?= yes
-+USE_JPEG2K ?= yes
-+USE_MNG ?= yes
-+USE_PNG ?= yes
-+USE_TIFF ?= yes
-+USE_RAW ?= yes
-+USE_WEBP ?= yes
-+
- VER_MAJOR = 3
- VER_MINOR = 18.0
--SRCS = \
-+SRCS-yes = \
- 	Source/FreeImage/BitmapAccess.cpp \
- 	Source/FreeImage/ColorLookup.cpp \
- 	Source/FreeImage/ConversionRGBA16.cpp \
-@@ -12,39 +21,80 @@ SRCS = \
- 	Source/FreeImage/LFPQuantizer.cpp \
- 	Source/FreeImage/MemoryIO.cpp \
- 	Source/FreeImage/PixelAccess.cpp \
-+
-+SRCS-$(USE_JPEG2K) += \
- 	Source/FreeImage/J2KHelper.cpp \
-+
-+SRCS-$(USE_MNG) += \
- 	Source/FreeImage/MNGHelper.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/Plugin.cpp \
- 	Source/FreeImage/PluginBMP.cpp \
- 	Source/FreeImage/PluginCUT.cpp \
- 	Source/FreeImage/PluginDDS.cpp \
-+
-+SRCS-$(USE_EXR) += \
- 	Source/FreeImage/PluginEXR.cpp \
-+
-+SRCS-$(USE_TIFF) += \
- 	Source/FreeImage/PluginG3.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginGIF.cpp \
- 	Source/FreeImage/PluginHDR.cpp \
- 	Source/FreeImage/PluginICO.cpp \
- 	Source/FreeImage/PluginIFF.cpp \
-+
-+SRCS-$(USE_JPEG2K) += \
- 	Source/FreeImage/PluginJ2K.cpp \
-+
-+SRCS-$(USE_MNG) += \
- 	Source/FreeImage/PluginJNG.cpp \
-+
-+SRCS-$(USE_JPEG2K) += \
- 	Source/FreeImage/PluginJP2.cpp \
-+
-+SRCS-$(USE_JPEG) += \
- 	Source/FreeImage/PluginJPEG.cpp \
--	Source/FreeImage/PluginJXR.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginKOALA.cpp \
-+
-+SRCS-$(USE_MNG) += \
- 	Source/FreeImage/PluginMNG.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginPCD.cpp \
- 	Source/FreeImage/PluginPCX.cpp \
- 	Source/FreeImage/PluginPFM.cpp \
- 	Source/FreeImage/PluginPICT.cpp \
-+
-+SRCS-$(USE_PNG) += \
- 	Source/FreeImage/PluginPNG.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginPNM.cpp \
- 	Source/FreeImage/PluginPSD.cpp \
- 	Source/FreeImage/PluginRAS.cpp \
-+
-+SRCS-$(USE_RAW) += \
- 	Source/FreeImage/PluginRAW.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginSGI.cpp \
- 	Source/FreeImage/PluginTARGA.cpp \
-+
-+SRCS-$(USE_TIFF) += \
- 	Source/FreeImage/PluginTIFF.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginWBMP.cpp \
-+
-+SRCS-$(USE_WEBP) += \
- 	Source/FreeImage/PluginWebP.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginXBM.cpp \
- 	Source/FreeImage/PluginXPM.cpp \
- 	Source/FreeImage/PSDParser.cpp \
-@@ -78,7 +128,11 @@ SRCS = \
- 	Source/Metadata/IPTC.cpp \
- 	Source/Metadata/TagConversion.cpp \
- 	Source/Metadata/TagLib.cpp \
-+
-+SRCS-$(USE_TIFF) += \
- 	Source/Metadata/XTIFF.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImageToolkit/Background.cpp \
- 	Source/FreeImageToolkit/BSplineRotate.cpp \
- 	Source/FreeImageToolkit/Channels.cpp \
-@@ -87,7 +141,11 @@ SRCS = \
- 	Source/FreeImageToolkit/CopyPaste.cpp \
- 	Source/FreeImageToolkit/Display.cpp \
- 	Source/FreeImageToolkit/Flip.cpp \
-+
-+SRCS-$(USE_JPEG) += \
- 	Source/FreeImageToolkit/JPEGTransform.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImageToolkit/MultigridPoissonSolver.cpp \
- 	Source/FreeImageToolkit/Rescale.cpp \
- 	Source/FreeImageToolkit/Resize.cpp \
-@@ -98,6 +156,11 @@ SRCS = \
- 	Wrapper/FreeImagePlus/src/fipTag.cpp \
- 	Wrapper/FreeImagePlus/src/fipWinImage.cpp \
- 	Wrapper/FreeImagePlus/src/FreeImagePlus.cpp 
-+
-+SRCS-$(USE_JPEG) += \
-+	Source/transupp.c
-+
-+SRCS = $(SRCS-yes)
- INCLUDE = -I. \
- 	-ISource \
- 	-ISource/Metadata \
--- 
-2.19.1
-
diff --git a/media-libs/freeimage/freeimage-3.18.0-r1.ebuild b/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
index e904c560e531..b6dc64c0ab98 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
@@ -12,7 +12,8 @@ MY_P=${MY_PN}${MY_PV}
 DESCRIPTION="Image library supporting many formats"
 HOMEPAGE="https://freeimage.sourceforge.io/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
-	mirror://sourceforge/${PN}/${MY_P}.pdf"
+	mirror://sourceforge/${PN}/${MY_P}.pdf
+	https://dev.gentoo.org/~juippis/distfiles/tmp/freeimage-3.18.0-unbundling.patch"
 
 LICENSE="|| ( GPL-2 FIPL-1.0 )"
 SLOT="0"
@@ -43,7 +44,7 @@ S=${WORKDIR}/${MY_PN}
 
 DOCS=( "${DISTDIR}"/${MY_P}.pdf README.linux Whatsnew.txt )
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.18.0-unbundling.patch
+	"${DISTDIR}"/${PN}-3.18.0-unbundling.patch
 	"${FILESDIR}"/${PN}-3.18.0-remove-jpeg-transform.patch
 	"${FILESDIR}"/${PN}-3.18.0-rename-jpeg_read_icc_profile.patch
 	"${FILESDIR}"/${PN}-3.18.0-disable-plugin-G3.patch
diff --git a/media-libs/freeimage/freeimage-3.18.0-r2.ebuild b/media-libs/freeimage/freeimage-3.18.0-r2.ebuild
index 3e551b4b3492..d8b629ca9c1f 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r2.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r2.ebuild
@@ -12,7 +12,8 @@ MY_P=${MY_PN}${MY_PV}
 DESCRIPTION="Image library supporting many formats"
 HOMEPAGE="https://freeimage.sourceforge.io/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
-	mirror://sourceforge/${PN}/${MY_P}.pdf"
+	mirror://sourceforge/${PN}/${MY_P}.pdf
+	https://dev.gentoo.org/~juippis/distfiles/tmp/freeimage-3.18.0-unbundling.patch"
 
 LICENSE="|| ( GPL-2 FIPL-1.0 )"
 SLOT="0"
@@ -43,7 +44,7 @@ S=${WORKDIR}/${MY_PN}
 
 DOCS=( "${DISTDIR}"/${MY_P}.pdf README.linux Whatsnew.txt )
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.18.0-unbundling.patch
+	"${DISTDIR}"/${PN}-3.18.0-unbundling.patch
 	"${FILESDIR}"/${PN}-3.18.0-remove-jpeg-transform.patch
 	"${FILESDIR}"/${PN}-3.18.0-rename-jpeg_read_icc_profile.patch
 	"${FILESDIR}"/${PN}-3.18.0-disable-plugin-G3.patch
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.16.2.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.16.2.ebuild
index a4cf85b7702b..6aeb1095638c 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.16.2.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.16.2.ebuild
@@ -138,7 +138,7 @@ multilib_src_configure() {
 		--disable-wgl
 	)
 
-	gstreamer_multilib_src_configure \
+	CONFIG_SHELL=${BASH} gstreamer_multilib_src_configure \
 		$(use_enable alsa) \
 		$(multilib_native_use_enable introspection) \
 		$(use_enable ivorbis) \
diff --git a/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild b/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild
index dc43dddf45c0..cb640251cfb5 100644
--- a/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild
+++ b/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild
@@ -12,13 +12,19 @@ SRC_URI="mirror://sourceforge/bs2b/${P}.tar.bz2"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86"
-IUSE=""
 
 RDEPEND=">=media-libs/libsndfile-1.0.25-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-# for default_src_configure to work
-ECONF_SOURCE="${S}"
+PATCHES=( "${FILESDIR}"/${PV}-format-security.patch )
 
-PATCHES=( "${FILESDIR}/${PV}-format-security.patch" )
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+		econf --disable-static
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild b/media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild
index 7d065081cb00..982289b9478e 100644
--- a/media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild
+++ b/media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild
@@ -18,5 +18,10 @@ PATCHES=(
 )
 
 src_configure() {
-	econf --enable-threads
+	econf --enable-threads --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libcuefile/files/libcuefile-static-libs.patch b/media-libs/libcuefile/files/libcuefile-static-libs.patch
new file mode 100644
index 000000000000..ecb141281bfb
--- /dev/null
+++ b/media-libs/libcuefile/files/libcuefile-static-libs.patch
@@ -0,0 +1,29 @@
+From 9379e01949bc8b9bc59b64a8cd60f947e2443232 Mon Sep 17 00:00:00 2001
+From: Jakov Smolic <jakov.smolic@sartura.hr>
+Date: Sun, 20 Sep 2020 22:07:58 +0200
+Subject: [PATCH] src: CMakeLists: disable static libs
+
+Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>
+---
+ src/CMakeLists.txt | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index c07fe0d..1bac1aa 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1,10 +1,7 @@
+ add_definitions(-DYY_NEVER_INTERACTIVE)
+ include_directories(${libcuefile_SOURCE_DIR}/include)
+ 
+-add_library(cuefile-static STATIC cd cdtext cue_parse cue_print cue_scan cuefile time toc toc_parse toc_print toc_scan)
+-set_target_properties(cuefile-static PROPERTIES OUTPUT_NAME cuefile CLEAN_DIRECT_OUTPUT 1)
+-
+ add_library(cuefile-shared SHARED cd cdtext cue_parse cue_print cue_scan cuefile time toc toc_parse toc_print toc_scan)
+ set_target_properties(cuefile-shared PROPERTIES OUTPUT_NAME cuefile CLEAN_DIRECT_OUTPUT 1 VERSION 0.0.0 SOVERSION 0)
+ 
+-install(TARGETS cuefile-static cuefile-shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
++install(TARGETS cuefile-shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
+-- 
+2.26.2
+
diff --git a/media-libs/libcuefile/libcuefile-477-r1.ebuild b/media-libs/libcuefile/libcuefile-477-r1.ebuild
index e36722005c3e..ebe24d60469f 100644
--- a/media-libs/libcuefile/libcuefile-477-r1.ebuild
+++ b/media-libs/libcuefile/libcuefile-477-r1.ebuild
@@ -16,7 +16,8 @@ SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
+
+PATCHES=( "${FILESDIR}"/${PN}-static-libs.patch )
 
 src_install() {
 	cmake-multilib_src_install
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index 52a1e78a8561..8aae44788f22 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -1 +1,2 @@
 DIST libexif-0.6.22.tar.gz 2741296 BLAKE2B df57aa0ff7d20faa47ea34f4d8164c33b113887bc2179405481b2c12c0d0336dc9e5321a260ffda64d974bfa9ac6af55c0cfb4cc9a57a941c17944a3d049befd SHA512 e399804c9d67072861988638349115c585546be20f15c4d26bb6f411ff4ee5bce979c1a41305c1456ecc2f830837349f93cfa4136b7a864e0486cecd3607b469
+DIST libexif-0.6.22_p20201105.tar.gz 1111695 BLAKE2B d4eb856ad950f8ae068a27088e54311789c7b8b646dd1c4851ef637b626015119b3b5ac9cbac58f9c79c37c07ba7d3e9a9a67dc52715187495aa824846ec2335 SHA512 5472bf2531d9147be5c6e681d0257325f6609d6aa3935243f887df0ab32e51242ff9d853fc2c183cf5c2709c89d5c52d8fecb9144343d6f959f4bed1062098ab
diff --git a/media-libs/libexif/libexif-0.6.22_p20201105.ebuild b/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
new file mode 100644
index 000000000000..1f44daf45d03
--- /dev/null
+++ b/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+COMMIT="9266d14b5ca4e29b970fa03272318e5f99386e06"
+DESCRIPTION="Library for parsing, editing, and saving EXIF data"
+HOMEPAGE="https://libexif.github.io/ https://github.com/libexif/libexif"
+SRC_URI="https://github.com/libexif/libexif/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+#SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PN}-${PV//./_}-release/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="doc nls static-libs"
+
+RDEPEND="nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.13-pkgconfig.patch
+)
+
+src_prepare() {
+	default
+	sed -i -e '/FLAGS=/s:-g::' configure.ac || die #390249
+	# Previously elibtoolize for BSD
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable doc docs) \
+		$(use_enable nls) \
+		$(use_enable static-libs static) \
+		--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+multilib_src_install() {
+	emake DESTDIR="${ED}" install
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+	rm -f "${ED}"/usr/share/doc/${PF}/{ABOUT-NLS,COPYING} || die
+}
diff --git a/media-libs/libfishsound/libfishsound-1.0.0.ebuild b/media-libs/libfishsound/libfishsound-1.0.0.ebuild
index 9c9167f6dd94..3422916b0400 100644
--- a/media-libs/libfishsound/libfishsound-1.0.0.ebuild
+++ b/media-libs/libfishsound/libfishsound-1.0.0.ebuild
@@ -33,7 +33,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf=""
+	local myconf="--disable-static"
 	use flac || myconf="${myconf} --disable-flac"
 	use speex || myconf="${myconf} --disable-speex"
 
@@ -44,4 +44,5 @@ src_install() {
 	emake DESTDIR="${D}" \
 		docdir="${D}/usr/share/doc/${PF}" install
 	dodoc AUTHORS ChangeLog README
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index c0eacf28d688..ccce62b45f72 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,2 +1 @@
-DIST libheif-1.7.0.tar.gz 1526096 BLAKE2B 74b8284875321781d13d17b877eb8291ecdd0fe1700f73a433d3b125a8ee6b33a326310d729e62bac9d9fecfea095f21ef590e711d550dcaac79570b3f917885 SHA512 13c95540fee13f3fba8d8a4f69886bf5563e9fa22c5cd113dbe16d20670b077b5961171e5f9fb0f256cc42c4650e13465c93d3fbb03013997a7fc163463e8b3a
 DIST libheif-1.9.1.tar.gz 1556450 BLAKE2B 5829afbde9c8ad8d7a2ed46e736d17e84dc6f5f2c4deccd1647c3048588fb8bdec96764a31e7801aac81d5f0a3f1c3e1474b8bd5e2d4d84236ef07478e62933e SHA512 a41ff9666877904da095c72af743b56196c75ce90deaeb1998be7eba9729a62282827e7e916e2a067489cc78e558c55fbb6d70da6a5b5281f6d2efcccbe6dbbe
diff --git a/media-libs/libheif/libheif-1.7.0-r1.ebuild b/media-libs/libheif/libheif-1.7.0-r1.ebuild
deleted file mode 100644
index 363d05f925db..000000000000
--- a/media-libs/libheif/libheif-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg multilib-minimal
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/strukturag/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/strukturag/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
-HOMEPAGE="https://github.com/strukturag/libheif"
-
-LICENSE="GPL-3"
-SLOT="0/1.7"
-IUSE="gdk-pixbuf go static-libs test +threads"
-REQUIRED_USE="test? ( go )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-lang/go )"
-DEPEND="
-	media-libs/libde265:=[${MULTILIB_USEDEP}]
-	media-libs/libpng:0=[${MULTILIB_USEDEP}]
-	media-libs/x265:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	virtual/jpeg:0=[${MULTILIB_USEDEP}]
-	gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] )
-	go? ( dev-lang/go )
-"
-RDEPEND="${DEPEND}"
-PATCHES=(
-	"${FILESDIR}"/${P}-aom.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e 's:-Werror::' configure.ac || die
-
-	eautoreconf
-
-	# prevent "stat heif-test.go: no such file or directory"
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local econf_args=(
-		$(multilib_is_native_abi && use go || echo --disable-go)
-		$(use_enable gdk-pixbuf)
-		$(use_enable static-libs static)
-		$(use_enable threads multithreading)
-	)
-	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
-}
-
-multilib_src_test() {
-	default
-	emake -C go test
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libheif/libheif-1.7.0-r2.ebuild b/media-libs/libheif/libheif-1.7.0-r2.ebuild
deleted file mode 100644
index a3ab22e400f5..000000000000
--- a/media-libs/libheif/libheif-1.7.0-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg multilib-minimal
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/strukturag/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/strukturag/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
-HOMEPAGE="https://github.com/strukturag/libheif"
-
-LICENSE="GPL-3"
-SLOT="0/1.7"
-IUSE="gdk-pixbuf go static-libs test +threads"
-REQUIRED_USE="test? ( go )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-lang/go )"
-DEPEND="
-	>=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}]
-	media-libs/libde265:=[${MULTILIB_USEDEP}]
-	media-libs/libpng:0=[${MULTILIB_USEDEP}]
-	media-libs/x265:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	virtual/jpeg:0=[${MULTILIB_USEDEP}]
-	gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] )
-	go? ( dev-lang/go )
-"
-RDEPEND="${DEPEND}"
-PATCHES=(
-	"${FILESDIR}"/${P}-aom.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e 's:-Werror::' configure.ac || die
-
-	eautoreconf
-
-	# prevent "stat heif-test.go: no such file or directory"
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local econf_args=(
-		$(multilib_is_native_abi && use go || echo --disable-go)
-		$(use_enable gdk-pixbuf)
-		$(use_enable static-libs static)
-		$(use_enable threads multithreading)
-	)
-	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
-}
-
-multilib_src_test() {
-	default
-	emake -C go test
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/liblingoteach/liblingoteach-0.2.3.ebuild b/media-libs/liblingoteach/liblingoteach-0.2.3.ebuild
index cc1b3d3936b6..4cfa64c18d6d 100644
--- a/media-libs/liblingoteach/liblingoteach-0.2.3.ebuild
+++ b/media-libs/liblingoteach/liblingoteach-0.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,12 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	econf \
+		--disable-static \
 		$(use_enable zlib compression) \
 		$(use_enable debug)
 }
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libmpris2client/libmpris2client-0.1.0-r1.ebuild b/media-libs/libmpris2client/libmpris2client-0.1.0-r1.ebuild
index a119a972166a..154f078fd7fa 100644
--- a/media-libs/libmpris2client/libmpris2client-0.1.0-r1.ebuild
+++ b/media-libs/libmpris2client/libmpris2client-0.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,6 @@ SRC_URI="https://github.com/matiasdelellis/${PN}/releases/download/V${PV}/${P}.t
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND=">=dev-libs/glib-2
 	x11-libs/gtk+:2"
@@ -20,10 +19,14 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS NEWS README TODO )
 
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
 	default
 
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/media-libs/libofa/libofa-0.9.3-r2.ebuild b/media-libs/libofa/libofa-0.9.3-r2.ebuild
index ff6565c00a7e..ebefb6806c18 100644
--- a/media-libs/libofa/libofa-0.9.3-r2.ebuild
+++ b/media-libs/libofa/libofa-0.9.3-r2.ebuild
@@ -34,10 +34,11 @@ multilib_src_configure() {
 	ECONF_SOURCE=${S} \
 	econf \
 		ac_cv_lib_expat_XML_ExpatVersion=yes \
-		ac_cv_lib_curl_curl_global_init=yes
+		ac_cv_lib_curl_curl_global_init=yes \
+		--disable-static
 }
 
 multilib_src_install_all() {
 	einstalldocs
-	find "${D}" -name '*.la' -type f -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libpng/libpng-1.6.37-r2.ebuild b/media-libs/libpng/libpng-1.6.37-r2.ebuild
index 5ac038821903..1eca072414c4 100644
--- a/media-libs/libpng/libpng-1.6.37-r2.ebuild
+++ b/media-libs/libpng/libpng-1.6.37-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng2"
 SLOT="0/16"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng cpu_flags_arm_neon cpu_flags_x86_sse static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libreplaygain/files/libreplaygain-static-libs.patch b/media-libs/libreplaygain/files/libreplaygain-static-libs.patch
new file mode 100644
index 000000000000..7772d620f13a
--- /dev/null
+++ b/media-libs/libreplaygain/files/libreplaygain-static-libs.patch
@@ -0,0 +1,28 @@
+From d06ffbc7d2e213e3d3743b1959ac774340bfe1d7 Mon Sep 17 00:00:00 2001
+From: Jakov Smolic <jakov.smolic@sartura.hr>
+Date: Sun, 20 Sep 2020 22:10:37 +0200
+Subject: [PATCH] src: CMakeLists: disable static libs
+
+Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>
+---
+ src/CMakeLists.txt | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 121cdb4..837e959 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1,9 +1,6 @@
+ include_directories(${libreplaygain_SOURCE_DIR}/include)
+ 
+-add_library(replaygain-static STATIC gain_analysis)
+-set_target_properties(replaygain-static PROPERTIES OUTPUT_NAME replaygain CLEAN_DIRECT_OUTPUT 1)
+-
+ add_library(replaygain-shared SHARED gain_analysis)
+ set_target_properties(replaygain-shared PROPERTIES OUTPUT_NAME replaygain CLEAN_DIRECT_OUTPUT 1 VERSION 1.0.0 SOVERSION 1)
+ 
+-install(TARGETS replaygain-static replaygain-shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
++install(TARGETS replaygain-shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
+-- 
+2.26.2
+
diff --git a/media-libs/libreplaygain/libreplaygain-477-r1.ebuild b/media-libs/libreplaygain/libreplaygain-477-r1.ebuild
index f1a6f5df2e81..171546eb7957 100644
--- a/media-libs/libreplaygain/libreplaygain-477-r1.ebuild
+++ b/media-libs/libreplaygain/libreplaygain-477-r1.ebuild
@@ -16,7 +16,8 @@ SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
+
+PATCHES=( "${FILESDIR}"/${PN}-static-libs.patch )
 
 src_prepare() {
 	cmake_src_prepare
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 47641bc8cba4..f3b206c56038 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,3 +1 @@
-DIST openimageio-1.8.17.tar.gz 27835527 BLAKE2B e524d171bb918a46aed3c5f329bc8d10853d8b170c1e9b4a6edad72db66b3a03ea32eba4338577a667254e884daebf6b5b33a70090b953a5b5e269d874c91852 SHA512 e58cad9458d71a845c3214675a41e0cffe0509fd52a95ef5a44af0015ef25a1145f9ebb50ff1f5e7200ae0a46efb40e851855f53c55d058c0bc5654a072bdbf7
-DIST openimageio-2.2.7.0.tar.gz 29189796 BLAKE2B 33974c8dc60e7619e139e6f73c48535e90208282b8d1e8e4ab10c36ec75c50bfe7ca7df0d6a80b49ebc4d61e3c6ceb7f87760854c13cc133f4dd031eeeaa5a65 SHA512 a36ffcf150cb1134aea33ec3e7ee2113c9df48c6860812a9e5ca519400211ba0fa5732153226f7e80cc20c2553834bd425adb93cdebbd5354612752f46ebc8e0
 DIST openimageio-2.2.8.0.tar.gz 29201949 BLAKE2B b77e42dddfaa6a8dff174b89e43c7de158efcae0e851037a97f1f46127f5cda458bdc7b64172c1fe64236d5ace351c9a432c2e857467c7f83b59dc9f6670fbeb SHA512 7bb94832734b4354d961003ec7f85fa30e4a69d7f825c5668a0230d857f8c137dd522730ec5089db012f0d843fc67368c731458a3d6de9ae41dabfb4cc30592e
diff --git a/media-libs/openimageio/metadata.xml b/media-libs/openimageio/metadata.xml
index 592d071e5e52..dbbc1a37515e 100644
--- a/media-libs/openimageio/metadata.xml
+++ b/media-libs/openimageio/metadata.xml
@@ -10,7 +10,6 @@
 		<name>Gentoo Science Project</name>
 	</maintainer>
 	<use>
-		<flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg></flag>
 		<flag name="dicom">Enable DICOM medical image file support via <pkg>sci-libs/dcmtk</pkg></flag>
 		<flag name="field3d">Enable f3d file (write) support via <pkg>media-libs/Field3D</pkg></flag>
 		<flag name="opencv">Enable OpenCV support via <pkg>media-libs/opencv</pkg></flag>
diff --git a/media-libs/openimageio/openimageio-1.8.17-r2.ebuild b/media-libs/openimageio/openimageio-1.8.17-r2.ebuild
deleted file mode 100644
index e0e7eafa62ad..000000000000
--- a/media-libs/openimageio/openimageio-1.8.17-r2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit cmake python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-X86_CPU_FEATURES=(
-	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="color-management dicom doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python qt5 raw ssl +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="test" # bug 431412
-
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-RDEPEND="
-	>=dev-libs/boost-1.62:=
-	dev-libs/pugixml:=
-	>=media-libs/ilmbase-2.2.0-r1:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	>=media-libs/openexr-2.2.0-r2:=
-	media-libs/tiff:0=
-	sys-libs/zlib:=
-	virtual/jpeg:0
-	color-management? ( media-libs/opencolorio:= )
-	dicom? ( sci-libs/dcmtk )
-	ffmpeg? ( media-video/ffmpeg:= )
-	field3d? ( media-libs/Field3D:= )
-	gif? ( media-libs/giflib:0= )
-	jpeg2k? ( >=media-libs/openjpeg-1.5:0= )
-	opencv? ( media-libs/opencv:= )
-	opengl? (
-		media-libs/glew:=
-		virtual/glu
-		virtual/opengl
-	)
-	ptex? ( media-libs/ptex:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	raw? ( media-libs/libraw:= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	truetype? ( media-libs/freetype:2= )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES.md CREDITS.md README.md src/doc/${PN}.pdf )
-
-PATCHES=( "${FILESDIR}/${P}-boostpython.patch" )
-
-S="${WORKDIR}/oiio-Release-${PV}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	cmake_comment_add_subdirectory src/fonts
-}
-
-src_configure() {
-	# Build with SIMD support
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd} ]] && mysimd=("0")
-
-	local mycmakeargs=(
-		-DINSTALL_DOCS=$(usex doc)
-		-DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed
-		-DSTOP_ON_WARNING=OFF
-		-DUSE_EXTERNAL_PUGIXML=ON
-		-DUSE_JPEGTURBO=ON
-		-DUSE_NUKE=NO # Missing in Gentoo
-		-DUSE_NUKE=OFF
-		-DUSE_OCIO=$(usex color-management)
-		-DUSE_DICOM=$(usex dicom)
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_FIELD3D=$(usex field3d)
-		-DUSE_GIF=$(usex gif)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENCV=$(usex opencv)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_PTEX=$(usex ptex)
-		-DUSE_PYTHON=$(usex python)
-		-DUSE_QT=$(usex qt5)
-		-DUSE_LIBRAW=$(usex raw)
-		-DUSE_OPENSSL=$(usex ssl)
-		-DUSE_FREETYPE=$(usex truetype)
-		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
-	)
-
-	cmake_src_configure
-}
diff --git a/media-libs/openimageio/openimageio-2.2.7.0.ebuild b/media-libs/openimageio/openimageio-2.2.7.0.ebuild
deleted file mode 100644
index b0e52adab181..000000000000
--- a/media-libs/openimageio/openimageio-2.2.7.0.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/oiio-Release-${PV}"
-
-LICENSE="BSD"
-SLOT="0/2.2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-X86_CPU_FEATURES=(
-	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# test data in separate repo
-# second repo has no structure whatsoever
-RESTRICT="test"
-
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-RDEPEND="
-	>=dev-libs/boost-1.62:=
-	dev-cpp/robin-map
-	dev-libs/libfmt:=
-	dev-libs/pugixml:=
-	>=media-libs/ilmbase-2.2.0-r1:=
-	>=media-libs/libheif-1.7.0:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	media-libs/opencolorio:=
-	>=media-libs/openexr-2.2.0-r2:=
-	media-libs/tiff:0=
-	sci-libs/dcmtk
-	sys-libs/zlib:=
-	virtual/jpeg:0
-	ffmpeg? ( media-video/ffmpeg:= )
-	field3d? ( media-libs/Field3D:= )
-	gif? ( media-libs/giflib:0= )
-	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
-	opencv? ( media-libs/opencv:= )
-	opengl? (
-		media-libs/glew:=
-		virtual/glu
-		virtual/opengl
-	)
-	openvdb? (
-		dev-cpp/tbb:=
-		media-gfx/openvdb:=
-	)
-	ptex? ( media-libs/ptex:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/pybind11[${PYTHON_USEDEP}]
-		')
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	raw? ( media-libs/libraw:= )
-	truetype? ( media-libs/freetype:2= )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES.md CREDITS.md README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.6.1-pugixml.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	cmake_comment_add_subdirectory src/fonts
-}
-
-src_configure() {
-	# Build with SIMD support
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd} ]] && mysimd=("0")
-
-	local mycmakeargs=(
-		-DVERBOSE=ON
-		-DOIIO_BUILD_TESTS=OFF
-		-DBUILD_DOCS=$(usex doc)
-		-DINSTALL_DOCS=$(usex doc)
-		-DSTOP_ON_WARNING=OFF
-		-DUSE_EXTERNAL_PUGIXML=ON
-		-DUSE_JPEGTURBO=ON
-		-DUSE_NUKE=OFF # not in Gentoo
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_FIELD3D=$(usex field3d)
-		-DUSE_GIF=$(usex gif)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENCV=$(usex opencv)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_OPENVDB=$(usex openvdb)
-		-DUSE_PTEX=$(usex ptex)
-		-DUSE_PYTHON=$(usex python)
-		-DUSE_QT=$(usex qt5)
-		-DUSE_LIBRAW=$(usex raw)
-		-DUSE_FREETYPE=$(usex truetype)
-		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
-	)
-
-	cmake_src_configure
-}
diff --git a/media-libs/openimageio/openimageio-2.2.8.0.ebuild b/media-libs/openimageio/openimageio-2.2.8.0.ebuild
index 847ae6ec6348..934cf38bd1c8 100644
--- a/media-libs/openimageio/openimageio-2.2.8.0.ebuild
+++ b/media-libs/openimageio/openimageio-2.2.8.0.ebuild
@@ -21,7 +21,7 @@ X86_CPU_FEATURES=(
 )
 CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
 
-IUSE="doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
+IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 # test data in separate repo
@@ -50,9 +50,9 @@ RDEPEND="
 	media-libs/opencolorio:=
 	>=media-libs/openexr-2.2.0-r2:=
 	media-libs/tiff:0=
-	sci-libs/dcmtk
 	sys-libs/zlib:=
 	virtual/jpeg:0
+	dicom? ( sci-libs/dcmtk )
 	ffmpeg? ( media-video/ffmpeg:= )
 	field3d? ( media-libs/Field3D:= )
 	gif? ( media-libs/giflib:0= )
@@ -115,6 +115,7 @@ src_configure() {
 		-DBUILD_DOCS=$(usex doc)
 		-DINSTALL_DOCS=$(usex doc)
 		-DSTOP_ON_WARNING=OFF
+		-DUSE_DCMTK=$(usex dicom)
 		-DUSE_EXTERNAL_PUGIXML=ON
 		-DUSE_JPEGTURBO=ON
 		-DUSE_NUKE=OFF # not in Gentoo
diff --git a/media-libs/sratom/Manifest b/media-libs/sratom/Manifest
index dfb564b1e3d4..caf807ff90b2 100644
--- a/media-libs/sratom/Manifest
+++ b/media-libs/sratom/Manifest
@@ -1,2 +1 @@
-DIST sratom-0.6.4.tar.bz2 339707 BLAKE2B acf29c7dd3c4e23bf20ef2811706abdd3543d0fc380183f7f419932c3178ff5e2f6d95c57bad2ef991dbc1e32c6e8a3645238c7b42dfd204942dbc4c05270652 SHA512 6462d8d33ed7ddaa2aea267fab14c9a15bfc077a4f8d26eb493be4c48c95d8dcec614f540bd82fe22aecca641771326a44d175c3991cd473ae371062c78aaac3
 DIST sratom-0.6.6.tar.bz2 347297 BLAKE2B 0cb1949486deb5e8f823b17c98fb415dc44b0cefece647b6c5b3646438736ee9c7afa617bb00a68d61a31c80f6e643758f48602f647655aa4b185b2cc5fff893 SHA512 ccc209af68a39c1a669ba694d250b292df2f588aeea2a9d1dfe54a23e31f032fcce1d99ebf9dd7cff80ce5aedd204c74e3ccc04d6cd239921cd3e443db83ed55
diff --git a/media-libs/sratom/sratom-0.6.4.ebuild b/media-libs/sratom/sratom-0.6.4.ebuild
deleted file mode 100644
index ef2f5673e199..000000000000
--- a/media-libs/sratom/sratom-0.6.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE='threads(+)'
-inherit python-any-r1 waf-utils multilib-build multilib-minimal
-
-DESCRIPTION="Library for serialising LV2 atoms to/from RDF, particularly the Turtle syntax"
-HOMEPAGE="http://drobilla.net/software/sratom/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=media-libs/lv2-1.16.0
-	>=dev-libs/serd-0.30.0
-	>=dev-libs/sord-0.14.0"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-
-DOCS=( "NEWS" "README.md" )
-
-src_prepare() {
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	waf-utils_src_configure \
-		--docdir=/usr/share/doc/${PF} \
-		$(multilib_native_usex doc --docs "") \
-		$(usex test --test "") \
-		$(usex static-libs --static "")
-}
-
-multilib_src_test() {
-	./waf test || die
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-	default
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-	default
-}
diff --git a/media-libs/suil/Manifest b/media-libs/suil/Manifest
index 774ef55a9661..008277b25541 100644
--- a/media-libs/suil/Manifest
+++ b/media-libs/suil/Manifest
@@ -1,2 +1 @@
-DIST suil-0.10.6.tar.bz2 347615 BLAKE2B 667379c6290c4c1e03168911fa58b991e95bbc7c7477606e42ba39d33645f4580ea09051d294f24cdbb3b2df9ed1d415b73eda3ec1f593fed2e7f2d9ff2a85c3 SHA512 b23ffe0c0ae25467b2cd60117a2efa8c13132c8e5612619e4c9ad2cc228b835f1c7fd384db62b74d4a327e3708f189b6a91f972756fcafe501308adb732c3b36
 DIST suil-0.10.8.tar.bz2 357003 BLAKE2B d5445a8a539d3aaca94141fe0a7bfce976db9602fcaa563d0e5661ce7d281ac48679110e5545d3a3aa4d3c488c5ce7a00f2f06bd67e56da26943885a71480648 SHA512 1d68996756ac593b2b2da6d9554e3257944cacbc8d70d90ded0f6ad5b5877778a08c779a12c7b4527d492f9c480613e030ab6933532f758e16221daa9d5c2dd4
diff --git a/media-libs/suil/suil-0.10.6.ebuild b/media-libs/suil/suil-0.10.6.ebuild
deleted file mode 100644
index f9bfceda0f04..000000000000
--- a/media-libs/suil/suil-0.10.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Lightweight C library for loading and wrapping LV2 plugin UIs"
-HOMEPAGE="http://drobilla.net/software/suil/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
-IUSE="doc gtk qt5"
-
-BDEPEND="
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-"
-CDEPEND="
-	>=media-libs/lv2-1.16.0
-	gtk? ( x11-libs/gtk+:2 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-	)"
-RDEPEND="${CDEPEND}"
-DEPEND="
-	${CDEPEND}
-	${PYTHON_DEPS}
-"
-
-DOCS=( AUTHORS NEWS README.md )
-
-src_prepare() {
-	default
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
-}
-
-src_configure() {
-	waf-utils_src_configure \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--no-qt4 \
-		$(usex gtk '' --no-gtk) \
-		$(usex qt5 '' --no-qt5) \
-		$(usex doc --docs '')
-}
diff --git a/media-libs/vitamtp/vitamtp-2.5.9_pre20160829.ebuild b/media-libs/vitamtp/vitamtp-2.5.9_pre20160829.ebuild
index daed23602791..c1a028b1ab19 100644
--- a/media-libs/vitamtp/vitamtp-2.5.9_pre20160829.ebuild
+++ b/media-libs/vitamtp/vitamtp-2.5.9_pre20160829.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,9 +34,13 @@ src_prepare() {
 	eautoreconf
 }
 
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
 	default
-	find "${D}" -name '*.la' -type f -delete || die
+	find "${ED}" -name '*.la' -delete || die
 	insinto /lib/udev/rules.d
 	newins debian/libvitamtp5.udev 10-vitamtp.rules
 }
diff --git a/media-libs/vitamtp/vitamtp-9999.ebuild b/media-libs/vitamtp/vitamtp-9999.ebuild
index 03249b880bcf..90e58fb32077 100644
--- a/media-libs/vitamtp/vitamtp-9999.ebuild
+++ b/media-libs/vitamtp/vitamtp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,9 +30,13 @@ src_prepare() {
 	eautoreconf
 }
 
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
 	default
-	find "${D}" -name '*.la' -type f -delete || die
+	find "${ED}" -name '*.la' -delete || die
 	insinto /lib/udev/rules.d
 	newins debian/libvitamtp5.udev 10-vitamtp.rules
 }
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 1342c616154a..8a7c888ca51b 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.14.5.ebuild b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.14.5.ebuild
index 6bc2aaff99d5..8c812758db10 100644
--- a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.14.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPION="JACK audio server source/sink plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="virtual/jack[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.16.2.ebuild b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.16.2.ebuild
index 6bc2aaff99d5..8c812758db10 100644
--- a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPION="JACK audio server source/sink plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="virtual/jack[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-lv2/Manifest b/media-plugins/gst-plugins-lv2/Manifest
index cf517f25a29b..38910de89b33 100644
--- a/media-plugins/gst-plugins-lv2/Manifest
+++ b/media-plugins/gst-plugins-lv2/Manifest
@@ -1,2 +1,3 @@
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
+DIST gst-plugins-lv2-1.16.2-r1-gcc10.patch 25387 BLAKE2B c8dfc47869907912af37258b63e790cb630ac0898ca3710faee6a6d08f2a1f6e0507823cf7b9a3ef017f26304962b94424afdce74f3af137170055fa72e42a68 SHA512 083f5b6436cacf33bca72ede6075d10d77682426cc8161f9a643f721f62dfe791951948290fc32b419e0127b524e9f2b7112a30d6ba0b2f46fef62566d18b18f
diff --git a/media-plugins/gst-plugins-lv2/files/patch-1.16.2-gcc10.patch b/media-plugins/gst-plugins-lv2/files/patch-1.16.2-gcc10.patch
deleted file mode 100644
index cdfa976d0560..000000000000
--- a/media-plugins/gst-plugins-lv2/files/patch-1.16.2-gcc10.patch
+++ /dev/null
@@ -1,606 +0,0 @@
-Bug: https://bugs.gentoo.org/716008
-
---- a/ext/lv2/gstlv2.c
-+++ b/ext/lv2/gstlv2.c
-@@ -69,6 +69,38 @@
- #error "Unsupported OS"
- #endif
- 
-+LilvWorld *gst_lv2_world_node = NULL;
-+LilvNode *gst_lv2_audio_node = NULL;
-+LilvNode *gst_lv2_control_node = NULL;
-+LilvNode *gst_lv2_cv_node = NULL;
-+LilvNode *gst_lv2_event_node = NULL;
-+LilvNode *gst_lv2_input_node = NULL;
-+LilvNode *gst_lv2_output_node = NULL;
-+LilvNode *gst_lv2_preset_node = NULL;
-+LilvNode *gst_lv2_state_iface_node = NULL;
-+LilvNode *gst_lv2_state_uri_node = NULL;
-+
-+LilvNode *gst_lv2_integer_prop_node = NULL;
-+LilvNode *gst_lv2_toggled_prop_node = NULL;
-+LilvNode *gst_lv2_designation_pred_node = NULL;
-+LilvNode *gst_lv2_in_place_broken_pred_node = NULL;
-+LilvNode *gst_lv2_optional_pred_node = NULL;
-+LilvNode *gst_lv2_group_pred_node = NULL;
-+LilvNode *gst_lv2_supports_event_pred_node = NULL;
-+LilvNode *gst_lv2_label_pred_node = NULL;
-+
-+LilvNode *gst_lv2_center_role_node = NULL;
-+LilvNode *gst_lv2_left_role_node = NULL;
-+LilvNode *gst_lv2_right_role_node = NULL;
-+LilvNode *gst_lv2_rear_center_role_node = NULL;
-+LilvNode *gst_lv2_rear_left_role_node = NULL;
-+LilvNode *gst_lv2_rear_right_role_node = NULL;
-+LilvNode *gst_lv2_lfe_role_node = NULL;
-+LilvNode *gst_lv2_center_left_role_node = NULL;
-+LilvNode *gst_lv2_center_right_role_node = NULL;
-+LilvNode *gst_lv2_side_left_role_node = NULL;
-+LilvNode *gst_lv2_side_right_role_node = NULL;
-+
- GstStructure *lv2_meta_all = NULL;
- 
- static void
-@@ -98,9 +130,11 @@
-   for (i = 0; i < lilv_plugin_get_num_ports (lv2plugin); i++) {
-     const LilvPort *port = lilv_plugin_get_port_by_index (lv2plugin, i);
- 
--    if (lilv_port_is_a (lv2plugin, port, audio_class)) {
--      const gboolean is_input = lilv_port_is_a (lv2plugin, port, input_class);
--      LilvNodes *lv2group = lilv_port_get (lv2plugin, port, group_pred);
-+    if (lilv_port_is_a (lv2plugin, port, gst_lv2_audio_node)) {
-+      const gboolean is_input =
-+          lilv_port_is_a (lv2plugin, port, gst_lv2_input_node);
-+      LilvNodes *lv2group =
-+          lilv_port_get (lv2plugin, port, gst_lv2_group_pred_node);
- 
-       if (lv2group) {
-         const gchar *uri = lilv_node_as_uri (lv2group);
-@@ -116,8 +150,8 @@
-         (*audio_in)++;
-       else
-         (*audio_out)++;
--    } else if (lilv_port_is_a (lv2plugin, port, control_class) ||
--        lilv_port_is_a (lv2plugin, port, cv_class)) {
-+    } else if (lilv_port_is_a (lv2plugin, port, gst_lv2_control_node) ||
-+        lilv_port_is_a (lv2plugin, port, gst_lv2_cv_node)) {
-       (*control)++;
-     }
-   }
-@@ -130,7 +164,7 @@
- {
-   guint audio_in, audio_out, control;
-   LilvIter *i;
--  const LilvPlugins *plugins = lilv_world_get_all_plugins (world);
-+  const LilvPlugins *plugins = lilv_world_get_all_plugins (gst_lv2_world_node);
- 
-   for (i = lilv_plugins_begin (plugins); !lilv_plugins_is_end (plugins, i);
-       i = lilv_plugins_next (plugins, i)) {
-@@ -187,8 +221,9 @@
-     }
- 
-     /* check supported extensions */
--    can_do_presets = lilv_plugin_has_extension_data (lv2plugin, state_iface)
--        || lilv_plugin_has_feature (lv2plugin, state_uri)
-+    can_do_presets =
-+        lilv_plugin_has_extension_data (lv2plugin, gst_lv2_state_iface_node)
-+        || lilv_plugin_has_feature (lv2plugin, gst_lv2_state_uri_node)
-         || (control > 0);
-     GST_INFO ("plugin %s can%s do presets", type_name,
-         (can_do_presets ? "" : "'t"));
-@@ -224,8 +259,8 @@
-   GST_DEBUG_CATEGORY_INIT (lv2_debug, "lv2",
-       GST_DEBUG_FG_GREEN | GST_DEBUG_BG_BLACK | GST_DEBUG_BOLD, "LV2");
- 
--  world = lilv_world_new ();
--  lilv_world_load_all (world);
-+  gst_lv2_world_node = lilv_world_new ();
-+  lilv_world_load_all (gst_lv2_world_node);
-   gst_lv2_host_init ();
- 
- /* have been added after lilv-0.22.0, which is the last release */
-@@ -236,37 +271,57 @@
- #define LILV_URI_CV_PORT      "http://lv2plug.in/ns/lv2core#CVPort"
- #endif
- 
--  atom_class = lilv_new_uri (world, LILV_URI_ATOM_PORT);
--  audio_class = lilv_new_uri (world, LILV_URI_AUDIO_PORT);
--  control_class = lilv_new_uri (world, LILV_URI_CONTROL_PORT);
--  cv_class = lilv_new_uri (world, LILV_URI_CV_PORT);
--  event_class = lilv_new_uri (world, LILV_URI_EVENT_PORT);
--  input_class = lilv_new_uri (world, LILV_URI_INPUT_PORT);
--  output_class = lilv_new_uri (world, LILV_URI_OUTPUT_PORT);
--  preset_class = lilv_new_uri (world, LV2_PRESETS__Preset);
--  state_iface = lilv_new_uri (world, LV2_STATE__interface);
--  state_uri = lilv_new_uri (world, LV2_STATE_URI);
--
--  integer_prop = lilv_new_uri (world, LV2_CORE__integer);
--  toggled_prop = lilv_new_uri (world, LV2_CORE__toggled);
--  designation_pred = lilv_new_uri (world, LV2_CORE__designation);
--  in_place_broken_pred = lilv_new_uri (world, LV2_CORE__inPlaceBroken);
--  optional_pred = lilv_new_uri (world, LV2_CORE__optionalFeature);
--  group_pred = lilv_new_uri (world, LV2_PORT_GROUPS__group);
--  supports_event_pred = lilv_new_uri (world, LV2_EVENT__supportsEvent);
--  label_pred = lilv_new_uri (world, LILV_NS_RDFS "label");
--
--  center_role = lilv_new_uri (world, LV2_PORT_GROUPS__center);
--  left_role = lilv_new_uri (world, LV2_PORT_GROUPS__left);
--  right_role = lilv_new_uri (world, LV2_PORT_GROUPS__right);
--  rear_center_role = lilv_new_uri (world, LV2_PORT_GROUPS__rearCenter);
--  rear_left_role = lilv_new_uri (world, LV2_PORT_GROUPS__rearLeft);
--  rear_right_role = lilv_new_uri (world, LV2_PORT_GROUPS__rearLeft);
--  lfe_role = lilv_new_uri (world, LV2_PORT_GROUPS__lowFrequencyEffects);
--  center_left_role = lilv_new_uri (world, LV2_PORT_GROUPS__centerLeft);
--  center_right_role = lilv_new_uri (world, LV2_PORT_GROUPS__centerRight);
--  side_left_role = lilv_new_uri (world, LV2_PORT_GROUPS__sideLeft);
--  side_right_role = lilv_new_uri (world, LV2_PORT_GROUPS__sideRight);
-+  gst_lv2_audio_node = lilv_new_uri (gst_lv2_world_node, LILV_URI_AUDIO_PORT);
-+  gst_lv2_control_node =
-+      lilv_new_uri (gst_lv2_world_node, LILV_URI_CONTROL_PORT);
-+  gst_lv2_cv_node = lilv_new_uri (gst_lv2_world_node, LILV_URI_CV_PORT);
-+  gst_lv2_event_node = lilv_new_uri (gst_lv2_world_node, LILV_URI_EVENT_PORT);
-+  gst_lv2_input_node = lilv_new_uri (gst_lv2_world_node, LILV_URI_INPUT_PORT);
-+  gst_lv2_output_node = lilv_new_uri (gst_lv2_world_node, LILV_URI_OUTPUT_PORT);
-+  gst_lv2_preset_node = lilv_new_uri (gst_lv2_world_node, LV2_PRESETS__Preset);
-+  gst_lv2_state_iface_node =
-+      lilv_new_uri (gst_lv2_world_node, LV2_STATE__interface);
-+  gst_lv2_state_uri_node = lilv_new_uri (gst_lv2_world_node, LV2_STATE_URI);
-+
-+  gst_lv2_integer_prop_node =
-+      lilv_new_uri (gst_lv2_world_node, LV2_CORE__integer);
-+  gst_lv2_toggled_prop_node =
-+      lilv_new_uri (gst_lv2_world_node, LV2_CORE__toggled);
-+  gst_lv2_designation_pred_node =
-+      lilv_new_uri (gst_lv2_world_node, LV2_CORE__designation);
-+  gst_lv2_in_place_broken_pred_node =
-+      lilv_new_uri (gst_lv2_world_node, LV2_CORE__inPlaceBroken);
-+  gst_lv2_optional_pred_node =
-+      lilv_new_uri (gst_lv2_world_node, LV2_CORE__optionalFeature);
-+  gst_lv2_group_pred_node =
-+      lilv_new_uri (gst_lv2_world_node, LV2_PORT_GROUPS__group);
-+  gst_lv2_supports_event_pred_node =
-+      lilv_new_uri (gst_lv2_world_node, LV2_EVENT__supportsEvent);
-+  gst_lv2_label_pred_node =
-+      lilv_new_uri (gst_lv2_world_node, LILV_NS_RDFS "label");
-+
-+  gst_lv2_center_role_node =
-+      lilv_new_uri (gst_lv2_world_node, LV2_PORT_GROUPS__center);
-+  gst_lv2_left_role_node =
-+      lilv_new_uri (gst_lv2_world_node, LV2_PORT_GROUPS__left);
-+  gst_lv2_right_role_node =
-+      lilv_new_uri (gst_lv2_world_node, LV2_PORT_GROUPS__right);
-+  gst_lv2_rear_center_role_node =
-+      lilv_new_uri (gst_lv2_world_node, LV2_PORT_GROUPS__rearCenter);
-+  gst_lv2_rear_left_role_node =
-+      lilv_new_uri (gst_lv2_world_node, LV2_PORT_GROUPS__rearLeft);
-+  gst_lv2_rear_right_role_node =
-+      lilv_new_uri (gst_lv2_world_node, LV2_PORT_GROUPS__rearRight);
-+  gst_lv2_lfe_role_node =
-+      lilv_new_uri (gst_lv2_world_node, LV2_PORT_GROUPS__lowFrequencyEffects);
-+  gst_lv2_center_left_role_node =
-+      lilv_new_uri (gst_lv2_world_node, LV2_PORT_GROUPS__centerLeft);
-+  gst_lv2_center_right_role_node =
-+      lilv_new_uri (gst_lv2_world_node, LV2_PORT_GROUPS__centerRight);
-+  gst_lv2_side_left_role_node =
-+      lilv_new_uri (gst_lv2_world_node, LV2_PORT_GROUPS__sideLeft);
-+  gst_lv2_side_right_role_node =
-+      lilv_new_uri (gst_lv2_world_node, LV2_PORT_GROUPS__sideRight);
- 
-   gst_plugin_add_dependency_simple (plugin,
-       "LV2_PATH:" GST_LV2_ENVVARS, GST_LV2_DEFAULT_PATH, NULL,
-@@ -323,39 +378,38 @@
- #endif
-      static void plugin_cleanup (GstPlugin * plugin)
- {
--  lilv_node_free (atom_class);
--  lilv_node_free (audio_class);
--  lilv_node_free (control_class);
--  lilv_node_free (cv_class);
--  lilv_node_free (event_class);
--  lilv_node_free (input_class);
--  lilv_node_free (output_class);
--  lilv_node_free (preset_class);
--  lilv_node_free (state_iface);
--  lilv_node_free (state_uri);
--
--  lilv_node_free (integer_prop);
--  lilv_node_free (toggled_prop);
--  lilv_node_free (designation_pred);
--  lilv_node_free (in_place_broken_pred);
--  lilv_node_free (optional_pred);
--  lilv_node_free (group_pred);
--  lilv_node_free (supports_event_pred);
--  lilv_node_free (label_pred);
--
--  lilv_node_free (center_role);
--  lilv_node_free (left_role);
--  lilv_node_free (right_role);
--  lilv_node_free (rear_center_role);
--  lilv_node_free (rear_left_role);
--  lilv_node_free (rear_right_role);
--  lilv_node_free (lfe_role);
--  lilv_node_free (center_left_role);
--  lilv_node_free (center_right_role);
--  lilv_node_free (side_left_role);
--  lilv_node_free (side_right_role);
-+  lilv_node_free (gst_lv2_audio_node);
-+  lilv_node_free (gst_lv2_control_node);
-+  lilv_node_free (gst_lv2_cv_node);
-+  lilv_node_free (gst_lv2_event_node);
-+  lilv_node_free (gst_lv2_input_node);
-+  lilv_node_free (gst_lv2_output_node);
-+  lilv_node_free (gst_lv2_preset_node);
-+  lilv_node_free (gst_lv2_state_iface_node);
-+  lilv_node_free (gst_lv2_state_uri_node);
-+
-+  lilv_node_free (gst_lv2_integer_prop_node);
-+  lilv_node_free (gst_lv2_toggled_prop_node);
-+  lilv_node_free (gst_lv2_designation_pred_node);
-+  lilv_node_free (gst_lv2_in_place_broken_pred_node);
-+  lilv_node_free (gst_lv2_optional_pred_node);
-+  lilv_node_free (gst_lv2_group_pred_node);
-+  lilv_node_free (gst_lv2_supports_event_pred_node);
-+  lilv_node_free (gst_lv2_label_pred_node);
-+
-+  lilv_node_free (gst_lv2_center_role_node);
-+  lilv_node_free (gst_lv2_left_role_node);
-+  lilv_node_free (gst_lv2_right_role_node);
-+  lilv_node_free (gst_lv2_rear_center_role_node);
-+  lilv_node_free (gst_lv2_rear_left_role_node);
-+  lilv_node_free (gst_lv2_rear_right_role_node);
-+  lilv_node_free (gst_lv2_lfe_role_node);
-+  lilv_node_free (gst_lv2_center_left_role_node);
-+  lilv_node_free (gst_lv2_center_right_role_node);
-+  lilv_node_free (gst_lv2_side_left_role_node);
-+  lilv_node_free (gst_lv2_side_right_role_node);
- 
--  lilv_world_free (world);
-+  lilv_world_free (gst_lv2_world_node);
- }
- 
- GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
---- a/ext/lv2/gstlv2filter.c
-+++ b/ext/lv2/gstlv2filter.c
-@@ -183,37 +183,37 @@
- gst_lv2_filter_role_to_position (LilvNode * role)
- {
-   /* Front.  Mono and left/right are mututally exclusive */
--  if (lilv_node_equals (role, center_role)) {
-+  if (lilv_node_equals (role, gst_lv2_center_role_node)) {
- 
-     return GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER;
--  } else if (lilv_node_equals (role, left_role)) {
-+  } else if (lilv_node_equals (role, gst_lv2_left_role_node)) {
-     return GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT;
--  } else if (lilv_node_equals (role, right_role)) {
-+  } else if (lilv_node_equals (role, gst_lv2_right_role_node)) {
-     return GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT;
- 
-     /* Rear. Left/right and center are mututally exclusive */
--  } else if (lilv_node_equals (role, rear_center_role)) {
-+  } else if (lilv_node_equals (role, gst_lv2_rear_center_role_node)) {
-     return GST_AUDIO_CHANNEL_POSITION_REAR_CENTER;
--  } else if (lilv_node_equals (role, rear_left_role)) {
-+  } else if (lilv_node_equals (role, gst_lv2_rear_left_role_node)) {
-     return GST_AUDIO_CHANNEL_POSITION_REAR_LEFT;
--  } else if (lilv_node_equals (role, rear_right_role)) {
-+  } else if (lilv_node_equals (role, gst_lv2_rear_right_role_node)) {
-     return GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT;
- 
-     /* Subwoofer/low-frequency-effects */
--  } else if (lilv_node_equals (role, lfe_role)) {
-+  } else if (lilv_node_equals (role, gst_lv2_lfe_role_node)) {
-     return GST_AUDIO_CHANNEL_POSITION_LFE1;
- 
-     /* Center front speakers. Center and left/right_of_center
-      * are mutually exclusive */
--  } else if (lilv_node_equals (role, center_left_role)) {
-+  } else if (lilv_node_equals (role, gst_lv2_center_left_role_node)) {
-     return GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER;
--  } else if (lilv_node_equals (role, center_right_role)) {
-+  } else if (lilv_node_equals (role, gst_lv2_center_right_role_node)) {
-     return GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER;
- 
-     /* sides */
--  } else if (lilv_node_equals (role, side_left_role)) {
-+  } else if (lilv_node_equals (role, gst_lv2_side_left_role_node)) {
-     return GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT;
--  } else if (lilv_node_equals (role, side_right_role)) {
-+  } else if (lilv_node_equals (role, gst_lv2_side_right_role_node)) {
-     return GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT;
-   }
- 
-@@ -531,7 +531,8 @@
- {
-   gst_lv2_init (&self->lv2, &klass->lv2);
- 
--  if (!lilv_plugin_has_feature (klass->lv2.plugin, in_place_broken_pred))
-+  if (!lilv_plugin_has_feature (klass->lv2.plugin,
-+          gst_lv2_in_place_broken_pred_node))
-     gst_base_transform_set_in_place (GST_BASE_TRANSFORM (self), TRUE);
- }
- 
---- a/ext/lv2/gstlv2.h
-+++ b/ext/lv2/gstlv2.h
-@@ -28,40 +28,39 @@
- 
- #include "gstlv2utils.h"
- 
--LilvWorld *world;
--LilvNode *atom_class;
--LilvNode *audio_class;
--LilvNode *control_class;
--LilvNode *cv_class;
--LilvNode *event_class;
--LilvNode *input_class;
--LilvNode *output_class;
--LilvNode *preset_class;
--LilvNode *state_iface;
--LilvNode *state_uri;
--
--LilvNode *integer_prop;
--LilvNode *toggled_prop;
--LilvNode *designation_pred;
--LilvNode *in_place_broken_pred;
--LilvNode *optional_pred;
--LilvNode *group_pred;
--LilvNode *supports_event_pred;
--LilvNode *label_pred;
--
--LilvNode *center_role;
--LilvNode *left_role;
--LilvNode *right_role;
--LilvNode *rear_center_role;
--LilvNode *rear_left_role;
--LilvNode *rear_right_role;
--LilvNode *lfe_role;
--LilvNode *center_left_role;
--LilvNode *center_right_role;
--LilvNode *side_left_role;
--LilvNode *side_right_role;
-+G_GNUC_INTERNAL extern LilvWorld *gst_lv2_world_node;
-+G_GNUC_INTERNAL extern LilvNode *gst_lv2_audio_node;
-+G_GNUC_INTERNAL extern LilvNode *gst_lv2_control_node;
-+G_GNUC_INTERNAL extern LilvNode *gst_lv2_cv_node;
-+G_GNUC_INTERNAL extern LilvNode *gst_lv2_event_node;
-+G_GNUC_INTERNAL extern LilvNode *gst_lv2_input_node;
-+G_GNUC_INTERNAL extern LilvNode *gst_lv2_output_node;
-+G_GNUC_INTERNAL extern LilvNode *gst_lv2_preset_node;
-+G_GNUC_INTERNAL extern LilvNode *gst_lv2_state_iface_node;
-+G_GNUC_INTERNAL extern LilvNode *gst_lv2_state_uri_node;
-+
-+G_GNUC_INTERNAL extern LilvNode *gst_lv2_integer_prop_node;
-+G_GNUC_INTERNAL extern LilvNode *gst_lv2_toggled_prop_node;
-+G_GNUC_INTERNAL extern LilvNode *gst_lv2_designation_pred_node;
-+G_GNUC_INTERNAL extern LilvNode *gst_lv2_in_place_broken_pred_node;
-+G_GNUC_INTERNAL extern LilvNode *gst_lv2_optional_pred_node;
-+G_GNUC_INTERNAL extern LilvNode *gst_lv2_group_pred_node;
-+G_GNUC_INTERNAL extern LilvNode *gst_lv2_supports_event_pred_node;
-+G_GNUC_INTERNAL extern LilvNode *gst_lv2_label_pred_node;
-+
-+G_GNUC_INTERNAL extern LilvNode *gst_lv2_center_role_node;
-+G_GNUC_INTERNAL extern LilvNode *gst_lv2_left_role_node;
-+G_GNUC_INTERNAL extern LilvNode *gst_lv2_right_role_node;
-+G_GNUC_INTERNAL extern LilvNode *gst_lv2_rear_center_role_node;
-+G_GNUC_INTERNAL extern LilvNode *gst_lv2_rear_left_role_node;
-+G_GNUC_INTERNAL extern LilvNode *gst_lv2_rear_right_role_node;
-+G_GNUC_INTERNAL extern LilvNode *gst_lv2_lfe_role_node;
-+G_GNUC_INTERNAL extern LilvNode *gst_lv2_center_left_role_node;
-+G_GNUC_INTERNAL extern LilvNode *gst_lv2_center_right_role_node;
-+G_GNUC_INTERNAL extern LilvNode *gst_lv2_side_left_role_node;
-+G_GNUC_INTERNAL extern LilvNode *gst_lv2_side_right_role_node;
- 
--GstStructure *lv2_meta_all;
-+G_GNUC_INTERNAL extern GstStructure *lv2_meta_all;
- 
- void gst_lv2_filter_register_element (GstPlugin *plugin,
-                                       GstStructure * lv2_meta);
---- a/ext/lv2/gstlv2utils.c
-+++ b/ext/lv2/gstlv2utils.c
-@@ -173,7 +173,9 @@
-   if (!lv2->presets) {
-     LilvNodes *presets;
- 
--    if ((presets = lilv_plugin_get_related (lv2->klass->plugin, preset_class))) {
-+    if ((presets =
-+            lilv_plugin_get_related (lv2->klass->plugin,
-+                gst_lv2_preset_node))) {
-       LilvIter *j;
- 
-       lv2->presets = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
-@@ -184,8 +186,10 @@
-         const LilvNode *preset = lilv_nodes_get (presets, j);
-         LilvNodes *titles;
- 
--        lilv_world_load_resource (world, preset);
--        titles = lilv_world_find_nodes (world, preset, label_pred, NULL);
-+        lilv_world_load_resource (gst_lv2_world_node, preset);
-+        titles =
-+            lilv_world_find_nodes (gst_lv2_world_node, preset,
-+            gst_lv2_label_pred_node, NULL);
-         if (titles) {
-           const LilvNode *title = lilv_nodes_get_first (titles);
-           g_hash_table_insert (lv2->presets,
-@@ -249,7 +253,8 @@
- gst_lv2_load_preset (GstLV2 * lv2, GstObject * obj, const gchar * name)
- {
-   LilvNode *preset = g_hash_table_lookup (lv2->presets, name);
--  LilvState *state = lilv_state_new_from_world (world, &lv2_map, preset);
-+  LilvState *state =
-+      lilv_state_new_from_world (gst_lv2_world_node, &lv2_map, preset);
-   gpointer user_data[] = { lv2->klass, obj };
- 
-   GST_INFO_OBJECT (obj, "loading preset <%s>", lilv_node_as_string (preset));
-@@ -291,7 +296,7 @@
-   gpointer user_data[] = { lv2->klass, obj };
-   LilvState *state;
-   LilvNode *bundle_dir;
--  const LilvNode *state_uri;
-+  const LilvNode *gst_lv2_state_uri_node;
-   LilvInstance *instance = lv2->instance;
-   gboolean res;
- #ifndef HAVE_LILV_0_22
-@@ -319,27 +324,27 @@
- 
-   lilv_state_set_label (state, name);
- 
--  res = lilv_state_save (world, &lv2_map, &lv2_unmap, state, /*uri */ NULL, dir,
--      filename) != 0;
-+  res = lilv_state_save (gst_lv2_world_node, &lv2_map, &lv2_unmap, state,       /*uri */
-+      NULL, dir, filename) != 0;
- 
--  /* reload bundle into the world */
--  bundle_dir = lilv_new_file_uri (world, NULL, dir);
--  lilv_world_unload_bundle (world, bundle_dir);
--  lilv_world_load_bundle (world, bundle_dir);
-+  /* reload bundle into the gst_lv2_world_node */
-+  bundle_dir = lilv_new_file_uri (gst_lv2_world_node, NULL, dir);
-+  lilv_world_unload_bundle (gst_lv2_world_node, bundle_dir);
-+  lilv_world_load_bundle (gst_lv2_world_node, bundle_dir);
-   lilv_node_free (bundle_dir);
- 
- #ifdef HAVE_LILV_0_22
--  state_uri = lilv_state_get_uri (state);
-+  gst_lv2_state_uri_node = lilv_state_get_uri (state);
- #else
-   filepath = g_build_filename (dir, filename, NULL);
--  state_uri = lilv_new_uri (world, filepath);
-+  gst_lv2_state_uri_node = lilv_new_uri (gst_lv2_world_node, filepath);
-   g_free (filepath);
- #endif
--  lilv_world_load_resource (world, state_uri);
-+  lilv_world_load_resource (gst_lv2_world_node, gst_lv2_state_uri_node);
-   g_hash_table_insert (lv2->presets, g_strdup (name),
--      lilv_node_duplicate (state_uri));
-+      lilv_node_duplicate (gst_lv2_state_uri_node));
- #ifndef HAVE_LILV_0_22
--  lilv_node_free ((LilvNode *) state_uri);
-+  lilv_node_free ((LilvNode *) gst_lv2_state_uri_node);
- #endif
- 
-   lilv_state_free (state);
-@@ -370,10 +375,11 @@
- {
- #ifdef HAVE_LILV_0_22
-   LilvNode *preset = g_hash_table_lookup (lv2->presets, name);
--  LilvState *state = lilv_state_new_from_world (world, &lv2_map, preset);
-+  LilvState *state =
-+      lilv_state_new_from_world (gst_lv2_world_node, &lv2_map, preset);
- 
--  lilv_world_unload_resource (world, lilv_state_get_uri (state));
--  lilv_state_delete (world, state);
-+  lilv_world_unload_resource (gst_lv2_world_node, lilv_state_get_uri (state));
-+  lilv_state_delete (gst_lv2_world_node, state);
-   lilv_state_free (state);
- #endif
-   g_hash_table_remove (lv2->presets, name);
-@@ -620,13 +626,13 @@
-       lilv_node_as_string (lilv_plugin_get_uri (lv2plugin)), name, nick);
- 
-   perms = G_PARAM_READABLE;
--  if (lilv_port_is_a (lv2plugin, port, input_class))
-+  if (lilv_port_is_a (lv2plugin, port, gst_lv2_input_node))
-     perms |= G_PARAM_WRITABLE | G_PARAM_CONSTRUCT;
--  if (lilv_port_is_a (lv2plugin, port, control_class) ||
--      lilv_port_is_a (lv2plugin, port, cv_class))
-+  if (lilv_port_is_a (lv2plugin, port, gst_lv2_control_node) ||
-+      lilv_port_is_a (lv2plugin, port, gst_lv2_cv_node))
-     perms |= GST_PARAM_CONTROLLABLE;
- 
--  if (lilv_port_has_property (lv2plugin, port, toggled_prop)) {
-+  if (lilv_port_has_property (lv2plugin, port, gst_lv2_toggled_prop_node)) {
-     ret = g_param_spec_boolean (name, nick, nick, FALSE, perms);
-     goto done;
-   }
-@@ -722,7 +728,8 @@
- 
-   if (enum_type != G_TYPE_INVALID) {
-     ret = g_param_spec_enum (name, nick, nick, enum_type, def, perms);
--  } else if (lilv_port_has_property (lv2plugin, port, integer_prop))
-+  } else if (lilv_port_has_property (lv2plugin, port,
-+          gst_lv2_integer_prop_node))
-     ret = g_param_spec_int (name, nick, nick, lower, upper, def, perms);
-   else
-     ret = g_param_spec_float (name, nick, nick, lower, upper, def, perms);
-@@ -814,14 +821,14 @@
-   GstStructure *lv2_meta = g_value_get_boxed (value);
-   const LilvPlugin *lv2plugin;
-   guint j, in_pad_index = 0, out_pad_index = 0;
--  const LilvPlugins *plugins = lilv_world_get_all_plugins (world);
-+  const LilvPlugins *plugins = lilv_world_get_all_plugins (gst_lv2_world_node);
-   LilvNode *plugin_uri;
-   const gchar *element_uri;
- 
-   GST_DEBUG ("LV2 initializing class");
- 
-   element_uri = gst_structure_get_string (lv2_meta, "element-uri");
--  plugin_uri = lilv_new_uri (world, element_uri);
-+  plugin_uri = lilv_new_uri (gst_lv2_world_node, element_uri);
-   g_assert (plugin_uri);
-   lv2plugin = lilv_plugins_get_by_uri (plugins, plugin_uri);
-   g_assert (lv2plugin);
-@@ -838,11 +845,13 @@
-   /* find ports and groups */
-   for (j = 0; j < lilv_plugin_get_num_ports (lv2plugin); j++) {
-     const LilvPort *port = lilv_plugin_get_port_by_index (lv2plugin, j);
--    const gboolean is_input = lilv_port_is_a (lv2plugin, port, input_class);
-+    const gboolean is_input =
-+        lilv_port_is_a (lv2plugin, port, gst_lv2_input_node);
-     const gboolean is_optional = lilv_port_has_property (lv2plugin, port,
--        optional_pred);
-+        gst_lv2_optional_pred_node);
-     GstLV2Port desc = { j, GST_LV2_PORT_AUDIO, -1, };
--    LilvNodes *lv2group = lilv_port_get (lv2plugin, port, group_pred);
-+    LilvNodes *lv2group =
-+        lilv_port_get (lv2plugin, port, gst_lv2_group_pred_node);
-     /* FIXME Handle channels positionning
-      * GstAudioChannelPosition position = GST_AUDIO_CHANNEL_POSITION_INVALID; */
- 
-@@ -860,7 +869,7 @@
- 
-       /* FIXME Handle channels positionning
-          position = GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT;
--         sub_values = lilv_port_get_value (lv2plugin, port, designation_pred);
-+         sub_values = lilv_port_get_value (lv2plugin, port, gst_lv2_designation_pred_node);
-          if (lilv_nodes_size (sub_values) > 0) {
-          LilvNode *role = lilv_nodes_get_at (sub_values, 0);
-          position = gst_lv2_filter_role_to_position (role);
-@@ -875,7 +884,7 @@
-     } else {
-       /* port is not part of a group, or it is part of a group but that group
-        * is illegal so we just ignore it */
--      if (lilv_port_is_a (lv2plugin, port, audio_class)) {
-+      if (lilv_port_is_a (lv2plugin, port, gst_lv2_audio_node)) {
-         if (is_input) {
-           desc.pad = in_pad_index++;
-           g_array_append_val (lv2_class->in_group.ports, desc);
-@@ -883,7 +892,7 @@
-           desc.pad = out_pad_index++;
-           g_array_append_val (lv2_class->out_group.ports, desc);
-         }
--      } else if (lilv_port_is_a (lv2plugin, port, control_class)) {
-+      } else if (lilv_port_is_a (lv2plugin, port, gst_lv2_control_node)) {
-         desc.type = GST_LV2_PORT_CONTROL;
-         if (is_input) {
-           lv2_class->num_control_in++;
-@@ -892,7 +901,7 @@
-           lv2_class->num_control_out++;
-           g_array_append_val (lv2_class->control_out_ports, desc);
-         }
--      } else if (lilv_port_is_a (lv2plugin, port, cv_class)) {
-+      } else if (lilv_port_is_a (lv2plugin, port, gst_lv2_cv_node)) {
-         desc.type = GST_LV2_PORT_CV;
-         if (is_input) {
-           lv2_class->num_cv_in++;
-@@ -901,9 +910,9 @@
-           lv2_class->num_cv_out++;
-           g_array_append_val (lv2_class->control_out_ports, desc);
-         }
--      } else if (lilv_port_is_a (lv2plugin, port, event_class)) {
-+      } else if (lilv_port_is_a (lv2plugin, port, gst_lv2_event_node)) {
-         LilvNodes *supported = lilv_port_get_value (lv2plugin, port,
--            supports_event_pred);
-+            gst_lv2_supports_event_pred_node);
- 
-         GST_INFO ("%s: unhandled event port %d: %s, optional=%d, input=%d",
-             element_uri, j,
diff --git a/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.16.2-r1.ebuild b/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.16.2-r1.ebuild
index 0e26e649b31b..13314f1e6423 100644
--- a/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.16.2-r1.ebuild
+++ b/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.16.2-r1.ebuild
@@ -6,6 +6,8 @@ GST_ORG_MODULE=gst-plugins-bad
 
 inherit gstreamer
 
+SRC_URI+=" https://dev.gentoo.org/~juippis/distfiles/tmp/gst-plugins-lv2-1.16.2-r1-gcc10.patch"
+
 DESCRIPTION="Lv2 elements for Gstreamer"
 KEYWORDS="amd64 x86"
 IUSE=""
@@ -17,5 +19,5 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/patch-1.16.2-gcc10.patch"
+	"${DISTDIR}/gst-plugins-lv2-1.16.2-r1-gcc10.patch"
 )
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index e06b647deb41..84981aa43a21 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index c97770ccc71c..a713cb887b99 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,2 +1 @@
-DIST Ardour-6.2.0.tar.bz2 11042230 BLAKE2B 7039b0ea7a8550d5372ce795bc978f3d6129828cc6e93d98ce8ba74c6fab3db0e4343142d75e9684f9dffdaebf1ee634f8ab0165f510eb658d32d890f6417b63 SHA512 d4c20968738ec2fef382fc1109f1b17560863c4eb0f7cf5c42b79e9a610916e57e6c01985a2ca2a66b8647e99c10bd98c16e05eb81a7811e73e482f7af11e4a8
 DIST Ardour-6.3.0.tar.bz2 11863993 BLAKE2B 6b50d0e4b1effc8893cf555098f51458920db6c26a2db8f3c75a5eed56a4d8dafa1565717da2a75577f3068cbce4777f502eaf96f275ed3fd042c6388b842487 SHA512 ce1a6f1b92adb2df0c8863ead9b5f3d8c62a810b224262bda75bca4c09b11826266794260c63bb40ec8d75fbba6fb746a0dff4526311ab1035a3a8ebf0de2dd0
diff --git a/media-sound/ardour/ardour-6.2-r1.ebuild b/media-sound/ardour/ardour-6.2-r1.ebuild
deleted file mode 100644
index a35b090054a2..000000000000
--- a/media-sound/ardour/ardour-6.2-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-PYTHON_REQ_USE='threads(+)'
-PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
-inherit eutils toolchain-funcs flag-o-matic l10n python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="https://ardour.org/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
-	inherit git-r3
-else
-	KEYWORDS="amd64 x86"
-	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
-	S="${WORKDIR}/Ardour-${PV}.0"
-fi
-
-LICENSE="GPL-2"
-SLOT="6"
-IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.32.0
-	>=dev-cpp/gtkmm-2.16:2.4
-	>=dev-cpp/libgnomecanvasmm-2.26:2.6
-	dev-libs/boost:=
-	>=dev-libs/glib-2.10.1:2
-	dev-libs/libsigc++:2
-	>=dev-libs/libxml2-2.6:2
-	dev-libs/libxslt
-	>=gnome-base/libgnomecanvas-2
-	media-libs/alsa-lib
-	media-libs/aubio
-	media-libs/flac
-	media-libs/freetype:2
-	media-libs/libart_lgpl
-	media-libs/liblo
-	>=media-libs/liblrdf-0.4.0-r20
-	>=media-libs/libsamplerate-0.1
-	>=media-libs/libsndfile-1.0.18
-	>=media-libs/libsoundtouch-1.6.0
-	media-libs/raptor:2
-	>=media-libs/rubberband-1.6.0
-	>=media-libs/taglib-1.7
-	media-libs/vamp-plugin-sdk
-	net-misc/curl
-	sys-libs/readline:0=
-	sci-libs/fftw:3.0[threads]
-	virtual/libusb:1
-	x11-libs/cairo
-	>=x11-libs/gtk+-2.8.1:2
-	x11-libs/pango
-	jack? ( virtual/jack )
-	pulseaudio? ( media-sound/pulseaudio )
-	media-libs/lilv
-	media-libs/sratom
-	dev-libs/sord
-	>=media-libs/suil-0.6.10
-	>=media-libs/lv2-1.4.0"
-#	!bundled-libs? ( media-sound/fluidsynth ) at leat libltc is missing to be able to unbundle...
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	jack? ( virtual/jack )
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-no-nls.patch"
-	"${FILESDIR}/${P}-use-signed-int-for-atomic-operations.patch"
-)
-
-pkg_pretend() {
-	[[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] || has_version sci-libs/fftw[threads]) && \
-		ewarn "Linking with gold linker might produce broken executable, see bug #733972"
-}
-
-pkg_setup() {
-	if has_version \>=dev-libs/libsigc++-2.6 ; then
-		append-cxxflags -std=c++11
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
-	MARCH=$(get-flag march)
-	OPTFLAGS=""
-	if use cpu_flags_x86_sse; then
-		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
-			elog "You enabled sse but use an march that does not support sse!"
-			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
-		fi
-		OPTFLAGS="sse"
-	fi
-	if use cpu_flags_x86_mmx; then
-		if [[ ${MARCH} == "i486" ]]; then
-		    elog "You enabled mmx with i486 set as march! You have been warned!"
-		fi
-		OPTFLAGS="${OPTFLAGS} mmx"
-	fi
-	if use cpu_flags_x86_3dnow; then
-		OPTFLAGS="${OPTFLAGS} 3dnow"
-	fi
-	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
-		-i "${S}"/wscript || die
-	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
-	append-flags "-lboost_system"
-	python_fix_shebang "${S}"/wscript
-	python_fix_shebang "${S}"/waf
-	my_lcmsg() {
-		rm -f {gtk2_ardour,gtk2_ardour/appdata,libs/ardour,libs/gtkmm2ext}/po/${1}.po
-	}
-	l10n_for_each_disabled_locale_do my_lcmsg
-}
-
-src_configure() {
-	local backends="alsa"
-	use jack && backends+=",jack"
-	use pulseaudio && backends+=",pulseaudio"
-
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--configdir=/etc \
-		--optimize \
-		--with-backends=${backends} \
-		$(usex doc "--docs" '') \
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(usex phonehome "--phone-home" "--no-phone-home") \
-		$(usex nls "--nls" "--no-nls")
-#not possible right now		--use-external-libs
-}
-src_compile() {
-	waf-utils_src_compile
-	use nls && waf-utils_src_compile i18n
-}
-src_install() {
-	waf-utils_src_install
-	mv ${PN}.1 ${PN}${SLOT}.1
-	doman ${PN}${SLOT}.1
-	newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png
-	make_desktop_entry ardour6 ardour6 ardour6 AudioVideo
-}
-
-pkg_postinst() {
-	elog "Please do _not_ report problems with the package to ${PN} upstream."
-	elog "If you think you've found a bug, check the upstream binary package"
-	elog "before you report anything to upstream."
-}
diff --git a/media-sound/ardour/files/ardour-6.2-fix-no-nls.patch b/media-sound/ardour/files/ardour-6.2-fix-no-nls.patch
deleted file mode 100644
index cc03d0baff50..000000000000
--- a/media-sound/ardour/files/ardour-6.2-fix-no-nls.patch
+++ /dev/null
@@ -1,474 +0,0 @@
-From fcd347fe0c11e8e04aebc086da328921f54b947f Mon Sep 17 00:00:00 2001
-From: Robin Gareus <robin@gareus.org>
-Date: Wed, 19 Aug 2020 17:39:32 +0200
-Subject: [PATCH 1/2] Fix --no-nls, i18n include order in libs -- #8361
-
-Ardour's "pbd/i18n.h" needs to be included last,
-after any include that may indirectly pull in getext or libintl.
-
-For that reason "pbd/i18n.h" must not be used in header files either.
----
- libs/ardour/ardour/disk_reader.h                           | 7 +------
- libs/ardour/ardour/disk_writer.h                           | 4 +---
- libs/ardour/ardour/transport_master.h                      | 3 +--
- libs/ardour/disk_reader.cc                                 | 6 ++++++
- libs/ardour/disk_writer.cc                                 | 6 ++++++
- libs/ardour/port.cc                                        | 3 ++-
- libs/ardour/port_engine_shared.cc                          | 3 ++-
- libs/ardour/region.cc                                      | 3 ++-
- libs/ardour/transport_fsm.cc                               | 3 ++-
- libs/ardour/transport_master.cc                            | 2 +-
- libs/surfaces/contourdesign/button_config_widget.cc        | 3 ++-
- libs/surfaces/contourdesign/contourdesign_gui.cc           | 4 ++--
- libs/surfaces/contourdesign/jump_distance_widget.cc        | 2 +-
- .../surfaces/generic_midi/generic_midi_control_protocol.cc | 3 ++-
- 14 files changed, 31 insertions(+), 21 deletions(-)
-
-diff --git a/libs/ardour/ardour/disk_reader.h b/libs/ardour/ardour/disk_reader.h
-index 724c091b3..d9773bbeb 100644
---- a/libs/ardour/ardour/disk_reader.h
-+++ b/libs/ardour/ardour/disk_reader.h
-@@ -22,8 +22,6 @@
- 
- #include <boost/optional.hpp>
- 
--#include "pbd/i18n.h"
--
- #include "evoral/Curve.h"
- 
- #include "ardour/disk_io.h"
-@@ -46,10 +44,7 @@ public:
- 
- 	bool set_name (std::string const& str);
- 
--	std::string display_name () const
--	{
--		return std::string (_("player"));
--	}
-+	std::string display_name () const;
- 
- 	static samplecnt_t chunk_samples ()
- 	{
-diff --git a/libs/ardour/ardour/disk_writer.h b/libs/ardour/ardour/disk_writer.h
-index 2bd753a00..511b6bc4f 100644
---- a/libs/ardour/ardour/disk_writer.h
-+++ b/libs/ardour/ardour/disk_writer.h
-@@ -23,8 +23,6 @@
- #include <list>
- #include <vector>
- 
--#include "pbd/i18n.h"
--
- #include "ardour/disk_io.h"
- #include "ardour/midi_buffer.h"
- 
-@@ -42,7 +40,7 @@ public:
- 	~DiskWriter ();
- 
- 	bool set_name (std::string const& str);
--	std::string display_name () const { return std::string (_ ("recorder")); }
-+	std::string display_name () const;
- 
- 	bool recordable () const { return _flags & Recordable; }
- 
-diff --git a/libs/ardour/ardour/transport_master.h b/libs/ardour/ardour/transport_master.h
-index d6b554ef8..af98c0b3a 100644
---- a/libs/ardour/ardour/transport_master.h
-+++ b/libs/ardour/ardour/transport_master.h
-@@ -29,7 +29,6 @@
- 
- #include <ltc.h>
- 
--#include "pbd/i18n.h"
- #include "pbd/properties.h"
- #include "pbd/signals.h"
- #include "pbd/statefuldestructible.h"
-@@ -123,7 +122,7 @@ struct LIBARDOUR_API SafeTime {
- 
- 		do {
- 			if (tries == 10) {
--				std::cerr << X_("SafeTime: atomic read of current time failed, sleeping!") << std::endl;
-+				std::cerr << "SafeTime: atomic read of current time failed, sleeping!" << std::endl;
- 				Glib::usleep (20);
- 				tries = 0;
- 			}
-diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc
-index 252a84a65..5fa694485 100644
---- a/libs/ardour/disk_reader.cc
-+++ b/libs/ardour/disk_reader.cc
-@@ -76,6 +76,12 @@ DiskReader::~DiskReader ()
- 	DEBUG_TRACE (DEBUG::Destruction, string_compose ("DiskReader %1 @ %2 deleted\n", _name, this));
- }
- 
-+std::string
-+DiskReader::display_name () const
-+{
-+	return std::string (_("player"));
-+}
-+
- void
- DiskReader::ReaderChannelInfo::resize (samplecnt_t bufsize)
- {
-diff --git a/libs/ardour/disk_writer.cc b/libs/ardour/disk_writer.cc
-index aee4f9301..34aa3f1e9 100644
---- a/libs/ardour/disk_writer.cc
-+++ b/libs/ardour/disk_writer.cc
-@@ -85,6 +85,12 @@ DiskWriter::default_chunk_samples ()
- 	return 65536;
- }
- 
-+std::string
-+DiskWriter::display_name () const
-+{
-+	return std::string (_ ("recorder"));
-+}
-+
- void
- DiskWriter::WriterChannelInfo::resize (samplecnt_t bufsize)
- {
-diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc
-index 9bc318a14..8be47efbd 100644
---- a/libs/ardour/port.cc
-+++ b/libs/ardour/port.cc
-@@ -26,7 +26,6 @@
- #include "pbd/compose.h"
- #include "pbd/error.h"
- #include "pbd/failed_constructor.h"
--#include "pbd/i18n.h"
- 
- #include "ardour/audioengine.h"
- #include "ardour/debug.h"
-@@ -34,6 +33,8 @@
- #include "ardour/port_engine.h"
- #include "ardour/rc_configuration.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace std;
- using namespace ARDOUR;
- using namespace PBD;
-diff --git a/libs/ardour/port_engine_shared.cc b/libs/ardour/port_engine_shared.cc
-index f8ab0e204..ad32762f0 100644
---- a/libs/ardour/port_engine_shared.cc
-+++ b/libs/ardour/port_engine_shared.cc
-@@ -21,10 +21,11 @@
- #include <regex.h>
- 
- #include "pbd/error.h"
--#include "pbd/i18n.h"
- 
- #include "ardour/port_engine_shared.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace ARDOUR;
- 
- BackendPort::BackendPort (PortEngineSharedImpl &b, const std::string& name, PortFlags flags)
-diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc
-index cb42f1d2c..ab6042af3 100644
---- a/libs/ardour/region.cc
-+++ b/libs/ardour/region.cc
-@@ -30,7 +30,6 @@
- 
- #include <glibmm/threads.h>
- 
--#include "pbd/i18n.h"
- #include "pbd/types_convert.h"
- #include "pbd/xml++.h"
- 
-@@ -47,6 +46,8 @@
- #include "ardour/transient_detector.h"
- #include "ardour/types_convert.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace std;
- using namespace ARDOUR;
- using namespace PBD;
-diff --git a/libs/ardour/transport_fsm.cc b/libs/ardour/transport_fsm.cc
-index 484106785..59de3d1de 100644
---- a/libs/ardour/transport_fsm.cc
-+++ b/libs/ardour/transport_fsm.cc
-@@ -22,7 +22,6 @@
- #include <boost/none.hpp>
- 
- #include "pbd/error.h"
--#include "pbd/i18n.h"
- #include "pbd/pthread_utils.h"
- #include "pbd/stacktrace.h"
- 
-@@ -31,6 +30,8 @@
- #include "ardour/session.h"
- #include "ardour/transport_fsm.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace ARDOUR;
- using namespace PBD;
- 
-diff --git a/libs/ardour/transport_master.cc b/libs/ardour/transport_master.cc
-index ea56a860b..e76fd5eb6 100644
---- a/libs/ardour/transport_master.cc
-+++ b/libs/ardour/transport_master.cc
-@@ -21,7 +21,6 @@
- 
- #include "pbd/boost_debug.h"
- #include "pbd/debug.h"
--#include "pbd/i18n.h"
- 
- #include "ardour/audioengine.h"
- #include "ardour/debug.h"
-@@ -32,6 +31,7 @@
- #include "ardour/types_convert.h"
- #include "ardour/utils.h"
- 
-+#include "pbd/i18n.h"
- 
- namespace ARDOUR {
- 	namespace Properties {
-diff --git a/libs/surfaces/contourdesign/button_config_widget.cc b/libs/surfaces/contourdesign/button_config_widget.cc
-index 785c8c6b1..f46f80f12 100644
---- a/libs/surfaces/contourdesign/button_config_widget.cc
-+++ b/libs/surfaces/contourdesign/button_config_widget.cc
-@@ -24,12 +24,13 @@
- #include "gtkmm2ext/actions.h"
- #include "gtkmm2ext/action_model.h"
- 
--#include "pbd/i18n.h"
- #include "pbd/strsplit.h"
- #include "pbd/signals.h"
- 
- #include "button_config_widget.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace std;
- using namespace Gtk;
- using namespace ArdourSurface;
-diff --git a/libs/surfaces/contourdesign/contourdesign_gui.cc b/libs/surfaces/contourdesign/contourdesign_gui.cc
-index 3d061b060..ed58c787d 100644
---- a/libs/surfaces/contourdesign/contourdesign_gui.cc
-+++ b/libs/surfaces/contourdesign/contourdesign_gui.cc
-@@ -37,12 +37,12 @@
- 
- #include "widgets/ardour_button.h"
- 
--#include "pbd/i18n.h"
--
- #include "contourdesign.h"
- #include "jump_distance_widget.h"
- #include "button_config_widget.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace ArdourSurface;
- 
- class ContourDesignGUI : public Gtk::VBox, public PBD::ScopedConnectionList
-diff --git a/libs/surfaces/contourdesign/jump_distance_widget.cc b/libs/surfaces/contourdesign/jump_distance_widget.cc
-index 8469658a1..dacc3a752 100644
---- a/libs/surfaces/contourdesign/jump_distance_widget.cc
-+++ b/libs/surfaces/contourdesign/jump_distance_widget.cc
-@@ -21,10 +21,10 @@
- #include <gtkmm/spinbutton.h>
- 
- #include "gtkmm2ext/utils.h"
--#include "pbd/i18n.h"
- 
- #include "jump_distance_widget.h"
- 
-+#include "pbd/i18n.h"
- 
- using namespace std;
- using namespace Gtk;
-diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
-index c5ba0b794..31e5383dc 100644
---- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
-+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
-@@ -41,7 +41,6 @@
- #include "pbd/error.h"
- #include "pbd/failed_constructor.h"
- #include "pbd/file_utils.h"
--#include "pbd/i18n.h"
- #include "pbd/strsplit.h"
- #include "pbd/types_convert.h"
- #include "pbd/xml++.h"
-@@ -66,6 +65,8 @@
- 
- #include "pbd/abstract_ui.cc" // instantiate template
- 
-+#include "pbd/i18n.h"
-+
- using namespace ARDOUR;
- using namespace PBD;
- using namespace Glib;
--- 
-2.28.0
-
-
-From a7a20e03ffc61e444c188411da0d3afa1d14548a Mon Sep 17 00:00:00 2001
-From: Robin Gareus <robin@gareus.org>
-Date: Wed, 19 Aug 2020 17:40:02 +0200
-Subject: [PATCH 2/2] Fix --no-nls, i18n include order in UI -- #8361
-
----
- gtk2_ardour/ardour_ui_access_web.cc | 3 ++-
- gtk2_ardour/ardour_ui_dependents.cc | 3 ++-
- gtk2_ardour/pt_import_selector.cc   | 3 ++-
- gtk2_ardour/startup_fsm.cc          | 3 ++-
- gtk2_ardour/template_dialog.cc      | 4 ++--
- gtk2_ardour/transport_control.cc    | 4 ++--
- session_utils/fix_bbtppq.cc         | 3 ++-
- 7 files changed, 14 insertions(+), 9 deletions(-)
-
-diff --git a/gtk2_ardour/ardour_ui_access_web.cc b/gtk2_ardour/ardour_ui_access_web.cc
-index 7986e2ca3..781b65262 100644
---- a/gtk2_ardour/ardour_ui_access_web.cc
-+++ b/gtk2_ardour/ardour_ui_access_web.cc
-@@ -36,12 +36,13 @@
- #include "gtk2ardour-version.h"
- #endif
- 
--#include "pbd/i18n.h"
- #include "pbd/openuri.h"
- 
- #include "ardour_message.h"
- #include "ardour_ui.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace ARDOUR;
- using namespace PBD;
- using namespace Gtk;
-diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
-index d28ae7c14..24810d3e7 100644
---- a/gtk2_ardour/ardour_ui_dependents.cc
-+++ b/gtk2_ardour/ardour_ui_dependents.cc
-@@ -33,7 +33,6 @@
- #include <cstdio>
- 
- #include "pbd/error.h"
--#include "pbd/i18n.h"
- 
- #include "ardour/session.h"
- #include "ardour/lv2_plugin.h"
-@@ -62,6 +61,8 @@
- #include <gdk/gdkx.h>
- #endif
- 
-+#include "pbd/i18n.h"
-+
- using namespace Gtk;
- using namespace PBD;
- 
-diff --git a/gtk2_ardour/pt_import_selector.cc b/gtk2_ardour/pt_import_selector.cc
-index da65bcb72..318da1e35 100644
---- a/gtk2_ardour/pt_import_selector.cc
-+++ b/gtk2_ardour/pt_import_selector.cc
-@@ -22,7 +22,6 @@
- #include <iostream>
- 
- #include "pbd/gstdio_compat.h"
--#include "pbd/i18n.h"
- #include "pbd/file_utils.h"
- 
- #include "ptformat/ptformat.h"
-@@ -33,6 +32,8 @@
- 
- #include "pt_import_selector.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace Gtk;
- using namespace ARDOUR;
- using namespace PBD;
-diff --git a/gtk2_ardour/startup_fsm.cc b/gtk2_ardour/startup_fsm.cc
-index c52b0ecea..dfdd01ce4 100644
---- a/gtk2_ardour/startup_fsm.cc
-+++ b/gtk2_ardour/startup_fsm.cc
-@@ -26,7 +26,6 @@
- #include "pbd/basename.h"
- #include "pbd/file_archive.h"
- #include "pbd/file_utils.h"
--#include "pbd/i18n.h"
- 
- #include "ardour/audioengine.h"
- #include "ardour/filename_extensions.h"
-@@ -58,6 +57,8 @@
- #include "gtk2ardour-version.h"
- #endif
- 
-+#include "pbd/i18n.h"
-+
- using namespace ARDOUR;
- using namespace Gtk;
- using namespace Gtkmm2ext;
-diff --git a/gtk2_ardour/template_dialog.cc b/gtk2_ardour/template_dialog.cc
-index e0c5590ee..c9c37d00e 100644
---- a/gtk2_ardour/template_dialog.cc
-+++ b/gtk2_ardour/template_dialog.cc
-@@ -40,7 +40,6 @@
- #include "pbd/error.h"
- #include "pbd/file_archive.h"
- #include "pbd/file_utils.h"
--#include "pbd/i18n.h"
- #include "pbd/xml++.h"
- 
- #include "gtkmm2ext/gui_thread.h"
-@@ -52,9 +51,10 @@
- #include "ardour/template_utils.h"
- 
- #include "progress_reporter.h"
--
- #include "template_dialog.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace std;
- using namespace Gtk;
- using namespace PBD;
-diff --git a/gtk2_ardour/transport_control.cc b/gtk2_ardour/transport_control.cc
-index a7be5903d..0828febb6 100644
---- a/gtk2_ardour/transport_control.cc
-+++ b/gtk2_ardour/transport_control.cc
-@@ -16,8 +16,6 @@
-  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
--#include "pbd/i18n.h"
--
- #include "ardour/location.h"
- #include "ardour/session.h"
- 
-@@ -25,6 +23,8 @@
- #include "ardour_ui.h"
- #include "transport_control.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace Gtk;
- 
- TransportControlProvider::TransportControlProvider ()
-diff --git a/session_utils/fix_bbtppq.cc b/session_utils/fix_bbtppq.cc
-index e3767c8cd..81b148bcc 100644
---- a/session_utils/fix_bbtppq.cc
-+++ b/session_utils/fix_bbtppq.cc
-@@ -25,7 +25,6 @@
- #include <glibmm.h>
- 
- #include "pbd/file_utils.h"
--#include "pbd/i18n.h"
- #include "pbd/stateful.h"
- 
- #include "ardour/region_factory.h"
-@@ -44,6 +43,8 @@
- 
- #include "common.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace std;
- using namespace ARDOUR;
- using namespace SessionUtils;
--- 
-2.28.0
-
diff --git a/media-sound/ardour/files/ardour-6.2-use-signed-int-for-atomic-operations.patch b/media-sound/ardour/files/ardour-6.2-use-signed-int-for-atomic-operations.patch
deleted file mode 100644
index 90454593b68d..000000000000
--- a/media-sound/ardour/files/ardour-6.2-use-signed-int-for-atomic-operations.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 6d950d15ba5192a86c57d8045d1d26f9ad4be0db Mon Sep 17 00:00:00 2001
-From: Robin Gareus <robin@gareus.org>
-Date: Thu, 16 Jul 2020 16:13:21 +0200
-Subject: [PATCH] Use signed int for atomic operations -- #8314
-
----
- libs/pbd/pbd/mpmc_queue.h | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/libs/pbd/pbd/mpmc_queue.h b/libs/pbd/pbd/mpmc_queue.h
-index a7909a901..2c08068e1 100644
---- a/libs/pbd/pbd/mpmc_queue.h
-+++ b/libs/pbd/pbd/mpmc_queue.h
-@@ -82,7 +82,7 @@ public:
- 	push_back (T const& data)
- 	{
- 		cell_t* cell;
--		guint   pos = g_atomic_int_get (&_enqueue_pos);
-+		gint    pos = g_atomic_int_get (&_enqueue_pos);
- 		for (;;) {
- 			cell         = &_buffer[pos & _buffer_mask];
- 			guint    seq = g_atomic_int_get (&cell->_sequence);
-@@ -108,7 +108,7 @@ public:
- 	pop_front (T& data)
- 	{
- 		cell_t* cell;
--		guint   pos = g_atomic_int_get (&_dequeue_pos);
-+		gint    pos = g_atomic_int_get (&_dequeue_pos);
- 		for (;;) {
- 			cell         = &_buffer[pos & _buffer_mask];
- 			guint    seq = g_atomic_int_get (&cell->_sequence);
-@@ -138,8 +138,8 @@ private:
- 	cell_t* _buffer;
- 	size_t  _buffer_mask;
- 
--	volatile guint _enqueue_pos;
--	volatile guint _dequeue_pos;
-+	volatile gint _enqueue_pos;
-+	volatile gint _dequeue_pos;
- };
- 
- } /* end namespace */
--- 
-2.28.0
-
-From 9fcb51de2e34f9fee74838e57317ad44d21c40d0 Mon Sep 17 00:00:00 2001
-From: Robin Gareus <robin@gareus.org>
-Date: Thu, 16 Jul 2020 18:07:14 +0200
-Subject: [PATCH] Use signed int for atomic operations part II -- #8314
-
----
- libs/ardour/ardour/session.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
-index dcc8c88ed..f491f7f17 100644
---- a/libs/ardour/ardour/session.h
-+++ b/libs/ardour/ardour/session.h
-@@ -1762,7 +1762,7 @@ private:
- 		OnlyLoop,
- 	};
- 
--	volatile guint _punch_or_loop; // enum PunchLoopLock
-+	volatile gint _punch_or_loop; // enum PunchLoopLock
- 	gint current_usecs_per_track;
- 
- 	bool punch_active () const;
--- 
-2.28.0
diff --git a/media-sound/aucdtect/aucdtect-0.8.2-r1.ebuild b/media-sound/aucdtect/aucdtect-0.8.2-r1.ebuild
index 8bdbe7a48d9d..a8ef9d25a203 100644
--- a/media-sound/aucdtect/aucdtect-0.8.2-r1.ebuild
+++ b/media-sound/aucdtect/aucdtect-0.8.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit rpm versionator
+inherit rpm
 
-MY_PV=$(replace_version_separator 2 '-')
+MY_PV=$(ver_rs 2 '-')
 MY_P="${PN}-${MY_PV}"
 MY_PN="${PN/cd/CD}"
 
@@ -16,7 +16,6 @@ SRC_URI="http://en.true-audio.com/ftp/${MY_P}.i586.rpm -> ${P}.rpm"
 LICENSE="freedist"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 S="${WORKDIR}/usr/local/bin"
 
@@ -24,5 +23,5 @@ QA_PREBUILT="opt/bin/.*"
 
 src_install() {
 	into /opt
-	dobin "${MY_PN}"
+	dobin auCDtect
 }
diff --git a/media-sound/aylet/aylet-0.5.ebuild b/media-sound/aylet/aylet-0.5.ebuild
index 05c703dca0f4..bab06f882fe1 100644
--- a/media-sound/aylet/aylet-0.5.ebuild
+++ b/media-sound/aylet/aylet-0.5.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="Aylet plays music files in the .ay format"
 HOMEPAGE="http://rus.members.beeb.net/aylet.html"
@@ -13,28 +14,29 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86"
 IUSE="gtk"
 
-RDEPEND="sys-libs/ncurses
+RDEPEND="
+	sys-libs/ncurses:=
 	gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gtk.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-gtk.patch )
 
 src_compile() {
 	tc-export CC PKG_CONFIG
 
-	emake ${PN} CURSES_LIB="$( ${PKG_CONFIG} --libs ncurses)"
+	emake aylet CURSES_LIB="$(${PKG_CONFIG} --libs ncurses)"
 	use gtk && emake gtk2
 }
 
 src_install() {
-	dobin ${PN}
-	use gtk && dobin x${PN}
+	dobin aylet
+	use gtk && dobin xaylet
 
-	doman ${PN}.1
-	use gtk && echo '.so aylet.1' > "${D}"/usr/share/man/man1/xaylet.1
+	doman aylet.1
+	if use gtk; then
+		echo '.so aylet.1' > "${ED}"/usr/share/man/man1/xaylet.1 || die
+	fi
 
-	dodoc ChangeLog NEWS README TODO
+	einstalldocs
 }
diff --git a/media-sound/cmusfm/Manifest b/media-sound/cmusfm/Manifest
index 9573b1f519b3..ea606266f132 100644
--- a/media-sound/cmusfm/Manifest
+++ b/media-sound/cmusfm/Manifest
@@ -1,3 +1 @@
-DIST cmusfm-0.2.5.tar.gz 28651 BLAKE2B c69dcaa5900ed4cf3d1a0274ac3dc6e6322b73222a472c26434fa4912c2f351fa67b0f3ac1d91df9f707d5c38d6ffa7c4401ed3500ed929adcbb63b9e513f765 SHA512 0db8d865342438531bfb800d835800240e47732444795159f72ed3c91a4c3f0747ba2da1dcc8e71ef340ba5a3febdb39d8dd5868b134afcbcf7b3614a7790eae
-DIST cmusfm-0.3.1.tar.gz 34521 BLAKE2B d5f7ce5cb37a03114e910f0ad7fd39bb3e940ce9d0ad416e464dc6cfc5438bbe901845b610bd8d0e508bde236ef6ed9cb894afb5a4cae710b1347d3173ffa60b SHA512 2d4d551d2a82fc2d70c7f75705f8cec236a0cf7b8e5268c91cc32b4ede4ecd51c4577d673b8c36f041e514af59142f2c9c001cd422c0790f0e0b3596b4394064
 DIST cmusfm-0.3.3.tar.gz 37553 BLAKE2B f266d83edbed960d8c466cba80ce57d645c5c9cdfceac27c29d0ef424c8135f22377dc0490462d3107dfcfd32ac9d15fa6142269b453c8a80818da9bd10a28fd SHA512 6537905bdf09d04f09783237997536a1ee231ee4e589826d87f435c0dd7542dbd7d97167990bf949d2a9eb73c4a9a4da1bab17888de0aecedb2a63deaa873f39
diff --git a/media-sound/cmusfm/cmusfm-0.2.5.ebuild b/media-sound/cmusfm/cmusfm-0.2.5.ebuild
deleted file mode 100644
index 704bd8f11246..000000000000
--- a/media-sound/cmusfm/cmusfm-0.2.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools-utils readme.gentoo
-
-DESCRIPTION="Last.fm scrobbler for cmus music player"
-HOMEPAGE="https://github.com/Arkq/cmusfm"
-SRC_URI="https://github.com/Arkq/cmusfm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libnotify"
-
-DEPEND="net-misc/curl
-	dev-libs/openssl:0=
-	libnotify? ( x11-libs/libnotify )"
-RDEPEND="${DEPEND}
-	media-sound/cmus"
-
-src_prepare() {
-	epatch_user
-	eautoreconf
-	DOC_CONTENTS="Please refer to the README.md file before running cmusfm the first time."
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable libnotify)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-}
diff --git a/media-sound/cmusfm/cmusfm-0.3.1.ebuild b/media-sound/cmusfm/cmusfm-0.3.1.ebuild
deleted file mode 100644
index 841a36a0b073..000000000000
--- a/media-sound/cmusfm/cmusfm-0.3.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools readme.gentoo-r1
-
-DESCRIPTION="Last.fm scrobbler for cmus music player"
-HOMEPAGE="https://github.com/Arkq/cmusfm"
-SRC_URI="https://github.com/Arkq/cmusfm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libnotify"
-
-CDEPEND="net-misc/curl
-	dev-libs/openssl:0=
-	libnotify? ( >=x11-libs/libnotify-0.7 )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	media-sound/cmus"
-
-src_prepare() {
-	default
-	eautoreconf
-	DOC_CONTENTS="Please refer to the README.md file before running cmusfm the first time."
-}
-
-src_configure() {
-	econf $(use_enable libnotify)
-}
-
-src_install() {
-	default
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-}
diff --git a/media-sound/dbmeasure/dbmeasure-0.0.20100217.ebuild b/media-sound/dbmeasure/dbmeasure-0.0.20100217.ebuild
index 274d72ed6f75..6a8ba2c3976d 100644
--- a/media-sound/dbmeasure/dbmeasure-0.0.20100217.ebuild
+++ b/media-sound/dbmeasure/dbmeasure-0.0.20100217.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 GIT_COMMITID="ed8105083ab72f9afac9d18b7563fbc3d6c1c925"
 MY_PV="${PV}-${GIT_COMMITID}"
 MY_P="${PN}-${MY_PV}"
@@ -15,24 +16,18 @@ SRC_URI="http://git.0pointer.de/?p=${PN}.git;a=snapshot;h=${GIT_COMMITID};sf=tgz
 LICENSE="BSD" # need to confirm w/ upstream
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND=">=media-libs/alsa-lib-1.0.26"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}"
 
-S=${WORKDIR}/${PN}
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
-src_prepare() {
-	tc-export CC
-	# We drop the -g for debug output but we keep the -O0, as we don't want GCC
-	# to optimize out some critical math.
+src_configure() {
+	tc-export CC PKG_CONFIG
 	strip-flags
-	sed -i \
-		-e 's:$(CC):& $(LDFLAGS):' \
-		-e '/^CFLAGS/s:=:+=:' \
-		-e '/^CFLAGS/s:-g -pipe::' \
-		Makefile || die
 }
 
 src_install() {
diff --git a/media-sound/dbmeasure/files/dbmeasure-0.0.20100217-makefile.patch b/media-sound/dbmeasure/files/dbmeasure-0.0.20100217-makefile.patch
new file mode 100644
index 000000000000..6851c9b357c7
--- /dev/null
+++ b/media-sound/dbmeasure/files/dbmeasure-0.0.20100217-makefile.patch
@@ -0,0 +1,23 @@
+We drop the -g for debug output but we keep the -O0, as we don't want GCC
+to optimize out some critical math.
+
+--- a/Makefile
++++ b/Makefile
+@@ -1,13 +1,13 @@
+-CFLAGS=-Wextra -Wall -O0 -g -pipe `pkg-config --cflags alsa`
+-LIBS=`pkg-config --libs alsa` -lm
++CFLAGS+=-Wextra -Wall -O0 $(shell $(PKG_CONFIG) --cflags alsa)
++LIBS=-lm $(shell $(PKG_CONFIG) --libs alsa)
+ 
+ all: dbmeasure dbverify
+ 
+ dbmeasure: dbmeasure.o
+-	$(CC) -o dbmeasure $^ $(CFLAGS) $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o dbmeasure $^ $(LIBS)
+ 
+ dbverify: dbverify.o
+-	$(CC) -o dbverify $^ $(CFLAGS) $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o dbverify $^ $(LIBS)
+ 
+ clean:
+ 	rm -f *.o dbmeasure dbverify
diff --git a/media-sound/dcadec/dcadec-0.2.0.ebuild b/media-sound/dcadec/dcadec-0.2.0.ebuild
index d49effdb57c4..68303aac6077 100644
--- a/media-sound/dcadec/dcadec-0.2.0.ebuild
+++ b/media-sound/dcadec/dcadec-0.2.0.ebuild
@@ -1,54 +1,46 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit eutils toolchain-funcs multilib multilib-minimal
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/foo86/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/foo86/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
-fi
+inherit toolchain-funcs multilib-minimal
 
 DESCRIPTION="DTS Coherent Acoustics decoder with support for HD extensions"
 HOMEPAGE="https://github.com/foo86/dcadec"
+SRC_URI="https://github.com/foo86/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE=""
-DOCS=( CHANGELOG.md README.md )
+KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 
-src_prepare() {
-	sed -i \
-		-e '/^CFLAGS/s:-O3::' \
-		Makefile || die
-}
+PATCHES=( "${FILESDIR}"/${P}-respect-CFLAGS.patch )
+
+multilib_src_configure() {
+	tc-export AR CC
 
-multilib_src_compile() {
 	# Build shared libs
-	echo 'CONFIG_SHARED=1' >> .config
+	echo 'CONFIG_SHARED=1' >> .config || die
+}
 
+multilib_src_compile() {
 	local target=all
 	multilib_is_native_abi || target=lib
-	tc-export AR CC
-	PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		emake -f "${S}/Makefile" ${target}
+
+	PREFIX="${EPREFIX}"/usr LIBDIR="${EPREFIX}"/usr/$(get_libdir) \
+		emake -f "${S}"/Makefile ${target}
 }
 
 multilib_src_install() {
 	local target=install
 	multilib_is_native_abi || target=install-lib
-	PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		emake -f "${S}/Makefile" DESTDIR="${D}" ${target}
+
+	PREFIX="${EPREFIX}"/usr LIBDIR="${EPREFIX}"/usr/$(get_libdir) \
+		emake -f "${S}"/Makefile DESTDIR="${D}" ${target}
 }
 
 multilib_src_install_all() {
 	# Rename the executable since it conflicts with libdca.
 	mv "${ED}"/usr/bin/dcadec{,-new} || die
 
-	einstalldocs
+	dodoc CHANGELOG.md README.md
 }
diff --git a/media-sound/dcadec/files/dcadec-0.2.0-respect-CFLAGS.patch b/media-sound/dcadec/files/dcadec-0.2.0-respect-CFLAGS.patch
new file mode 100644
index 000000000000..d232cd2ce78c
--- /dev/null
+++ b/media-sound/dcadec/files/dcadec-0.2.0-respect-CFLAGS.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -4,7 +4,7 @@
+ API_MINOR = 1
+ API_PATCH = 0
+ 
+-CFLAGS := -std=gnu99 -D_FILE_OFFSET_BITS=64 -Wall -Wextra -O3 -ffast-math -g -MMD $(CFLAGS)
++CFLAGS := -std=gnu99 -D_FILE_OFFSET_BITS=64 -Wall -Wextra -ffast-math -MMD $(CFLAGS) $(CPPFLAGS)
+ 
+ PREFIX ?= /usr/local
+ BINDIR ?= $(PREFIX)/bin
diff --git a/media-sound/fmtools/fmtools-2.0.7.ebuild b/media-sound/fmtools/fmtools-2.0.7.ebuild
index 1bed06a20375..dcf8ace90a88 100644
--- a/media-sound/fmtools/fmtools-2.0.7.ebuild
+++ b/media-sound/fmtools/fmtools-2.0.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="A collection of programs for controlling v4l radio card drivers"
 HOMEPAGE="https://benpfaff.org/fmtools/"
diff --git a/media-sound/gqradio/files/gqradio-1.9.2-desktop-QA.patch b/media-sound/gqradio/files/gqradio-1.9.2-desktop-QA.patch
new file mode 100644
index 000000000000..b9ec631f59fb
--- /dev/null
+++ b/media-sound/gqradio/files/gqradio-1.9.2-desktop-QA.patch
@@ -0,0 +1,20 @@
+--- a/gqradio.desktop
++++ b/gqradio.desktop
+@@ -3,12 +3,12 @@
+ Comment=Radio tuner
+ Comment[fr]=Tuner radio
+ Exec=gqradio
+-Icon=gqradio.png
+-Info=Radio tuner app.
+-Info[fr]=Application tuner radio
+-Terminal=0
++Icon=gqradio
++X-Info=Radio tuner app.
++X-Info[fr]=Application tuner radio
++Terminal=false
+ Type=Application
+ StartupNotify=false
+ StartupWMClass=gqradio
+ Encoding=UTF-8
+-Categories=Application;AudioVideo;
++Categories=AudioVideo;
diff --git a/media-sound/gqradio/files/gqradio-1.9.2-underlinking.patch b/media-sound/gqradio/files/gqradio-1.9.2-underlinking.patch
index bcedc3e40f10..f6e75954607f 100644
--- a/media-sound/gqradio/files/gqradio-1.9.2-underlinking.patch
+++ b/media-sound/gqradio/files/gqradio-1.9.2-underlinking.patch
@@ -1,5 +1,5 @@
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -30,6 +30,16 @@
  AC_DEFINE_UNQUOTED(GQRADIO_SKINDIR, "$prefix/share/gqradio/skins", [Location of skins])
  AC_DEFINE_UNQUOTED(GQRADIO_HELPDIR, "$prefix/share/doc/gqradio-$VERSION", [Location of documentation files])
diff --git a/media-sound/gqradio/gqradio-1.9.2.ebuild b/media-sound/gqradio/gqradio-1.9.2.ebuild
index 7f87210ea6e2..235f711463f2 100644
--- a/media-sound/gqradio/gqradio-1.9.2.ebuild
+++ b/media-sound/gqradio/gqradio-1.9.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="An FM radio tuner app from the people who brought you GQmpeg"
 HOMEPAGE="http://gqmpeg.sourceforge.net/radio.html"
@@ -11,16 +12,20 @@ SRC_URI="mirror://sourceforge/gqmpeg/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.4:2"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig"
 
-DOCS="AUTHORS ChangeLog README SKIN-SPECS TODO"
+PATCHES=(
+	"${FILESDIR}"/${P}-underlinking.patch
+	"${FILESDIR}"/${P}-desktop-QA.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-underlinking.patch
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
diff --git a/media-sound/gramofile/gramofile-1.6_p9.ebuild b/media-sound/gramofile/gramofile-1.6_p9.ebuild
index 481ba2576b05..c0697de57da2 100644
--- a/media-sound/gramofile/gramofile-1.6_p9.ebuild
+++ b/media-sound/gramofile/gramofile-1.6_p9.ebuild
@@ -1,45 +1,45 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils multilib toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="Transfer sound from gramophone records to CD"
 HOMEPAGE="http://www.opensourcepartners.nl/~costar/gramofile"
 SRC_URI="
 	mirror://debian/pool/main/g/${PN}/${PN}_${PV/_p*}.orig.tar.gz
-	mirror://debian/pool/main/g/${PN}/${PN}_${PV/_p*}-${PV/*_p}.diff.gz
-"
+	mirror://debian/pool/main/g/${PN}/${PN}_${PV/_p*}-${PV/*_p}.diff.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
-	sys-libs/ncurses
-	sci-libs/fftw:2.1
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${P/_p*}
+	sys-libs/ncurses:=
+	sci-libs/fftw:2.1"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-src_prepare() {
-	epatch "${WORKDIR}"/${PN}_${PV/_p*}-${PV/*_p}.diff
-	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch ${P/_p*}/debian/patches
+S="${WORKDIR}/${P/_p*}"
 
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-strlen_and_exit.patch
+PATCHES=(
+	"${WORKDIR}"/${PN}_${PV/_p*}-${PV/*_p}.diff
+	"${S}"/debian/patches
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-strlen_and_exit.patch
+)
 
+src_configure() {
 	tc-export CC PKG_CONFIG
 }
 
 src_install() {
-	dobin ${PN}
-	exeinto /usr/$(get_libdir)/${PN}
+	dobin gramofile
+
+	exeinto /usr/$(get_libdir)/gramofile
 	doexe bplay_gramo brec_gramo
+
 	dodoc ChangeLog README TODO *.txt
-	newdoc ${P/_p*}/debian/changelog ChangeLog.debian
+	newdoc debian/changelog ChangeLog.debian
 }
diff --git a/media-sound/gtkguitune/gtkguitune-0.8.ebuild b/media-sound/gtkguitune/gtkguitune-0.8.ebuild
index c0fcf6da9d6f..3373aab1e71a 100644
--- a/media-sound/gtkguitune/gtkguitune-0.8.ebuild
+++ b/media-sound/gtkguitune/gtkguitune-0.8.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils flag-o-matic gnome2-utils
+EAPI=7
+
+inherit desktop xdg
 
 DESCRIPTION="A guitar tuning program that uses Schmitt-triggering for quick feedback"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
@@ -11,25 +12,24 @@ SRC_URI="mirror://gentoo/${PN}-gtk2-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
 
-RDEPEND="dev-cpp/glibmm:2
+RDEPEND="
+	dev-cpp/glibmm:2
 	dev-cpp/gtkmm:2.4
 	dev-libs/libsigc++:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${PN}"
 
-src_prepare() {
-	append-cxxflags -std=c++11
+src_configure() {
+	# improperly packaged tarball, contains object code
+	emake distclean
+
+	default
 }
 
 src_install() {
 	default
-	make_desktop_entry ${PN} Guitune guitune_logo
+	make_desktop_entry gtkguitune Guitune guitune_logo
 }
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index e7afd4cf70a3..5b7603f1c81f 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -1,3 +1 @@
-DIST guitarix2-0.39.0.tar.xz 80769472 BLAKE2B a699545b7e4a9992ed11a17ee9f82170c1891a95a0543c3b847ff2a02ab4e6597c28cbb4708f85022b1e94f0184b6dc712c271729bdda07373101ea9e8a1323f SHA512 5eb799498385ab9aa865e3f5a7e79d77f7f62c9bd7ad6875ec32bdec85829ed5b84bed3b0eab786ce74088fe2e1d53080f70afcb25ab1ef8d8f78a676b4947df
-DIST guitarix2-0.40.0.tar.xz 70880548 BLAKE2B 08d849d15fcfaa26e6eacb5480e8ea28a86e94f2c28969abc00c479c2f8c31ecb80cd4e02f0244f2ead26d687ff90dcdb9027a5c7ad448cf1241d69ab56d2521 SHA512 902e4d924cae68a477518cb87d7b63edb8716db93e11add921e733c315f2646652fb1b434d182e836e1e866035cabe22a41d8dc66df0b6156b5242cdd31d51e8
 DIST guitarix2-0.41.0.tar.xz 70865716 BLAKE2B d3caa51f297153c16df624ababaffc1405ddb10f04ae01672720bb2229d4be3426b33f75021b1862f996fb09466eaad008f748b42cb8382f08d14e23758cfc9b SHA512 27fe6f2b87c8913feafae1c17472150d37df46ed3437b033cd22f509edf67420fb8f4024e404d5bec901a687dbe948acda702bf37cb0c738feb5b3b8e5ebb8aa
diff --git a/media-sound/guitarix/files/guitarix-0.40.0-noexecstack.patch b/media-sound/guitarix/files/guitarix-0.40.0-noexecstack.patch
deleted file mode 100644
index f64a21f26b51..000000000000
--- a/media-sound/guitarix/files/guitarix-0.40.0-noexecstack.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From fc3e0b4754425bb262c8bcfd24cd345dd10e8d60 Mon Sep 17 00:00:00 2001
-From: brummer10 <brummer-@web.de>
-Date: Fri, 5 Jun 2020 06:41:30 +0200
-Subject: [PATCH] Fix issue #104 lv2 plugins contains executable stack, patch
- by Alexander Tsoy
-
----
- trunk/src/LV2/xputty/resources/wscript | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/LV2/xputty/resources/wscript b/src/LV2/xputty/resources/wscript
-index a2f0402c..3c383393 100644
---- a/src/LV2/xputty/resources/wscript
-+++ b/src/LV2/xputty/resources/wscript
-@@ -41,7 +41,7 @@ def img2obj(task):
-     src = " ".join(["'%s'" % os.path.splitext(v.name)[0] for v in task.inputs[0:]])
-     cmd = ("cd src/LV2/xputty/resources/ \
-     && for f in %s; do\
--     %s -r -b binary ${f}.png -o  ${f}.o; \
-+     %s -r -b binary -z noexecstack ${f}.png -o  ${f}.o; \
-      done " % (src, env.LD[0]) )
-    # Logs.debug("runner: system command -> %s" % cmd)
-     ret = task.exec_command(cmd, shell=True)
--- 
-2.26.2
-
diff --git a/media-sound/guitarix/files/guitarix-0.40.0-nostrip.patch b/media-sound/guitarix/files/guitarix-0.40.0-nostrip.patch
deleted file mode 100644
index 2bc77f443b16..000000000000
--- a/media-sound/guitarix/files/guitarix-0.40.0-nostrip.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 3dd1e0a8ea7db95b76a7b38e27a9b54d6fe75c76 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Fri, 5 Jun 2020 17:21:10 +0300
-Subject: [PATCH] Do not strip lv2 plugins
-
----
- trunk/wscript | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/wscript b/wscript
-index 2699325f..f2d8f86d 100644
---- a/wscript
-+++ b/wscript
-@@ -375,7 +375,6 @@ def configure(conf):
-     conf.env['DESKAPPS_DIR'] = os.path.normpath(os.path.join(conf.env['SHAREDIR'], 'applications'))
-     conf.env['BIN_NAME'] = APPNAME
-     if opt.lv2:
--        conf.gxload('strip')
-         conf.gxload('lv2')
-     conf.env['LADSPA'] = opt.ladspa
-     conf.env['NEW_LADSPA'] = opt.new_ladspa
--- 
-2.26.2
-
diff --git a/media-sound/guitarix/guitarix-0.39.0.ebuild b/media-sound/guitarix/guitarix-0.39.0.ebuild
deleted file mode 100644
index 688596340430..000000000000
--- a/media-sound/guitarix/guitarix-0.39.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit python-any-r1 waf-utils xdg
-
-MY_P="${PN}2-${PV}"
-
-DESCRIPTION="Virtual guitar amplifier for Linux"
-HOMEPAGE="https://guitarix.org/"
-SRC_URI="mirror://sourceforge/guitarix/guitarix/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="bluetooth debug lv2 nls +standalone zeroconf"
-REQUIRED_USE="|| ( lv2 standalone )"
-
-COMMON_DEPEND="dev-cpp/eigen:3
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:2.4
-	dev-libs/glib:2
-	>=media-libs/libsndfile-1.0.17
-	>=media-libs/zita-convolver-3:=
-	media-libs/zita-resampler
-	>=net-misc/curl-7.26.0
-	>=sci-libs/fftw-3.1.2:3.0=
-	x11-libs/gtk+:2
-	lv2? ( media-libs/lv2 )
-	standalone? (
-		dev-libs/boost:=
-		media-libs/liblrdf
-		media-libs/lilv
-		virtual/jack
-		bluetooth? ( net-wireless/bluez )
-		zeroconf? ( net-dns/avahi )
-	)
-"
-# clearlooks gtk engine and roboto fonts are required for correct ui rendering
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/gtk-engines
-	standalone? (
-		media-fonts/roboto
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	nls? ( dev-util/intltool )
-"
-
-DOCS=( changelog README )
-
-src_configure() {
-	local myconf=(
-		--cxxflags-debug=""
-		--cxxflags-release="-DNDEBUG"
-		--ldflags="${LDFLAGS}"
-		--enable-lfs
-		--lib-dev
-		--no-desktop-update
-		--no-faust
-		--no-ldconfig
-		--shared-lib
-		$(use_enable nls)
-		$(usex bluetooth "" "--no-bluez")
-		$(usex debug "--debug" "")
-		$(usex lv2 "--lv2dir=${EPREFIX}/usr/$(get_libdir)/lv2" "--no-lv2 --no-lv2-gui")
-		$(usex standalone "" "--no-standalone")
-		$(usex zeroconf "" "--no-avahi")
-	)
-	waf-utils_src_configure "${myconf[@]}"
-}
diff --git a/media-sound/guitarix/guitarix-0.40.0.ebuild b/media-sound/guitarix/guitarix-0.40.0.ebuild
deleted file mode 100644
index 7a7c6a6d4525..000000000000
--- a/media-sound/guitarix/guitarix-0.40.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit python-any-r1 waf-utils xdg
-
-MY_P="${PN}2-${PV}"
-
-DESCRIPTION="Virtual guitar amplifier for Linux"
-HOMEPAGE="https://guitarix.org/"
-SRC_URI="mirror://sourceforge/guitarix/guitarix/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="bluetooth debug lv2 nls +standalone zeroconf"
-REQUIRED_USE="|| ( lv2 standalone )"
-
-COMMON_DEPEND="dev-cpp/eigen:3
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:3.0
-	dev-libs/glib:2
-	>=media-libs/libsndfile-1.0.17
-	>=media-libs/zita-convolver-3:=
-	media-libs/zita-resampler
-	>=net-misc/curl-7.26.0
-	>=sci-libs/fftw-3.1.2:3.0=
-	x11-libs/gtk+:3
-	lv2? ( media-libs/lv2 )
-	standalone? (
-		dev-libs/boost:=
-		media-libs/liblrdf
-		media-libs/lilv
-		virtual/jack
-		bluetooth? ( net-wireless/bluez )
-		zeroconf? ( net-dns/avahi )
-	)
-"
-# roboto fonts are required for correct ui rendering
-RDEPEND="${COMMON_DEPEND}
-	standalone? (
-		media-fonts/roboto
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	dev-lang/sassc
-	virtual/pkgconfig
-	nls? (
-		dev-util/intltool
-		sys-devel/gettext
-	)
-"
-
-DOCS=( changelog README )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-noexecstack.patch
-	"${FILESDIR}"/${P}-nostrip.patch
-)
-
-src_configure() {
-	local myconf=(
-		--cxxflags-debug=""
-		--cxxflags-release="-DNDEBUG"
-		--ldflags="${LDFLAGS}"
-		--enable-lfs
-		--lib-dev
-		--no-desktop-update
-		--no-faust
-		--no-ldconfig
-		--shared-lib
-		$(use_enable nls)
-		$(usex bluetooth "" "--no-bluez")
-		$(usex debug "--debug" "")
-		$(usex lv2 "--lv2dir=${EPREFIX}/usr/$(get_libdir)/lv2" "--no-lv2 --no-lv2-gui")
-		$(usex standalone "" "--no-standalone")
-		$(usex zeroconf "" "--no-avahi")
-	)
-	waf-utils_src_configure "${myconf[@]}"
-}
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
deleted file mode 100644
index 2bf8c095b503..000000000000
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic eutils multilib-minimal
-
-DESCRIPTION="A low-latency audio server"
-HOMEPAGE="http://www.jackaudio.org"
-SRC_URI="https://github.com/jackaudio/jack1/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
-IUSE="cpu_flags_x86_3dnow altivec alsa coreaudio doc debug examples oss cpu_flags_x86_sse pam"
-
-# readline: only used for jack_transport -> useless for non native ABIs
-# libsndfile: ditto for jackrec
-RDEPEND="
-	sys-libs/db:=[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=media-libs/libsndfile-1.0.0
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	>=media-libs/libsamplerate-0.1.8-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	alsa? ( sys-process/lsof )
-	pam? ( sys-auth/realtime-base )"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS TODO README )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.125.0-freebsd.patch"
-)
-
-multilib_src_configure() {
-	local myconf=""
-
-	# Disabling CPU Detection (dynsimd) disables optimized asm routines (3dnow
-	# or sse)
-	if use cpu_flags_x86_3dnow || use cpu_flags_x86_sse ; then
-		myconf="${myconf} --enable-dynsimd"
-	fi
-
-	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
-
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable altivec) \
-		$(use_enable alsa) \
-		$(use_enable coreaudio) \
-		$(use_enable debug) \
-		$(use_enable oss) \
-		--disable-portaudio \
-		--disable-firewire \
-		$(use_enable cpu_flags_x86_sse sse) \
-		--with-html-dir=/usr/share/doc/${PF} \
-		${myconf}
-
-	if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
-		for i in tools man ; do
-			sed -i -e "s/ ${i}//" Makefile || die
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	if use examples; then
-		dodoc -r "${S}/example-clients"
-		docompress -x /usr/share/doc/${PF}/example-clients
-	fi
-}
diff --git a/media-sound/lash/lash-0.5.4-r4.ebuild b/media-sound/lash/lash-0.5.4-r4.ebuild
index 95da6954e5d9..da41b2341e12 100644
--- a/media-sound/lash/lash-0.5.4-r4.ebuild
+++ b/media-sound/lash/lash-0.5.4-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 IUSE="alsa debug gtk python static-libs" # doc
 
 BDEPEND="
diff --git a/media-sound/mangler/mangler-1.2.5-r1.ebuild b/media-sound/mangler/mangler-1.2.5-r1.ebuild
index 6c07765cec25..8f58aefd5e7c 100644
--- a/media-sound/mangler/mangler-1.2.5-r1.ebuild
+++ b/media-sound/mangler/mangler-1.2.5-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils flag-o-matic ltprune toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="Open source VOIP client capable of connecting to Ventrilo 3.x servers"
 HOMEPAGE="http://www.mangler.org/"
@@ -11,9 +12,10 @@ SRC_URI="http://www.mangler.org/downloads/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-2.1 ZLIB"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="+alsa opus espeak g15 +gsm oss pulseaudio static-libs +speex +xosd"
+IUSE="+alsa opus espeak g15 +gsm oss pulseaudio +speex +xosd"
 
-RDEPEND="dev-cpp/gtkmm:2.4
+RDEPEND="
+	dev-cpp/gtkmm:2.4
 	gnome-base/librsvg
 	>=dev-libs/dbus-glib-0.80
 	>=dev-libs/glib-2.20.1:2
@@ -28,14 +30,14 @@ RDEPEND="dev-cpp/gtkmm:2.4
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.14 )
 	speex? ( >=media-libs/speex-1.2_rc1 )
 	xosd? ( x11-libs/xosd )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	tc-export CC
-	append-cxxflags -std=c++11
+
 	econf \
-		$(use_enable static-libs static) \
+		--disable-static \
 		$(use_enable gsm) \
 		$(use_enable speex) \
 		$(use_enable opus) \
@@ -49,5 +51,7 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 75aba0d3a38c..62a1ed63dfa1 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,3 +1,4 @@
 DIST mpd-0.21.26.tar.xz 685396 BLAKE2B 176c75069190c8df79e5c0b37605abeafac2358dc1840ec66b2eecb809449cf0908b7a3af61c499e88d82b210c8907a752b4f006bcffb7c7d279cbdbc082032f SHA512 31eb5d42bcfc942116cb203d8b1ceb8489b46251204f7288d1e8d7e052ff4cab2c8b2087795cc8118c8b86f080613f80cb182163fcb1c5b5027053d53c5a594a
 DIST mpd-0.22.1.tar.xz 725204 BLAKE2B 7032472776129c9cb302545d8bdd266a7551df4647d6fc09e9f5e287f25b25158759316dde5bb481a7b87366d7eaa5a91613bbc6679a9f1b768297b63b1fb9fb SHA512 b7c0156bb85bbc551435bbb9a49ed719e51fe0446dcecbaadbe083e705fc16da9d03d83814c7dcc041075a46544473cf63e5d1576dbc3961bfdfa44ef5fb27d7
 DIST mpd-0.22.2.tar.xz 725808 BLAKE2B 5961177dd33b5e008b17131c6a83b8fc61df62317acdfd6bac4e20a9e31111d1307be79223a23fdaa0e2ae0593aa8015ac140648ea4b5b699a8b64632fc589ef SHA512 13ec85bda79d0c2588c50e2ebbf53b733f23c9700abfd7ccd4140db8080a4c496073727c8c04e9a2f8897669beeced0d77caa2bac7e2ca9adb41ad56dcf92aeb
+DIST mpd-0.22.3.tar.xz 726356 BLAKE2B a821e9fed56c3ad625d155057867747d2c883dd90d110b097dfd4acc56ff583949889b849686d5644687226f205c5ae3f95eec182841f706f56135c7e8f3746b SHA512 deeafbe1a95f777fa4f9f355293a648a3f7121fae8e299c92dbd43d821319ffa4182c558cb0691f65e90f243428cec2cf14f64e9572bc72fc6a2af0fd9c0cd60
diff --git a/media-sound/mpd/mpd-0.22.3.ebuild b/media-sound/mpd/mpd-0.22.3.ebuild
new file mode 100644
index 000000000000..bf08e1431b44
--- /dev/null
+++ b/media-sound/mpd/mpd-0.22.3.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info meson systemd xdg-utils
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
+	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
+	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
+	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
+	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd
+	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
+	zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	upnp? ( expat )
+	webdav? ( curl expat )
+	"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/mpd
+	sys-libs/liburing:=
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile:= )
+
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+
+	chromaprint? ( media-libs/chromaprint )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	doc? ( dev-python/sphinx )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+	ffmpeg? ( media-video/ffmpeg:0= )
+	flac? ( media-libs/flac )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? (  dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	libsoxr? ( media-libs/soxr )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( media-libs/libshout )
+	nfs? ( net-fs/libnfs )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	qobuz? ( dev-libs/libgcrypt:0 )
+	samba? ( net-fs/samba )
+	selinux? ( sec-policy/selinux-mpd )
+	sid? ( || (
+		media-libs/libsidplay:2
+		media-libs/libsidplayfp
+	) )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tidal? ( dev-libs/yajl
+		net-misc/curl )
+	twolame? ( media-sound/twolame )
+	udisks? ( sys-fs/udisks:2 )
+	upnp? ( net-libs/libupnp:0 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.58:=
+	test? ( dev-cpp/gtest )"
+
+BDEPEND=">=dev-util/meson-0.49.2
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.conf.patch
+)
+
+pkg_setup() {
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+	sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dbzip2=$(usex bzip2 enabled disabled)
+		-Dcdio_paranoia=$(usex cdio enabled disabled)
+		-Dchromaprint=$(usex chromaprint enabled disabled)
+		-Dcue=$(usex cue true false)
+		-Dcurl=$(usex curl enabled disabled)
+		-Ddbus=$(usex dbus enabled disabled)
+		-Deventfd=$(usex eventfd true false)
+		-Dexpat=$(usex expat enabled disabled)
+		-Dicu=$(usex icu enabled disabled)
+		-Did3tag=$(usex id3tag enabled disabled)
+		-Dinotify=$(usex inotify true false)
+		-Dipv6=$(usex ipv6 enabled disabled)
+		-Diso9660=$(usex cdio enabled disabled)
+		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
+		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
+		-Dmms=$(usex mms enabled disabled)
+		-Dnfs=$(usex nfs enabled disabled)
+		-Dsignalfd=$(usex signalfd true false)
+		-Dsmbclient=$(usex samba enabled disabled)
+		-Dsoxr=$(usex libsoxr enabled disabled)
+		-Dsqlite=$(usex sqlite enabled disabled)
+		-Dsystemd=$(usex systemd enabled disabled)
+		-Dtest=$(usex test true false)
+		-Dudisks=$(usex udisks enabled disabled)
+		-Dupnp=$(usex upnp enabled disabled)
+		-Dwebdav=$(usex webdav enabled disabled)
+		-Dzeroconf=$(usex zeroconf avahi disabled)
+		-Dzlib=$(usex zlib enabled disabled)
+		-Dzzip=$(usex zip enabled disabled)
+		)
+
+	emesonargs+=(
+		-Dalsa=$(usex alsa enabled disabled)
+		-Dao=$(usex ao enabled disabled)
+		-Dfifo=$(usex fifo true false)
+		-Djack=$(usex jack enabled disabled)
+		-Dopenal=$(usex openal enabled disabled)
+		-Doss=$(usex oss enabled disabled)
+		-Dpipe=$(usex pipe true false)
+		-Dpulse=$(usex pulseaudio enabled disabled)
+		-Drecorder=$(usex recorder true false)
+	)
+
+	if use samba || use upnp; then
+		emesonargs+=( -Dneighbor=true )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	if use network; then
+
+	emesonargs+=(
+		-Dshine=disabled
+		-Dshout=enabled
+		-Dvorbisenc=$(usex vorbis enabled disabled)
+		-Dhttpd=true
+		-Dlame=$(usex lame enabled disabled)
+		-Dtwolame=$(usex twolame enabled disabled)
+		-Dwave_encoder=$(usex audiofile true false)
+	)
+	fi
+
+	emesonargs+=(
+		# media-libs/adplug is not packaged anymore
+		-Dadplug=disabled
+		-Daudiofile=$(usex audiofile enabled disabled)
+		-Dfaad=$(usex faad enabled disabled)
+		-Dffmpeg=$(usex ffmpeg enabled disabled)
+		-Dflac=$(usex flac enabled disabled)
+		-Dfluidsynth=$(usex fluidsynth enabled disabled)
+		-Dgme=$(usex gme enabled disabled)
+		-Dmad=$(usex mad enabled disabled)
+		-Dmikmod=$(usex mikmod enabled disabled)
+		-Dmodplug=$(usex modplug enabled disabled)
+		-Dmpcdec=$(usex musepack enabled disabled)
+		-Dmpg123=$(usex mpg123 enabled disabled)
+		-Dopus=$(usex opus enabled disabled)
+		-Dsidplay=$(usex sid enabled disabled)
+		-Dsndfile=$(usex sndfile enabled disabled)
+		-Dvorbis=$(usex vorbis enabled disabled)
+		-Dwavpack=$(usex wavpack enabled disabled)
+		-Dwildmidi=$(usex wildmidi enabled disabled)
+
+	)
+
+	emesonargs+=(
+		-Dqobuz=$(usex qobuz enabled disabled)
+		-Dsoundcloud=$(usex soundcloud enabled disabled)
+		-Dtidal=$(usex tidal enabled disabled)
+	)
+
+	emesonargs+=(
+		--libdir="/usr/$(get_libdir)"
+		-Ddocumentation=$(usex doc enabled disabled)
+		-Dsndio=disabled #not yet in the tree
+		-Dsolaris_output=disabled
+
+		-Ddatabase=true
+		-Ddsd=true
+		-Dio_uring=enabled
+		-Dtcp=true
+
+		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+		)
+
+	if use icu; then
+		emesonargs+=( -Diconv=enabled )
+	else
+		emesonargs+=( -Diconv=disabled )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc
+	newins doc/mpdconf.dist mpd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	if use doc; then
+		doman doc/mpd.1
+		doman doc/mpd.conf.5
+	fi
+
+	keepdir /var/lib/mpd
+	keepdir /var/lib/mpd/music
+	keepdir /var/lib/mpd/playlists
+
+	rm -r "${ED}"/usr/share/doc/mpd || die
+
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch b/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch
index 51df29910742..5c80531d96f4 100644
--- a/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch
+++ b/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch
@@ -13,28 +13,79 @@
  add_subdirectory(libmpcenc)
 --- a/libmpcdec/CMakeLists.txt
 +++ b/libmpcdec/CMakeLists.txt
-@@ -1,7 +1,22 @@
+@@ -1,7 +1,15 @@
  include_directories(${libmpc_SOURCE_DIR}/include)
- if(SHARED)
-   add_library(mpcdec_shared SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
+-if(SHARED)
+-  add_library(mpcdec_shared SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
 -else(SHARED)
 -  add_library(mpcdec_static STATIC huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
-+  set_target_properties(mpcdec_shared PROPERTIES OUTPUT_NAME mpcdec CLEAN_DIRECT_OUTPUT 1 VERSION 7.0.1 SOVERSION 7)
-+  if(NOT MSVC)
-+    target_link_libraries(mpcdec_shared m)
-+  endif(NOT MSVC)
- endif(SHARED)
+-endif(SHARED)
  
-+add_library(mpcdec_static STATIC huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
++add_library(mpcdec_shared SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
++set_target_properties(mpcdec_shared PROPERTIES OUTPUT_NAME mpcdec CLEAN_DIRECT_OUTPUT 1 VERSION 7.0.1 SOVERSION 7)
++if(NOT MSVC)
++  target_link_libraries(mpcdec_shared m)
++endif(NOT MSVC)
 +
-+set_target_properties(mpcdec_static PROPERTIES OUTPUT_NAME mpcdec CLEAN_DIRECT_OUTPUT 1)
++add_library(mpcdec_shared STATIC huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
 +
 +if(NOT MSVC)
-+  target_link_libraries(mpcdec_static m)
++  target_link_libraries(mpcdec_shared m)
 +endif(NOT MSVC)
 +
-+install(TARGETS mpcdec_static LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
-+
-+if(SHARED)
-+  install(TARGETS mpcdec_shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
-+endif(SHARED)
++install(TARGETS mpcdec_shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
+--- a/mpc2sv8/CMakeLists.txt
++++ b/mpc2sv8/CMakeLists.txt
+@@ -15,7 +15,7 @@
+ if(SHARED)
+   target_link_libraries(mpc2sv8 mpcdec_shared)
+ else(SHARED)
+-  target_link_libraries(mpc2sv8 mpcdec_static)
++  target_link_libraries(mpc2sv8 mpcdec_shared)
+ endif(SHARED)
+ 
+ target_link_libraries(mpc2sv8 mpcenc_static)
+--- a/mpcchap/CMakeLists.txt
++++ b/mpcchap/CMakeLists.txt
+@@ -17,7 +17,7 @@
+ if(SHARED)
+   target_link_libraries(mpcchap mpcdec_shared)
+ else(SHARED)
+-  target_link_libraries(mpcchap mpcdec_static)
++  target_link_libraries(mpcchap mpcdec_shared)
+ endif(SHARED)
+ 
+ target_link_libraries(mpcchap mpcenc_static)
+--- a/mpccut/CMakeLists.txt
++++ b/mpccut/CMakeLists.txt
+@@ -15,7 +15,7 @@
+ if(SHARED)
+   target_link_libraries(mpccut mpcdec_shared)
+ else(SHARED)
+-  target_link_libraries(mpccut mpcdec_static)
++  target_link_libraries(mpccut mpcdec_shared)
+ endif(SHARED)
+ 
+ target_link_libraries(mpccut mpcenc_static)
+--- a/mpcdec/CMakeLists.txt
++++ b/mpcdec/CMakeLists.txt
+@@ -21,7 +21,7 @@
+ if(SHARED)
+   target_link_libraries(mpcdec mpcdec_shared)
+ else(SHARED)
+-  target_link_libraries(mpcdec mpcdec_static)
++  target_link_libraries(mpcdec mpcdec_shared)
+ endif(SHARED)
+ 
+ install(TARGETS mpcdec RUNTIME DESTINATION bin)
+--- a/mpcgain/CMakeLists.txt
++++ b/mpcgain/CMakeLists.txt
+@@ -22,7 +22,7 @@
+ if(SHARED)
+   target_link_libraries(mpcgain mpcdec_shared)
+ else(SHARED)
+-  target_link_libraries(mpcgain mpcdec_static)
++  target_link_libraries(mpcgain mpcdec_shared)
+ endif(SHARED)
+ 
+ if(NOT MSVC)
diff --git a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
index 6c28404bd48e..e7f1c0e71931 100644
--- a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
@@ -16,18 +16,15 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="BSD LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
 
 DEPEND="
 	>=media-libs/libcuefile-${PV}[${MULTILIB_USEDEP}]
-	>=media-libs/libreplaygain-${PV}[${MULTILIB_USEDEP}]
-"
+	>=media-libs/libreplaygain-${PV}[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}
 	!media-libs/libmpcdec
-	!media-libs/libmpcdecsv7
-"
+	!media-libs/libmpcdecsv7"
 
 PATCHES=(
-	"${FILESDIR}/${P}-gentoo.patch"
-	"${FILESDIR}/${P}-fno-common.patch"
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index bca12ef1b120..416db5f56970 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,4 +1,3 @@
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184 SHA512 69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
 DIST musescore-3.5.1.tar.gz 66952759 BLAKE2B 74907cc3a7c2305f26a763c12d5bba63a42d720bf97103c366e8d51ca513f8e77e3e950c6674c1c68f71b6e73deaf75dc35de82ee509df632ba3752a34486122 SHA512 ae3907f0cc39f0855fe5069a21d87c5c6ddc31811def36ebf9e069be773693363569fb6b7ad35ff9bf2a64c771133b7c68d50636af9e0733743dd365bc86f654
 DIST musescore-3.5.2.tar.gz 66326638 BLAKE2B 6f4f10c40c2c9c84a1cf07b45ce1badf14a74c834315a1e7768ffbf6738fafb550937105be9e8fd0c7deb79721691fbf40621135e0e2a7354129c00e3623c6fb SHA512 4e98bebaa43abcb692969bd3272c64b6a8ff8e794c54ca8d4ed7dcb8059f4adbe498491f21b3b6d90e6495d4f44166747e1c1869617eba82af6db1aea6b06d38
-DIST musescore-3.5.tar.gz 66798006 BLAKE2B dc3a30d187d22124216023597e98b80d13bc7a47181b65978b2a3c91c419e2783d6fa499b6bed6dcb122155a0b6f72a3ec89d0c9be4355e7afe10bc4fca1a907 SHA512 db2d22abf1b53e37ea5e3b2f367dc945afa3bab7fb4c5b3b5c172498060170a3b0a96767584c0959b29c412729eb059917b98058c6b11e30f54ec4047a775e96
diff --git a/media-sound/musescore/musescore-3.5.1.ebuild b/media-sound/musescore/musescore-3.5.1.ebuild
index a1d345341b93..b8137e72faf0 100644
--- a/media-sound/musescore/musescore-3.5.1.ebuild
+++ b/media-sound/musescore/musescore-3.5.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
 else
 	SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	S="${WORKDIR}/MuseScore-${PV}"
 fi
 
diff --git a/media-sound/musescore/musescore-3.5.ebuild b/media-sound/musescore/musescore-3.5.ebuild
deleted file mode 100644
index d3027a0f4a74..000000000000
--- a/media-sound/musescore/musescore-3.5.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CHECKREQS_DISK_BUILD=3500M
-inherit cmake xdg check-reqs
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
-else
-	SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-	S="${WORKDIR}/MuseScore-${PV}"
-fi
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/"
-# MuseScore_General-*.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
-# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
-SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine"
-REQUIRED_USE="portmidi? ( portaudio )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/designer:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qthelp:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtquickcontrols2:5
-	>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
-	dev-qt/qtsvg:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	>=media-libs/freetype-2.5.2
-	media-libs/libsndfile
-	sys-libs/zlib:=
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	jack? ( virtual/jack )
-	mp3? ( media-sound/lame )
-	omr? ( app-text/poppler )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-	sf3? ( media-libs/libvorbis )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
-	"${FILESDIR}/${P}-lambda-capture-this.patch"
-	"${FILESDIR}/${P}-remove-duplicite-declaration.patch"
-)
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_src_unpack
-		unpack ${A}
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Move soundfonts to the correct directory
-	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAEOLUS=OFF # does not compile
-		-DBUILD_ALSA="$(usex alsa)"
-		-DBUILD_CRASH_REPORTER=OFF
-		-DBUILD_JACK="$(usex jack)"
-		-DBUILD_LAME="$(usex mp3)"
-		-DBUILD_PCH=ON
-		-DBUILD_PORTAUDIO="$(usex portaudio)"
-		-DBUILD_PORTMIDI="$(usex portmidi)"
-		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_TELEMETRY_MODULE=ON
-		-DBUILD_WEBENGINE="$(usex webengine)"
-		-DCMAKE_SKIP_RPATH=ON
-		-DDOWNLOAD_SOUNDFONT=OFF
-		-DHAS_AUDIOFILE=ON
-		-DOCR=OFF
-		-DOMR="$(usex omr)"
-		-DSOUNDFONT3=ON
-		-DZERBERUS="$(usex sfz)"
-		-DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
-		-DUSE_SYSTEM_FREETYPE=ON
-		-DUSE_SYSTEM_POPPLER=ON
-		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cd "${BUILD_DIR}" || die
-	cmake_build -j1 lrelease manpages
-	cmake_src_compile
-}
diff --git a/media-sound/pavucontrol/Manifest b/media-sound/pavucontrol/Manifest
index 194fed115843..c1e9e38d5383 100644
--- a/media-sound/pavucontrol/Manifest
+++ b/media-sound/pavucontrol/Manifest
@@ -1,2 +1 @@
-DIST pavucontrol-3.0.tar.xz 145092 BLAKE2B 3461aaac4228150918effcff04b61f9112c8b12aa61bcce9a82d033c825d7466720a4d8f008ff19d9d8d2ad0d52c6ffd0ee0a2288ce84beb7f30c5f816eb0c11 SHA512 3562fc50e5f60c6b6280c2d524e13cf44114bf481e5ec98b8714c7c2f162d0332179ebcf4c5a78d86f511de857bdc3aa7415e1548e0c10d4582b5958c4cacae9
 DIST pavucontrol-4.0.tar.xz 165216 BLAKE2B 5a556dbd8132d811b7704b377f4a62ad606378e235f9892a7951e1f981917e4196d17e85350ef757a956e6fbc448f0f6cd600b5656e12e2152b71d10b5e64e2a SHA512 eaea303c46ddb36733aed88c8a603907d70e4539c345d8acec23527d3306ee21ae630c0508bdab6ae52cbc2f1eb8fc4b212abda72876dc92e83fba7ceb623be2
diff --git a/media-sound/pavucontrol/pavucontrol-3.0.ebuild b/media-sound/pavucontrol/pavucontrol-3.0.ebuild
deleted file mode 100644
index 074bee782902..000000000000
--- a/media-sound/pavucontrol/pavucontrol-3.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic
-
-DESCRIPTION="Pulseaudio Volume Control, GTK based mixer for Pulseaudio"
-HOMEPAGE="https://freedesktop.org/software/pulseaudio/pavucontrol/"
-SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ~ppc64 ~sparc x86"
-IUSE="nls"
-
-RDEPEND="
-	>=dev-cpp/gtkmm-3.0:3.0
-	>=dev-libs/libsigc++-2.2:2
-	>=media-libs/libcanberra-0.16[gtk3]
-	>=media-sound/pulseaudio-3[glib]
-	virtual/freedesktop-icon-theme
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? (
-		dev-util/intltool
-		sys-devel/gettext
-	)
-"
-
-src_configure() {
-	append-cxxflags -std=c++11 #567216
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--disable-lynx \
-		$(use_enable nls)
-}
diff --git a/media-sound/pavumeter/files/pavumeter-0.9.3-desktop-QA.patch b/media-sound/pavumeter/files/pavumeter-0.9.3-desktop-QA.patch
new file mode 100644
index 000000000000..54214ed1d273
--- /dev/null
+++ b/media-sound/pavumeter/files/pavumeter-0.9.3-desktop-QA.patch
@@ -0,0 +1,16 @@
+--- a/src/pavumeter.desktop
++++ b/src/pavumeter.desktop
+@@ -7,4 +7,4 @@
+ Icon=audio-input-microphone
+ StartupNotify=true
+ Type=Application
+-Categories=Application;AudioVideo;Audio;
++Categories=AudioVideo;Audio;
+--- a/src/pavumeter-record.desktop
++++ b/src/pavumeter-record.desktop
+@@ -7,4 +7,4 @@
+ Icon=audio-input-microphone
+ StartupNotify=true
+ Type=Application
+-Categories=Application;AudioVideo;Audio;
++Categories=AudioVideo;Audio;
diff --git a/media-sound/pavumeter/pavumeter-0.9.3-r1.ebuild b/media-sound/pavumeter/pavumeter-0.9.3-r1.ebuild
index 85efd70acf71..891fe6fc3489 100644
--- a/media-sound/pavumeter/pavumeter-0.9.3-r1.ebuild
+++ b/media-sound/pavumeter/pavumeter-0.9.3-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit flag-o-matic
+EAPI=7
 
 DESCRIPTION="PulseAudio Volume Meter, simple GTK volume meter for PulseAudio"
 HOMEPAGE="http://0pointer.de/lennart/projects/pavumeter/"
@@ -11,22 +10,19 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~sparc x86"
-IUSE=""
 
-RDEPEND="dev-cpp/gtkmm:2.4
+RDEPEND="
+	dev-cpp/gtkmm:2.4
 	dev-libs/libsigc++:2
 	>=media-sound/pulseaudio-0.9.7[glib]
 	x11-themes/tango-icon-theme"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-src_configure() {
-	append-cxxflags -std=c++11 #568592
-	econf \
-		--disable-lynx
-}
+PATCHES=( "${FILESDIR}"/${P}-desktop-QA.patch )
 
-src_install() {
-	default
-	dohtml -r doc
+HTML_DOCS=( doc/{README.html,style.css} )
+
+src_configure() {
+	econf --disable-lynx
 }
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index c2186a789901..0812692868cd 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,3 +1,2 @@
-DIST qtractor-0.9.16.tar.gz 1937425 BLAKE2B b49c2455338bf14c918b9a00567855d68e0bc954ce1e7d4df53cb8330a44e65d51e6ea21571d0cc22900182a39efa099194d2cc676c9f353eb76ee69a62d48ab SHA512 7312b73bccf79e1ca2cadb0bf33b492b221a65fec9894225e78512d63a9ac65b8387edb854607c44cc8a7ecd72758437c5c67ef901e58e495b09c0f48bbda01a
 DIST qtractor-0.9.17.tar.gz 1934317 BLAKE2B 2cb387484203fcd6511a87364db9ed00d4d21452948abc0bad7d2775f022ab9a224537a8300a46ec220ddc497d071072456ed4e46a3e73c52954b5992bb1ba52 SHA512 9392eb594920be5c826613bfd75be93ac006a718c14256b20bf8d6af23f9316f56c801e5422548b9387ccfd4fe3ba926f1a01cacc2324eab1ca66255f02c9c93
 DIST qtractor-0.9.18.tar.gz 1937478 BLAKE2B 269d2fd9cdb3171155ba32d7af5d6c0ad0037287311d2e77efb706820071fde353c84ba6958c0c0fb75f3ecc22eea5e5f7204018d1503bbfb424f48aefc60150 SHA512 e488f95becde10117fc675a5b20b66378e8ae1f8c388fb12042cafa1f4434292d4156f5fe613b93e0c7409c414df9bf0e614afce843e0a42e4a1bce7c9ee9125
diff --git a/media-sound/qtractor/files/qtractor-0.9.13-dont-compress-manpages.patch b/media-sound/qtractor/files/qtractor-0.9.13-dont-compress-manpages.patch
deleted file mode 100644
index 4520a6b8df9f..000000000000
--- a/media-sound/qtractor/files/qtractor-0.9.13-dont-compress-manpages.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index c2fa808..d72bbe2 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -345,7 +345,6 @@ install:	$(target) translations_lrelease $(name).1
- 	@install -d -v -m 0755 $(DESTDIR)$(mandir)/man1
- 	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(translations_dir)
- 	@install -v -m 0644 $(name)*.1 $(DESTDIR)$(mandir)/man1
--	@gzip -nvf $(DESTDIR)$(mandir)/man1/$(name)*.1
- 
- uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
- 	@$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak uninstall
diff --git a/media-sound/qtractor/qtractor-0.9.16.ebuild b/media-sound/qtractor/qtractor-0.9.16.ebuild
deleted file mode 100644
index f4986fa3a51a..000000000000
--- a/media-sound/qtractor/qtractor-0.9.16.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic qmake-utils xdg
-
-DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
-HOMEPAGE="https://qtractor.sourceforge.io"
-SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="aubio cpu_flags_x86_sse debug dssi libsamplerate mad osc rubberband vorbis zlib"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib
-	media-libs/ladspa-sdk
-	media-libs/libsndfile
-	>=media-libs/lilv-0.16.0
-	media-libs/lv2
-	media-libs/suil
-	virtual/jack
-	aubio? ( media-libs/aubio )
-	dssi? ( media-libs/dssi )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	osc? ( media-libs/liblo )
-	rubberband? ( media-libs/rubberband )
-	vorbis? ( media-libs/libvorbis )
-	zlib? ( sys-libs/zlib )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.13-dont-compress-manpages.patch"
-)
-
-src_configure() {
-	append-cxxflags -std=c++11
-	econf \
-		--enable-ladspa \
-		--enable-liblilv \
-		$(use_enable debug) \
-		$(use_enable aubio libaubio) \
-		$(use_enable dssi) \
-		$(use_enable libsamplerate) \
-		$(use_enable mad libmad) \
-		$(use_enable osc liblo) \
-		$(use_enable rubberband librubberband) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable vorbis libvorbis) \
-		$(use_enable zlib libz)
-
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}
diff --git a/media-sound/redoflacs/redoflacs-0.30.ebuild b/media-sound/redoflacs/redoflacs-0.30.ebuild
index a41aaed10bde..cb5eed7d1a02 100644
--- a/media-sound/redoflacs/redoflacs-0.30.ebuild
+++ b/media-sound/redoflacs/redoflacs-0.30.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit readme.gentoo vcs-snapshot
+inherit readme.gentoo-r1 vcs-snapshot
 
 DESCRIPTION="Bash commandline flac compressor, verifier, organizer, analyzer, retagger"
 HOMEPAGE="https://github.com/sirjaren/redoflacs"
@@ -12,9 +12,7 @@ SRC_URI="https://github.com/sirjaren/${PN}/tarball/v${PV} -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND=""
 RDEPEND="
 	>=app-shells/bash-4
 	media-libs/flac
diff --git a/media-sound/ripperx/files/ripperx-2.7.3-ceilf-underlink.patch b/media-sound/ripperx/files/ripperx-2.7.3-ceilf-underlink.patch
new file mode 100644
index 000000000000..56e40f132658
--- /dev/null
+++ b/media-sound/ripperx/files/ripperx-2.7.3-ceilf-underlink.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -264,7 +264,7 @@
+ 	$(GTK_CFLAGS) \
+ 	-I$(includedir)
+ 
+-ripperX_LDADD = \
++ripperX_LDADD = -lm \
+ 	$(INTLLIBS) \
+ 	$(GTK_LIBS)
+ 
diff --git a/media-sound/ripperx/files/ripperx-2.7.3-ldflags.patch b/media-sound/ripperx/files/ripperx-2.7.3-ldflags.patch
index 11e18972e638..e7e8a066b3b7 100644
--- a/media-sound/ripperx/files/ripperx-2.7.3-ldflags.patch
+++ b/media-sound/ripperx/files/ripperx-2.7.3-ldflags.patch
@@ -1,11 +1,11 @@
---- plugins/Makefile.in
-+++ plugins/Makefile.in
+--- a/plugins/Makefile.in
++++ b/plugins/Makefile.in
 @@ -658,7 +658,7 @@ uninstall-am: uninstall-binPROGRAMS
  all: ripperX_plugin_tester $(PLUGINS)
  
  .c.o:
 -	$(CC) $(CFLAGS) $(LDFLAGS) -c $< -o $@
-+	$(CC) $(CFLAGS) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/media-sound/ripperx/files/ripperx-2.7.3-pkgconfig.patch b/media-sound/ripperx/files/ripperx-2.7.3-pkgconfig.patch
index 48c24f4054a9..d6a311a60b05 100644
--- a/media-sound/ripperx/files/ripperx-2.7.3-pkgconfig.patch
+++ b/media-sound/ripperx/files/ripperx-2.7.3-pkgconfig.patch
@@ -1,5 +1,5 @@
---- ripperX.pc.in
-+++ ripperX.pc.in
+--- a/ripperX.pc.in
++++ b/ripperX.pc.in
 @@ -1,6 +1,7 @@
  prefix=@prefix@
  exec_prefix=@exec_prefix@
diff --git a/media-sound/ripperx/ripperx-2.7.3.ebuild b/media-sound/ripperx/ripperx-2.7.3.ebuild
index 96bb4e62f35e..2656cb3b070a 100644
--- a/media-sound/ripperx/ripperx-2.7.3.ebuild
+++ b/media-sound/ripperx/ripperx-2.7.3.ebuild
@@ -1,47 +1,44 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=7
 
-MY_P=${P/x/X}
-MY_PN=${PN/x/X}
+inherit desktop
 
-DESCRIPTION="a GTK program to rip CD audio tracks and encode them to the Ogg, MP3, or FLAC formats"
+DESCRIPTION="GTK program to rip CD audio tracks to Ogg, MP3 or FLAC"
 HOMEPAGE="https://sourceforge.net/projects/ripperx"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P/x/X}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="nls"
 
-RDEPEND="media-libs/id3lib
+RDEPEND="
+	media-libs/id3lib
 	media-sound/cdparanoia
 	media-sound/lame
 	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${P/x/X}"
 
-src_prepare() {
-	# AC_CHECK_LIB(m, ceilf, [], [MATH_LIB="-lm" MATH_LIB=""]) #401867
-	sed -i -e '/ripperX_LDADD/s:=:= -lm:' src/Makefile.in || die
-
-	epatch \
-		"${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-pkgconfig.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-ceilf-underlink.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${P}-pkgconfig.patch
+)
 
 src_configure() {
 	econf $(use_enable nls)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc BUGS CHANGES FAQ README* TODO
-	doicon src/xpms/${MY_PN}-icon.xpm
-	make_desktop_entry ${MY_PN} ${MY_PN} ${MY_PN}-icon
+	default
+
+	doicon src/xpms/ripperX-icon.xpm
+	make_desktop_entry ripperX ripperX ripperX-icon
 }
diff --git a/media-sound/rplay/rplay-3.3.2-r3.ebuild b/media-sound/rplay/rplay-3.3.2-r3.ebuild
index 6ecec5d4fe4c..faf1dd2c8545 100644
--- a/media-sound/rplay/rplay-3.3.2-r3.ebuild
+++ b/media-sound/rplay/rplay-3.3.2-r3.ebuild
@@ -51,4 +51,6 @@ src_install() {
 		mandir="${ED}/usr/share/man" \
 		sysconfdir="${ED}/etc" \
 		install
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-sound/spek/spek-0.8.3-r1.ebuild b/media-sound/spek/spek-0.8.3-r1.ebuild
index 4c60f5cbe8a1..7a4eb6af0e76 100644
--- a/media-sound/spek/spek-0.8.3-r1.ebuild
+++ b/media-sound/spek/spek-0.8.3-r1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 WX_GTK_VER="3.0"
 
-inherit autotools eutils toolchain-funcs wxwidgets
+inherit autotools wxwidgets xdg
 
 DESCRIPTION="Analyse your audio files by showing their spectrogram"
 HOMEPAGE="http://www.spek-project.org/"
@@ -16,30 +17,27 @@ KEYWORDS="~amd64"
 
 RDEPEND="
 	media-video/ffmpeg:0=
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-"
-DEPEND="${RDEPEND}
+	x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/intltool
-	virtual/pkgconfig
-	>=sys-devel/gcc-4.7
 	sys-devel/gettext
-"
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.1-disable-updates.patch
+	"${FILESDIR}"/${P}-replace-gnu+11-with-c++11.patch
+	"${FILESDIR}"/${P}-stdlib.patch
+	"${FILESDIR}"/${P}-ffmpeg3.patch
+	"${FILESDIR}"/${P}-ffmpeg3-1.patch
+)
 
 src_prepare() {
-	need-wxwidgets unicode
-
-	if [ $(gcc-major-version) -lt "4" ] ; then
-		die "You need to activate at least gcc:4.7"
-	fi
-	if [ $(gcc-major-version) -eq "4" -a $(gcc-minor-version) -lt "7" ] ; then
-		die "You need to activate at least gcc:4.7"
-	fi
-
-	epatch \
-		"${FILESDIR}"/${PN}-0.8.1-disable-updates.patch \
-		"${FILESDIR}"/${P}-replace-gnu+11-with-c++11.patch \
-		"${FILESDIR}"/${P}-stdlib.patch \
-		"${FILESDIR}"/${P}-ffmpeg3.patch \
-		"${FILESDIR}"/${P}-ffmpeg3-1.patch
+	default
 	eautoreconf
 }
+
+src_configure() {
+	setup-wxwidgets unicode
+	default
+}
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index 2e4221e179d8..acddf673257f 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,2 +1,2 @@
-DIST strawberry-0.8.2.tar.xz 10280568 BLAKE2B 16af6602137e7e8623dbb7b39610fc574157677078321888f002115c254fbf6c8b8d1b6644a2d064e7eca452cb411abc8ee48ea07b179a0dcd4a352d355bf6ab SHA512 7ff983aa3b8ff5d904af583be28e253be2d59db72d3f4ea4b4b13bad934fd91052028fddfd52ee1c316d6b8e54b42c44e7e33312f0d8d4d9027e1c529a716c38
 DIST strawberry-0.8.3.tar.xz 10280356 BLAKE2B 3c99193af3e753d48822567a3391900b1d4326ece49582718b949eb3753fd15d3cae2469ffdcc28334db95099a914c1065ed84c397b4ade53c624e7eab5cdfe5 SHA512 e64c49a6b479677486ae7868107e945a63a028cbaa6dcfb68c9c0784fe0ea8a1133264832367d092628fb1094ca90d87d6ab49199d4aab7f56f2620eb4e9b2f7
+DIST strawberry-0.8.4.tar.xz 10781080 BLAKE2B 395898e68117848613666edb545d15db22eea418c7dce553c442c52b459406c88640368da9a98c4f25e5cbff40369127ee4cec2dfadacdb79e4cef4c17e0f875 SHA512 a93308e6ba3450e8164f02c2b46bd5e785995d59963be7a896e769fa8312467fe29f1c7d48f5fbc290ccd6392293dc6af65e24001912a9f54292f25a023468b4
diff --git a/media-sound/strawberry/strawberry-0.8.3.ebuild b/media-sound/strawberry/strawberry-0.8.3.ebuild
index 92c336d58feb..caca9c641006 100644
--- a/media-sound/strawberry/strawberry-0.8.3.ebuild
+++ b/media-sound/strawberry/strawberry-0.8.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/media-sound/strawberry/strawberry-0.8.2.ebuild b/media-sound/strawberry/strawberry-0.8.4.ebuild
similarity index 100%
rename from media-sound/strawberry/strawberry-0.8.2.ebuild
rename to media-sound/strawberry/strawberry-0.8.4.ebuild
index 92c336d58feb..2e4b045125e9 100644
--- a/media-sound/strawberry/strawberry-0.8.2.ebuild
+++ b/media-sound/strawberry/strawberry-0.8.4.ebuild
@@ -80,8 +80,8 @@ DOCS=( Changelog README.md )
 src_prepare() {
 	l10n_find_plocales_changes "src/translations" "" ".po"
 
-	cmake_src_prepare
 	rm -r 3rdparty/taglib || die
+	cmake_src_prepare
 }
 
 src_configure() {
diff --git a/media-sound/strawberry/strawberry-9999.ebuild b/media-sound/strawberry/strawberry-9999.ebuild
index 92c336d58feb..2e4b045125e9 100644
--- a/media-sound/strawberry/strawberry-9999.ebuild
+++ b/media-sound/strawberry/strawberry-9999.ebuild
@@ -80,8 +80,8 @@ DOCS=( Changelog README.md )
 src_prepare() {
 	l10n_find_plocales_changes "src/translations" "" ".po"
 
-	cmake_src_prepare
 	rm -r 3rdparty/taglib || die
+	cmake_src_prepare
 }
 
 src_configure() {
diff --git a/media-sound/subsonic-bin/subsonic-bin-5.2.1-r2.ebuild b/media-sound/subsonic-bin/subsonic-bin-5.2.1-r2.ebuild
index 1fe06db06e55..522f0e8ef95f 100644
--- a/media-sound/subsonic-bin/subsonic-bin-5.2.1-r2.ebuild
+++ b/media-sound/subsonic-bin/subsonic-bin-5.2.1-r2.ebuild
@@ -52,11 +52,11 @@ src_install() {
 
 	if use ffmpeg; then
 		dodir ${SUBSONIC_HOME}/transcode
-		dosym /usr/bin/ffmpeg ${SUBSONIC_HOME}/transcode/ffmpeg
+		dosym ../../../../usr/bin/ffmpeg ${SUBSONIC_HOME}/transcode/ffmpeg
 	fi
 
 	if use lame; then
 		dodir ${SUBSONIC_HOME}/transcode
-		dosym /usr/bin/lame ${SUBSONIC_HOME}/transcode/lame
+		dosym ../../../../usr/bin/lame ${SUBSONIC_HOME}/transcode/lame
 	fi
 }
diff --git a/media-sound/teamspeak-client/Manifest b/media-sound/teamspeak-client/Manifest
index 62f1d65cc3b5..30e33848684a 100644
--- a/media-sound/teamspeak-client/Manifest
+++ b/media-sound/teamspeak-client/Manifest
@@ -2,4 +2,4 @@ DIST TeamSpeak3-Client-linux_amd64-3.5.3.run 97454216 BLAKE2B 228542b7b5169bd4bc
 DIST TeamSpeak3-Client-linux_amd64-3.5.5.run 97478893 BLAKE2B 4007613a04ef0d42521d7ce2f1ff26924e7fd8a5b3f4da87749365bd866c2cda245b5a013394c9f50248e61361ab86fddf79baa138b1c5bb52acfbab730a5c6c SHA512 0082464460860897519643f292323fb38e7739a62338bc38dfb9443d7f5582be929bfd82bd3cbe3c5b04979d9a146dc58c51c70bf7359dfbcc6f828fcdac95c6
 DIST TeamSpeak3-Client-linux_x86-3.5.3.run 95939656 BLAKE2B 5aec52b4461d45cd19947e3f87729a40bca23bc78d45565bad59a1f11b437e253f0bf073ad32ca1a43396b8bcf47794d0efb0673ec0b7314e3dd5c2a0dcdb140 SHA512 54a6d7ad03a357a78be71710e7878b9b5c0a54d175bf4242a35ba82df1abfa692dc4d4c921099677c5d163caf18b68db73a87b8637b216ef5c72eaa25b6deab7
 DIST TeamSpeak3-Client-linux_x86-3.5.5.run 95960042 BLAKE2B 221b3dc69b35e959160d0941abd7bdf1103bc160ee5cf739ae61bfe8ca855997a708eb3e1feff5113b247b371526968272d68c4a84a8a4aea788c21108b09ef4 SHA512 7aa8e8da9c0be6ad9d52ef4cf500ce6cd4c56d2660f39075455951a556c92c03d44b76d8f9c79a612e1c1120191047d6e11d917c21f0010d65b9daa18cdeb435
-DIST teamspeak-client-5.0.0_beta27.tar.gz 106013392 BLAKE2B 6d591cd2f79601bfb561adcfe9c118393eea9add8ac113bc4e5ebcfe6a154aa9ff0a0f951bda8c55747b9ceaea4cdbcbc65bc23082968709d12b239948b2e1a7 SHA512 4b141e63495bd0e4c4c6f02fb36153c35c4b86c999a682bd12f6f29110ce972ec8c72a99b1fd6a1b7584b8db63012cab9942bd85ae1c67636e5b3e3024fe2b98
+DIST teamspeak-client-5.0.0_beta32.tar.gz 111368604 BLAKE2B 85771c2e7078bf4a25073b66295a8629911a7ed6fcfce17840130abe26e79565df306756928edd7439e0bc8800071a126187cc184b7f9beda15334af2e14acc7 SHA512 ac806deb1c001da01d76ddb07babc8bbde45bebaa5fab0cf2359ccc043036f1d882bfbd973be2cd184451681c297224f3437c89f72212ce10112a42bb46a823b
diff --git a/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta27.ebuild b/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta32.ebuild
similarity index 89%
rename from media-sound/teamspeak-client/teamspeak-client-5.0.0_beta27.ebuild
rename to media-sound/teamspeak-client/teamspeak-client-5.0.0_beta32.ebuild
index bbb81414064b..1d1cf415618e 100644
--- a/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta27.ebuild
+++ b/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta32.ebuild
@@ -51,6 +51,8 @@ QA_PREBUILT="
 	opt/teamspeak5-client/chrome-sandbox
 	opt/teamspeak5-client/hotkey_helper
 	opt/teamspeak5-client/libcef.so
+	opt/teamspeak5-client/libtschat_client_lib.so
+	opt/teamspeak5-client/libtschat_client_lib_export.so
 	opt/teamspeak5-client/patcher
 	opt/teamspeak5-client/TeamSpeak
 	opt/teamspeak5-client/soundbackends/libalsa_linux_amd64.so
@@ -59,7 +61,7 @@ QA_PREBUILT="
 
 src_install() {
 	exeinto /opt/teamspeak5-client
-	doexe chrome-sandbox hotkey_helper patcher TeamSpeak libcef.so
+	doexe chrome-sandbox hotkey_helper patcher TeamSpeak libcef.so libtschat_client_lib.so libtschat_client_lib_export.so
 
 	insinto /opt/teamspeak5-client
 	doins *.bin *.dat *.pak
diff --git a/media-sound/teamspeak-server/Manifest b/media-sound/teamspeak-server/Manifest
index 74c85f882681..a45333c2b60a 100644
--- a/media-sound/teamspeak-server/Manifest
+++ b/media-sound/teamspeak-server/Manifest
@@ -1,2 +1,4 @@
 DIST teamspeak3-server_linux_amd64-3.12.1.tar.bz2 9428301 BLAKE2B aeab07edc31d1ee57ffd34b218aeb3f7e23f31ffb5b8b940cbc46bca91b6ef9caffb67f1a52c059439a64d73ceb8fce124c0e8101d3e04d752782344ff6c1843 SHA512 58bfb582deddc4137245fe73d3aabfbcd84c3c346fe5fd3db8c7756014fcdd1f0bd7798ee029aa9beebe454fa8021dd180dd577f147cc5f02c833b68d9253fc7
+DIST teamspeak3-server_linux_amd64-3.13.1.tar.bz2 9946950 BLAKE2B 3a84f969fdc7da5599a5b61720b5d598b066aa2eeb65295270f14929ea58027f603288b9258d7f9ba90499bfa7fd1e21a8fe38b3a038c3054bf1f017728330ee SHA512 20a24fd5f35dfd58647900c7b1dd541c7132be4e0ccfa2d6f57fc9778b9d303721a0b5371cda16089b543b964b1cdc8351fd68c99b347d225df63311231d11d7
 DIST teamspeak3-server_linux_x86-3.12.1.tar.bz2 9268349 BLAKE2B 61d0794944775e4e9bfb57bc2ac331c5cc9da04d6a3956d4c1ec6c6d36ef87cb04ea1f0004d75251adc4baa1b9be999373d08ea36ca9f86e10b00e03d0f20f38 SHA512 83222586ff6e157af7242afc151c900eb339f05813f8b5fef602f9989a109b80de46bc86c7381b6acce240c62e9859b86df655a0b0219225162315337ca609ef
+DIST teamspeak3-server_linux_x86-3.13.1.tar.bz2 9780835 BLAKE2B 4bcfd9c3567f58cc340bd5a08547c9f3dc272898cd79c653ae0892fd35b9af7a8efe56b0a0e730bfdc7c22ffbdf6dfee403a00839e0eb59a82e4f3b9d1c9bd57 SHA512 a479f6e4306b505d0a620aab9b98395c4def3ceb143b27a5aea29bf4bacf2a1c9a87902d247566e0f333fadccec21be2855e96863c9f1e0675a399ff5608039f
diff --git a/media-sound/teamspeak-server/files/ts3db_postgresql.ini.sample b/media-sound/teamspeak-server/files/ts3db_postgresql.ini.sample
new file mode 100644
index 000000000000..2d7c711f2533
--- /dev/null
+++ b/media-sound/teamspeak-server/files/ts3db_postgresql.ini.sample
@@ -0,0 +1,7 @@
+[config]
+host=localhost
+port=5432
+username=teamspeak
+password=teamspeak
+database=teamspeak
+socket=
diff --git a/media-sound/teamspeak-server/files/ts3server.ini-r2 b/media-sound/teamspeak-server/files/ts3server.ini-r2
new file mode 100644
index 000000000000..34f11d3f72e9
--- /dev/null
+++ b/media-sound/teamspeak-server/files/ts3server.ini-r2
@@ -0,0 +1,29 @@
+machine_id=
+default_voice_port=9987
+voice_ip=
+licensepath=/opt/teamspeak3-server/
+filetransfer_port=30033
+filetransfer_ip=
+query_port=10011
+query_ip=0.0.0.0, ::
+query_ip_allowlist=query_ip_allowlist.txt
+query_ip_denylist=query_ip_denylist.txt
+dbplugin=ts3db_sqlite3
+dbpluginparameter=
+dbsqlpath=/opt/teamspeak3-server/sql/
+dbsqlcreatepath=create_sqlite/
+dbconnections=10
+logpath=/var/log/teamspeak3-server/
+logquerycommands=0
+dbclientkeepdays=30
+logappend=0
+query_skipbruteforcecheck=0
+query_buffer_mb=20
+http_proxy=
+license_accepted=1
+serverquerydocs_path=/opt/teamspeak3-server/serverquerydocs/
+query_ssh_ip=0.0.0.0, ::
+query_ssh_port=10022
+query_protocols=raw
+query_ssh_rsa_host_key=ssh_host_rsa_key
+query_timeout=300
diff --git a/media-sound/teamspeak-server/files/ts3server_mariadb.ini.sample-r2 b/media-sound/teamspeak-server/files/ts3server_mariadb.ini.sample-r2
new file mode 100644
index 000000000000..ff93fb649322
--- /dev/null
+++ b/media-sound/teamspeak-server/files/ts3server_mariadb.ini.sample-r2
@@ -0,0 +1,29 @@
+machine_id=
+default_voice_port=9987
+voice_ip=
+licensepath=/opt/teamspeak3-server/
+filetransfer_port=30033
+filetransfer_ip=
+query_port=10011
+query_ip=0.0.0.0, ::
+query_ip_allowlist=query_ip_allowlist.txt
+query_ip_denylist=query_ip_denylist.txt
+dbplugin=ts3db_mariadb
+dbpluginparameter=/etc/teamspeak3-server/ts3db_mariadb.ini
+dbsqlpath=/opt/teamspeak3-server/sql/
+dbsqlcreatepath=create_mariadb/
+dbconnections=10
+logpath=/var/log/teamspeak3-server/
+logquerycommands=0
+dbclientkeepdays=30
+logappend=0
+query_skipbruteforcecheck=0
+query_buffer_mb=20
+http_proxy=
+license_accepted=1
+serverquerydocs_path=/opt/teamspeak3-server/serverquerydocs/
+query_ssh_ip=0.0.0.0, ::
+query_ssh_port=10022
+query_protocols=raw
+query_ssh_rsa_host_key=ssh_host_rsa_key
+query_timeout=300
diff --git a/media-sound/teamspeak-server/files/ts3server_postgresql.ini.sample b/media-sound/teamspeak-server/files/ts3server_postgresql.ini.sample
new file mode 100644
index 000000000000..4bfa86641add
--- /dev/null
+++ b/media-sound/teamspeak-server/files/ts3server_postgresql.ini.sample
@@ -0,0 +1,29 @@
+machine_id=
+default_voice_port=9987
+voice_ip=
+licensepath=/opt/teamspeak3-server/
+filetransfer_port=30033
+filetransfer_ip=
+query_port=10011
+query_ip=0.0.0.0, ::
+query_ip_allowlist=query_ip_allowlist.txt
+query_ip_denylist=query_ip_denylist.txt
+dbplugin=ts3db_mariadb
+dbpluginparameter=/etc/teamspeak3-server/ts3db_postgresql.ini
+dbsqlpath=/opt/teamspeak3-server/sql/
+dbsqlcreatepath=create_postgresql/
+dbconnections=10
+logpath=/var/log/teamspeak3-server/
+logquerycommands=0
+dbclientkeepdays=30
+logappend=0
+query_skipbruteforcecheck=0
+query_buffer_mb=20
+http_proxy=
+license_accepted=1
+serverquerydocs_path=/opt/teamspeak3-server/serverquerydocs/
+query_ssh_ip=0.0.0.0, ::
+query_ssh_port=10022
+query_protocols=raw
+query_ssh_rsa_host_key=ssh_host_rsa_key
+query_timeout=300
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.13.1.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.13.1.ebuild
new file mode 100644
index 000000000000..75790c371a7d
--- /dev/null
+++ b/media-sound/teamspeak-server/teamspeak-server-3.13.1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="A server software for hosting quality voice communication via the internet"
+HOMEPAGE="https://www.teamspeak.com/"
+SRC_URI="
+	amd64? ( https://files.teamspeak-services.com/releases/server/${PV}/teamspeak3-server_linux_amd64-${PV}.tar.bz2 )
+	x86? ( https://files.teamspeak-services.com/releases/server/${PV}/teamspeak3-server_linux_x86-${PV}.tar.bz2 )
+"
+
+LICENSE="Apache-2.0 Boost-1.0 BSD LGPL-2.1 LGPL-3 MIT teamspeak3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="doc mysql postgres tsdns"
+
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	acct-group/teamspeak
+	acct-user/teamspeak
+	postgres? ( dev-db/postgresql )
+"
+
+QA_PREBUILT="
+	opt/teamspeak3-server/libmariadb.so.2
+	opt/teamspeak3-server/libts3db_mariadb.so
+	opt/teamspeak3-server/libts3db_postgresql.so
+	opt/teamspeak3-server/libts3db_sqlite3.so
+	opt/teamspeak3-server/libts3_ssh.so
+	opt/teamspeak3-server/ts3server
+	opt/teamspeak3-server/tsdnsserver
+"
+
+src_unpack() {
+	default
+
+	mv teamspeak3-server_linux_$(usex amd64 amd64 x86) "${P}" || die
+}
+
+src_install() {
+	diropts -o teamspeak -g teamspeak
+	keepdir /opt/teamspeak3-server /var/log/teamspeak3-server
+
+	diropts
+	keepdir /etc/teamspeak3-server
+
+	touch "${ED}"/opt/teamspeak3-server/.ts3server_license_accepted || die
+
+	exeinto /opt/teamspeak3-server
+	doexe ts3server
+
+	dodir /opt/bin
+	dosym ../teamspeak3-server/ts3server /opt/bin/ts3server
+
+	exeinto /opt/teamspeak3-server
+	doexe libts3db_sqlite3.so libts3_ssh.so
+
+	insinto /opt/teamspeak3-server/serverquerydocs
+	doins -r serverquerydocs/.
+
+	insinto /opt/teamspeak3-server/sql
+	doins sql/*.sql
+	doins -r sql/create_sqlite
+
+	insinto /etc/teamspeak3-server
+	newins "${FILESDIR}"/ts3server.ini-r2 ts3server.ini
+
+	dodoc CHANGELOG
+	docinto ts3server
+	dodoc doc/*.{md,txt}
+
+	newinitd "${FILESDIR}"/teamspeak.initd-r1 teamspeak3-server
+	systemd_newunit "${FILESDIR}"/teamspeak.service teamspeak3-server.service
+
+	newenvd - 99teamspeak3-server <<- EOF
+		CONFIG_PROTECT="/etc/teamspeak3-server/ts3server.ini /etc/teamspeak3-server/ts3server_mariadb.ini /etc/teamspeak3-server/tsdns_settings.ini"
+	EOF
+
+	if use doc; then
+		docinto html
+		dodoc -r doc/serverquery/.
+	fi
+
+	if use mysql; then
+		insinto /etc/teamspeak3-server
+		newins "${FILESDIR}"/ts3server_mariadb.ini.sample-r2 ts3server_mariadb.ini.sample
+		doins "${FILESDIR}"/ts3db_mariadb.ini.sample
+
+		exeinto /opt/teamspeak3-server
+		doexe libts3db_mariadb.so
+		doexe redist/libmariadb.so.2
+
+		insinto /opt/teamspeak3-server/sql
+		doins -r sql/create_mariadb
+		doins -r sql/updates_and_fixes
+	fi
+
+	if use postgres; then
+		insinto /etc/teamspeak3-server
+		doins "${FILESDIR}"/ts3server_postgresql.ini.sample
+		doins "${FILESDIR}"/ts3db_postgresql.ini.sample
+
+		exeinto /opt/teamspeak3-server
+		doexe libts3db_postgresql.so
+
+		insinto /opt/teamspeak3-server/sql
+		doins -r sql/create_postgresql
+		doins -r sql/updates_and_fixes
+	fi
+
+	if use tsdns; then
+		exeinto /opt/teamspeak3-server
+		doexe tsdns/tsdnsserver
+		dodir /opt/bin
+		dosym ../teamspeak3-server/tsdnsserver /opt/bin/tsdnsserver
+
+		insinto /etc/teamspeak3-server
+		doins tsdns/tsdns_settings.ini.sample
+
+		docinto tsdns
+		dodoc tsdns/{README,USAGE}
+	fi
+}
+
+pkg_postinst() {
+	elog "If you have a license,"
+	elog "put it in /opt/teamspeak3-server named as licensekey.dat."
+	elog "Please note, that the license must be writeable by the teamspeak user,"
+	elog "as it will be automatically updated every six months."
+}
diff --git a/media-sound/terminatorx/files/terminatorx-4.0.1-desktop-QA.patch b/media-sound/terminatorx/files/terminatorx-4.0.1-desktop-QA.patch
new file mode 100644
index 000000000000..970b72f4de81
--- /dev/null
+++ b/media-sound/terminatorx/files/terminatorx-4.0.1-desktop-QA.patch
@@ -0,0 +1,12 @@
+--- a/terminatorX.desktop
++++ b/terminatorX.desktop
+@@ -8,5 +8,5 @@ Comment=Versatile DJ scratching and mixing application.
+ Terminal=false
+ Type=Application
+ Icon=terminatorX
+-Categories=Application;AudioVideo;
++Categories=AudioVideo;
+ StartupNotify=true
+-- 
+2.26.2
+
diff --git a/media-sound/terminatorx/terminatorx-4.0.1-r2.ebuild b/media-sound/terminatorx/terminatorx-4.0.1-r2.ebuild
index 8e85e9878242..5940c58dd66f 100644
--- a/media-sound/terminatorx/terminatorx-4.0.1-r2.ebuild
+++ b/media-sound/terminatorx/terminatorx-4.0.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -47,6 +47,8 @@ PATCHES=(
 	# Fails to build with USE="X vorbis -alsa -debug -mad -pulseaudio
 	# -sox", bug #604288
 	"${FILESDIR}"/${P}-gtkcombotext.patch
+	# 740502
+	"${FILESDIR}"/${P}-desktop-QA.patch
 )
 
 src_configure() {
diff --git a/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild b/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild
index e7eb715cab55..a03901c51b53 100644
--- a/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild
+++ b/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-MY_PN=${PN/timidity-/}
+MY_PN="${PN/timidity-/}"
 
 DESCRIPTION="Free and open set of instrument patches"
 HOMEPAGE="http://freepats.opensrc.org/"
@@ -12,18 +12,15 @@ SRC_URI="http://freepats.opensrc.org/${MY_PN}-${PV}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
-IUSE=""
-
 RESTRICT="binchecks strip"
 
-RDEPEND=""
-DEPEND=">=app-eselect/eselect-timidity-20061203"
+RDEPEND="app-eselect/eselect-timidity"
 
-S=${WORKDIR}/${MY_PN}
+S="${WORKDIR}/${MY_PN}"
 
-src_prepare() {
+src_configure() {
 	echo "dir ${EPREFIX}/usr/share/timidity/${MY_PN}" > timidity.cfg || die
-	cat freepats.cfg >> timidity.cfg || due
+	cat freepats.cfg >> timidity.cfg || die
 }
 
 src_install() {
diff --git a/media-sound/volwheel/files/volwheel-0.2.8-desktop-QA.patch b/media-sound/volwheel/files/volwheel-0.2.8-desktop-QA.patch
new file mode 100644
index 000000000000..11af8697af6a
--- /dev/null
+++ b/media-sound/volwheel/files/volwheel-0.2.8-desktop-QA.patch
@@ -0,0 +1,9 @@
+--- a/volwheel.desktop
++++ b/volwheel.desktop
+@@ -1,6 +1,5 @@
+ [Desktop Entry]
+ Version=1.0
+-Encoding=UTF-8
+ Name=VolWheel
+ GenericName=VolWheel
+ Comment=Easy sound volume adjustment
diff --git a/media-sound/volwheel/files/volwheel-0.2.8-perl516.patch b/media-sound/volwheel/files/volwheel-0.2.8-perl516.patch
index 130d9b7c331f..4a801cf5192f 100644
--- a/media-sound/volwheel/files/volwheel-0.2.8-perl516.patch
+++ b/media-sound/volwheel/files/volwheel-0.2.8-perl516.patch
@@ -1,7 +1,7 @@
 http://code.google.com/p/olwtools/issues/detail?id=8
 
---- install.pl
-+++ install.pl
+--- a/install.pl
++++ b/install.pl
 @@ -2,7 +2,6 @@
  
  use strict;
diff --git a/media-sound/volwheel/volwheel-0.2.8-r1.ebuild b/media-sound/volwheel/volwheel-0.2.8-r1.ebuild
index 51ff9c182eb0..49e02ece502f 100644
--- a/media-sound/volwheel/volwheel-0.2.8-r1.ebuild
+++ b/media-sound/volwheel/volwheel-0.2.8-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils gnome2-utils
+EAPI=7
+
+inherit xdg
 
 DESCRIPTION="A volume control trayicon with mouse wheel support"
 HOMEPAGE="https://oliwer.net/b/volwheel.html"
@@ -18,16 +19,12 @@ RDEPEND="${DEPEND}
 	dev-perl/Gtk2
 	alsa? ( media-sound/alsa-utils )"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-perl516.patch
-	sed -i -e '/^Encoding/d' ${PN}.desktop || die
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-perl516.patch
+	"${FILESDIR}"/${P}-desktop-QA.patch
+)
 
 src_install() {
-	./install.pl prefix=/usr destdir="${D}" || die
-	dodoc ChangeLog README TODO
+	./install.pl prefix="${EPREFIX}"/usr destdir="${D}" || die
+	einstalldocs
 }
-
-pkg_preinst() {	gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-sound/wavbreaker/wavbreaker-0.11.ebuild b/media-sound/wavbreaker/wavbreaker-0.11.ebuild
index 6ab4036ae813..157cac408b8e 100644
--- a/media-sound/wavbreaker/wavbreaker-0.11.ebuild
+++ b/media-sound/wavbreaker/wavbreaker-0.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools
+inherit autotools xdg
 
 DESCRIPTION="wavbreaker/wavmerge GTK+ utility to break or merge WAV files"
 HOMEPAGE="http://wavbreaker.sourceforge.net"
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index bc379c5f3826..ed63fe2f351c 100644
Binary files a/media-tv/Manifest.gz and b/media-tv/Manifest.gz differ
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 2cd0c5dfd6bb..261a47d69a27 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -1,2 +1,3 @@
+DIST mythtv-30.0_p20190808-cast_constants_to_short.patch 24201 BLAKE2B d76e519666914f6c9a510fb0aec493e361e857f51e56bd7d120657f350b0bf5da329a89eb58c9789f8f030c6d08bfe0171750690b76d8c2add807942aa686d59 SHA512 c2724ad248222ac4190412cf68e54ee0b265fdde128996e68a2e178e6debe0180c23f9c7d1878466f9a5689fab8172370c6b31c90aa9a096fb5919ec6e8960fe
 DIST mythtv-30.0_p20190808.tar.gz 101208060 BLAKE2B af8966dd6353fc514c9a95083f28e8b7b19f16e1bd5a4f7590a946c306bf16a09f0028c76da975e423136834f8f06d7f2a570b43957ef4ae5e42ee241b579f0a SHA512 c02371c0b2162556e40a560a0fd9cb121f46f2ccedbc2ca74cd03aa9caf2b7ea4bbaa09ae6320eb782f932190f449e7fdd274a6d6ba9676e5fd9b7f5432632a2
 DIST mythtv-31.0.tar.gz 102552136 BLAKE2B b09b41230eb2cae19d770c3cc59151863e0a56e95a86627473d52613e62f0acf3bd0c4bb37afb340ab874c222899f9d3c219ded470785d27960db9b39d784ceb SHA512 d53817231409934ef37d12739c38cf6936f04f816b0ba1c9738ce99b5b4ff387c70b683ccd84f649ff2f74992b2158829f5f1d1ffe06c8768da1922b90439f6e
diff --git a/media-tv/mythtv/files/mythtv-30.0_p20190808-cast_constants_to_short.patch b/media-tv/mythtv/files/mythtv-30.0_p20190808-cast_constants_to_short.patch
deleted file mode 100644
index 572f4e2b7574..000000000000
--- a/media-tv/mythtv/files/mythtv-30.0_p20190808-cast_constants_to_short.patch
+++ /dev/null
@@ -1,365 +0,0 @@
---- a/libs/libmyth/test/test_audioutils/test_audioutils.h
-+++ b/libs/libmyth/test/test_audioutils/test_audioutils.h
-@@ -204,42 +204,48 @@ class TestAudioUtils: public QObject
-             arrays1[i] = j;
-         }
- 
--        uint32_t pattern        = 0xbcbcbcbc;
--        arrays2[offsetshort-4]  = *(short*)&pattern;
--        arrays2[offsetshort-3]  = *(short*)&pattern;
--        arrays2[offsetshort-2]  = *(short*)&pattern;
--        arrays2[offsetshort-1]  = *(short*)&pattern;
--        arrayf[offsetfloat-4]   = *(float*)&pattern;
--        arrayf[offsetfloat-3]   = *(float*)&pattern;
--        arrayf[offsetfloat-2]   = *(float*)&pattern;
--        arrayf[offsetfloat-1]   = *(float*)&pattern;
--        arrays2[SAMPLES+offsetshort+0]    = *(short*)&pattern;
--        arrays2[SAMPLES+offsetshort+1]    = *(short*)&pattern;
--        arrays2[SAMPLES+offsetshort+2]    = *(short*)&pattern;
--        arrays2[SAMPLES+offsetshort+3]    = *(short*)&pattern;
--        arrayf[SAMPLES+offsetfloat+0]     = *(float*)&pattern;
--        arrayf[SAMPLES+offsetfloat+1]     = *(float*)&pattern;
--        arrayf[SAMPLES+offsetfloat+2]     = *(float*)&pattern;
--        arrayf[SAMPLES+offsetfloat+3]     = *(float*)&pattern;
-+	const union
-+	{
-+	    uint32_t pattern;
-+	    short shortpattern;
-+	    float floatpattern;
-+	} pattern = { .pattern = 0xbcbcbcbc };
-+
-+        arrays2[offsetshort-4]  = *&pattern.shortpattern;
-+        arrays2[offsetshort-3]  = *&pattern.shortpattern;
-+        arrays2[offsetshort-2]  = *&pattern.shortpattern;
-+        arrays2[offsetshort-1]  = *&pattern.shortpattern;
-+        arrayf[offsetfloat-4]   = *(float*)&pattern.floatpattern;
-+        arrayf[offsetfloat-3]   = *(float*)&pattern.floatpattern;
-+        arrayf[offsetfloat-2]   = *(float*)&pattern.floatpattern;
-+        arrayf[offsetfloat-1]   = *(float*)&pattern.floatpattern;
-+        arrays2[SAMPLES+offsetshort+0]    = *&pattern.shortpattern;
-+        arrays2[SAMPLES+offsetshort+1]    = *&pattern.shortpattern;
-+        arrays2[SAMPLES+offsetshort+2]    = *&pattern.shortpattern;
-+        arrays2[SAMPLES+offsetshort+3]    = *&pattern.shortpattern;
-+        arrayf[SAMPLES+offsetfloat+0]     = *(float*)&pattern.floatpattern;
-+        arrayf[SAMPLES+offsetfloat+1]     = *(float*)&pattern.floatpattern;
-+        arrayf[SAMPLES+offsetfloat+2]     = *(float*)&pattern.floatpattern;
-+        arrayf[SAMPLES+offsetfloat+3]     = *(float*)&pattern.floatpattern;
- 
-         // sanity tests
-         QCOMPARE(SAMPLES*2, SAMPLES * ISIZEOF(arrays1[0]));
--        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-4],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-3],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-2],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-1],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+0],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+1],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+2],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+3],pattern);
--        QCOMPARE(*(short*)&arrays2[offsetshort-4],*(short*)&pattern);
--        QCOMPARE(*(short*)&arrays2[offsetshort-3],*(short*)&pattern);
--        QCOMPARE(*(short*)&arrays2[offsetshort-2],*(short*)&pattern);
--        QCOMPARE(*(short*)&arrays2[offsetshort-1],*(short*)&pattern);
--        QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+0],*(short*)&pattern);
--        QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+1],*(short*)&pattern);
--        QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+2],*(short*)&pattern);
--        QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+3],*(short*)&pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-4],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-3],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-2],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-1],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+0],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+1],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+2],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+3],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(short*)&arrays2[offsetshort-4],*&pattern.shortpattern);
-+        QCOMPARE(*(short*)&arrays2[offsetshort-3],*&pattern.shortpattern);
-+        QCOMPARE(*(short*)&arrays2[offsetshort-2],*&pattern.shortpattern);
-+        QCOMPARE(*(short*)&arrays2[offsetshort-1],*&pattern.shortpattern);
-+        QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+0],*&pattern.shortpattern);
-+        QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+1],*&pattern.shortpattern);
-+        QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+2],*&pattern.shortpattern);
-+        QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+3],*&pattern.shortpattern);
-         QCOMPARE(arrayf+4,&arrayf[4]);
-         QCOMPARE(arrays2+4,&arrays2[4]);
- 
-@@ -248,22 +254,22 @@ class TestAudioUtils: public QObject
-         int val2 = AudioOutputUtil::fromFloat(FORMAT_S16, arrays2+offsetshort, arrayf+offsetfloat, SAMPLES * ISIZEOF(float));
-         QCOMPARE(val2, SAMPLES * ISIZEOF(short));
- 
--        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-4],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-3],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-2],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-1],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+0],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+1],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+2],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+3],pattern);
--        QCOMPARE(*(short*)&arrays2[offsetshort-4],*(short*)&pattern);
--        QCOMPARE(*(short*)&arrays2[offsetshort-3],*(short*)&pattern);
--        QCOMPARE(*(short*)&arrays2[offsetshort-2],*(short*)&pattern);
--        QCOMPARE(*(short*)&arrays2[offsetshort-1],*(short*)&pattern);
--        QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+0],*(short*)&pattern);
--        QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+1],*(short*)&pattern);
--        QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+2],*(short*)&pattern);
--        QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+3],*(short*)&pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-4],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-3],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-2],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-1],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+0],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+1],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+2],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+3],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(short*)&arrays2[offsetshort-4],*&pattern.shortpattern);
-+        QCOMPARE(*(short*)&arrays2[offsetshort-3],*&pattern.shortpattern);
-+        QCOMPARE(*(short*)&arrays2[offsetshort-2],*&pattern.shortpattern);
-+        QCOMPARE(*(short*)&arrays2[offsetshort-1],*&pattern.shortpattern);
-+        QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+0],*&pattern.shortpattern);
-+        QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+1],*&pattern.shortpattern);
-+        QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+2],*&pattern.shortpattern);
-+        QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+3],*&pattern.shortpattern);
- 
-         av_free(arrays1);
-         av_free(arrays2);
-@@ -505,42 +511,48 @@ class TestAudioUtils: public QObject
-             arrays1[i] = j;
-         }
- 
--        uint32_t pattern        = 0xbcbcbcbc;
--        arrays2[offsetuchar-4]  = *(uchar*)&pattern;
--        arrays2[offsetuchar-3]  = *(uchar*)&pattern;
--        arrays2[offsetuchar-2]  = *(uchar*)&pattern;
--        arrays2[offsetuchar-1]  = *(uchar*)&pattern;
--        arrayf[offsetfloat-4]   = *(float*)&pattern;
--        arrayf[offsetfloat-3]   = *(float*)&pattern;
--        arrayf[offsetfloat-2]   = *(float*)&pattern;
--        arrayf[offsetfloat-1]   = *(float*)&pattern;
--        arrays2[SIZEARRAY+offsetuchar+0]    = *(uchar*)&pattern;
--        arrays2[SIZEARRAY+offsetuchar+1]    = *(uchar*)&pattern;
--        arrays2[SIZEARRAY+offsetuchar+2]    = *(uchar*)&pattern;
--        arrays2[SIZEARRAY+offsetuchar+3]    = *(uchar*)&pattern;
--        arrayf[SIZEARRAY+offsetfloat+0]     = *(float*)&pattern;
--        arrayf[SIZEARRAY+offsetfloat+1]     = *(float*)&pattern;
--        arrayf[SIZEARRAY+offsetfloat+2]     = *(float*)&pattern;
--        arrayf[SIZEARRAY+offsetfloat+3]     = *(float*)&pattern;
-+	const union
-+	{
-+	    uint32_t pattern;
-+	    uchar ucharpattern;
-+	    float floatpattern;
-+	} pattern = { .pattern = 0xbcbcbcbc };
-+
-+        arrays2[offsetuchar-4]  = *(uchar*)&pattern.ucharpattern;
-+        arrays2[offsetuchar-3]  = *(uchar*)&pattern.ucharpattern;
-+        arrays2[offsetuchar-2]  = *(uchar*)&pattern.ucharpattern;
-+        arrays2[offsetuchar-1]  = *(uchar*)&pattern.ucharpattern;
-+        arrayf[offsetfloat-4]   = *(float*)&pattern.floatpattern;
-+        arrayf[offsetfloat-3]   = *(float*)&pattern.floatpattern;
-+        arrayf[offsetfloat-2]   = *(float*)&pattern.floatpattern;
-+        arrayf[offsetfloat-1]   = *(float*)&pattern.floatpattern;
-+        arrays2[SIZEARRAY+offsetuchar+0]    = *(uchar*)&pattern.ucharpattern;
-+        arrays2[SIZEARRAY+offsetuchar+1]    = *(uchar*)&pattern.ucharpattern;
-+        arrays2[SIZEARRAY+offsetuchar+2]    = *(uchar*)&pattern.ucharpattern;
-+        arrays2[SIZEARRAY+offsetuchar+3]    = *(uchar*)&pattern.ucharpattern;
-+        arrayf[SIZEARRAY+offsetfloat+0]     = *(float*)&pattern.floatpattern;
-+        arrayf[SIZEARRAY+offsetfloat+1]     = *(float*)&pattern.floatpattern;
-+        arrayf[SIZEARRAY+offsetfloat+2]     = *(float*)&pattern.floatpattern;
-+        arrayf[SIZEARRAY+offsetfloat+3]     = *(float*)&pattern.floatpattern;
- 
-         // sanity tests
-         QCOMPARE(SIZEARRAY*1, SIZEARRAY * ISIZEOF(arrays1[0]));
--        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-4],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-3],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-2],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-1],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+0],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+1],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+2],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+3],pattern);
--        QCOMPARE(*(uchar*)&arrays2[offsetuchar-4],*(uchar*)&pattern);
--        QCOMPARE(*(uchar*)&arrays2[offsetuchar-3],*(uchar*)&pattern);
--        QCOMPARE(*(uchar*)&arrays2[offsetuchar-2],*(uchar*)&pattern);
--        QCOMPARE(*(uchar*)&arrays2[offsetuchar-1],*(uchar*)&pattern);
--        QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+0],*(uchar*)&pattern);
--        QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+1],*(uchar*)&pattern);
--        QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+2],*(uchar*)&pattern);
--        QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+3],*(uchar*)&pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-4],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-3],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-2],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-1],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+0],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+1],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+2],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+3],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uchar*)&arrays2[offsetuchar-4],*(uchar*)&pattern.ucharpattern);
-+        QCOMPARE(*(uchar*)&arrays2[offsetuchar-3],*(uchar*)&pattern.ucharpattern);
-+        QCOMPARE(*(uchar*)&arrays2[offsetuchar-2],*(uchar*)&pattern.ucharpattern);
-+        QCOMPARE(*(uchar*)&arrays2[offsetuchar-1],*(uchar*)&pattern.ucharpattern);
-+        QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+0],*(uchar*)&pattern.ucharpattern);
-+        QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+1],*(uchar*)&pattern.ucharpattern);
-+        QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+2],*(uchar*)&pattern.ucharpattern);
-+        QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+3],*(uchar*)&pattern.ucharpattern);
-         QCOMPARE(arrayf+4,&arrayf[4]);
-         QCOMPARE(arrays2+4,&arrays2[4]);
- 
-@@ -549,22 +561,22 @@ class TestAudioUtils: public QObject
-         int val2 = AudioOutputUtil::fromFloat(FORMAT_U8, arrays2+offsetuchar, arrayf+offsetfloat, SIZEARRAY * ISIZEOF(float));
-         QCOMPARE(val2, SIZEARRAY * ISIZEOF(uchar));
- 
--        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-4],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-3],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-2],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-1],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+0],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+1],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+2],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+3],pattern);
--        QCOMPARE(*(uchar*)&arrays2[offsetuchar-4],*(uchar*)&pattern);
--        QCOMPARE(*(uchar*)&arrays2[offsetuchar-3],*(uchar*)&pattern);
--        QCOMPARE(*(uchar*)&arrays2[offsetuchar-2],*(uchar*)&pattern);
--        QCOMPARE(*(uchar*)&arrays2[offsetuchar-1],*(uchar*)&pattern);
--        QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+0],*(uchar*)&pattern);
--        QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+1],*(uchar*)&pattern);
--        QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+2],*(uchar*)&pattern);
--        QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+3],*(uchar*)&pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-4],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-3],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-2],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-1],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+0],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+1],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+2],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+3],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uchar*)&arrays2[offsetuchar-4],*(uchar*)&pattern.ucharpattern);
-+        QCOMPARE(*(uchar*)&arrays2[offsetuchar-3],*(uchar*)&pattern.ucharpattern);
-+        QCOMPARE(*(uchar*)&arrays2[offsetuchar-2],*(uchar*)&pattern.ucharpattern);
-+        QCOMPARE(*(uchar*)&arrays2[offsetuchar-1],*(uchar*)&pattern.ucharpattern);
-+        QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+0],*(uchar*)&pattern.ucharpattern);
-+        QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+1],*(uchar*)&pattern.ucharpattern);
-+        QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+2],*(uchar*)&pattern.ucharpattern);
-+        QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+3],*(uchar*)&pattern.ucharpattern);
- 
-         av_free(arrays1);
-         av_free(arrays2);
-@@ -686,42 +698,48 @@ class TestAudioUtils: public QObject
-             arrays1[i] = j;
-         }
- 
--        uint32_t pattern        = 0xbcbcbcbc;
--        arrays2[offsetint32_t-4]  = *(int32_t*)&pattern;
--        arrays2[offsetint32_t-3]  = *(int32_t*)&pattern;
--        arrays2[offsetint32_t-2]  = *(int32_t*)&pattern;
--        arrays2[offsetint32_t-1]  = *(int32_t*)&pattern;
--        arrayf[offsetfloat-4]   = *(float*)&pattern;
--        arrayf[offsetfloat-3]   = *(float*)&pattern;
--        arrayf[offsetfloat-2]   = *(float*)&pattern;
--        arrayf[offsetfloat-1]   = *(float*)&pattern;
--        arrays2[SIZEARRAY+offsetint32_t+0]    = *(int32_t*)&pattern;
--        arrays2[SIZEARRAY+offsetint32_t+1]    = *(int32_t*)&pattern;
--        arrays2[SIZEARRAY+offsetint32_t+2]    = *(int32_t*)&pattern;
--        arrays2[SIZEARRAY+offsetint32_t+3]    = *(int32_t*)&pattern;
--        arrayf[SIZEARRAY+offsetfloat+0]     = *(float*)&pattern;
--        arrayf[SIZEARRAY+offsetfloat+1]     = *(float*)&pattern;
--        arrayf[SIZEARRAY+offsetfloat+2]     = *(float*)&pattern;
--        arrayf[SIZEARRAY+offsetfloat+3]     = *(float*)&pattern;
-+	const union
-+	{
-+	    uint32_t pattern;
-+	    int32_t int32pattern;
-+	    float floatpattern;
-+	} pattern = { .pattern = 0xbcbcbcbc };
-+
-+        arrays2[offsetint32_t-4]  = *(int32_t*)&pattern.int32pattern;
-+        arrays2[offsetint32_t-3]  = *(int32_t*)&pattern.int32pattern;
-+        arrays2[offsetint32_t-2]  = *(int32_t*)&pattern.int32pattern;
-+        arrays2[offsetint32_t-1]  = *(int32_t*)&pattern.int32pattern;
-+        arrayf[offsetfloat-4]   = *(float*)&pattern.floatpattern;
-+        arrayf[offsetfloat-3]   = *(float*)&pattern.floatpattern;
-+        arrayf[offsetfloat-2]   = *(float*)&pattern.floatpattern;
-+        arrayf[offsetfloat-1]   = *(float*)&pattern.floatpattern;
-+        arrays2[SIZEARRAY+offsetint32_t+0]    = *(int32_t*)&pattern.int32pattern;
-+        arrays2[SIZEARRAY+offsetint32_t+1]    = *(int32_t*)&pattern.int32pattern;
-+        arrays2[SIZEARRAY+offsetint32_t+2]    = *(int32_t*)&pattern.int32pattern;
-+        arrays2[SIZEARRAY+offsetint32_t+3]    = *(int32_t*)&pattern.int32pattern;
-+        arrayf[SIZEARRAY+offsetfloat+0]     = *(float*)&pattern.floatpattern;
-+        arrayf[SIZEARRAY+offsetfloat+1]     = *(float*)&pattern.floatpattern;
-+        arrayf[SIZEARRAY+offsetfloat+2]     = *(float*)&pattern.floatpattern;
-+        arrayf[SIZEARRAY+offsetfloat+3]     = *(float*)&pattern.floatpattern;
- 
-         // sanity tests
-         QCOMPARE(SIZEARRAY*4, SIZEARRAY * ISIZEOF(arrays1[0]));
--        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-4],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-3],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-2],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-1],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+0],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+1],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+2],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+3],pattern);
--        QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-4],*(int32_t*)&pattern);
--        QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-3],*(int32_t*)&pattern);
--        QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-2],*(int32_t*)&pattern);
--        QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-1],*(int32_t*)&pattern);
--        QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+0],*(int32_t*)&pattern);
--        QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+1],*(int32_t*)&pattern);
--        QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+2],*(int32_t*)&pattern);
--        QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+3],*(int32_t*)&pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-4],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-3],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-2],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-1],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+0],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+1],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+2],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+3],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-4],*(int32_t*)&pattern.int32pattern);
-+        QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-3],*(int32_t*)&pattern.int32pattern);
-+        QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-2],*(int32_t*)&pattern.int32pattern);
-+        QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-1],*(int32_t*)&pattern.int32pattern);
-+        QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+0],*(int32_t*)&pattern.int32pattern);
-+        QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+1],*(int32_t*)&pattern.int32pattern);
-+        QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+2],*(int32_t*)&pattern.int32pattern);
-+        QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+3],*(int32_t*)&pattern.int32pattern);
-         QCOMPARE(arrayf+4,&arrayf[4]);
-         QCOMPARE(arrays2+4,&arrays2[4]);
- 
-@@ -730,22 +748,22 @@ class TestAudioUtils: public QObject
-         int val2 = AudioOutputUtil::fromFloat(FORMAT_S32, arrays2+offsetint32_t, arrayf+offsetfloat, SIZEARRAY * ISIZEOF(float));
-         QCOMPARE(val2, SIZEARRAY * ISIZEOF(int32_t));
- 
--        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-4],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-3],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-2],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-1],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+0],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+1],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+2],pattern);
--        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+3],pattern);
--        QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-4],*(int32_t*)&pattern);
--        QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-3],*(int32_t*)&pattern);
--        QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-2],*(int32_t*)&pattern);
--        QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-1],*(int32_t*)&pattern);
--        QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+0],*(int32_t*)&pattern);
--        QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+1],*(int32_t*)&pattern);
--        QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+2],*(int32_t*)&pattern);
--        QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+3],*(int32_t*)&pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-4],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-3],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-2],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-1],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+0],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+1],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+2],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+3],*(uint32_t*)&pattern.pattern);
-+        QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-4],*(int32_t*)&pattern.int32pattern);
-+        QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-3],*(int32_t*)&pattern.int32pattern);
-+        QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-2],*(int32_t*)&pattern.int32pattern);
-+        QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-1],*(int32_t*)&pattern.int32pattern);
-+        QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+0],*(int32_t*)&pattern.int32pattern);
-+        QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+1],*(int32_t*)&pattern.int32pattern);
-+        QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+2],*(int32_t*)&pattern.int32pattern);
-+        QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+3],*(int32_t*)&pattern.int32pattern);
- 
-         av_free(arrays1);
-         av_free(arrays2);
diff --git a/media-tv/mythtv/mythtv-30.0_p20190808-r3.ebuild b/media-tv/mythtv/mythtv-30.0_p20190808-r3.ebuild
index 820145e65378..4809398bba76 100644
--- a/media-tv/mythtv/mythtv-30.0_p20190808-r3.ebuild
+++ b/media-tv/mythtv/mythtv-30.0_p20190808-r3.ebuild
@@ -16,7 +16,8 @@ MYTHTV_BRANCH="fixes/${P%.*}"
 
 DESCRIPTION="Open Source DVR and media center hub"
 HOMEPAGE="https://www.mythtv.org"
-SRC_URI="https://github.com/MythTV/mythtv/archive/${BACKPORTS}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/MythTV/mythtv/archive/${BACKPORTS}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~juippis/distfiles/tmp/mythtv-30.0_p20190808-cast_constants_to_short.patch"
 
 LICENSE="GPL-2+"
 KEYWORDS="~amd64 ~x86"
@@ -143,7 +144,7 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${P}-respect_LDFLAGS.patch"
-	"${FILESDIR}/${P}-cast_constants_to_short.patch"
+	"${DISTDIR}/${P}-cast_constants_to_short.patch"
 	"${FILESDIR}/${P}-Fix_Dereferencing_type-punned_pointer.patch"
 	"${FILESDIR}/${P}-Fix_unitialized_variables.patch"
 	"${FILESDIR}/${PN}-29.1-Fix_create_webbrowser_window.patch"
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index a5255165ef00..856da1a2c768 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/jubler/jubler-5.1.ebuild b/media-video/jubler/jubler-5.1.ebuild
index 3acfb460574d..49775bdf39ef 100644
--- a/media-video/jubler/jubler-5.1.ebuild
+++ b/media-video/jubler/jubler-5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit java-pkg-2 java-ant-2 xdg-utils
+inherit java-pkg-2 java-ant-2 xdg
 
 MY_PN="${PN^}"
 
@@ -69,13 +69,3 @@ src_install() {
 	doman "resources/installers/linux/${PN}.1"
 	einstalldocs
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-video/kino/kino-1.3.4-r1.ebuild b/media-video/kino/kino-1.3.4-r1.ebuild
index e9af9289d67a..77e78c8d8e24 100644
--- a/media-video/kino/kino-1.3.4-r1.ebuild
+++ b/media-video/kino/kino-1.3.4-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools ltprune udev
+inherit autotools ltprune udev xdg
 
 DESCRIPTION="Kino is a non-linear DV editor for GNU/Linux"
 HOMEPAGE="http://www.kinodv.org/"
diff --git a/media-video/movit/movit-1.6.1.ebuild b/media-video/movit/movit-1.6.1.ebuild
index 461e4f729bf1..0a66dbe65a8e 100644
--- a/media-video/movit/movit-1.6.1.ebuild
+++ b/media-video/movit/movit-1.6.1.ebuild
@@ -27,6 +27,10 @@ RDEPEND="media-libs/mesa[X(+)]
 	"
 DEPEND="${RDEPEND}"
 
+src_configure() {
+	econf --disable-static
+}
+
 src_compile() {
 	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake
 }
@@ -34,3 +38,8 @@ src_compile() {
 src_test() {
 	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake check
 }
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-video/movit/movit-1.6.2.ebuild b/media-video/movit/movit-1.6.2.ebuild
index 4dd215db4660..130064615701 100644
--- a/media-video/movit/movit-1.6.2.ebuild
+++ b/media-video/movit/movit-1.6.2.ebuild
@@ -27,6 +27,10 @@ RDEPEND="media-libs/mesa[X(+)]
 	"
 DEPEND="${RDEPEND}"
 
+src_configure() {
+	econf --disable-static
+}
+
 src_compile() {
 	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake
 }
@@ -34,3 +38,8 @@ src_compile() {
 src_test() {
 	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake check
 }
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index e33d1bde68cd..522275d16bbe 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -3,3 +3,4 @@ DIST MPlayer-1.4.tar.xz 15054920 BLAKE2B 4777cb31a32d62c393778c581c1913fbf355a36
 DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e8a0db7342647f69f5421fc1170719015c97ffa770e89892cbb4cee8e5b2fb74a4772c8f6cbef9606ee12c3746d78c9 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340
 DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029
 DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d
+DIST mplayer-1.3-ffmpeg4.patch 25679 BLAKE2B 08f9ddb05a11c9b7ce0de7fe7bb92b492d1b35e65437c09be07cd39aa70cd9541baf442ffae1ee3060fd94d78eca30fa35808db8eebfdf679456da2c1d8217e8 SHA512 9f29fcd0bfd374fecf15a40c51e2bac53d2646d939ea13e7afffc8e9854d6d2105142f95745f0b26d8f58e19938c5ccedb191af30858fb6f3520072c98db3081
diff --git a/media-video/mplayer/files/mplayer-1.3-ffmpeg4.patch b/media-video/mplayer/files/mplayer-1.3-ffmpeg4.patch
deleted file mode 100644
index 036f9d151771..000000000000
--- a/media-video/mplayer/files/mplayer-1.3-ffmpeg4.patch
+++ /dev/null
@@ -1,501 +0,0 @@
-Index: Makefile
-===================================================================
---- a/Makefile.orig
-+++ b/Makefile
-@@ -68,7 +68,6 @@ SRCS_COMMON-$(CONFIG_VF_LAVFI)      +=
- 
- # These filters use private headers and do not work with shared FFmpeg.
- SRCS_COMMON-$(FFMPEG_A)              += libmpcodecs/vf_fspp.c           \
--                                        libmpcodecs/vf_mcdeint.c        \
-                                         libmpcodecs/vf_qp.c             \
-                                         libmpcodecs/vf_spp.c            \
-                                         libmpcodecs/vf_uspp.c           \
-@@ -616,9 +615,7 @@ SRCS_MPLAYER = command.c
- 
- #MEncoder
- SRCS_MENCODER-$(FAAC)             += libmpcodecs/ae_faac.c
--SRCS_MENCODER-$(FFMPEG)           += libmpcodecs/ae_lavc.c              \
--                                     libmpcodecs/ve_lavc.c              \
--                                     libmpdemux/muxer_lavf.c
-+SRCS_MENCODER-$(FFMPEG)           += libmpdemux/muxer_lavf.c
- SRCS_MENCODER-$(LIBDV)            += libmpcodecs/ve_libdv.c
- SRCS_MENCODER-$(LIBLZO)           += libmpcodecs/ve_nuv.c               \
-                                      libmpcodecs/native/rtjpegn.c
-Index: cfg-mencoder.h
-===================================================================
---- a/cfg-mencoder.h.orig
-+++ b/cfg-mencoder.h
-@@ -52,7 +52,7 @@ const m_option_t ovc_conf[]={
-     "   nuv      - nuppel video\n"
- #endif
- #ifdef CONFIG_FFMPEG
--    "   lavc     - libavcodec codecs - best quality!\n"
-+//    "   lavc     - libavcodec codecs - best quality!\n"//TODO: ve_lavc is deactivated because it doesn't build after latest FFmpeg major bumps
- #endif
- #ifdef CONFIG_WIN32DLL
-     "   vfw      - VfW DLLs, read DOCS/HTML/en/encoding-guide.html.\n"
-@@ -106,7 +106,7 @@ const m_option_t oac_conf[]={
-     "   mp3lame  - cbr/abr/vbr MP3 using libmp3lame\n"
- #endif
- #ifdef CONFIG_FFMPEG
--    "   lavc     - FFmpeg audio encoder (MP2, AC3, ...)\n"
-+//    "   lavc     - FFmpeg audio encoder (MP2, AC3, ...)\n"//TODO: ae_lavc was deactivated because it depends on ve_lavc which does not compile after latest FFmpeg major bumps
- #endif
- #ifdef CONFIG_TOOLAME
-     "   toolame  - Toolame MP2 audio encoder\n"
-@@ -226,7 +226,7 @@ const m_option_t mencoder_opts[]={
-     {"lameopts", lameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
- #endif
- #ifdef CONFIG_FFMPEG
--    {"lavcopts", lavcopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
-+    //{"lavcopts", lavcopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, //TODO: ve_lavc doesn't build after latest FFmpeg major bumps
- #else
-     {"lavcopts", "MPlayer was compiled without libavcodec. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
- #endif /* CONFIG_FFMPEG */
-Index: gui/util/bitmap.c
-===================================================================
---- a/gui/util/bitmap.c.orig
-+++ b/gui/util/bitmap.c
-@@ -95,7 +95,7 @@ static int pngRead(const char *fname, gu
-         return 3;
-     }
- 
--    data = av_malloc(len + FF_INPUT_BUFFER_PADDING_SIZE);
-+    data = av_malloc(len + AV_INPUT_BUFFER_PADDING_SIZE);
- 
-     if (!data) {
-         fclose(file);
-Index: libmpdemux/demuxer.c
-===================================================================
---- a/libmpdemux/demuxer.c.orig
-+++ b/libmpdemux/demuxer.c
-@@ -50,7 +50,7 @@
- 
- #ifdef CONFIG_FFMPEG
- #include "libavcodec/avcodec.h"
--#if MP_INPUT_BUFFER_PADDING_SIZE < FF_INPUT_BUFFER_PADDING_SIZE
-+#if MP_INPUT_BUFFER_PADDING_SIZE < AV_INPUT_BUFFER_PADDING_SIZE
- #error MP_INPUT_BUFFER_PADDING_SIZE is too small!
- #endif
- #include "av_helpers.h"
-Index: libmpdemux/demux_lavf.c
-===================================================================
---- a/libmpdemux/demux_lavf.c.orig
-+++ b/libmpdemux/demux_lavf.c
-@@ -176,7 +176,7 @@ static int lavf_check_file(demuxer_t *de
-     }
- 
-     avpd.buf = av_mallocz(FFMAX(BIO_BUFFER_SIZE, PROBE_BUF_SIZE) +
--                          FF_INPUT_BUFFER_PADDING_SIZE);
-+                          AV_INPUT_BUFFER_PADDING_SIZE);
-     do {
-         read_size = stream_read(demuxer->stream, avpd.buf + probe_data_size, read_size);
-         if(read_size < 0) {
-Index: libmpcodecs/vf_uspp.c
-===================================================================
---- a/libmpcodecs/vf_uspp.c.orig
-+++ b/libmpcodecs/vf_uspp.c
-@@ -240,7 +240,7 @@ static int config(struct vf_instance *vf
-             avctx_enc->gop_size = 300;
-             avctx_enc->max_b_frames= 0;
-             avctx_enc->pix_fmt = AV_PIX_FMT_YUV420P;
--            avctx_enc->flags = CODEC_FLAG_QSCALE | CODEC_FLAG_LOW_DELAY;
-+            avctx_enc->flags = AV_CODEC_FLAG_QSCALE | AV_CODEC_FLAG_LOW_DELAY;
-             avctx_enc->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             avctx_enc->global_quality= 123;
-             av_dict_set(&opts, "no_bitstream", "1", 0);
-Index: libmpcodecs/ad_ffmpeg.c
-===================================================================
---- a/libmpcodecs/ad_ffmpeg.c.orig
-+++ b/libmpcodecs/ad_ffmpeg.c
-@@ -134,7 +134,7 @@ static int init(sh_audio_t *sh_audio)
- 
-     /* alloc extra data */
-     if (sh_audio->wf && sh_audio->wf->cbSize > 0) {
--        lavc_context->extradata = av_mallocz(sh_audio->wf->cbSize + FF_INPUT_BUFFER_PADDING_SIZE);
-+        lavc_context->extradata = av_mallocz(sh_audio->wf->cbSize + AV_INPUT_BUFFER_PADDING_SIZE);
-         lavc_context->extradata_size = sh_audio->wf->cbSize;
-         memcpy(lavc_context->extradata, sh_audio->wf + 1,
-                lavc_context->extradata_size);
-Index: libmpcodecs/vf_lavc.c
-===================================================================
---- a/libmpcodecs/vf_lavc.c.orig
-+++ b/libmpcodecs/vf_lavc.c
-@@ -157,7 +157,7 @@ static int vf_open(vf_instance_t *vf, ch
- 
-     if(p_quality<32){
- 	// fixed qscale
--	lavc_venc_context.flags = CODEC_FLAG_QSCALE;
-+	lavc_venc_context.flags = AV_CODEC_FLAG_QSCALE;
- 	lavc_venc_context.global_quality =
- 	vf->priv->pic->quality = (int)(FF_QP2LAMBDA * ((p_quality<1) ? 1 : p_quality) + 0.5);
-     } else {
-Index: libmpcodecs/ae_lavc.c
-===================================================================
---- a/libmpcodecs/ae_lavc.c.orig
-+++ b/libmpcodecs/ae_lavc.c
-@@ -224,10 +224,10 @@ int mpae_init_lavc(audio_encoder_t *enco
- 	}
-         if((lavc_param_audio_global_header&1)
-         /*|| (video_global_header==0 && (oc->oformat->flags & AVFMT_GLOBALHEADER))*/){
--                lavc_actx->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+                lavc_actx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-         }
-         if(lavc_param_audio_global_header&2){
--                lavc_actx->flags2 |= CODEC_FLAG2_LOCAL_HEADER;
-+                lavc_actx->flags2 |= AV_CODEC_FLAG2_LOCAL_HEADER;
-         }
- 
- 	if(avcodec_open2(lavc_actx, lavc_acodec, NULL) < 0)
-Index: libmpcodecs/vf_mcdeint.c
-===================================================================
---- a/libmpcodecs/vf_mcdeint.c.orig
-+++ b/libmpcodecs/vf_mcdeint.c
-@@ -231,7 +231,7 @@ static int config(struct vf_instance *vf
-             avctx_enc->gop_size = 300;
-             avctx_enc->max_b_frames= 0;
-             avctx_enc->pix_fmt = AV_PIX_FMT_YUV420P;
--            avctx_enc->flags = CODEC_FLAG_QSCALE | CODEC_FLAG_LOW_DELAY;
-+            avctx_enc->flags = AV_CODEC_FLAG_QSCALE | AV_CODEC_FLAG_LOW_DELAY;
-             avctx_enc->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             avctx_enc->global_quality= 1;
-             av_dict_set(&opts, "memc_only", "1", 0);
-@@ -245,11 +245,11 @@ static int config(struct vf_instance *vf
-             case 2:
-                 avctx_enc->me_method= ME_ITER;
-             case 1:
--                avctx_enc->flags |= CODEC_FLAG_4MV;
-+                avctx_enc->flags |= AV_CODEC_FLAG_4MV;
-                 avctx_enc->dia_size=2;
- //                avctx_enc->mb_decision = MB_DECISION_RD;
-             case 0:
--                avctx_enc->flags |= CODEC_FLAG_QPEL;
-+                avctx_enc->flags |= AV_CODEC_FLAG_QPEL;
-             }
- 
-             avcodec_open2(avctx_enc, enc, &opts);
-Index: libmpcodecs/ve_lavc.c
-===================================================================
---- a/libmpcodecs/ve_lavc.c.orig
-+++ b/libmpcodecs/ve_lavc.c
-@@ -213,7 +213,7 @@ const m_option_t lavcopts_conf[]={
- 	{"vstrict", &lavc_param_strict, CONF_TYPE_INT, CONF_RANGE, -99, 99, NULL},
- 	{"vdpart", &lavc_param_data_partitioning, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- 	{"keyint", &lavc_param_keyint, CONF_TYPE_INT, 0, 0, 0, NULL},
--	{"gray", &lavc_param_gray, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY, NULL},
-+	{"gray", &lavc_param_gray, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY, NULL},
- 	{"mpeg_quant", &lavc_param_mpeg_quant, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- 	{"vi_qfactor", &lavc_param_vi_qfactor, CONF_TYPE_FLOAT, CONF_RANGE, -31.0, 31.0, NULL},
- 	{"vi_qoffset", &lavc_param_vi_qoffset, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 31.0, NULL},
-@@ -242,7 +242,7 @@ const m_option_t lavcopts_conf[]={
-         {"pred", &lavc_param_prediction_method, CONF_TYPE_INT, CONF_RANGE, 0, 20, NULL},
-         {"format", &lavc_param_format, CONF_TYPE_IMGFMT, 0, 0, 0, NULL},
-         {"debug", &lavc_param_debug, CONF_TYPE_INT, CONF_RANGE, 0, 100000000, NULL},
--        {"psnr", &lavc_param_psnr, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR, NULL},
-+        {"psnr", &lavc_param_psnr, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR, NULL},
-         {"precmp", &lavc_param_me_pre_cmp, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
-         {"cmp", &lavc_param_me_cmp, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
-         {"subcmp", &lavc_param_me_sub_cmp, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
-@@ -251,21 +251,21 @@ const m_option_t lavcopts_conf[]={
- #ifdef FF_CMP_VSAD
-         {"ildctcmp", &lavc_param_ildct_cmp, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
- #endif
--        {"bit_exact", &lavc_param_bit_exact, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_BITEXACT, NULL},
-+        {"bit_exact", &lavc_param_bit_exact, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_BITEXACT, NULL},
-         {"predia", &lavc_param_pre_dia_size, CONF_TYPE_INT, CONF_RANGE, -2000, 2000, NULL},
-         {"dia", &lavc_param_dia_size, CONF_TYPE_INT, CONF_RANGE, -2000, 2000, NULL},
--	{"qpel", &lavc_param_qpel, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL, NULL},
-+	{"qpel", &lavc_param_qpel, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL, NULL},
- 	{"trell", &lavc_param_trell, CONF_TYPE_FLAG, 0, 0, 1, NULL},
--	{"lowdelay", &lavc_param_lowdelay, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_LOW_DELAY, NULL},
-+	{"lowdelay", &lavc_param_lowdelay, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_LOW_DELAY, NULL},
- 	{"last_pred", &lavc_param_last_pred, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
- 	{"preme", &lavc_param_pre_me, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
- 	{"subq", &lavc_param_me_subpel_quality, CONF_TYPE_INT, CONF_RANGE, 0, 8, NULL},
- 	{"me_range", &lavc_param_me_range, CONF_TYPE_INT, CONF_RANGE, 0, 16000, NULL},
--	{"aic", &lavc_param_aic, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED, NULL},
-+	{"aic", &lavc_param_aic, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED, NULL},
- 	{"umv", &lavc_param_umv, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- 	{"aiv", &lavc_param_aiv, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- 	{"obmc", &lavc_param_obmc, CONF_TYPE_FLAG, 0, 0, 1, NULL},
--	{"loop", &lavc_param_loop, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_LOOP_FILTER, NULL},
-+	{"loop", &lavc_param_loop, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_LOOP_FILTER, NULL},
- 	{"ibias", &lavc_param_ibias, CONF_TYPE_INT, CONF_RANGE, -512, 512, NULL},
- 	{"pbias", &lavc_param_pbias, CONF_TYPE_INT, CONF_RANGE, -512, 512, NULL},
- 	{"coder", &lavc_param_coder, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL},
-@@ -278,8 +278,8 @@ const m_option_t lavcopts_conf[]={
- 	{"qprd", "Please use o=mpv_flags=+qp_rd instead of qprd.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
- 	{"ss", &lavc_param_ss, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- 	{"alt", &lavc_param_alt, CONF_TYPE_FLAG, 0, 0, 1, NULL},
--	{"ilme", &lavc_param_ilme, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME, NULL},
--	{"cgop", &lavc_param_closed_gop, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP, NULL},
-+	{"ilme", &lavc_param_ilme, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME, NULL},
-+	{"cgop", &lavc_param_closed_gop, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP, NULL},
- 	{"gmc", &lavc_param_gmc, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC, NULL},
- 	{"dc", &lavc_param_dc_precision, CONF_TYPE_INT, CONF_RANGE, 8, 11, NULL},
- 	{"border_mask", &lavc_param_border_masking, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL},
-@@ -543,7 +543,7 @@ static int config(struct vf_instance *vf
-     if (lavc_param_obmc)
-         av_dict_set(&opts, "obmc", "1", 0);
-     lavc_venc_context->flags|= lavc_param_loop;
--    lavc_venc_context->flags|= lavc_param_v4mv ? CODEC_FLAG_4MV : 0;
-+    lavc_venc_context->flags|= lavc_param_v4mv ? AV_CODEC_FLAG_4MV : 0;
-     if (lavc_param_data_partitioning)
-         av_dict_set(&opts, "data_partitioning", "1", 0);
-     lavc_venc_context->flags|= lavc_param_mv0;
-@@ -553,13 +553,13 @@ static int config(struct vf_instance *vf
-         av_dict_set(&opts, "alternate_scan", "1", 0);
-     lavc_venc_context->flags|= lavc_param_ilme;
-     lavc_venc_context->flags|= lavc_param_gmc;
--#ifdef CODEC_FLAG_CLOSED_GOP
-+#ifdef AV_CODEC_FLAG_CLOSED_GOP
-     lavc_venc_context->flags|= lavc_param_closed_gop;
- #endif
-     lavc_venc_context->flags|= lavc_param_gray;
- 
-     if(lavc_param_normalize_aqp) lavc_venc_context->flags|= CODEC_FLAG_NORMALIZE_AQP;
--    if(lavc_param_interlaced_dct) lavc_venc_context->flags|= CODEC_FLAG_INTERLACED_DCT;
-+    if(lavc_param_interlaced_dct) lavc_venc_context->flags|= AV_CODEC_FLAG_INTERLACED_DCT;
-     lavc_venc_context->flags|= lavc_param_psnr;
-     lavc_venc_context->intra_dc_precision = lavc_param_dc_precision - 8;
-     lavc_venc_context->prediction_method= lavc_param_prediction_method;
-@@ -568,10 +568,10 @@ static int config(struct vf_instance *vf
-     lavc_venc_context->scenechange_factor = lavc_param_sc_factor;
-     if((lavc_param_video_global_header&1)
-        /*|| (video_global_header==0 && (oc->oformat->flags & AVFMT_GLOBALHEADER))*/){
--        lavc_venc_context->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+        lavc_venc_context->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-     }
-     if(lavc_param_video_global_header&2){
--        lavc_venc_context->flags2 |= CODEC_FLAG2_LOCAL_HEADER;
-+        lavc_venc_context->flags2 |= AV_CODEC_FLAG2_LOCAL_HEADER;
-     }
-     lavc_venc_context->mv0_threshold = lavc_param_mv0_threshold;
-     lavc_venc_context->refs = lavc_param_refs;
-@@ -595,7 +595,7 @@ static int config(struct vf_instance *vf
-     switch(lavc_param_vpass){
-     case 2:
-     case 3:
--	lavc_venc_context->flags|= CODEC_FLAG_PASS2;
-+	lavc_venc_context->flags|= AV_CODEC_FLAG_PASS2;
- 	stats_file= fopen(passtmpfile, "rb");
- 	if(stats_file==NULL){
- 	    mp_msg(MSGT_MENCODER,MSGL_ERR,"2pass failed: filename=%s\n", passtmpfile);
-@@ -618,7 +618,7 @@ static int config(struct vf_instance *vf
- 	    fclose(stats_file);
- 	    /* fall through */
-     case 1:
--	lavc_venc_context->flags|= CODEC_FLAG_PASS1;
-+	lavc_venc_context->flags|= AV_CODEC_FLAG_PASS1;
- 	stats_file= fopen(passtmpfile, "wb");
- 	if(stats_file==NULL){
- 	    mp_msg(MSGT_MENCODER,MSGL_ERR,"2pass failed: filename=%s\n", passtmpfile);
-@@ -638,8 +638,8 @@ static int config(struct vf_instance *vf
- 	  lavc_venc_context->noise_reduction = 0; // nr=0
- 	  lavc_venc_context->mb_decision = 0; // mbd=0 ("realtime" encoding)
- 
--	  lavc_venc_context->flags &= ~CODEC_FLAG_QPEL;
--	  lavc_venc_context->flags &= ~CODEC_FLAG_4MV;
-+	  lavc_venc_context->flags &= ~AV_CODEC_FLAG_QPEL;
-+	  lavc_venc_context->flags &= ~AV_CODEC_FLAG_4MV;
- 	  lavc_venc_context->trellis = 0;
- 	  av_dict_set(&opts, "mpv_flags", "-mv0", 0);
- 	  av_dict_set(&opts, "mpv_flags", "-qp_rd-cbp_rd", 0);
-@@ -654,7 +654,7 @@ static int config(struct vf_instance *vf
-     if (lavc_param_vqscale >= 0.0)
-     {
- 	mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_MPCODECS_UsingConstantQscale, lavc_param_vqscale);
--	lavc_venc_context->flags |= CODEC_FLAG_QSCALE;
-+	lavc_venc_context->flags |= AV_CODEC_FLAG_QSCALE;
-         lavc_venc_context->global_quality=
- 	vf->priv->pic->quality = (int)(FF_QP2LAMBDA * lavc_param_vqscale + 0.5);
-     }
-@@ -693,7 +693,7 @@ static int control(struct vf_instance *v
- 
-     switch(request){
-         case VFCTRL_FLUSH_FRAMES:
--            if(vf->priv->codec->capabilities & CODEC_CAP_DELAY)
-+            if(vf->priv->codec->capabilities & AV_CODEC_CAP_DELAY)
-                 while(encode_frame(vf, NULL, MP_NOPTS_VALUE) > 0);
-             return CONTROL_TRUE;
-         default:
-Index: libmpcodecs/ve.c
-===================================================================
---- a/libmpcodecs/ve.c.orig
-+++ b/libmpcodecs/ve.c
-@@ -43,7 +43,7 @@ extern const vf_info_t ve_info_x264;
- 
- static const vf_info_t * const encoder_list[] = {
- #ifdef CONFIG_FFMPEG
--    &ve_info_lavc,
-+//    &ve_info_lavc,//TODO: ve_lavc is deactivated because it doesn't build after latest FFmpeg major bumps
- #endif
- #ifdef CONFIG_WIN32DLL
-     &ve_info_vfw,
-Index: libmpcodecs/ae.c
-===================================================================
---- a/libmpcodecs/ae.c.orig
-+++ b/libmpcodecs/ae.c
-@@ -59,9 +59,7 @@ audio_encoder_t *new_audio_encoder(muxer
- 			break;
- #endif
- #ifdef CONFIG_FFMPEG
--		case ACODEC_LAVC:
--			ris = mpae_init_lavc(encoder);
--			break;
-+		//TODO: ACODEC_LAVC <-- has been removed here because it depends on ve_lavc which does not compile after latest FFmpeg major bumps
- #endif
- #ifdef CONFIG_MP3LAME
- 		case ACODEC_VBRMP3:
-Index: libmpcodecs/vd_ffmpeg.c
-===================================================================
---- a/libmpcodecs/vd_ffmpeg.c.orig
-+++ b/libmpcodecs/vd_ffmpeg.c
-@@ -115,8 +115,7 @@ static int lavc_param_gray=0;
- static int lavc_param_vstats=0;
- static int lavc_param_idct_algo=0;
- static int lavc_param_debug=0;
--static int lavc_param_vismv=0;
--#ifdef CODEC_FLAG2_SHOW_ALL
-+#ifdef AV_CODEC_FLAG2_SHOW_ALL
- static int lavc_param_wait_keyframe=0;
- #endif
- static int lavc_param_skip_top=0;
-@@ -141,24 +140,23 @@ static const mp_image_t mpi_no_picture =
- const m_option_t lavc_decode_opts_conf[]={
-     {"bug"           , &lavc_param_workaround_bugs      , CONF_TYPE_INT     , CONF_RANGE, -1, 999999, NULL},
-     {"er"            , &lavc_param_error_resilience     , CONF_TYPE_INT     , CONF_RANGE, 0, 99, NULL},
--    {"gray"          , &lavc_param_gray                 , CONF_TYPE_FLAG    , 0, 0, CODEC_FLAG_GRAY, NULL},
-+    {"gray"          , &lavc_param_gray                 , CONF_TYPE_FLAG    , 0, 0, AV_CODEC_FLAG_GRAY, NULL},
-     {"idct"          , &lavc_param_idct_algo            , CONF_TYPE_INT     , CONF_RANGE, 0, 99, NULL},
-     {"ec"            , &lavc_param_error_concealment    , CONF_TYPE_INT     , CONF_RANGE, 0, 99, NULL},
-     {"vstats"        , &lavc_param_vstats               , CONF_TYPE_FLAG    , 0, 0, 1, NULL},
-     {"debug"         , &lavc_param_debug                , CONF_TYPE_INT     , CONF_RANGE, 0, 9999999, NULL},
--    {"vismv"         , &lavc_param_vismv                , CONF_TYPE_INT     , CONF_RANGE, 0, 9999999, NULL},
--#ifdef CODEC_FLAG2_SHOW_ALL
-+#ifdef AV_CODEC_FLAG2_SHOW_ALL
-     {"wait_keyframe" , &lavc_param_wait_keyframe        , CONF_TYPE_FLAG    , 0, 0, 1, NULL},
- #endif
-     {"st"            , &lavc_param_skip_top             , CONF_TYPE_INT     , CONF_RANGE, 0, 999, NULL},
-     {"sb"            , &lavc_param_skip_bottom          , CONF_TYPE_INT     , CONF_RANGE, 0, 999, NULL},
--    {"fast"          , &lavc_param_fast                 , CONF_TYPE_FLAG    , 0, 0, CODEC_FLAG2_FAST, NULL},
-+    {"fast"          , &lavc_param_fast                 , CONF_TYPE_FLAG    , 0, 0, AV_CODEC_FLAG2_FAST, NULL},
-     {"lowres"        , &lavc_param_lowres_str           , CONF_TYPE_STRING  , 0, 0, 0, NULL},
-     {"skiploopfilter", &lavc_param_skip_loop_filter_str , CONF_TYPE_STRING  , 0, 0, 0, NULL},
-     {"skipidct"      , &lavc_param_skip_idct_str        , CONF_TYPE_STRING  , 0, 0, 0, NULL},
-     {"skipframe"     , &lavc_param_skip_frame_str       , CONF_TYPE_STRING  , 0, 0, 0, NULL},
--    {"threads"       , &lavc_param_threads              , CONF_TYPE_INT     , CONF_RANGE, 1, 16, NULL},
--    {"bitexact"      , &lavc_param_bitexact             , CONF_TYPE_FLAG    , 0, 0, CODEC_FLAG_BITEXACT, NULL},
-+    {"threads"       , &lavc_param_threads              , CONF_TYPE_INT     , CONF_RANGE, 1, 32, NULL},
-+    {"bitexact"      , &lavc_param_bitexact             , CONF_TYPE_FLAG    , 0, 0, AV_CODEC_FLAG_BITEXACT, NULL},
-     {"o"             , &lavc_avopt                      , CONF_TYPE_STRING  , 0, 0, 0, NULL},
-     {NULL, NULL, 0, 0, 0, 0, NULL}
- };
-@@ -257,9 +255,9 @@ static void set_dr_slice_settings(struct
-     // explicitly requested
-     int use_slices = vd_use_slices > 0 || (vd_use_slices <  0 && lavc_param_threads <= 1);
- 
--    ctx->do_slices = use_slices && (lavc_codec->capabilities & CODEC_CAP_DRAW_HORIZ_BAND);
-+    ctx->do_slices = use_slices && (lavc_codec->capabilities & AV_CODEC_CAP_DRAW_HORIZ_BAND);
- 
--    ctx->do_dr1 = (lavc_codec->capabilities & CODEC_CAP_DR1) &&
-+    ctx->do_dr1 = (lavc_codec->capabilities & AV_CODEC_CAP_DR1) &&
-         lavc_codec->id != AV_CODEC_ID_INTERPLAY_VIDEO &&
-         lavc_codec->id != AV_CODEC_ID_H264 &&
-         lavc_codec->id != AV_CODEC_ID_HEVC;
-@@ -271,12 +269,9 @@ static void set_dr_slice_settings(struct
-         ctx->do_dr1 = 1;
-         ctx->nonref_dr = 1;
-     }
--    if (lavc_param_vismv || (lavc_param_debug & (FF_DEBUG_VIS_MB_TYPE|FF_DEBUG_VIS_QP))) {
--        ctx->do_slices = ctx->do_dr1 = 0;
--    }
-     if(ctx->do_dr1){
-         avctx->get_buffer2 = get_buffer2;
--    } else if (lavc_codec->capabilities & CODEC_CAP_DR1) {
-+    } else if (lavc_codec->capabilities & AV_CODEC_CAP_DR1) {
-         avctx->get_buffer2 = avcodec_default_get_buffer2;
-     }
-     avctx->slice_flags = 0;
-@@ -372,9 +367,9 @@ static int init(sh_video_t *sh){
-     case 1:
-         avctx->err_recognition |= AV_EF_CAREFUL;
-     }
--    lavc_param_gray|= CODEC_FLAG_GRAY;
--#ifdef CODEC_FLAG2_SHOW_ALL
--    if(!lavc_param_wait_keyframe) avctx->flags2 |= CODEC_FLAG2_SHOW_ALL;
-+    lavc_param_gray|= AV_CODEC_FLAG_GRAY;
-+#ifdef AV_CODEC_FLAG2_SHOW_ALL
-+    if(!lavc_param_wait_keyframe) avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL;
- #endif
-     avctx->flags2|= lavc_param_fast;
-     avctx->codec_tag= sh->format;
-@@ -383,7 +378,6 @@ static int init(sh_video_t *sh){
-     avctx->debug= lavc_param_debug;
-     if (lavc_param_debug)
-         av_log_set_level(AV_LOG_DEBUG);
--    avctx->debug_mv= lavc_param_vismv;
-     avctx->skip_top   = lavc_param_skip_top;
-     avctx->skip_bottom= lavc_param_skip_bottom;
-     if(lavc_param_lowres_str != NULL)
-@@ -419,7 +413,7 @@ static int init(sh_video_t *sh){
-        handled here; the second case falls through to the next section. */
-         if (sh->ImageDesc) {
-             avctx->extradata_size = (*(int *)sh->ImageDesc) - sizeof(int);
--            avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
-+            avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
-             memcpy(avctx->extradata, ((int *)sh->ImageDesc)+1, avctx->extradata_size);
-             break;
-         }
-@@ -434,7 +428,7 @@ static int init(sh_video_t *sh){
-             break;
-         av_dict_set(&opts, "extern_huff", "1", 0);
-         avctx->extradata_size = sh->bih->biSize-sizeof(*sh->bih);
--        avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
-+        avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
-         memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size);
- 
- #if 0
-@@ -457,14 +451,14 @@ static int init(sh_video_t *sh){
-         if(sh->bih->biSize<sizeof(*sh->bih)+8){
-             /* only 1 packet per frame & sub_id from fourcc */
-             avctx->extradata_size= 8;
--            avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
-+            avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
-             ((uint32_t *)avctx->extradata)[0] = 0;
-             ((uint32_t *)avctx->extradata)[1] =
-                 (sh->format == mmioFOURCC('R', 'V', '1', '3')) ? 0x10003001 : 0x10000000;
-         } else {
-             /* has extra slice header (demux_rm or rm->avi streamcopy) */
-             avctx->extradata_size = sh->bih->biSize-sizeof(*sh->bih);
--            avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
-+            avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
-             memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size);
-         }
- 
-@@ -475,7 +469,11 @@ static int init(sh_video_t *sh){
-         if (!sh->bih || sh->bih->biSize <= sizeof(*sh->bih))
-             break;
-         avctx->extradata_size = sh->bih->biSize-sizeof(*sh->bih);
--        avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
-+        avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
-+        if (!avctx->extradata) {
-+            avctx->extradata_size = 0;
-+            break;
-+	}
-         memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size);
-         break;
-     }
-Index: libmpcodecs/vf.c
-===================================================================
---- a/libmpcodecs/vf.c.orig
-+++ b/libmpcodecs/vf.c
-@@ -200,7 +200,7 @@ static const vf_info_t* const filter_lis
-     &vf_info_uspp,
-     &vf_info_fspp,
-     &vf_info_qp,
--    &vf_info_mcdeint,
-+//    &vf_info_mcdeint, //TODO: vf_mcdeint is deactivated because it doesn't build after latest FFmpeg major bumps
- #endif
-     &vf_info_yuvcsp,
-     &vf_info_kerndeint,
diff --git a/media-video/mplayer/mplayer-1.3.0-r6.ebuild b/media-video/mplayer/mplayer-1.3.0-r6.ebuild
index 425e4c483f20..1bdf32fb43ce 100644
--- a/media-video/mplayer/mplayer-1.3.0-r6.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r6.ebuild
@@ -39,6 +39,7 @@ else
 	RELEASE_URI="mirror://gentoo/${P}.tar.xz"
 fi
 SRC_URI="${RELEASE_URI}
+	https://dev.gentoo.org/~juippis/distfiles/tmp/mplayer-1.3-ffmpeg4.patch
 	!truetype? ( ${FONT_URI} )"
 
 DESCRIPTION="Media Player for Linux"
@@ -235,7 +236,7 @@ src_prepare() {
 	else
 		eapply "${FILESDIR}"/${PN}-1.3.0-freetype_pkgconfig.patch #655240
 		eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch
-		has_version '>media-video/ffmpeg-3.5' && eapply "${FILESDIR}"/${PN}-1.3-ffmpeg4.patch "${FILESDIR}"/${PN}-1.3-ffmpeg4+mencoder.patch
+		has_version '>media-video/ffmpeg-3.5' && eapply "${DISTDIR}"/${PN}-1.3-ffmpeg4.patch "${FILESDIR}"/${PN}-1.3-ffmpeg4+mencoder.patch
 	fi
 	if [ ! -f VERSION ] ; then
 		[ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
diff --git a/media-video/parole/files/parole-1.0.5-desktop-QA.patch b/media-video/parole/files/parole-1.0.5-desktop-QA.patch
new file mode 100644
index 000000000000..1b4d387837ec
--- /dev/null
+++ b/media-video/parole/files/parole-1.0.5-desktop-QA.patch
@@ -0,0 +1,23 @@
+--- a/data/desktop/desktop.sh
++++ b/data/desktop/desktop.sh
+@@ -18,17 +18,14 @@ echo "[Desktop Action Play]"
+ echo "Exec=parole --play"
+ echo "_Name=Play/Pause"
+ echo "Icon=media-playback-start-symbolic"
+-echo "OnlyShowIn=Unity;"
+ echo ""
+ echo "[Desktop Action Previous]"
+ echo "Exec=parole --previous"
+ echo "_Name=Previous Track"
+ echo "Icon=media-skip-backward-symbolic"
+-echo "OnlyShowIn=Unity;"
+ echo ""
+ echo "[Desktop Action Next]"
+ echo "Exec=parole --next"
+ echo "_Name=Next Track"
+ echo "Icon=media-skip-forward-symbolic"
+-echo "OnlyShowIn=Unity;"
+ echo ""
+-- 
+2.26.2
+
diff --git a/media-video/parole/parole-1.0.5.ebuild b/media-video/parole/parole-1.0.5.ebuild
index 390b7e2c5327..f7e2dcaf64b0 100644
--- a/media-video/parole/parole-1.0.5.ebuild
+++ b/media-video/parole/parole-1.0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit xdg-utils
+inherit xdg
 
 DESCRIPTION="A simple Xfce4 media player using GStreamer"
 HOMEPAGE="https://docs.xfce.org/apps/parole/start"
@@ -37,6 +37,11 @@ DEPEND="${COMMON_DEPEND}
 
 DOCS=( AUTHORS ChangeLog README THANKS TODO )
 
+PATCHES=(
+	# 740516
+	"${FILESDIR}"/${P}-desktop-QA.patch
+)
+
 src_configure() {
 	local myconf=(
 		# clutter backend does not work with new GTK+3 versions
@@ -52,13 +57,3 @@ src_install() {
 	default
 	find "${D}" -name '*.la' -delete || die
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 05de08f169d0..fffb83fc812f 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,3 +1,4 @@
 DIST pipewire-0.2.7.tar.gz 421644 BLAKE2B d2ccb56a9ea5ea7782678deb6eae0b0a70da1fa69e807398062d388733901839f15a2f0f7db982fbebd2b2759f443709e6c1950b6367f3ed4801d6c2d6109e73 SHA512 10d3e20cc3d233fbcd1fc39702ae3043a656ebcd9cd3c39c77f0cc2bf42ff4956fc03e7933c7b397bca446c63f45ddacea948d5ec7e4a3300499fa2794f14334
 DIST pipewire-0.3.10.tar.gz 1148297 BLAKE2B d890b8e6697b17be9f8706a7228b9c79631120550ac51d7fbea8b5d05ca161ce6142a5666a6a61db618d4da0519676160ba1180cf9274865d879f4bb0da2a8e7 SHA512 f2f3dd7ce9b9f3a5ab55b6da97cd64419dad5115714848ce8893795c0ed2fd2fe0059240ec9fe1c92fb1442caf8d7071e415afe6712500be1c29fd001293cf0d
 DIST pipewire-0.3.13.tar.gz 1176949 BLAKE2B 5a4c7f211c1ac3c823cc34cede2f42204a2a7c6d583237465e702936926fad924c37f0638c8bbdedc55ad70d59cc2796e64b2b3dea2c64f199383d4ed9c1c84a SHA512 38ce7d8808e69935db0148c077340cfbc1b85f5a016a0a57eff2c076560c42f0695cfe681c9f16ebf15796d773dd113c9a84631eb50ac44dfb09f91ed3fc61f0
+DIST pipewire-0.3.15.tar.gz 1227022 BLAKE2B 590c5275d98a38c238f8c63d5bcdc9dbab07e870aff0e7414e0894aeb93507c106b7b45cd70b0f44a077b2fc5bd916c764dc4e03a54926f90a3296d870b7bcaa SHA512 949f2e64a3e9ec06b3414cacfbd7cf4ef6b7bad484a5dea1b79b5d4310413ec5a7538b702431f2cf6fb580ffd430081bd568399faa9b819689a79bebc955ca33
diff --git a/media-video/pipewire/pipewire-0.3.15.ebuild b/media-video/pipewire/pipewire-0.3.15.ebuild
new file mode 100644
index 000000000000..ddd42bd689c4
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.15.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/PipeWire/pipewire.git"
+	EGIT_BRANCH="work"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/0.3"
+IUSE="bluetooth debug doc ffmpeg gstreamer jack pulseaudio systemd test vulkan X"
+
+BDEPEND="
+	app-doc/xmltoman
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	>=media-libs/alsa-lib-1.1.7
+	media-libs/libsdl2
+	>=media-libs/libsndfile-1.0.20
+	sys-apps/dbus
+	virtual/libudev
+	bluetooth? (
+		media-libs/sbc
+		net-wireless/bluez:=
+	)
+	ffmpeg? ( media-video/ffmpeg:= )
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jack? ( >=media-sound/jack2-1.9.10:2 )
+	pulseaudio? (
+		dev-libs/glib:2
+		>=media-sound/pulseaudio-11.1
+	)
+	systemd? ( sys-apps/systemd )
+	vulkan? ( media-libs/vulkan-loader )
+	X? ( x11-libs/libX11 )
+"
+DEPEND="${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+"
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	spa_use() {
+		if ! in_iuse ${1} || ! use ${1}; then
+			sed -e "/^add-spa-lib.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
+				-e "/^load-module.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
+				-i src/daemon/pipewire.conf.in || die
+		fi
+	}
+
+	default
+	spa_use libcamera
+	spa_use rtkit
+	spa_use bluetooth bluez5
+	spa_use jack
+	spa_use vulkan
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dexamples=true # contains required pipewire-media-session
+		-Dman=true
+		-Dspa-plugins=true
+		--buildtype=$(usex debug debugoptimized plain)
+		# alsa plugin and jack/pulseaudio emulation
+		-Dpipewire-alsa=true
+		$(meson_use jack pipewire-jack)
+		$(meson_use pulseaudio pipewire-pulseaudio)
+		# spa-plugins
+		# we install alsa support unconditionally
+		$(meson_use bluetooth bluez5)
+		$(meson_use ffmpeg)
+		$(meson_use jack)
+		$(meson_use vulkan)
+		# libcamera is not packaged
+		# misc
+		$(meson_use doc docs)
+		$(meson_use gstreamer)
+		$(meson_use gstreamer gstreamer-device-provider)
+		$(meson_use systemd)
+		$(meson_use test test)
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+
+# 	# TODO: this breaks alsa users
+# 	if use alsa; then
+# 		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
+# 	fi
+}
+
+pkg_postinst() {
+	elog "Package has optional sys-auth/rtkit RUNTIME support that may be disabled"
+	elog "by setting DISABLE_RTKIT env var."
+	elog "To enable rtkit, uncomment the load-module line in /etc/pipewire/pipewire.conf"
+	elog
+	if use jack; then
+		elog "Please note that even though the libraries for JACK emulation have"
+		elog "been installed, this ebuild is not yet wired up to replace a JACK server."
+		elog
+	fi
+	if use pulseaudio; then
+		elog "Please note that even though the libraries for PulseAudio emulation have"
+		elog "been installed, this ebuild is not yet wired up to replace PulseAudio."
+		elog
+	fi
+	elog "Read INSTALL.md for information about ALSA plugin or JACK/PulseAudio emulation."
+}
diff --git a/media-video/unifi-video/unifi-video-3.10.13-r1.ebuild b/media-video/unifi-video/unifi-video-3.10.13-r1.ebuild
new file mode 100644
index 000000000000..69e9754686ec
--- /dev/null
+++ b/media-video/unifi-video/unifi-video-3.10.13-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user
+
+MY_PV="${PV/_beta/-beta.}"
+DESCRIPTION="UniFi Video Server"
+HOMEPAGE="https://www.ubnt.com/download/unifi-video/"
+SRC_URI="https://dl.ubnt.com/firmwares/ufv/v${MY_PV}/unifi-video.Ubuntu18.04_amd64.v${MY_PV}.deb"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="mirror"
+
+DEPEND=""
+RDEPEND="dev-db/mongodb
+	dev-java/commons-daemon
+	sys-apps/lsb-release
+	sys-apps/util-linux
+	sys-libs/libcap
+	virtual/jre:1.8"
+
+S=${WORKDIR}
+QA_PREBUILT="usr/lib*/${PN}/lib/*.so usr/lib*/${PN}/bin/*"
+
+pkg_setup() {
+	enewuser ${PN}
+	enewgroup ${PN}
+}
+
+src_unpack() {
+	default
+	unpack "${WORKDIR}"/data.tar.gz
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/commons-daemon-move.patch
+	sed -i usr/sbin/${PN} \
+		-e '/require_root$/d' \
+		-e '/update_limits$/d' \
+		-e '/ulimit/d' \
+		-e '/coredump_filter/d' || die
+	default
+}
+
+src_install() {
+	export CODEPATH=/usr/lib/${PN}
+	export DATAPATH=/var/lib/${PN}
+	LOGPATH=${DATAPATH}/logs
+	VARLOGPATH=/var/log/${PN}
+
+	insinto /usr/lib
+	doins -r .${CODEPATH}
+	into /usr
+	dosbin usr/sbin/unifi-video
+
+	dodir ${LOGPATH}
+	fowners -R ${PN}:${PN} ${DATAPATH}
+	dosym ${LOGPATH} ${VARLOGPATH}
+	dosym ${LOGPATH} ${CODEPATH}/logs
+
+	dosym ${DATAPATH} ${CODEPATH}/data
+
+	fperms 500 ${CODEPATH}/bin/ubnt.avtool
+	fperms 500 ${CODEPATH}/bin/evostreamms
+	fperms 500 /usr/sbin/${PN}
+	fowners -R ${PN}:${PN} ${CODEPATH}
+	fperms -R 0400 ${CODEPATH}/lib/
+	fperms 500 ${CODEPATH}/lib/
+
+	echo "CONFIG_PROTECT=\"${DATAPATH}/system.properties\"" > "${T}"/99${PN}
+	doenvd "${T}"/99${PN}
+
+	dosym ../../../bin/mongod ${CODEPATH}/bin/mongod
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	if [[ ! -f ${DATAPATH}/system.properties ]]; then
+		cp ${CODEPATH}/etc/system.properties ${DATAPATH}/system.properties
+		echo uuid=$(uuidgen) >> ${DATAPATH}/system.properties
+	fi
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index d60139447886..64e3a67fa767 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 20dd48e4a2c6..50e3f6406761 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 13 Nov 2020 05:08:35 +0000
+Mon, 16 Nov 2020 05:08:38 +0000
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index ead84b464109..c634afe38c1c 100644
Binary files a/metadata/glsa/Manifest.files.gz and b/metadata/glsa/Manifest.files.gz differ
diff --git a/metadata/glsa/glsa-202011-15.xml b/metadata/glsa/glsa-202011-15.xml
new file mode 100644
index 000000000000..91f3acadcd3b
--- /dev/null
+++ b/metadata/glsa/glsa-202011-15.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202011-15">
+  <title>libmaxminddb: Denial of service</title>
+  <synopsis>A vulnerability in libmaxminddb could lead to a Denial of Service
+    condition.
+  </synopsis>
+  <product type="ebuild">libmaxminddb</product>
+  <announced>2020-11-14</announced>
+  <revised count="1">2020-11-14</revised>
+  <bug>753275</bug>
+  <access>remote</access>
+  <affected>
+    <package name="dev-libs/libmaxminddb" auto="yes" arch="*">
+      <unaffected range="ge">1.4.3</unaffected>
+      <vulnerable range="lt">1.4.3</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>The libmaxminddb library provides a C library for reading MaxMind DB
+      files, including the GeoIP2 databases from MaxMind.
+    </p>
+  </background>
+  <description>
+    <p>libmaxminddb used uninitialised memory when reading from a corrupt
+      database file.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could entice a user to use a specially crafted
+      database with libmaxminddb, possibly resulting in a Denial of Service
+      condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All libmaxminddb users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-libs/libmaxminddb-1.4.3"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28241">CVE-2020-28241</uri>
+  </references>
+  <metadata tag="requester" timestamp="2020-11-12T15:42:40Z">sam_c</metadata>
+  <metadata tag="submitter" timestamp="2020-11-14T18:14:48Z">sam_c</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202011-16.xml b/metadata/glsa/glsa-202011-16.xml
new file mode 100644
index 000000000000..1ffe1738d62b
--- /dev/null
+++ b/metadata/glsa/glsa-202011-16.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202011-16">
+  <title>Chromium, Google Chrome: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Chromium and Google
+    Chrome, the worst of which could result in the arbitrary execution of code.
+  </synopsis>
+  <product type="ebuild">chromium,google-chrome</product>
+  <announced>2020-11-16</announced>
+  <revised count="1">2020-11-16</revised>
+  <bug>754093</bug>
+  <access>local, remote</access>
+  <affected>
+    <package name="www-client/chromium" auto="yes" arch="*">
+      <unaffected range="ge">86.0.4240.198</unaffected>
+      <vulnerable range="lt">86.0.4240.198</vulnerable>
+    </package>
+    <package name="www-client/google-chrome" auto="yes" arch="*">
+      <unaffected range="ge">86.0.4240.198</unaffected>
+      <vulnerable range="lt">86.0.4240.198</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Chromium is an open-source browser project that aims to build a safer,
+      faster, and more stable way for all users to experience the web.
+    </p>
+    
+    <p>Google Chrome is one fast, simple, and secure browser for all your
+      devices.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Chromium and Google
+      Chrome. Please review the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>Please review the referenced CVE identifiers for details.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Chromium users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=www-client/chromium-86.0.4240.198"
+    </code>
+    
+    <p>All Google Chrome users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=www-client/google-chrome-86.0.4240.198"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-16013">CVE-2020-16013</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-16017">CVE-2020-16017</uri>
+    <uri link="https://chromereleases.googleblog.com/2020/11/stable-channel-update-for-desktop_11.html">
+      Google Chrome 86.0.4240.198 release announcement
+    </uri>
+  </references>
+  <metadata tag="requester" timestamp="2020-11-12T12:59:44Z">sam_c</metadata>
+  <metadata tag="submitter" timestamp="2020-11-16T02:34:43Z">sam_c</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202011-17.xml b/metadata/glsa/glsa-202011-17.xml
new file mode 100644
index 000000000000..8de429e1f0a3
--- /dev/null
+++ b/metadata/glsa/glsa-202011-17.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202011-17">
+  <title>MIT Kerberos 5: Denial of service</title>
+  <synopsis>A vulnerability in MIT Kerberos 5 could lead to a Denial of Service
+    condition.
+  </synopsis>
+  <product type="ebuild">mit-krb5</product>
+  <announced>2020-11-16</announced>
+  <revised count="1">2020-11-16</revised>
+  <bug>753281</bug>
+  <access>remote</access>
+  <affected>
+    <package name="app-crypt/mit-krb5" auto="yes" arch="*">
+      <unaffected range="ge">1.18.2-r2</unaffected>
+      <vulnerable range="lt">1.18.2-r2</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>The MIT Kerberos 5 implementation provides a command line telnet client
+      which is used for remote login via the telnet protocol.
+    </p>
+  </background>
+  <description>
+    <p>It was discovered that MIT Kerberos network authentication system, krb5,
+      did not properly handle ASN.1-encoded Kerberos messages.
+    </p>
+  </description>
+  <impact type="low">
+    <p>A remote attacker could send a specially crafted Kerberos message,
+      possibly resulting in a Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All MIT Kerberos 5 users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=app-crypt/mit-krb5-1.18.2-r2"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28196">CVE-2020-28196</uri>
+  </references>
+  <metadata tag="requester" timestamp="2020-11-13T18:08:33Z">sam_c</metadata>
+  <metadata tag="submitter" timestamp="2020-11-16T02:42:29Z">sam_c</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202011-18.xml b/metadata/glsa/glsa-202011-18.xml
new file mode 100644
index 000000000000..5e570091d36a
--- /dev/null
+++ b/metadata/glsa/glsa-202011-18.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202011-18">
+  <title>Apache Ant: Insecure temporary file</title>
+  <synopsis>Apache Ant uses various insecure temporary files possibly allowing
+    local code execution. 
+  </synopsis>
+  <product type="ebuild">ant</product>
+  <announced>2020-11-16</announced>
+  <revised count="1">2020-11-16</revised>
+  <bug>745768</bug>
+  <access>local</access>
+  <affected>
+    <package name="dev-java/ant" auto="yes" arch="*">
+      <unaffected range="ge">1.10.9</unaffected>
+      <vulnerable range="lt">1.10.9</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Ant is a Java-based build tool similar to ‘make’ that uses XML
+      configuration files.
+    </p>
+  </background>
+  <description>
+    <p>A previous fix for a security vulnerability involving insecure temporary
+      files has been found to be incomplete.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A local attacker could perform symlink attacks to overwrite arbitrary
+      files with the privileges of the user running the application.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Apache Ant users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-java/ant-1.10.9"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-11979">CVE-2020-11979</uri>
+    <uri link="https://security.gentoo.org/glsa/202007-34">GLSA-202007-34</uri>
+  </references>
+  <metadata tag="requester" timestamp="2020-10-15T12:30:53Z">sam_c</metadata>
+  <metadata tag="submitter" timestamp="2020-11-16T02:44:41Z">sam_c</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 20dd48e4a2c6..50e3f6406761 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 13 Nov 2020 05:08:35 +0000
+Mon, 16 Nov 2020 05:08:38 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index d547e3e30b3f..2720ee7a0ead 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-85d2754949c49070bea44df8f904e9e985c57532 1605066557 2020-11-11T03:49:17+00:00
+68875cd72cdbf25bb2cc28bb5534ab8030abe720 1605494699 2020-11-16T02:44:59+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 63a6cdf58844..6b60d0b2da40 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/Manifest.gz b/metadata/md5-cache/acct-group/Manifest.gz
index 6d958ea5f3a4..94ff3b808054 100644
Binary files a/metadata/md5-cache/acct-group/Manifest.gz and b/metadata/md5-cache/acct-group/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/freenet-0 b/metadata/md5-cache/acct-group/freenet-0
new file mode 100644
index 000000000000..876e13bb0931
--- /dev/null
+++ b/metadata/md5-cache/acct-group/freenet-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-p2p/freenet
+EAPI=7
+KEYWORDS=~amd64 ~x86
+SLOT=0
+_eclasses_=acct-group	c7c2102da2c8db70657be99a7add9c06	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=6797e21abd4ef70bdd2e749418764dea
diff --git a/metadata/md5-cache/acct-group/ipsec-0 b/metadata/md5-cache/acct-group/ipsec-0
new file mode 100644
index 000000000000..618ad4d070f5
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ipsec-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=ipsec (strongswan) program group
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	c7c2102da2c8db70657be99a7add9c06	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=cd946e2b23225795e12a1cc3cac334f7
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index 9effe0d279c1..8b0878fe6e34 100644
Binary files a/metadata/md5-cache/acct-user/Manifest.gz and b/metadata/md5-cache/acct-user/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-user/freenet-0 b/metadata/md5-cache/acct-user/freenet-0
new file mode 100644
index 000000000000..d8ec7d4170b3
--- /dev/null
+++ b/metadata/md5-cache/acct-user/freenet-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-p2p/freenet
+EAPI=7
+KEYWORDS=~amd64 ~x86
+RDEPEND=acct-group/freenet
+SLOT=0
+_eclasses_=acct-user	4e8cbda4e2f81e96d4113bcf7547e6ba	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=ada619ce9fb5b2a108d317f31a7fada7
diff --git a/metadata/md5-cache/acct-user/ipsec-0 b/metadata/md5-cache/acct-user/ipsec-0
new file mode 100644
index 000000000000..1739349329ba
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ipsec-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=ipsec (strongswan) program user
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/ipsec
+SLOT=0
+_eclasses_=acct-user	4e8cbda4e2f81e96d4113bcf7547e6ba	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=39c9f12b9f6a5143c4306b8b5895ca09
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index d99588242d8c..6a059c3dafed 100644
Binary files a/metadata/md5-cache/app-accessibility/Manifest.gz and b/metadata/md5-cache/app-accessibility/Manifest.gz differ
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-core-2.36.0 b/metadata/md5-cache/app-accessibility/at-spi2-core-2.36.0
index f252a3604297..9cb66fee421c 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-core-2.36.0
+++ b/metadata/md5-cache/app-accessibility/at-spi2-core-2.36.0
@@ -5,11 +5,11 @@ DESCRIPTION=D-Bus accessibility specifications and registration daemon
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Accessibility
 IUSE=X gtk-doc +introspection abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1+
 RDEPEND=>=sys-apps/dbus-1.5[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/glib-2.36:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54.0:= ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-core/2.36/at-spi2-core-2.36.0.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0a43668cf7f5b5e6da957bb756c87286
+_md5_=fd09177cc0e43a10c355b32523e67f78
diff --git a/metadata/md5-cache/app-accessibility/edbrowse-3.7.5.1 b/metadata/md5-cache/app-accessibility/edbrowse-3.7.5.1-r1
similarity index 74%
rename from metadata/md5-cache/app-accessibility/edbrowse-3.7.5.1
rename to metadata/md5-cache/app-accessibility/edbrowse-3.7.5.1-r1
index 071bdf564068..ea1274e97d9c 100644
--- a/metadata/md5-cache/app-accessibility/edbrowse-3.7.5.1
+++ b/metadata/md5-cache/app-accessibility/edbrowse-3.7.5.1-r1
@@ -1,14 +1,14 @@
-BDEPEND=app-text/tidy-html5 >=net-misc/curl-7.36.0 >=dev-libs/libpcre-7.8 >=sys-libs/readline-6.0 dev-lang/duktape odbc? ( dev-db/unixODBC ) dev-lang/perl virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=app-text/tidy-html5 >=net-misc/curl-7.36.0 >=dev-libs/libpcre-7.8 >=sys-libs/readline-6.0 dev-lang/duktape:= odbc? ( dev-db/unixODBC ) dev-lang/perl virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/tidy-html5 >=net-misc/curl-7.36.0 >=dev-libs/libpcre-7.8 >=sys-libs/readline-6.0 dev-lang/duktape odbc? ( dev-db/unixODBC )
+DEPEND=app-text/tidy-html5 >=net-misc/curl-7.36.0 >=dev-libs/libpcre-7.8 >=sys-libs/readline-6.0 dev-lang/duktape:= odbc? ( dev-db/unixODBC )
 DESCRIPTION=Combination editor, browser, and mail client that is 100% text based
 EAPI=7
 HOMEPAGE=http://edbrowse.org
 IUSE=odbc
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=app-text/tidy-html5 >=net-misc/curl-7.36.0 >=dev-libs/libpcre-7.8 >=sys-libs/readline-6.0 dev-lang/duktape odbc? ( dev-db/unixODBC )
+RDEPEND=app-text/tidy-html5 >=net-misc/curl-7.36.0 >=dev-libs/libpcre-7.8 >=sys-libs/readline-6.0 dev-lang/duktape:= odbc? ( dev-db/unixODBC )
 SLOT=0
 SRC_URI=https://github.com/CMB/edbrowse/archive/v3.7.5.1.tar.gz -> edbrowse-3.7.5.1.tar.gz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=266a2b2b7dda0e9f25a9bea582ee3c26
+_md5_=51abd6c32be74858360f39b57d26cf3f
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 748f40ac0050..cee9643f3280 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/cgmanager-0.41 b/metadata/md5-cache/app-admin/cgmanager-0.41
index 2b8682845f3a..bcfa525fb29b 100644
--- a/metadata/md5-cache/app-admin/cgmanager-0.41
+++ b/metadata/md5-cache/app-admin/cgmanager-0.41
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/libnih[dbus] sys-apps/dbus selinux? ( sec-policy/selinux-cgmana
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/cgmanager/cgmanager-0.41.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	pam	226d8d2ff588bdfd7d188512dbdb189d	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9f8edaef861bdc646db8415870827902
+_md5_=a3d95418605aab0b870e14e93979a7e6
diff --git a/metadata/md5-cache/app-admin/cgmanager-0.42 b/metadata/md5-cache/app-admin/cgmanager-0.42
index fe5279ef0429..425a01835e48 100644
--- a/metadata/md5-cache/app-admin/cgmanager-0.42
+++ b/metadata/md5-cache/app-admin/cgmanager-0.42
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/libnih[dbus] sys-apps/dbus selinux? ( sec-policy/selinux-cgmana
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/cgmanager/cgmanager-0.42.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	pam	226d8d2ff588bdfd7d188512dbdb189d	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=90a2b815bf8379f7323a9290270472d3
+_md5_=0df6b15816b6079eb3cddf794db2ffab
diff --git a/metadata/md5-cache/app-admin/filebeat-6.8.12 b/metadata/md5-cache/app-admin/filebeat-6.8.12
deleted file mode 100644
index 6d921f24b089..000000000000
--- a/metadata/md5-cache/app-admin/filebeat-6.8.12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=>=dev-lang/go-1.12.9
-DESCRIPTION=Lightweight log shipper for Logstash and Elasticsearch
-EAPI=7
-HOMEPAGE=https://www.elastic.co/products/beats
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 BSD-2 MIT
-RDEPEND=!app-admin/filebeat-bin
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/elastic/beats/archive/v6.8.12.tar.gz -> filebeat-6.8.12.tar.gz
-_md5_=6b9e36a7191f95c3a3048ec9993cd029
diff --git a/metadata/md5-cache/app-admin/filebeat-7.6.1 b/metadata/md5-cache/app-admin/filebeat-6.8.13
similarity index 79%
rename from metadata/md5-cache/app-admin/filebeat-7.6.1
rename to metadata/md5-cache/app-admin/filebeat-6.8.13
index ffc1912e09ca..f74556a6d243 100644
--- a/metadata/md5-cache/app-admin/filebeat-7.6.1
+++ b/metadata/md5-cache/app-admin/filebeat-6.8.13
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 BSD-2 MIT
 RDEPEND=!app-admin/filebeat-bin
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/elastic/beats/archive/v7.6.1.tar.gz -> filebeat-7.6.1.tar.gz
+SRC_URI=https://github.com/elastic/beats/archive/v6.8.13.tar.gz -> filebeat-6.8.13.tar.gz
 _md5_=6b9e36a7191f95c3a3048ec9993cd029
diff --git a/metadata/md5-cache/app-admin/filebeat-7.10.0 b/metadata/md5-cache/app-admin/filebeat-7.10.0
new file mode 100644
index 000000000000..1c046a446049
--- /dev/null
+++ b/metadata/md5-cache/app-admin/filebeat-7.10.0
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst prepare unpack
+DESCRIPTION=Lightweight log shipper for Logstash and Elasticsearch
+EAPI=7
+HOMEPAGE=https://www.elastic.co/products/beats
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 BSD-2 MIT
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/elastic/beats/archive/v7.10.0.tar.gz -> filebeat-7.10.0.tar.gz mirror://goproxy//4d63.com/embedfiles/@v/v0.0.0-20190311033909-995e0740726f.zip -> 4d63.com%2Fembedfiles%2F@v%2Fv0.0.0-20190311033909-995e0740726f.zip mirror://goproxy//4d63.com/embedfiles/@v/v0.0.0-20190311033909-995e0740726f.mod -> 4d63.com%2Fembedfiles%2F@v%2Fv0.0.0-20190311033909-995e0740726f.mod mirror://goproxy//4d63.com/tz/@v/v1.1.1-0.20191124060701-6d37baae851b.zip -> 4d63.com%2Ftz%2F@v%2Fv1.1.1-0.20191124060701-6d37baae851b.zip mirror://goproxy//4d63.com/tz/@v/v1.1.1-0.20191124060701-6d37baae851b.mod -> 4d63.com%2Ftz%2F@v%2Fv1.1.1-0.20191124060701-6d37baae851b.mod mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.51.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.51.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.zip -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.zip mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.zip -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.zip mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.zip -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.zip mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.zip mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//code.cloudfoundry.org/go-diodes/@v/v0.0.0-20190809170250-f77fb823c7ee.zip -> code.cloudfoundry.org%2Fgo-diodes%2F@v%2Fv0.0.0-20190809170250-f77fb823c7ee.zip mirror://goproxy//code.cloudfoundry.org/go-diodes/@v/v0.0.0-20190809170250-f77fb823c7ee.mod -> code.cloudfoundry.org%2Fgo-diodes%2F@v%2Fv0.0.0-20190809170250-f77fb823c7ee.mod mirror://goproxy//code.cloudfoundry.org/go-loggregator/@v/v7.4.0+incompatible.zip -> code.cloudfoundry.org%2Fgo-loggregator%2F@v%2Fv7.4.0+incompatible.zip mirror://goproxy//code.cloudfoundry.org/go-loggregator/@v/v7.4.0+incompatible.mod -> code.cloudfoundry.org%2Fgo-loggregator%2F@v%2Fv7.4.0+incompatible.mod mirror://goproxy//code.cloudfoundry.org/gofileutils/@v/v0.0.0-20170111115228-4d0c80011a0f.zip -> code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a0f.zip mirror://goproxy//code.cloudfoundry.org/gofileutils/@v/v0.0.0-20170111115228-4d0c80011a0f.mod -> code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a0f.mod mirror://goproxy//code.cloudfoundry.org/rfc5424/@v/v0.0.0-20180905210152-236a6d29298a.zip -> code.cloudfoundry.org%2Frfc5424%2F@v%2Fv0.0.0-20180905210152-236a6d29298a.zip mirror://goproxy//code.cloudfoundry.org/rfc5424/@v/v0.0.0-20180905210152-236a6d29298a.mod -> code.cloudfoundry.org%2Frfc5424%2F@v%2Fv0.0.0-20180905210152-236a6d29298a.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/azure-amqp-common-go/v3/@v/v3.0.0.zip -> github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//github.com/!azure/azure-amqp-common-go/v3/@v/v3.0.0.mod -> github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/!azure/azure-event-hubs-go/v3/@v/v3.1.2.zip -> github.com%2F!azure%2Fazure-event-hubs-go%2Fv3%2F@v%2Fv3.1.2.zip mirror://goproxy//github.com/!azure/azure-event-hubs-go/v3/@v/v3.1.2.mod -> github.com%2F!azure%2Fazure-event-hubs-go%2Fv3%2F@v%2Fv3.1.2.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.1.8.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.1.9.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.1.9.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.1.zip -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.1.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v37.1.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv37.1.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v37.1.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv37.1.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.6.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.8.0.zip -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.8.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-amqp/@v/v0.12.6.zip -> github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.6.zip mirror://goproxy//github.com/!azure/go-amqp/@v/v0.12.6.mod -> github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.6.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.4.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.4.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.4.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!data!dog/zstd/@v/v1.4.1.zip -> github.com%2F!data!dog%2Fzstd%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/!data!dog/zstd/@v/v1.4.1.mod -> github.com%2F!data!dog%2Fzstd%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.4.2.zip -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/!masterminds/semver/@v/v1.4.2.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.zip -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.zip -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.zip mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.mod -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20170221213301-9f32b5905fd6.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20170221213301-9f32b5905fd6.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20170221213301-9f32b5905fd6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20170221213301-9f32b5905fd6.mod mirror://goproxy//github.com/adriansr/fsnotify/@v/v0.0.0-20180417234312-c9bbe1f46f1d.zip -> github.com%2Fadriansr%2Ffsnotify%2F@v%2Fv0.0.0-20180417234312-c9bbe1f46f1d.zip mirror://goproxy//github.com/adriansr/fsnotify/@v/v0.0.0-20180417234312-c9bbe1f46f1d.mod -> github.com%2Fadriansr%2Ffsnotify%2F@v%2Fv0.0.0-20180417234312-c9bbe1f46f1d.mod mirror://goproxy//github.com/adriansr/gopacket/@v/v1.1.18-0.20200327165309-dd62abfa8a41.zip -> github.com%2Fadriansr%2Fgopacket%2F@v%2Fv1.1.18-0.20200327165309-dd62abfa8a41.zip mirror://goproxy//github.com/adriansr/gopacket/@v/v1.1.18-0.20200327165309-dd62abfa8a41.mod -> github.com%2Fadriansr%2Fgopacket%2F@v%2Fv1.1.18-0.20200327165309-dd62abfa8a41.mod mirror://goproxy//github.com/aerospike/aerospike-client-go/@v/v1.27.1-0.20170612174108-0f3b54da6bdc.zip -> github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv1.27.1-0.20170612174108-0f3b54da6bdc.zip mirror://goproxy//github.com/aerospike/aerospike-client-go/@v/v1.27.1-0.20170612174108-0f3b54da6bdc.mod -> github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv1.27.1-0.20170612174108-0f3b54da6bdc.mod mirror://goproxy//github.com/akavel/rsrc/@v/v0.8.0.zip -> github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/akavel/rsrc/@v/v0.8.0.mod -> github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.zip -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.zip mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.zip -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.zip mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/andrewkroh/goja/@v/v0.0.0-20190128172624-dd2ac4456e20.zip -> github.com%2Fandrewkroh%2Fgoja%2F@v%2Fv0.0.0-20190128172624-dd2ac4456e20.zip mirror://goproxy//github.com/andrewkroh/goja/@v/v0.0.0-20190128172624-dd2ac4456e20.mod -> github.com%2Fandrewkroh%2Fgoja%2F@v%2Fv0.0.0-20190128172624-dd2ac4456e20.mod mirror://goproxy//github.com/andrewkroh/sys/@v/v0.0.0-20151128191922-287798fe3e43.zip -> github.com%2Fandrewkroh%2Fsys%2F@v%2Fv0.0.0-20151128191922-287798fe3e43.zip mirror://goproxy//github.com/andrewkroh/sys/@v/v0.0.0-20151128191922-287798fe3e43.mod -> github.com%2Fandrewkroh%2Fsys%2F@v%2Fv0.0.0-20151128191922-287798fe3e43.mod mirror://goproxy//github.com/antihax/optional/@v/v0.0.0-20180407024304-ca021399b1a6.mod -> github.com%2Fantihax%2Foptional%2F@v%2Fv0.0.0-20180407024304-ca021399b1a6.mod mirror://goproxy//github.com/antlr/antlr4/@v/v0.0.0-20200820155224-be881fa6b91d.zip -> github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200820155224-be881fa6b91d.zip mirror://goproxy//github.com/antlr/antlr4/@v/v0.0.0-20200820155224-be881fa6b91d.mod -> github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200820155224-be881fa6b91d.mod mirror://goproxy//github.com/apoydence/eachers/@v/v0.0.0-20181020210610-23942921fe77.zip -> github.com%2Fapoydence%2Feachers%2F@v%2Fv0.0.0-20181020210610-23942921fe77.zip mirror://goproxy//github.com/apoydence/eachers/@v/v0.0.0-20181020210610-23942921fe77.mod -> github.com%2Fapoydence%2Feachers%2F@v%2Fv0.0.0-20181020210610-23942921fe77.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.zip -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.zip mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.mod -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.mod mirror://goproxy//github.com/aws/aws-lambda-go/@v/v1.6.0.zip -> github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/aws/aws-lambda-go/@v/v1.6.0.mod -> github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v0.9.0.zip -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v0.9.0.mod -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/awslabs/goformation/v3/@v/v3.1.0.mod -> github.com%2Fawslabs%2Fgoformation%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/awslabs/goformation/v4/@v/v4.1.0.zip -> github.com%2Fawslabs%2Fgoformation%2Fv4%2F@v%2Fv4.1.0.zip mirror://goproxy//github.com/awslabs/goformation/v4/@v/v4.1.0.mod -> github.com%2Fawslabs%2Fgoformation%2Fv4%2F@v%2Fv4.1.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bi-zone/go-winio/@v/v0.4.15.zip -> github.com%2Fbi-zone%2Fgo-winio%2F@v%2Fv0.4.15.zip mirror://goproxy//github.com/bi-zone/go-winio/@v/v0.4.15.mod -> github.com%2Fbi-zone%2Fgo-winio%2F@v%2Fv0.4.15.mod mirror://goproxy//github.com/blakerouse/service/@v/v1.1.1-0.20200924160513-057808572ffa.zip -> github.com%2Fblakerouse%2Fservice%2F@v%2Fv1.1.1-0.20200924160513-057808572ffa.zip mirror://goproxy//github.com/blakerouse/service/@v/v1.1.1-0.20200924160513-057808572ffa.mod -> github.com%2Fblakerouse%2Fservice%2F@v%2Fv1.1.1-0.20200924160513-057808572ffa.mod mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20150311145944-8bd4349a67f2.zip -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20150311145944-8bd4349a67f2.zip mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20150311145944-8bd4349a67f2.mod -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20150311145944-8bd4349a67f2.mod mirror://goproxy//github.com/blang/semver/@v/v3.1.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.mod mirror://goproxy//github.com/bradleyfalzon/ghinstallation/@v/v1.1.0.zip -> github.com%2Fbradleyfalzon%2Fghinstallation%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/bradleyfalzon/ghinstallation/@v/v1.1.0.mod -> github.com%2Fbradleyfalzon%2Fghinstallation%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/bsm/sarama-cluster/@v/v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.zip -> github.com%2Fbsm%2Fsarama-cluster%2F@v%2Fv2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.zip mirror://goproxy//github.com/bsm/sarama-cluster/@v/v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.mod -> github.com%2Fbsm%2Fsarama-cluster%2F@v%2Fv2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.mod mirror://goproxy//github.com/cavaliercoder/badio/@v/v0.0.0-20160213150051-ce5280129e9e.zip -> github.com%2Fcavaliercoder%2Fbadio%2F@v%2Fv0.0.0-20160213150051-ce5280129e9e.zip mirror://goproxy//github.com/cavaliercoder/badio/@v/v0.0.0-20160213150051-ce5280129e9e.mod -> github.com%2Fcavaliercoder%2Fbadio%2F@v%2Fv0.0.0-20160213150051-ce5280129e9e.mod mirror://goproxy//github.com/cavaliercoder/go-rpm/@v/v0.0.0-20190131055624-7a9c54e3d83e.zip -> github.com%2Fcavaliercoder%2Fgo-rpm%2F@v%2Fv0.0.0-20190131055624-7a9c54e3d83e.zip mirror://goproxy//github.com/cavaliercoder/go-rpm/@v/v0.0.0-20190131055624-7a9c54e3d83e.mod -> github.com%2Fcavaliercoder%2Fgo-rpm%2F@v%2Fv0.0.0-20190131055624-7a9c54e3d83e.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cloudfoundry-community/go-cfclient/@v/v0.0.0-20190808214049-35bcce23fc5f.zip -> github.com%2Fcloudfoundry-community%2Fgo-cfclient%2F@v%2Fv0.0.0-20190808214049-35bcce23fc5f.zip mirror://goproxy//github.com/cloudfoundry-community/go-cfclient/@v/v0.0.0-20190808214049-35bcce23fc5f.mod -> github.com%2Fcloudfoundry-community%2Fgo-cfclient%2F@v%2Fv0.0.0-20190808214049-35bcce23fc5f.mod mirror://goproxy//github.com/cloudfoundry/noaa/@v/v2.1.0+incompatible.zip -> github.com%2Fcloudfoundry%2Fnoaa%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/cloudfoundry/noaa/@v/v2.1.0+incompatible.mod -> github.com%2Fcloudfoundry%2Fnoaa%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/cloudfoundry/sonde-go/@v/v0.0.0-20171206171820-b33733203bb4.zip -> github.com%2Fcloudfoundry%2Fsonde-go%2F@v%2Fv0.0.0-20171206171820-b33733203bb4.zip mirror://goproxy//github.com/cloudfoundry/sonde-go/@v/v0.0.0-20171206171820-b33733203bb4.mod -> github.com%2Fcloudfoundry%2Fsonde-go%2F@v%2Fv0.0.0-20171206171820-b33733203bb4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/codegangsta/inject/@v/v0.0.0-20150114235600-33e0aa1cb7c0.zip -> github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.zip mirror://goproxy//github.com/codegangsta/inject/@v/v0.0.0-20150114235600-33e0aa1cb7c0.mod -> github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190919134610-bf292b21730f.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190919134610-bf292b21730f.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20180822173158-c12b1e7919c1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.3.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.3.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190426062206-aaeac12a7ffc.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200107194136-26c1120b8d41.zip -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200107194136-26c1120b8d41.zip mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200107194136-26c1120b8d41.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200107194136-26c1120b8d41.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190226154929-a9fb20d87448.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190226154929-a9fb20d87448.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190816180239-bda0ff6ed73c.zip -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190816180239-bda0ff6ed73c.zip mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190816180239-bda0ff6ed73c.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190816180239-bda0ff6ed73c.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20180907222934-5a6d9f37cfa3.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828154514-0e0f228740de.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180108230652-97fdf19511ea.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.zip mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180108230652-97fdf19511ea.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/cucumber/godog/@v/v0.8.1.zip -> github.com%2Fcucumber%2Fgodog%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/cucumber/godog/@v/v0.8.1.mod -> github.com%2Fcucumber%2Fgodog%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.zip -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.mod -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/davecgh/go-xdr/@v/v0.0.0-20161123171359-e6a2ba005892.zip -> github.com%2Fdavecgh%2Fgo-xdr%2F@v%2Fv0.0.0-20161123171359-e6a2ba005892.zip mirror://goproxy//github.com/davecgh/go-xdr/@v/v0.0.0-20161123171359-e6a2ba005892.mod -> github.com%2Fdavecgh%2Fgo-xdr%2F@v%2Fv0.0.0-20161123171359-e6a2ba005892.mod mirror://goproxy//github.com/denisenkom/go-mssqldb/@v/v0.0.0-20200206145737-bbfc9a55622e.zip -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200206145737-bbfc9a55622e.zip mirror://goproxy//github.com/denisenkom/go-mssqldb/@v/v0.0.0-20200206145737-bbfc9a55622e.mod -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200206145737-bbfc9a55622e.mod mirror://goproxy//github.com/devigned/tab/@v/v0.1.1.mod -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/devigned/tab/@v/v0.1.2-0.20190607222403-0c15cf42f9a2.zip -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.2-0.20190607222403-0c15cf42f9a2.zip mirror://goproxy//github.com/devigned/tab/@v/v0.1.2-0.20190607222403-0c15cf42f9a2.mod -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.2-0.20190607222403-0c15cf42f9a2.mod mirror://goproxy//github.com/dgraph-io/badger/v2/@v/v2.2007.3-0.20201012072640-f5a7e0a1c83b.zip -> github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.2007.3-0.20201012072640-f5a7e0a1c83b.zip mirror://goproxy//github.com/dgraph-io/badger/v2/@v/v2.2007.3-0.20201012072640-f5a7e0a1c83b.mod -> github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.2007.3-0.20201012072640-f5a7e0a1c83b.mod mirror://goproxy//github.com/dgraph-io/ristretto/@v/v0.0.3-0.20200630154024-f66de99634de.zip -> github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.3-0.20200630154024-f66de99634de.zip mirror://goproxy//github.com/dgraph-io/ristretto/@v/v0.0.3-0.20200630154024-f66de99634de.mod -> github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.3-0.20200630154024-f66de99634de.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.mod mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190423205320-6a90982ecee2.zip -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.zip mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190423205320-6a90982ecee2.mod -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.mod mirror://goproxy//github.com/digitalocean/go-libvirt/@v/v0.0.0-20180301200012-6075ea3c39a1.zip -> github.com%2Fdigitalocean%2Fgo-libvirt%2F@v%2Fv0.0.0-20180301200012-6075ea3c39a1.zip mirror://goproxy//github.com/digitalocean/go-libvirt/@v/v0.0.0-20180301200012-6075ea3c39a1.mod -> github.com%2Fdigitalocean%2Fgo-libvirt%2F@v%2Fv0.0.0-20180301200012-6075ea3c39a1.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.7-0.20171009020623-7632a260cbaf.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.7-0.20171009020623-7632a260cbaf.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.7-0.20171009020623-7632a260cbaf.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.7-0.20171009020623-7632a260cbaf.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/engine/@v/v0.0.0-20191113042239-ea84732a7725.zip -> github.com%2Fdocker%2Fengine%2F@v%2Fv0.0.0-20191113042239-ea84732a7725.zip mirror://goproxy//github.com/docker/engine/@v/v0.0.0-20191113042239-ea84732a7725.mod -> github.com%2Fdocker%2Fengine%2F@v%2Fv0.0.0-20191113042239-ea84732a7725.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.zip -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.zip -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.zip mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dop251/goja_nodejs/@v/v0.0.0-20171011081505-adff31b136e6.zip -> github.com%2Fdop251%2Fgoja_nodejs%2F@v%2Fv0.0.0-20171011081505-adff31b136e6.zip mirror://goproxy//github.com/dop251/goja_nodejs/@v/v0.0.0-20171011081505-adff31b136e6.mod -> github.com%2Fdop251%2Fgoja_nodejs%2F@v%2Fv0.0.0-20171011081505-adff31b136e6.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.2.0.zip -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.2.0.mod -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.zip -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.zip mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.mod -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.zip -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.mod -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.1-0.20200121105743-0d940dd29fd2.zip -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.1-0.20200121105743-0d940dd29fd2.zip mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.1-0.20200121105743-0d940dd29fd2.mod -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.1-0.20200121105743-0d940dd29fd2.mod mirror://goproxy//github.com/elastic/dhcp/@v/v0.0.0-20200227161230-57ec251c7eb3.zip -> github.com%2Felastic%2Fdhcp%2F@v%2Fv0.0.0-20200227161230-57ec251c7eb3.zip mirror://goproxy//github.com/elastic/dhcp/@v/v0.0.0-20200227161230-57ec251c7eb3.mod -> github.com%2Felastic%2Fdhcp%2F@v%2Fv0.0.0-20200227161230-57ec251c7eb3.mod mirror://goproxy//github.com/elastic/ecs/@v/v1.6.0.zip -> github.com%2Felastic%2Fecs%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/elastic/ecs/@v/v1.6.0.mod -> github.com%2Felastic%2Fecs%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/elastic/elastic-agent-client/v7/@v/v7.0.0-20200709172729-d43b7ad5833a.zip -> github.com%2Felastic%2Felastic-agent-client%2Fv7%2F@v%2Fv7.0.0-20200709172729-d43b7ad5833a.zip mirror://goproxy//github.com/elastic/elastic-agent-client/v7/@v/v7.0.0-20200709172729-d43b7ad5833a.mod -> github.com%2Felastic%2Felastic-agent-client%2Fv7%2F@v%2Fv7.0.0-20200709172729-d43b7ad5833a.mod mirror://goproxy//github.com/elastic/fsevents/@v/v0.0.0-20181029231046-e1d381a4d270.zip -> github.com%2Felastic%2Ffsevents%2F@v%2Fv0.0.0-20181029231046-e1d381a4d270.zip mirror://goproxy//github.com/elastic/fsevents/@v/v0.0.0-20181029231046-e1d381a4d270.mod -> github.com%2Felastic%2Ffsevents%2F@v%2Fv0.0.0-20181029231046-e1d381a4d270.mod mirror://goproxy//github.com/elastic/go-concert/@v/v0.0.4.zip -> github.com%2Felastic%2Fgo-concert%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/elastic/go-concert/@v/v0.0.4.mod -> github.com%2Felastic%2Fgo-concert%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/elastic/go-libaudit/v2/@v/v2.0.2.zip -> github.com%2Felastic%2Fgo-libaudit%2Fv2%2F@v%2Fv2.0.2.zip mirror://goproxy//github.com/elastic/go-libaudit/v2/@v/v2.0.2.mod -> github.com%2Felastic%2Fgo-libaudit%2Fv2%2F@v%2Fv2.0.2.mod mirror://goproxy//github.com/elastic/go-licenser/@v/v0.3.1.zip -> github.com%2Felastic%2Fgo-licenser%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/elastic/go-licenser/@v/v0.3.1.mod -> github.com%2Felastic%2Fgo-licenser%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/elastic/go-lookslike/@v/v0.3.0.zip -> github.com%2Felastic%2Fgo-lookslike%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/elastic/go-lookslike/@v/v0.3.0.mod -> github.com%2Felastic%2Fgo-lookslike%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/elastic/go-lumber/@v/v0.1.0.zip -> github.com%2Felastic%2Fgo-lumber%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/elastic/go-lumber/@v/v0.1.0.mod -> github.com%2Felastic%2Fgo-lumber%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/elastic/go-perf/@v/v0.0.0-20191212140718-9c656876f595.zip -> github.com%2Felastic%2Fgo-perf%2F@v%2Fv0.0.0-20191212140718-9c656876f595.zip mirror://goproxy//github.com/elastic/go-perf/@v/v0.0.0-20191212140718-9c656876f595.mod -> github.com%2Felastic%2Fgo-perf%2F@v%2Fv0.0.0-20191212140718-9c656876f595.mod mirror://goproxy//github.com/elastic/go-plugins-helpers/@v/v0.0.0-20200207104224-bdf17607b79f.zip -> github.com%2Felastic%2Fgo-plugins-helpers%2F@v%2Fv0.0.0-20200207104224-bdf17607b79f.zip mirror://goproxy//github.com/elastic/go-plugins-helpers/@v/v0.0.0-20200207104224-bdf17607b79f.mod -> github.com%2Felastic%2Fgo-plugins-helpers%2F@v%2Fv0.0.0-20200207104224-bdf17607b79f.mod mirror://goproxy//github.com/elastic/go-seccomp-bpf/@v/v1.1.0.zip -> github.com%2Felastic%2Fgo-seccomp-bpf%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/elastic/go-seccomp-bpf/@v/v1.1.0.mod -> github.com%2Felastic%2Fgo-seccomp-bpf%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/elastic/go-structform/@v/v0.0.7.zip -> github.com%2Felastic%2Fgo-structform%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/elastic/go-structform/@v/v0.0.7.mod -> github.com%2Felastic%2Fgo-structform%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/elastic/go-sysinfo/@v/v1.1.1.mod -> github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/elastic/go-sysinfo/@v/v1.3.0.zip -> github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/elastic/go-sysinfo/@v/v1.3.0.mod -> github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/elastic/go-txfile/@v/v0.0.7.zip -> github.com%2Felastic%2Fgo-txfile%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/elastic/go-txfile/@v/v0.0.7.mod -> github.com%2Felastic%2Fgo-txfile%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/elastic/go-ucfg/@v/v0.7.0.mod -> github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/elastic/go-ucfg/@v/v0.8.3.zip -> github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.8.3.zip mirror://goproxy//github.com/elastic/go-ucfg/@v/v0.8.3.mod -> github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.8.3.mod mirror://goproxy//github.com/elastic/go-windows/@v/v1.0.0.mod -> github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elastic/go-windows/@v/v1.0.1.zip -> github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/elastic/go-windows/@v/v1.0.1.mod -> github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/elastic/gosigar/@v/v0.10.6-0.20200715000138-f115143bb233.zip -> github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.6-0.20200715000138-f115143bb233.zip mirror://goproxy//github.com/elastic/gosigar/@v/v0.10.6-0.20200715000138-f115143bb233.mod -> github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.6-0.20200715000138-f115143bb233.mod mirror://goproxy//github.com/elastic/sarama/@v/v1.19.1-0.20200629123429-0e7b69039eec.zip -> github.com%2Felastic%2Fsarama%2F@v%2Fv1.19.1-0.20200629123429-0e7b69039eec.zip mirror://goproxy//github.com/elastic/sarama/@v/v1.19.1-0.20200629123429-0e7b69039eec.mod -> github.com%2Felastic%2Fsarama%2F@v%2Fv1.19.1-0.20200629123429-0e7b69039eec.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.zip -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.zip mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.5.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.5.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.zip -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.mod -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.7.2.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.7.2.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/garyburd/redigo/@v/v1.0.1-0.20160525165706-b8dc90050f24.zip -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv1.0.1-0.20160525165706-b8dc90050f24.zip mirror://goproxy//github.com/garyburd/redigo/@v/v1.0.1-0.20160525165706-b8dc90050f24.mod -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv1.0.1-0.20160525165706-b8dc90050f24.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.zip -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-martini/martini/@v/v0.0.0-20170121215854-22fa46961aab.zip -> github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.zip mirror://goproxy//github.com/go-martini/martini/@v/v0.0.0-20170121215854-22fa46961aab.mod -> github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.5-0.20190920104607-14974a1cf647.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.5-0.20190920104607-14974a1cf647.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.5-0.20190920104607-14974a1cf647.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.5-0.20190920104607-14974a1cf647.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-sourcemap/sourcemap/@v/v2.1.2+incompatible.zip -> github.com%2Fgo-sourcemap%2Fsourcemap%2F@v%2Fv2.1.2+incompatible.zip mirror://goproxy//github.com/go-sourcemap/sourcemap/@v/v2.1.2+incompatible.mod -> github.com%2Fgo-sourcemap%2Fsourcemap%2F@v%2Fv2.1.2+incompatible.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gobuffalo/here/@v/v0.6.0.zip -> github.com%2Fgobuffalo%2Fhere%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/gobuffalo/here/@v/v0.6.0.mod -> github.com%2Fgobuffalo%2Fhere%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/gocarina/gocsv/@v/v0.0.0-20170324095351-ffef3ffc77be.zip -> github.com%2Fgocarina%2Fgocsv%2F@v%2Fv0.0.0-20170324095351-ffef3ffc77be.zip mirror://goproxy//github.com/gocarina/gocsv/@v/v0.0.0-20170324095351-ffef3ffc77be.mod -> github.com%2Fgocarina%2Fgocsv%2F@v%2Fv0.0.0-20170324095351-ffef3ffc77be.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.zip -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.zip mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/godror/godror/@v/v0.10.4.zip -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.10.4.zip mirror://goproxy//github.com/godror/godror/@v/v0.10.4.mod -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.10.4.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.7.1.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.7.2-0.20190320160742-5135e617513b.zip -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.2-0.20190320160742-5135e617513b.zip mirror://goproxy//github.com/gofrs/flock/@v/v0.7.2-0.20190320160742-5135e617513b.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.2-0.20190320160742-5135e617513b.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.3.0+incompatible.zip -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.3.0+incompatible.zip mirror://goproxy//github.com/gofrs/uuid/@v/v3.3.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.3.0+incompatible.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang-sql/civil/@v/v0.0.0-20190719163853-cb61b32ac6fe.zip -> github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.zip mirror://goproxy//github.com/golang-sql/civil/@v/v0.0.0-20190719163853-cb61b32ac6fe.mod -> github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/flatbuffers/@v/v1.7.2-0.20170925184458-7a6b2bf521e9.zip -> github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.7.2-0.20170925184458-7a6b2bf521e9.zip mirror://goproxy//github.com/google/flatbuffers/@v/v1.7.2-0.20170925184458-7a6b2bf521e9.mod -> github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.7.2-0.20170925184458-7a6b2bf521e9.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-github/v28/@v/v28.1.1.zip -> github.com%2Fgoogle%2Fgo-github%2Fv28%2F@v%2Fv28.1.1.zip mirror://goproxy//github.com/google/go-github/v28/@v/v28.1.1.mod -> github.com%2Fgoogle%2Fgo-github%2Fv28%2F@v%2Fv28.1.1.mod mirror://goproxy//github.com/google/go-github/v29/@v/v29.0.2.zip -> github.com%2Fgoogle%2Fgo-github%2Fv29%2F@v%2Fv29.0.2.zip mirror://goproxy//github.com/google/go-github/v29/@v/v29.0.2.mod -> github.com%2Fgoogle%2Fgo-github%2Fv29%2F@v%2Fv29.0.2.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/licenseclassifier/@v/v0.0.0-20200402202327-879cb1424de0.zip -> github.com%2Fgoogle%2Flicenseclassifier%2F@v%2Fv0.0.0-20200402202327-879cb1424de0.zip mirror://goproxy//github.com/google/licenseclassifier/@v/v0.0.0-20200402202327-879cb1424de0.mod -> github.com%2Fgoogle%2Flicenseclassifier%2F@v%2Fv0.0.0-20200402202327-879cb1424de0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/subcommands/@v/v1.0.1.mod -> github.com%2Fgoogle%2Fsubcommands%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2-0.20190416172445-c2e93f3ae59f.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2-0.20190416172445-c2e93f3ae59f.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.2-0.20190416172445-c2e93f3ae59f.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2-0.20190416172445-c2e93f3ae59f.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.1.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.1-0.20190624222214-25d8b0b66985.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.1-0.20190624222214-25d8b0b66985.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.1-0.20190624222214-25d8b0b66985.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.1-0.20190624222214-25d8b0b66985.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorhill/cronexpr/@v/v0.0.0-20161205141322-d520615e531a.zip -> github.com%2Fgorhill%2Fcronexpr%2F@v%2Fv0.0.0-20161205141322-d520615e531a.zip mirror://goproxy//github.com/gorhill/cronexpr/@v/v0.0.0-20161205141322-d520615e531a.mod -> github.com%2Fgorhill%2Fcronexpr%2F@v%2Fv0.0.0-20161205141322-d520615e531a.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.13.0.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.13.0.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.13.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/h2non/filetype/@v/v1.0.12.zip -> github.com%2Fh2non%2Ffiletype%2F@v%2Fv1.0.12.zip mirror://goproxy//github.com/h2non/filetype/@v/v1.0.12.mod -> github.com%2Fh2non%2Ffiletype%2F@v%2Fv1.0.12.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v0.0.0-20141028054710-7554cd9344ce.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v0.0.0-20161216184304-ed905158d874.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.2-0.20190520140433-59383c442f7d.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.2-0.20190520140433-59383c442f7d.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.2-0.20190520140433-59383c442f7d.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.2-0.20190520140433-59383c442f7d.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/haya14busa/go-actions-toolkit/@v/v0.0.0-20200105081403-ca0307860f01.zip -> github.com%2Fhaya14busa%2Fgo-actions-toolkit%2F@v%2Fv0.0.0-20200105081403-ca0307860f01.zip mirror://goproxy//github.com/haya14busa/go-actions-toolkit/@v/v0.0.0-20200105081403-ca0307860f01.mod -> github.com%2Fhaya14busa%2Fgo-actions-toolkit%2F@v%2Fv0.0.0-20200105081403-ca0307860f01.mod mirror://goproxy//github.com/haya14busa/go-checkstyle/@v/v0.0.0-20170303121022-5e9d09f51fa1.mod -> github.com%2Fhaya14busa%2Fgo-checkstyle%2F@v%2Fv0.0.0-20170303121022-5e9d09f51fa1.mod mirror://goproxy//github.com/haya14busa/secretbox/@v/v0.0.0-20180525171038-07c7ecf409f5.mod -> github.com%2Fhaya14busa%2Fsecretbox%2F@v%2Fv0.0.0-20180525171038-07c7ecf409f5.mod mirror://goproxy//github.com/hectane/go-acl/@v/v0.0.0-20190604041725-da78bae5fc95.zip -> github.com%2Fhectane%2Fgo-acl%2F@v%2Fv0.0.0-20190604041725-da78bae5fc95.zip mirror://goproxy//github.com/hectane/go-acl/@v/v0.0.0-20190604041725-da78bae5fc95.mod -> github.com%2Fhectane%2Fgo-acl%2F@v%2Fv0.0.0-20190604041725-da78bae5fc95.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jcmturner/gofork/@v/v1.0.0.zip -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jcmturner/gofork/@v/v1.0.0.mod -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jessevdk/go-flags/@v/v1.4.0.mod -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmoiron/sqlx/@v/v1.2.1-0.20190826204134-d7d95172beb5.zip -> github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.1-0.20190826204134-d7d95172beb5.zip mirror://goproxy//github.com/jmoiron/sqlx/@v/v1.2.1-0.20190826204134-d7d95172beb5.mod -> github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.1-0.20190826204134-d7d95172beb5.mod mirror://goproxy//github.com/joeshaw/multierror/@v/v0.0.0-20140124173710-69b34d4ec901.zip -> github.com%2Fjoeshaw%2Fmultierror%2F@v%2Fv0.0.0-20140124173710-69b34d4ec901.zip mirror://goproxy//github.com/joeshaw/multierror/@v/v0.0.0-20140124173710-69b34d4ec901.mod -> github.com%2Fjoeshaw%2Fmultierror%2F@v%2Fv0.0.0-20140124173710-69b34d4ec901.mod mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.zip -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/josephspurrier/goversioninfo/@v/v0.0.0-20200309025242-14b0ab84c6ca.zip -> github.com%2Fjosephspurrier%2Fgoversioninfo%2F@v%2Fv0.0.0-20200309025242-14b0ab84c6ca.zip mirror://goproxy//github.com/josephspurrier/goversioninfo/@v/v0.0.0-20200309025242-14b0ab84c6ca.mod -> github.com%2Fjosephspurrier%2Fgoversioninfo%2F@v%2Fv0.0.0-20200309025242-14b0ab84c6ca.mod mirror://goproxy//github.com/jpillora/backoff/@v/v0.0.0-20180909062703-3050d21c67d7.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv0.0.0-20180909062703-3050d21c67d7.mod mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.zip -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.zip -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/justinas/nosurf/@v/v1.1.0.mod -> github.com%2Fjustinas%2Fnosurf%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.15.6.zip -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.15.6.zip mirror://goproxy//github.com/karrick/godirwalk/@v/v1.15.6.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.15.6.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.9.8.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.8.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.9.8.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.8.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.zip -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.zip mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.zip -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.0.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.2-0.20190507191818-2ff3cb3adc01.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.2-0.20190507191818-2ff3cb3adc01.zip mirror://goproxy//github.com/lib/pq/@v/v1.1.2-0.20190507191818-2ff3cb3adc01.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.2-0.20190507191818-2ff3cb3adc01.mod mirror://goproxy//github.com/magefile/mage/@v/v1.9.0.mod -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/magefile/mage/@v/v1.10.0.zip -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/magefile/mage/@v/v1.10.0.mod -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.1.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.1.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/markbates/pkger/@v/v0.17.0.zip -> github.com%2Fmarkbates%2Fpkger%2F@v%2Fv0.17.0.zip mirror://goproxy//github.com/markbates/pkger/@v/v0.17.0.mod -> github.com%2Fmarkbates%2Fpkger%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/martini-contrib/render/@v/v0.0.0-20150707142108-ec18f8345a11.zip -> github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.zip mirror://goproxy//github.com/martini-contrib/render/@v/v0.0.0-20150707142108-ec18f8345a11.mod -> github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.8.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20190610004146-91bb50d98149.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190610004146-91bb50d98149.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20191113090002-7c0f6868bffe.zip -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20191113090002-7c0f6868bffe.zip mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20191113090002-7c0f6868bffe.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20191113090002-7c0f6868bffe.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.2.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.7.zip -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.7.zip mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.7.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.7.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.9.0.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.9.0.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.15.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.15.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170116052023-ab25296c0f51.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170116052023-ab25296c0f51.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170116052023-ab25296c0f51.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170116052023-ab25296c0f51.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.zip -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.5.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.2.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.0.20190228220655-ac19fd6e7483.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.0.20190228220655-ac19fd6e7483.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.0.20190228220655-ac19fd6e7483.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.0.20190228220655-ac19fd6e7483.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.2-0.20190823105129-775207bd45b6.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.2-0.20190823105129-775207bd45b6.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.2-0.20190823105129-775207bd45b6.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.2-0.20190823105129-775207bd45b6.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.0.0-20190115041553-12f6a991201f.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.0.0-20190115041553-12f6a991201f.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v0.1.2-0.20190507144316-5b71a03e2700.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv0.1.2-0.20190507144316-5b71a03e2700.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runtime-tools/@v/v0.0.0-20181011054405-1d69bd0f9c39.mod -> github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod mirror://goproxy//github.com/otiai10/copy/@v/v1.2.0.zip -> github.com%2Fotiai10%2Fcopy%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/otiai10/copy/@v/v1.2.0.mod -> github.com%2Fotiai10%2Fcopy%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/otiai10/curr/@v/v0.0.0-20150429015615-9b4961190c95.mod -> github.com%2Fotiai10%2Fcurr%2F@v%2Fv0.0.0-20150429015615-9b4961190c95.mod mirror://goproxy//github.com/otiai10/curr/@v/v1.0.0.zip -> github.com%2Fotiai10%2Fcurr%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/otiai10/curr/@v/v1.0.0.mod -> github.com%2Fotiai10%2Fcurr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/otiai10/mint/@v/v1.3.0.mod -> github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/otiai10/mint/@v/v1.3.1.zip -> github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/otiai10/mint/@v/v1.3.1.mod -> github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/oxtoacart/bpool/@v/v0.0.0-20150712133111-4e1c5567d7c2.zip -> github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.zip mirror://goproxy//github.com/oxtoacart/bpool/@v/v0.0.0-20150712133111-4e1c5567d7c2.mod -> github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.4.1+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.4.1+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.4.1+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.4.1+incompatible.mod mirror://goproxy//github.com/pierrre/gotestcover/@v/v0.0.0-20160517101806-924dca7d15f0.zip -> github.com%2Fpierrre%2Fgotestcover%2F@v%2Fv0.0.0-20160517101806-924dca7d15f0.zip mirror://goproxy//github.com/pierrre/gotestcover/@v/v0.0.0-20160517101806-924dca7d15f0.mod -> github.com%2Fpierrre%2Fgotestcover%2F@v%2Fv0.0.0-20160517101806-924dca7d15f0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1-0.20170505043639-c605e284fe17.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20170505043639-c605e284fe17.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1-0.20171018195549-f15c970de5b7.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20171018195549-f15c970de5b7.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/poy/eachers/@v/v0.0.0-20181020210610-23942921fe77.zip -> github.com%2Fpoy%2Feachers%2F@v%2Fv0.0.0-20181020210610-23942921fe77.zip mirror://goproxy//github.com/poy/eachers/@v/v0.0.0-20181020210610-23942921fe77.mod -> github.com%2Fpoy%2Feachers%2F@v%2Fv0.0.0-20181020210610-23942921fe77.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.1-0.20190913103102-20428fa0bffc.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.1-0.20190913103102-20428fa0bffc.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.1-0.20190913103102-20428fa0bffc.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.1-0.20190913103102-20428fa0bffc.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190425082905-87a4384529e0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190425082905-87a4384529e0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.5.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.11.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.11.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.11.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/prometheus/prometheus/@v/v2.5.0+incompatible.zip -> github.com%2Fprometheus%2Fprometheus%2F@v%2Fv2.5.0+incompatible.zip mirror://goproxy//github.com/prometheus/prometheus/@v/v2.5.0+incompatible.mod -> github.com%2Fprometheus%2Fprometheus%2F@v%2Fv2.5.0+incompatible.mod mirror://goproxy//github.com/rakyll/statik/@v/v0.1.6.mod -> github.com%2Frakyll%2Fstatik%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20190826022208-cac0b30c2563.zip -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20190826022208-cac0b30c2563.zip mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20190826022208-cac0b30c2563.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20190826022208-cac0b30c2563.mod mirror://goproxy//github.com/reviewdog/errorformat/@v/v0.0.0-20200109134752-8983be9bc7dd.zip -> github.com%2Freviewdog%2Ferrorformat%2F@v%2Fv0.0.0-20200109134752-8983be9bc7dd.zip mirror://goproxy//github.com/reviewdog/errorformat/@v/v0.0.0-20200109134752-8983be9bc7dd.mod -> github.com%2Freviewdog%2Ferrorformat%2F@v%2Fv0.0.0-20200109134752-8983be9bc7dd.mod mirror://goproxy//github.com/reviewdog/reviewdog/@v/v0.9.17.zip -> github.com%2Freviewdog%2Freviewdog%2F@v%2Fv0.9.17.zip mirror://goproxy//github.com/reviewdog/reviewdog/@v/v0.9.17.mod -> github.com%2Freviewdog%2Freviewdog%2F@v%2Fv0.9.17.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v1.2.0.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/samuel/go-parser/@v/v0.0.0-20130731160455-ca8abbf65d0e.zip -> github.com%2Fsamuel%2Fgo-parser%2F@v%2Fv0.0.0-20130731160455-ca8abbf65d0e.zip mirror://goproxy//github.com/samuel/go-parser/@v/v0.0.0-20130731160455-ca8abbf65d0e.mod -> github.com%2Fsamuel%2Fgo-parser%2F@v%2Fv0.0.0-20130731160455-ca8abbf65d0e.mod mirror://goproxy//github.com/samuel/go-thrift/@v/v0.0.0-20140522043831-2187045faa54.zip -> github.com%2Fsamuel%2Fgo-thrift%2F@v%2Fv0.0.0-20140522043831-2187045faa54.zip mirror://goproxy//github.com/samuel/go-thrift/@v/v0.0.0-20140522043831-2187045faa54.mod -> github.com%2Fsamuel%2Fgo-thrift%2F@v%2Fv0.0.0-20140522043831-2187045faa54.mod mirror://goproxy//github.com/sanathkr/go-yaml/@v/v0.0.0-20170819195128-ed9d249f429b.zip -> github.com%2Fsanathkr%2Fgo-yaml%2F@v%2Fv0.0.0-20170819195128-ed9d249f429b.zip mirror://goproxy//github.com/sanathkr/go-yaml/@v/v0.0.0-20170819195128-ed9d249f429b.mod -> github.com%2Fsanathkr%2Fgo-yaml%2F@v%2Fv0.0.0-20170819195128-ed9d249f429b.mod mirror://goproxy//github.com/sanathkr/yaml/@v/v0.0.0-20170819201035-0056894fa522.mod -> github.com%2Fsanathkr%2Fyaml%2F@v%2Fv0.0.0-20170819201035-0056894fa522.mod mirror://goproxy//github.com/sanathkr/yaml/@v/v1.0.1-0.20170819201035-0056894fa522.zip -> github.com%2Fsanathkr%2Fyaml%2F@v%2Fv1.0.1-0.20170819201035-0056894fa522.zip mirror://goproxy//github.com/sanathkr/yaml/@v/v1.0.1-0.20170819201035-0056894fa522.mod -> github.com%2Fsanathkr%2Fyaml%2F@v%2Fv1.0.1-0.20170819201035-0056894fa522.mod mirror://goproxy//github.com/santhosh-tekuri/jsonschema/@v/v1.2.4.zip -> github.com%2Fsanthosh-tekuri%2Fjsonschema%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/santhosh-tekuri/jsonschema/@v/v1.2.4.mod -> github.com%2Fsanthosh-tekuri%2Fjsonschema%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.zip -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v2.19.11+incompatible.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.19.11+incompatible.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v2.19.11+incompatible.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.19.11+incompatible.mod mirror://goproxy//github.com/shopspring/decimal/@v/v1.2.0.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/shopspring/decimal/@v/v1.2.0.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.4-0.20170822132746-89742aefa4b2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.4-0.20170822132746-89742aefa4b2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.zip -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.1.5-0.20170601210322-f6abca593680.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.1.5-0.20170601210322-f6abca593680.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20170704070218-db04d3cc01c8.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.mod mirror://goproxy//github.com/tsg/go-daemon/@v/v0.0.0-20200207173439-e704b93fd89b.zip -> github.com%2Ftsg%2Fgo-daemon%2F@v%2Fv0.0.0-20200207173439-e704b93fd89b.zip mirror://goproxy//github.com/tsg/go-daemon/@v/v0.0.0-20200207173439-e704b93fd89b.mod -> github.com%2Ftsg%2Fgo-daemon%2F@v%2Fv0.0.0-20200207173439-e704b93fd89b.mod mirror://goproxy//github.com/tsg/gopacket/@v/v0.0.0-20200626092518-2ab8e397a786.zip -> github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20200626092518-2ab8e397a786.zip mirror://goproxy//github.com/tsg/gopacket/@v/v0.0.0-20200626092518-2ab8e397a786.mod -> github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20200626092518-2ab8e397a786.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.8.zip -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.8.zip mirror://goproxy//github.com/ugorji/go/@v/v1.1.8.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v1.1.8.zip -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv1.1.8.zip mirror://goproxy//github.com/ugorji/go/codec/@v/v1.1.8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/urfave/cli/@v/v0.0.0-20171014202726-7bc6a0acffa5.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.mod mirror://goproxy//github.com/urso/diag/@v/v0.0.0-20200210123136-21b3cc8eb797.zip -> github.com%2Furso%2Fdiag%2F@v%2Fv0.0.0-20200210123136-21b3cc8eb797.zip mirror://goproxy//github.com/urso/diag/@v/v0.0.0-20200210123136-21b3cc8eb797.mod -> github.com%2Furso%2Fdiag%2F@v%2Fv0.0.0-20200210123136-21b3cc8eb797.mod mirror://goproxy//github.com/urso/go-bin/@v/v0.0.0-20180220135811-781c575c9f0e.zip -> github.com%2Furso%2Fgo-bin%2F@v%2Fv0.0.0-20180220135811-781c575c9f0e.zip mirror://goproxy//github.com/urso/go-bin/@v/v0.0.0-20180220135811-781c575c9f0e.mod -> github.com%2Furso%2Fgo-bin%2F@v%2Fv0.0.0-20180220135811-781c575c9f0e.mod mirror://goproxy//github.com/urso/magetools/@v/v0.0.0-20190919040553-290c89e0c230.zip -> github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20190919040553-290c89e0c230.zip mirror://goproxy//github.com/urso/magetools/@v/v0.0.0-20190919040553-290c89e0c230.mod -> github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20190919040553-290c89e0c230.mod mirror://goproxy//github.com/urso/qcgen/@v/v0.0.0-20180131103024-0b059e7db4f4.zip -> github.com%2Furso%2Fqcgen%2F@v%2Fv0.0.0-20180131103024-0b059e7db4f4.zip mirror://goproxy//github.com/urso/qcgen/@v/v0.0.0-20180131103024-0b059e7db4f4.mod -> github.com%2Furso%2Fqcgen%2F@v%2Fv0.0.0-20180131103024-0b059e7db4f4.mod mirror://goproxy//github.com/urso/sderr/@v/v0.0.0-20200210124243-c2a16f3d43ec.zip -> github.com%2Furso%2Fsderr%2F@v%2Fv0.0.0-20200210124243-c2a16f3d43ec.zip mirror://goproxy//github.com/urso/sderr/@v/v0.0.0-20200210124243-c2a16f3d43ec.mod -> github.com%2Furso%2Fsderr%2F@v%2Fv0.0.0-20200210124243-c2a16f3d43ec.mod mirror://goproxy//github.com/vbatts/tar-split/@v/v0.11.1.mod -> github.com%2Fvbatts%2Ftar-split%2F@v%2Fv0.11.1.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.0.0-20170802214208-2cad15190b41.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.0.0-20170802214208-2cad15190b41.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.0.0-20170802214208-2cad15190b41.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.0.0-20170802214208-2cad15190b41.mod mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.22.3.zip -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.22.3.zip mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.22.3.mod -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.22.3.mod mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.zip -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.zip mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.mod -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.mod mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.zip -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.mod -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20190905194746-02993c407bfb.zip -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20190905194746-02993c407bfb.zip mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20190905194746-02993c407bfb.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20190905194746-02993c407bfb.mod mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.zip -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.zip mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.mod -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20180618132009-1d523034197f.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20181112162635-ac52e6811b56.zip -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20181112162635-ac52e6811b56.zip mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20181112162635-ac52e6811b56.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20181112162635-ac52e6811b56.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/gopher-lua/@v/v0.0.0-20170403160031-b402f3114ec7.zip -> github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20170403160031-b402f3114ec7.zip mirror://goproxy//github.com/yuin/gopher-lua/@v/v0.0.0-20170403160031-b402f3114ec7.mod -> github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20170403160031-b402f3114ec7.mod mirror://goproxy//go.elastic.co/apm/@v/v1.7.2.mod -> go.elastic.co%2Fapm%2F@v%2Fv1.7.2.mod mirror://goproxy//go.elastic.co/apm/@v/v1.8.1-0.20200909061013-2aef45b9cf4b.zip -> go.elastic.co%2Fapm%2F@v%2Fv1.8.1-0.20200909061013-2aef45b9cf4b.zip mirror://goproxy//go.elastic.co/apm/@v/v1.8.1-0.20200909061013-2aef45b9cf4b.mod -> go.elastic.co%2Fapm%2F@v%2Fv1.8.1-0.20200909061013-2aef45b9cf4b.mod mirror://goproxy//go.elastic.co/apm/module/apmelasticsearch/@v/v1.7.2.zip -> go.elastic.co%2Fapm%2Fmodule%2Fapmelasticsearch%2F@v%2Fv1.7.2.zip mirror://goproxy//go.elastic.co/apm/module/apmelasticsearch/@v/v1.7.2.mod -> go.elastic.co%2Fapm%2Fmodule%2Fapmelasticsearch%2F@v%2Fv1.7.2.mod mirror://goproxy//go.elastic.co/apm/module/apmhttp/@v/v1.7.2.zip -> go.elastic.co%2Fapm%2Fmodule%2Fapmhttp%2F@v%2Fv1.7.2.zip mirror://goproxy//go.elastic.co/apm/module/apmhttp/@v/v1.7.2.mod -> go.elastic.co%2Fapm%2Fmodule%2Fapmhttp%2F@v%2Fv1.7.2.mod mirror://goproxy//go.elastic.co/ecszap/@v/v0.3.0.zip -> go.elastic.co%2Fecszap%2F@v%2Fv0.3.0.zip mirror://goproxy//go.elastic.co/ecszap/@v/v0.3.0.mod -> go.elastic.co%2Fecszap%2F@v%2Fv0.3.0.mod mirror://goproxy//go.elastic.co/fastjson/@v/v1.0.0.mod -> go.elastic.co%2Ffastjson%2F@v%2Fv1.0.0.mod mirror://goproxy//go.elastic.co/fastjson/@v/v1.1.0.zip -> go.elastic.co%2Ffastjson%2F@v%2Fv1.1.0.zip mirror://goproxy//go.elastic.co/fastjson/@v/v1.1.0.mod -> go.elastic.co%2Ffastjson%2F@v%2Fv1.1.0.mod mirror://goproxy//go.elastic.co/go-licence-detector/@v/v0.4.0.zip -> go.elastic.co%2Fgo-licence-detector%2F@v%2Fv0.4.0.zip mirror://goproxy//go.elastic.co/go-licence-detector/@v/v0.4.0.mod -> go.elastic.co%2Fgo-licence-detector%2F@v%2Fv0.4.0.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.4.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.4.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.4.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.4.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.zip -> go.opencensus.io%2F@v%2Fv0.22.2.zip mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.zip mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.3.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.3.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.zip -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.zip mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.14.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.14.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.14.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.14.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20171113213409-9f005a07e0d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20171113213409-9f005a07e0d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190325154230-a5d413f7728c.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200204104054-c9f3fb736b72.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200204104054-c9f3fb736b72.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200510223506-06a226fb4e37.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200510223506-06a226fb4e37.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.zip -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.zip mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181108082009-03003ca0c849.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181108082009-03003ca0c849.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191002035440-2ec189313ef0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191002035440-2ec189313ef0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191021144547-ec77196f6094.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191021144547-ec77196f6094.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191112182307-2180aed22343.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191112182307-2180aed22343.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181106182150-f42d05182288.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181106182150-f42d05182288.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190130055435-99b60b757ec1.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190130055435-99b60b757ec1.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190204203706-41f3e6584952.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190204203706-41f3e6584952.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190405154228-4b34438f7a67.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190405154228-4b34438f7a67.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190514135907-3a4b5fb9f71f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190514135907-3a4b5fb9f71f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190529164535-6a60838ec259.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190529164535-6a60838ec259.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190626221950-04f50cda93cb.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626221950-04f50cda93cb.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190801041406-cbf593c0f2f3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191025021431-6c3a3bfe00ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191025021431-6c3a3bfe00ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191112214154-59a1497f0cea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191112214154-59a1497f0cea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200102141924-c96a22e43c9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200102141924-c96a22e43c9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200602230032-c00d67ef29d0.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200602230032-c00d67ef29d0.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200602230032-c00d67ef29d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200602230032-c00d67ef29d0.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.zip mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.2.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.3.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.3.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190927181202-20e1ac93f88c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190927181202-20e1ac93f88c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.24.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/jcmturner/aescts.v1/@v/v1.0.1.zip -> gopkg.in%2Fjcmturner%2Faescts.v1%2F@v%2Fv1.0.1.zip mirror://goproxy//gopkg.in/jcmturner/aescts.v1/@v/v1.0.1.mod -> gopkg.in%2Fjcmturner%2Faescts.v1%2F@v%2Fv1.0.1.mod mirror://goproxy//gopkg.in/jcmturner/dnsutils.v1/@v/v1.0.1.zip -> gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.zip mirror://goproxy//gopkg.in/jcmturner/dnsutils.v1/@v/v1.0.1.mod -> gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.mod mirror://goproxy//gopkg.in/jcmturner/goidentity.v3/@v/v3.0.0.zip -> gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.zip mirror://goproxy//gopkg.in/jcmturner/goidentity.v3/@v/v3.0.0.mod -> gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.mod mirror://goproxy//gopkg.in/jcmturner/gokrb5.v7/@v/v7.5.0.zip -> gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.5.0.zip mirror://goproxy//gopkg.in/jcmturner/gokrb5.v7/@v/v7.5.0.mod -> gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.5.0.mod mirror://goproxy//gopkg.in/jcmturner/rpc.v1/@v/v1.1.0.zip -> gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.zip mirror://goproxy//gopkg.in/jcmturner/rpc.v1/@v/v1.1.0.mod -> gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20160818020120-3f83fa500528.zip -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20160818020120-3f83fa500528.zip mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20160818020120-3f83fa500528.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20160818020120-3f83fa500528.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.3.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//howett.net/plist/@v/v0.0.0-20181124034731-591f970eefbb.zip -> howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.zip mirror://goproxy//howett.net/plist/@v/v0.0.0-20181124034731-591f970eefbb.mod -> howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.mod mirror://goproxy//k8s.io/api/@v/v0.18.3.zip -> k8s.io%2Fapi%2F@v%2Fv0.18.3.zip mirror://goproxy//k8s.io/api/@v/v0.18.3.mod -> k8s.io%2Fapi%2F@v%2Fv0.18.3.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.18.3.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.3.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.18.3.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.3.mod mirror://goproxy//k8s.io/client-go/@v/v0.18.3.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.18.3.zip mirror://goproxy//k8s.io/client-go/@v/v0.18.3.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.18.3.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200410145947-61e04a5be9a6.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410145947-61e04a5be9a6.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200410145947-61e04a5be9a6.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410145947-61e04a5be9a6.mod mirror://goproxy//k8s.io/kubernetes/@v/v1.13.0.mod -> k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0-20200116222232-67a7b8c61874.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod
+_eclasses_=go-module	92660621959e7fab813173772987588b
+_md5_=d518fcbe359cd399bbd0782f931f802d
diff --git a/metadata/md5-cache/app-admin/filebeat-7.3.2 b/metadata/md5-cache/app-admin/filebeat-7.3.2
deleted file mode 100644
index 0912ecb7d038..000000000000
--- a/metadata/md5-cache/app-admin/filebeat-7.3.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=>=dev-lang/go-1.12.9
-DESCRIPTION=Lightweight log shipper for Logstash and Elasticsearch
-EAPI=7
-HOMEPAGE=https://www.elastic.co/products/beats
-KEYWORDS=amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=!app-admin/filebeat-bin
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/elastic/beats/archive/v7.3.2.tar.gz -> filebeat-7.3.2.tar.gz
-_md5_=651e687e8c2369282ef9d79eb6c18abb
diff --git a/metadata/md5-cache/app-admin/filebeat-7.7.0 b/metadata/md5-cache/app-admin/filebeat-7.7.0
deleted file mode 100644
index c3b8f813476a..000000000000
--- a/metadata/md5-cache/app-admin/filebeat-7.7.0
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst prepare unpack
-DESCRIPTION=Lightweight log shipper for Logstash and Elasticsearch
-EAPI=7
-HOMEPAGE=https://www.elastic.co/products/beats
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 BSD-2 MIT
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/elastic/beats/archive/v7.7.0.tar.gz -> filebeat-7.7.0.tar.gz mirror://goproxy//4d63.com/embedfiles/@v/v0.0.0-20190311033909-995e0740726f.zip -> 4d63.com%2Fembedfiles%2F@v%2Fv0.0.0-20190311033909-995e0740726f.zip mirror://goproxy//4d63.com/embedfiles/@v/v0.0.0-20190311033909-995e0740726f.mod -> 4d63.com%2Fembedfiles%2F@v%2Fv0.0.0-20190311033909-995e0740726f.mod mirror://goproxy//4d63.com/tz/@v/v1.1.1-0.20191124060701-6d37baae851b.zip -> 4d63.com%2Ftz%2F@v%2Fv1.1.1-0.20191124060701-6d37baae851b.zip mirror://goproxy//4d63.com/tz/@v/v1.1.1-0.20191124060701-6d37baae851b.mod -> 4d63.com%2Ftz%2F@v%2Fv1.1.1-0.20191124060701-6d37baae851b.mod mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.51.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.51.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.zip -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.zip mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.zip -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.zip mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.zip -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.zip mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.zip mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//code.cloudfoundry.org/go-diodes/@v/v0.0.0-20190809170250-f77fb823c7ee.zip -> code.cloudfoundry.org%2Fgo-diodes%2F@v%2Fv0.0.0-20190809170250-f77fb823c7ee.zip mirror://goproxy//code.cloudfoundry.org/go-diodes/@v/v0.0.0-20190809170250-f77fb823c7ee.mod -> code.cloudfoundry.org%2Fgo-diodes%2F@v%2Fv0.0.0-20190809170250-f77fb823c7ee.mod mirror://goproxy//code.cloudfoundry.org/go-loggregator/@v/v7.4.0+incompatible.zip -> code.cloudfoundry.org%2Fgo-loggregator%2F@v%2Fv7.4.0+incompatible.zip mirror://goproxy//code.cloudfoundry.org/go-loggregator/@v/v7.4.0+incompatible.mod -> code.cloudfoundry.org%2Fgo-loggregator%2F@v%2Fv7.4.0+incompatible.mod mirror://goproxy//code.cloudfoundry.org/gofileutils/@v/v0.0.0-20170111115228-4d0c80011a0f.zip -> code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a0f.zip mirror://goproxy//code.cloudfoundry.org/gofileutils/@v/v0.0.0-20170111115228-4d0c80011a0f.mod -> code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a0f.mod mirror://goproxy//code.cloudfoundry.org/rfc5424/@v/v0.0.0-20180905210152-236a6d29298a.zip -> code.cloudfoundry.org%2Frfc5424%2F@v%2Fv0.0.0-20180905210152-236a6d29298a.zip mirror://goproxy//code.cloudfoundry.org/rfc5424/@v/v0.0.0-20180905210152-236a6d29298a.mod -> code.cloudfoundry.org%2Frfc5424%2F@v%2Fv0.0.0-20180905210152-236a6d29298a.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/azure-amqp-common-go/v3/@v/v3.0.0.zip -> github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//github.com/!azure/azure-amqp-common-go/v3/@v/v3.0.0.mod -> github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/!azure/azure-event-hubs-go/v3/@v/v3.1.2.zip -> github.com%2F!azure%2Fazure-event-hubs-go%2Fv3%2F@v%2Fv3.1.2.zip mirror://goproxy//github.com/!azure/azure-event-hubs-go/v3/@v/v3.1.2.mod -> github.com%2F!azure%2Fazure-event-hubs-go%2Fv3%2F@v%2Fv3.1.2.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.1.8.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.1.9.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.1.9.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.1.zip -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.1.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v37.1.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv37.1.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v37.1.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv37.1.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.6.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.8.0.zip -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.8.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-amqp/@v/v0.12.6.zip -> github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.6.zip mirror://goproxy//github.com/!azure/go-amqp/@v/v0.12.6.mod -> github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.6.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v12.2.0+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv12.2.0+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v12.2.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv12.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.4.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.4.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.4.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.4.2.zip -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/!masterminds/semver/@v/v1.4.2.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.zip -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.zip mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.mod -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20170221213301-9f32b5905fd6.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20170221213301-9f32b5905fd6.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20170221213301-9f32b5905fd6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20170221213301-9f32b5905fd6.mod mirror://goproxy//github.com/adriansr/fsnotify/@v/v0.0.0-20180417234312-c9bbe1f46f1d.zip -> github.com%2Fadriansr%2Ffsnotify%2F@v%2Fv0.0.0-20180417234312-c9bbe1f46f1d.zip mirror://goproxy//github.com/adriansr/fsnotify/@v/v0.0.0-20180417234312-c9bbe1f46f1d.mod -> github.com%2Fadriansr%2Ffsnotify%2F@v%2Fv0.0.0-20180417234312-c9bbe1f46f1d.mod mirror://goproxy//github.com/adriansr/gopacket/@v/v1.1.18-0.20200327165309-dd62abfa8a41.zip -> github.com%2Fadriansr%2Fgopacket%2F@v%2Fv1.1.18-0.20200327165309-dd62abfa8a41.zip mirror://goproxy//github.com/adriansr/gopacket/@v/v1.1.18-0.20200327165309-dd62abfa8a41.mod -> github.com%2Fadriansr%2Fgopacket%2F@v%2Fv1.1.18-0.20200327165309-dd62abfa8a41.mod mirror://goproxy//github.com/aerospike/aerospike-client-go/@v/v1.27.1-0.20170612174108-0f3b54da6bdc.zip -> github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv1.27.1-0.20170612174108-0f3b54da6bdc.zip mirror://goproxy//github.com/aerospike/aerospike-client-go/@v/v1.27.1-0.20170612174108-0f3b54da6bdc.mod -> github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv1.27.1-0.20170612174108-0f3b54da6bdc.mod mirror://goproxy//github.com/akavel/rsrc/@v/v0.8.0.zip -> github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/akavel/rsrc/@v/v0.8.0.mod -> github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/andrewkroh/goja/@v/v0.0.0-20190128172624-dd2ac4456e20.zip -> github.com%2Fandrewkroh%2Fgoja%2F@v%2Fv0.0.0-20190128172624-dd2ac4456e20.zip mirror://goproxy//github.com/andrewkroh/goja/@v/v0.0.0-20190128172624-dd2ac4456e20.mod -> github.com%2Fandrewkroh%2Fgoja%2F@v%2Fv0.0.0-20190128172624-dd2ac4456e20.mod mirror://goproxy//github.com/andrewkroh/sys/@v/v0.0.0-20151128191922-287798fe3e43.zip -> github.com%2Fandrewkroh%2Fsys%2F@v%2Fv0.0.0-20151128191922-287798fe3e43.zip mirror://goproxy//github.com/andrewkroh/sys/@v/v0.0.0-20151128191922-287798fe3e43.mod -> github.com%2Fandrewkroh%2Fsys%2F@v%2Fv0.0.0-20151128191922-287798fe3e43.mod mirror://goproxy//github.com/antihax/optional/@v/v0.0.0-20180407024304-ca021399b1a6.mod -> github.com%2Fantihax%2Foptional%2F@v%2Fv0.0.0-20180407024304-ca021399b1a6.mod mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.zip -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.zip mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.mod -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.mod mirror://goproxy//github.com/aws/aws-lambda-go/@v/v1.6.0.zip -> github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/aws/aws-lambda-go/@v/v1.6.0.mod -> github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v0.9.0.zip -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v0.9.0.mod -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/awslabs/goformation/v3/@v/v3.1.0.mod -> github.com%2Fawslabs%2Fgoformation%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/awslabs/goformation/v4/@v/v4.1.0.zip -> github.com%2Fawslabs%2Fgoformation%2Fv4%2F@v%2Fv4.1.0.zip mirror://goproxy//github.com/awslabs/goformation/v4/@v/v4.1.0.mod -> github.com%2Fawslabs%2Fgoformation%2Fv4%2F@v%2Fv4.1.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20150311145944-8bd4349a67f2.zip -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20150311145944-8bd4349a67f2.zip mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20150311145944-8bd4349a67f2.mod -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20150311145944-8bd4349a67f2.mod mirror://goproxy//github.com/blang/semver/@v/v3.1.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.mod mirror://goproxy//github.com/bradleyfalzon/ghinstallation/@v/v1.1.0.zip -> github.com%2Fbradleyfalzon%2Fghinstallation%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/bradleyfalzon/ghinstallation/@v/v1.1.0.mod -> github.com%2Fbradleyfalzon%2Fghinstallation%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/bsm/sarama-cluster/@v/v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.zip -> github.com%2Fbsm%2Fsarama-cluster%2F@v%2Fv2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.zip mirror://goproxy//github.com/bsm/sarama-cluster/@v/v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.mod -> github.com%2Fbsm%2Fsarama-cluster%2F@v%2Fv2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.mod mirror://goproxy//github.com/cavaliercoder/badio/@v/v0.0.0-20160213150051-ce5280129e9e.zip -> github.com%2Fcavaliercoder%2Fbadio%2F@v%2Fv0.0.0-20160213150051-ce5280129e9e.zip mirror://goproxy//github.com/cavaliercoder/badio/@v/v0.0.0-20160213150051-ce5280129e9e.mod -> github.com%2Fcavaliercoder%2Fbadio%2F@v%2Fv0.0.0-20160213150051-ce5280129e9e.mod mirror://goproxy//github.com/cavaliercoder/go-rpm/@v/v0.0.0-20190131055624-7a9c54e3d83e.zip -> github.com%2Fcavaliercoder%2Fgo-rpm%2F@v%2Fv0.0.0-20190131055624-7a9c54e3d83e.zip mirror://goproxy//github.com/cavaliercoder/go-rpm/@v/v0.0.0-20190131055624-7a9c54e3d83e.mod -> github.com%2Fcavaliercoder%2Fgo-rpm%2F@v%2Fv0.0.0-20190131055624-7a9c54e3d83e.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cloudfoundry-community/go-cfclient/@v/v0.0.0-20190808214049-35bcce23fc5f.zip -> github.com%2Fcloudfoundry-community%2Fgo-cfclient%2F@v%2Fv0.0.0-20190808214049-35bcce23fc5f.zip mirror://goproxy//github.com/cloudfoundry-community/go-cfclient/@v/v0.0.0-20190808214049-35bcce23fc5f.mod -> github.com%2Fcloudfoundry-community%2Fgo-cfclient%2F@v%2Fv0.0.0-20190808214049-35bcce23fc5f.mod mirror://goproxy//github.com/cloudfoundry/sonde-go/@v/v0.0.0-20171206171820-b33733203bb4.zip -> github.com%2Fcloudfoundry%2Fsonde-go%2F@v%2Fv0.0.0-20171206171820-b33733203bb4.zip mirror://goproxy//github.com/cloudfoundry/sonde-go/@v/v0.0.0-20171206171820-b33733203bb4.mod -> github.com%2Fcloudfoundry%2Fsonde-go%2F@v%2Fv0.0.0-20171206171820-b33733203bb4.mod mirror://goproxy//github.com/codegangsta/inject/@v/v0.0.0-20150114235600-33e0aa1cb7c0.zip -> github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.zip mirror://goproxy//github.com/codegangsta/inject/@v/v0.0.0-20150114235600-33e0aa1cb7c0.mod -> github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190919134610-bf292b21730f.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190919134610-bf292b21730f.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20180822173158-c12b1e7919c1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.3.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.3.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190426062206-aaeac12a7ffc.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200107194136-26c1120b8d41.zip -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200107194136-26c1120b8d41.zip mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200107194136-26c1120b8d41.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200107194136-26c1120b8d41.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190226154929-a9fb20d87448.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190226154929-a9fb20d87448.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190816180239-bda0ff6ed73c.zip -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190816180239-bda0ff6ed73c.zip mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190816180239-bda0ff6ed73c.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190816180239-bda0ff6ed73c.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20180907222934-5a6d9f37cfa3.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828154514-0e0f228740de.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.1-coreos.6.0.20180318001526-af9db2027c98.zip -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.1-coreos.6.0.20180318001526-af9db2027c98.zip mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.1-coreos.6.0.20180318001526-af9db2027c98.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.1-coreos.6.0.20180318001526-af9db2027c98.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180108230652-97fdf19511ea.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.zip mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180108230652-97fdf19511ea.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/davecgh/go-xdr/@v/v0.0.0-20161123171359-e6a2ba005892.zip -> github.com%2Fdavecgh%2Fgo-xdr%2F@v%2Fv0.0.0-20161123171359-e6a2ba005892.zip mirror://goproxy//github.com/davecgh/go-xdr/@v/v0.0.0-20161123171359-e6a2ba005892.mod -> github.com%2Fdavecgh%2Fgo-xdr%2F@v%2Fv0.0.0-20161123171359-e6a2ba005892.mod mirror://goproxy//github.com/denisenkom/go-mssqldb/@v/v0.0.0-20181014144952-4e0d7dc8888f.zip -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20181014144952-4e0d7dc8888f.zip mirror://goproxy//github.com/denisenkom/go-mssqldb/@v/v0.0.0-20181014144952-4e0d7dc8888f.mod -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20181014144952-4e0d7dc8888f.mod mirror://goproxy//github.com/devigned/tab/@v/v0.1.1.mod -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/devigned/tab/@v/v0.1.2-0.20190607222403-0c15cf42f9a2.zip -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.2-0.20190607222403-0c15cf42f9a2.zip mirror://goproxy//github.com/devigned/tab/@v/v0.1.2-0.20190607222403-0c15cf42f9a2.mod -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.2-0.20190607222403-0c15cf42f9a2.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v0.0.0-20160705203006-01aeca54ebda.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv0.0.0-20160705203006-01aeca54ebda.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.mod mirror://goproxy//github.com/digitalocean/go-libvirt/@v/v0.0.0-20180301200012-6075ea3c39a1.zip -> github.com%2Fdigitalocean%2Fgo-libvirt%2F@v%2Fv0.0.0-20180301200012-6075ea3c39a1.zip mirror://goproxy//github.com/digitalocean/go-libvirt/@v/v0.0.0-20180301200012-6075ea3c39a1.mod -> github.com%2Fdigitalocean%2Fgo-libvirt%2F@v%2Fv0.0.0-20180301200012-6075ea3c39a1.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.7-0.20171009020623-7632a260cbaf.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.7-0.20171009020623-7632a260cbaf.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.7-0.20171009020623-7632a260cbaf.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.7-0.20171009020623-7632a260cbaf.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/engine/@v/v0.0.0-20191113042239-ea84732a7725.zip -> github.com%2Fdocker%2Fengine%2F@v%2Fv0.0.0-20191113042239-ea84732a7725.zip mirror://goproxy//github.com/docker/engine/@v/v0.0.0-20191113042239-ea84732a7725.mod -> github.com%2Fdocker%2Fengine%2F@v%2Fv0.0.0-20191113042239-ea84732a7725.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.zip -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dop251/goja_nodejs/@v/v0.0.0-20171011081505-adff31b136e6.zip -> github.com%2Fdop251%2Fgoja_nodejs%2F@v%2Fv0.0.0-20171011081505-adff31b136e6.zip mirror://goproxy//github.com/dop251/goja_nodejs/@v/v0.0.0-20171011081505-adff31b136e6.mod -> github.com%2Fdop251%2Fgoja_nodejs%2F@v%2Fv0.0.0-20171011081505-adff31b136e6.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.1.0.zip -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.1.0.mod -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.zip -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.zip mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.mod -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.zip -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.mod -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.1-0.20200121105743-0d940dd29fd2.zip -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.1-0.20200121105743-0d940dd29fd2.zip mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.1-0.20200121105743-0d940dd29fd2.mod -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.1-0.20200121105743-0d940dd29fd2.mod mirror://goproxy//github.com/elastic/dhcp/@v/v0.0.0-20200227161230-57ec251c7eb3.zip -> github.com%2Felastic%2Fdhcp%2F@v%2Fv0.0.0-20200227161230-57ec251c7eb3.zip mirror://goproxy//github.com/elastic/dhcp/@v/v0.0.0-20200227161230-57ec251c7eb3.mod -> github.com%2Felastic%2Fdhcp%2F@v%2Fv0.0.0-20200227161230-57ec251c7eb3.mod mirror://goproxy//github.com/elastic/ecs/@v/v1.5.0.zip -> github.com%2Felastic%2Fecs%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/elastic/ecs/@v/v1.5.0.mod -> github.com%2Felastic%2Fecs%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/elastic/fsevents/@v/v0.0.0-20181029231046-e1d381a4d270.zip -> github.com%2Felastic%2Ffsevents%2F@v%2Fv0.0.0-20181029231046-e1d381a4d270.zip mirror://goproxy//github.com/elastic/fsevents/@v/v0.0.0-20181029231046-e1d381a4d270.mod -> github.com%2Felastic%2Ffsevents%2F@v%2Fv0.0.0-20181029231046-e1d381a4d270.mod mirror://goproxy//github.com/elastic/go-libaudit/@v/v0.4.0.zip -> github.com%2Felastic%2Fgo-libaudit%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/elastic/go-libaudit/@v/v0.4.0.mod -> github.com%2Felastic%2Fgo-libaudit%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/elastic/go-licenser/@v/v0.2.1.zip -> github.com%2Felastic%2Fgo-licenser%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/elastic/go-licenser/@v/v0.2.1.mod -> github.com%2Felastic%2Fgo-licenser%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/elastic/go-lookslike/@v/v0.3.0.zip -> github.com%2Felastic%2Fgo-lookslike%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/elastic/go-lookslike/@v/v0.3.0.mod -> github.com%2Felastic%2Fgo-lookslike%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/elastic/go-lumber/@v/v0.1.0.zip -> github.com%2Felastic%2Fgo-lumber%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/elastic/go-lumber/@v/v0.1.0.mod -> github.com%2Felastic%2Fgo-lumber%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/elastic/go-perf/@v/v0.0.0-20191212140718-9c656876f595.zip -> github.com%2Felastic%2Fgo-perf%2F@v%2Fv0.0.0-20191212140718-9c656876f595.zip mirror://goproxy//github.com/elastic/go-perf/@v/v0.0.0-20191212140718-9c656876f595.mod -> github.com%2Felastic%2Fgo-perf%2F@v%2Fv0.0.0-20191212140718-9c656876f595.mod mirror://goproxy//github.com/elastic/go-plugins-helpers/@v/v0.0.0-20200207104224-bdf17607b79f.zip -> github.com%2Felastic%2Fgo-plugins-helpers%2F@v%2Fv0.0.0-20200207104224-bdf17607b79f.zip mirror://goproxy//github.com/elastic/go-plugins-helpers/@v/v0.0.0-20200207104224-bdf17607b79f.mod -> github.com%2Felastic%2Fgo-plugins-helpers%2F@v%2Fv0.0.0-20200207104224-bdf17607b79f.mod mirror://goproxy//github.com/elastic/go-seccomp-bpf/@v/v1.1.0.zip -> github.com%2Felastic%2Fgo-seccomp-bpf%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/elastic/go-seccomp-bpf/@v/v1.1.0.mod -> github.com%2Felastic%2Fgo-seccomp-bpf%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/elastic/go-structform/@v/v0.0.6.zip -> github.com%2Felastic%2Fgo-structform%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/elastic/go-structform/@v/v0.0.6.mod -> github.com%2Felastic%2Fgo-structform%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/elastic/go-sysinfo/@v/v1.3.0.zip -> github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/elastic/go-sysinfo/@v/v1.3.0.mod -> github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/elastic/go-txfile/@v/v0.0.7.zip -> github.com%2Felastic%2Fgo-txfile%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/elastic/go-txfile/@v/v0.0.7.mod -> github.com%2Felastic%2Fgo-txfile%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/elastic/go-ucfg/@v/v0.7.0.zip -> github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/elastic/go-ucfg/@v/v0.7.0.mod -> github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/elastic/go-ucfg/@v/v0.8.3.zip -> github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.8.3.zip mirror://goproxy//github.com/elastic/go-ucfg/@v/v0.8.3.mod -> github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.8.3.mod mirror://goproxy//github.com/elastic/go-windows/@v/v1.0.0.mod -> github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elastic/go-windows/@v/v1.0.1.zip -> github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/elastic/go-windows/@v/v1.0.1.mod -> github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/elastic/gosigar/@v/v0.10.5.zip -> github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.5.zip mirror://goproxy//github.com/elastic/gosigar/@v/v0.10.5.mod -> github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.5.mod mirror://goproxy//github.com/elastic/sarama/@v/v0.0.0-20191122160421-355d120d0970.zip -> github.com%2Felastic%2Fsarama%2F@v%2Fv0.0.0-20191122160421-355d120d0970.zip mirror://goproxy//github.com/elastic/sarama/@v/v0.0.0-20191122160421-355d120d0970.mod -> github.com%2Felastic%2Fsarama%2F@v%2Fv0.0.0-20191122160421-355d120d0970.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v0.0.0-20190203023257-5858425f7550.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv0.0.0-20190203023257-5858425f7550.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.5.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.5.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.zip -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.mod -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.4.1.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.4.1.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/garyburd/redigo/@v/v1.0.1-0.20160525165706-b8dc90050f24.zip -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv1.0.1-0.20160525165706-b8dc90050f24.zip mirror://goproxy//github.com/garyburd/redigo/@v/v1.0.1-0.20160525165706-b8dc90050f24.mod -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv1.0.1-0.20160525165706-b8dc90050f24.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.zip -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-martini/martini/@v/v0.0.0-20170121215854-22fa46961aab.zip -> github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.zip mirror://goproxy//github.com/go-martini/martini/@v/v0.0.0-20170121215854-22fa46961aab.mod -> github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.5-0.20190920104607-14974a1cf647.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.5-0.20190920104607-14974a1cf647.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.5-0.20190920104607-14974a1cf647.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.5-0.20190920104607-14974a1cf647.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-sourcemap/sourcemap/@v/v2.1.2+incompatible.zip -> github.com%2Fgo-sourcemap%2Fsourcemap%2F@v%2Fv2.1.2+incompatible.zip mirror://goproxy//github.com/go-sourcemap/sourcemap/@v/v2.1.2+incompatible.mod -> github.com%2Fgo-sourcemap%2Fsourcemap%2F@v%2Fv2.1.2+incompatible.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gocarina/gocsv/@v/v0.0.0-20170324095351-ffef3ffc77be.zip -> github.com%2Fgocarina%2Fgocsv%2F@v%2Fv0.0.0-20170324095351-ffef3ffc77be.zip mirror://goproxy//github.com/gocarina/gocsv/@v/v0.0.0-20170324095351-ffef3ffc77be.mod -> github.com%2Fgocarina%2Fgocsv%2F@v%2Fv0.0.0-20170324095351-ffef3ffc77be.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.zip -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.zip mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/godror/godror/@v/v0.10.4.zip -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.10.4.zip mirror://goproxy//github.com/godror/godror/@v/v0.10.4.mod -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.10.4.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.7.1.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.7.2-0.20190320160742-5135e617513b.zip -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.2-0.20190320160742-5135e617513b.zip mirror://goproxy//github.com/gofrs/flock/@v/v0.7.2-0.20190320160742-5135e617513b.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.2-0.20190320160742-5135e617513b.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.zip -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/gogo/protobuf/@v/v0.0.0-20171007142547-342cbe0a0415.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv0.0.0-20171007142547-342cbe0a0415.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.0.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20160524151835-7d79101e329e.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20160524151835-7d79101e329e.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/flatbuffers/@v/v1.7.2-0.20170925184458-7a6b2bf521e9.zip -> github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.7.2-0.20170925184458-7a6b2bf521e9.zip mirror://goproxy//github.com/google/flatbuffers/@v/v1.7.2-0.20170925184458-7a6b2bf521e9.mod -> github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.7.2-0.20170925184458-7a6b2bf521e9.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-github/v28/@v/v28.1.1.zip -> github.com%2Fgoogle%2Fgo-github%2Fv28%2F@v%2Fv28.1.1.zip mirror://goproxy//github.com/google/go-github/v28/@v/v28.1.1.mod -> github.com%2Fgoogle%2Fgo-github%2Fv28%2F@v%2Fv28.1.1.mod mirror://goproxy//github.com/google/go-github/v29/@v/v29.0.2.zip -> github.com%2Fgoogle%2Fgo-github%2Fv29%2F@v%2Fv29.0.2.zip mirror://goproxy//github.com/google/go-github/v29/@v/v29.0.2.mod -> github.com%2Fgoogle%2Fgo-github%2Fv29%2F@v%2Fv29.0.2.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20170612174753-24818f796faf.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/subcommands/@v/v1.0.1.mod -> github.com%2Fgoogle%2Fsubcommands%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2-0.20190416172445-c2e93f3ae59f.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2-0.20190416172445-c2e93f3ae59f.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.2-0.20190416172445-c2e93f3ae59f.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2-0.20190416172445-c2e93f3ae59f.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170426233943-68f4ded48ba9.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170426233943-68f4ded48ba9.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.1-0.20190624222214-25d8b0b66985.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.1-0.20190624222214-25d8b0b66985.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.1-0.20190624222214-25d8b0b66985.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.1-0.20190624222214-25d8b0b66985.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.0.0-20190126172459-c818fa66e4c8.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20190126172459-c818fa66e4c8.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorhill/cronexpr/@v/v0.0.0-20161205141322-d520615e531a.zip -> github.com%2Fgorhill%2Fcronexpr%2F@v%2Fv0.0.0-20161205141322-d520615e531a.zip mirror://goproxy//github.com/gorhill/cronexpr/@v/v0.0.0-20161205141322-d520615e531a.mod -> github.com%2Fgorhill%2Fcronexpr%2F@v%2Fv0.0.0-20161205141322-d520615e531a.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20170728041850-787624de3eb7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20170728041850-787624de3eb7.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.13.0.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.13.0.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.13.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v0.0.0-20141028054710-7554cd9344ce.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v0.0.0-20161216184304-ed905158d874.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.2-0.20190520140433-59383c442f7d.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.2-0.20190520140433-59383c442f7d.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.2-0.20190520140433-59383c442f7d.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.2-0.20190520140433-59383c442f7d.mod mirror://goproxy//github.com/haya14busa/go-actions-toolkit/@v/v0.0.0-20200105081403-ca0307860f01.zip -> github.com%2Fhaya14busa%2Fgo-actions-toolkit%2F@v%2Fv0.0.0-20200105081403-ca0307860f01.zip mirror://goproxy//github.com/haya14busa/go-actions-toolkit/@v/v0.0.0-20200105081403-ca0307860f01.mod -> github.com%2Fhaya14busa%2Fgo-actions-toolkit%2F@v%2Fv0.0.0-20200105081403-ca0307860f01.mod mirror://goproxy//github.com/haya14busa/go-checkstyle/@v/v0.0.0-20170303121022-5e9d09f51fa1.mod -> github.com%2Fhaya14busa%2Fgo-checkstyle%2F@v%2Fv0.0.0-20170303121022-5e9d09f51fa1.mod mirror://goproxy//github.com/haya14busa/secretbox/@v/v0.0.0-20180525171038-07c7ecf409f5.mod -> github.com%2Fhaya14busa%2Fsecretbox%2F@v%2Fv0.0.0-20180525171038-07c7ecf409f5.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jcmturner/gofork/@v/v0.0.0-20190328161633-dc7c13fece03.mod -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv0.0.0-20190328161633-dc7c13fece03.mod mirror://goproxy//github.com/jcmturner/gofork/@v/v1.0.0.zip -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jcmturner/gofork/@v/v1.0.0.mod -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jessevdk/go-flags/@v/v1.4.0.mod -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmoiron/sqlx/@v/v1.2.1-0.20190826204134-d7d95172beb5.zip -> github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.1-0.20190826204134-d7d95172beb5.zip mirror://goproxy//github.com/jmoiron/sqlx/@v/v1.2.1-0.20190826204134-d7d95172beb5.mod -> github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.1-0.20190826204134-d7d95172beb5.mod mirror://goproxy//github.com/joeshaw/multierror/@v/v0.0.0-20140124173710-69b34d4ec901.zip -> github.com%2Fjoeshaw%2Fmultierror%2F@v%2Fv0.0.0-20140124173710-69b34d4ec901.zip mirror://goproxy//github.com/joeshaw/multierror/@v/v0.0.0-20140124173710-69b34d4ec901.mod -> github.com%2Fjoeshaw%2Fmultierror%2F@v%2Fv0.0.0-20140124173710-69b34d4ec901.mod mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.zip -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/josephspurrier/goversioninfo/@v/v0.0.0-20200309025242-14b0ab84c6ca.zip -> github.com%2Fjosephspurrier%2Fgoversioninfo%2F@v%2Fv0.0.0-20200309025242-14b0ab84c6ca.zip mirror://goproxy//github.com/josephspurrier/goversioninfo/@v/v0.0.0-20200309025242-14b0ab84c6ca.mod -> github.com%2Fjosephspurrier%2Fgoversioninfo%2F@v%2Fv0.0.0-20200309025242-14b0ab84c6ca.mod mirror://goproxy//github.com/jpillora/backoff/@v/v0.0.0-20180909062703-3050d21c67d7.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv0.0.0-20180909062703-3050d21c67d7.mod mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.zip -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180701071628-ab8a2e0c74be.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180701071628-ab8a2e0c74be.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.zip -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.zip mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.zip -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/justinas/nosurf/@v/v1.1.0.mod -> github.com%2Fjustinas%2Fnosurf%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.8.2.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.8.2.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.9.3-0.20191122130757-c099ac9f21dd.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.3-0.20191122130757-c099ac9f21dd.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.9.3-0.20191122130757-c099ac9f21dd.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.3-0.20191122130757-c099ac9f21dd.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.zip -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.zip mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.zip -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.0.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.2-0.20190507191818-2ff3cb3adc01.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.2-0.20190507191818-2ff3cb3adc01.zip mirror://goproxy//github.com/lib/pq/@v/v1.1.2-0.20190507191818-2ff3cb3adc01.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.2-0.20190507191818-2ff3cb3adc01.mod mirror://goproxy//github.com/magefile/mage/@v/v1.9.0.zip -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/magefile/mage/@v/v1.9.0.mod -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.1.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.1.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/martini-contrib/render/@v/v0.0.0-20150707142108-ec18f8345a11.zip -> github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.zip mirror://goproxy//github.com/martini-contrib/render/@v/v0.0.0-20150707142108-ec18f8345a11.mod -> github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.8.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20190610004146-91bb50d98149.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190610004146-91bb50d98149.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20191113090002-7c0f6868bffe.zip -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20191113090002-7c0f6868bffe.zip mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20191113090002-7c0f6868bffe.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20191113090002-7c0f6868bffe.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.2.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.7.zip -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.7.zip mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.7.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.7.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.9.0.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.9.0.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.15.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.15.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170116052023-ab25296c0f51.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170116052023-ab25296c0f51.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170116052023-ab25296c0f51.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170116052023-ab25296c0f51.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.5.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20190113212917-5533ce8a0da3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20190113212917-5533ce8a0da3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.2.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.0.20190228220655-ac19fd6e7483.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.0.20190228220655-ac19fd6e7483.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.0.20190228220655-ac19fd6e7483.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.0.20190228220655-ac19fd6e7483.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.2-0.20190823105129-775207bd45b6.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.2-0.20190823105129-775207bd45b6.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.2-0.20190823105129-775207bd45b6.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.2-0.20190823105129-775207bd45b6.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.0.0-20190115041553-12f6a991201f.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.0.0-20190115041553-12f6a991201f.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v0.1.2-0.20190507144316-5b71a03e2700.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv0.1.2-0.20190507144316-5b71a03e2700.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runtime-tools/@v/v0.0.0-20181011054405-1d69bd0f9c39.mod -> github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod mirror://goproxy//github.com/oxtoacart/bpool/@v/v0.0.0-20150712133111-4e1c5567d7c2.zip -> github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.zip mirror://goproxy//github.com/oxtoacart/bpool/@v/v0.0.0-20150712133111-4e1c5567d7c2.mod -> github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.2.6+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.2.6+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.2.6+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.2.6+incompatible.mod mirror://goproxy//github.com/pierrre/gotestcover/@v/v0.0.0-20160113212533-7b94f124d338.zip -> github.com%2Fpierrre%2Fgotestcover%2F@v%2Fv0.0.0-20160113212533-7b94f124d338.zip mirror://goproxy//github.com/pierrre/gotestcover/@v/v0.0.0-20160113212533-7b94f124d338.mod -> github.com%2Fpierrre%2Fgotestcover%2F@v%2Fv0.0.0-20160113212533-7b94f124d338.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1-0.20171018195549-f15c970de5b7.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20171018195549-f15c970de5b7.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.1-0.20190913103102-20428fa0bffc.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.1-0.20190913103102-20428fa0bffc.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.1-0.20190913103102-20428fa0bffc.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.1-0.20190913103102-20428fa0bffc.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190425082905-87a4384529e0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190425082905-87a4384529e0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.5.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.9-0.20191208103036-42f6e295b56f.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.9-0.20191208103036-42f6e295b56f.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.9-0.20191208103036-42f6e295b56f.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.9-0.20191208103036-42f6e295b56f.mod mirror://goproxy//github.com/prometheus/prometheus/@v/v2.5.0+incompatible.zip -> github.com%2Fprometheus%2Fprometheus%2F@v%2Fv2.5.0+incompatible.zip mirror://goproxy//github.com/prometheus/prometheus/@v/v2.5.0+incompatible.mod -> github.com%2Fprometheus%2Fprometheus%2F@v%2Fv2.5.0+incompatible.mod mirror://goproxy//github.com/rakyll/statik/@v/v0.1.6.mod -> github.com%2Frakyll%2Fstatik%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20181016184325-3113b8401b8a.zip -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.zip mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20181016184325-3113b8401b8a.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod mirror://goproxy//github.com/reviewdog/errorformat/@v/v0.0.0-20200109134752-8983be9bc7dd.zip -> github.com%2Freviewdog%2Ferrorformat%2F@v%2Fv0.0.0-20200109134752-8983be9bc7dd.zip mirror://goproxy//github.com/reviewdog/errorformat/@v/v0.0.0-20200109134752-8983be9bc7dd.mod -> github.com%2Freviewdog%2Ferrorformat%2F@v%2Fv0.0.0-20200109134752-8983be9bc7dd.mod mirror://goproxy//github.com/reviewdog/reviewdog/@v/v0.9.17.zip -> github.com%2Freviewdog%2Freviewdog%2F@v%2Fv0.9.17.zip mirror://goproxy//github.com/reviewdog/reviewdog/@v/v0.9.17.mod -> github.com%2Freviewdog%2Freviewdog%2F@v%2Fv0.9.17.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v1.2.0.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/samuel/go-parser/@v/v0.0.0-20130731160455-ca8abbf65d0e.zip -> github.com%2Fsamuel%2Fgo-parser%2F@v%2Fv0.0.0-20130731160455-ca8abbf65d0e.zip mirror://goproxy//github.com/samuel/go-parser/@v/v0.0.0-20130731160455-ca8abbf65d0e.mod -> github.com%2Fsamuel%2Fgo-parser%2F@v%2Fv0.0.0-20130731160455-ca8abbf65d0e.mod mirror://goproxy//github.com/samuel/go-thrift/@v/v0.0.0-20140522043831-2187045faa54.zip -> github.com%2Fsamuel%2Fgo-thrift%2F@v%2Fv0.0.0-20140522043831-2187045faa54.zip mirror://goproxy//github.com/samuel/go-thrift/@v/v0.0.0-20140522043831-2187045faa54.mod -> github.com%2Fsamuel%2Fgo-thrift%2F@v%2Fv0.0.0-20140522043831-2187045faa54.mod mirror://goproxy//github.com/sanathkr/go-yaml/@v/v0.0.0-20170819195128-ed9d249f429b.zip -> github.com%2Fsanathkr%2Fgo-yaml%2F@v%2Fv0.0.0-20170819195128-ed9d249f429b.zip mirror://goproxy//github.com/sanathkr/go-yaml/@v/v0.0.0-20170819195128-ed9d249f429b.mod -> github.com%2Fsanathkr%2Fgo-yaml%2F@v%2Fv0.0.0-20170819195128-ed9d249f429b.mod mirror://goproxy//github.com/sanathkr/yaml/@v/v0.0.0-20170819201035-0056894fa522.mod -> github.com%2Fsanathkr%2Fyaml%2F@v%2Fv0.0.0-20170819201035-0056894fa522.mod mirror://goproxy//github.com/sanathkr/yaml/@v/v1.0.1-0.20170819201035-0056894fa522.zip -> github.com%2Fsanathkr%2Fyaml%2F@v%2Fv1.0.1-0.20170819201035-0056894fa522.zip mirror://goproxy//github.com/sanathkr/yaml/@v/v1.0.1-0.20170819201035-0056894fa522.mod -> github.com%2Fsanathkr%2Fyaml%2F@v%2Fv1.0.1-0.20170819201035-0056894fa522.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v2.19.11+incompatible.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.19.11+incompatible.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v2.19.11+incompatible.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.19.11+incompatible.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.4-0.20170822132746-89742aefa4b2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.4-0.20170822132746-89742aefa4b2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.2-0.20180702103455-b8b73a35e983.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.2-0.20180702103455-b8b73a35e983.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.2-0.20180702103455-b8b73a35e983.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.2-0.20180702103455-b8b73a35e983.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20170704070218-db04d3cc01c8.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.mod mirror://goproxy//github.com/tsg/go-daemon/@v/v0.0.0-20200207173439-e704b93fd89b.zip -> github.com%2Ftsg%2Fgo-daemon%2F@v%2Fv0.0.0-20200207173439-e704b93fd89b.zip mirror://goproxy//github.com/tsg/go-daemon/@v/v0.0.0-20200207173439-e704b93fd89b.mod -> github.com%2Ftsg%2Fgo-daemon%2F@v%2Fv0.0.0-20200207173439-e704b93fd89b.mod mirror://goproxy//github.com/tsg/gopacket/@v/v0.0.0-20190320122513-dd3d0e41124a.zip -> github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20190320122513-dd3d0e41124a.zip mirror://goproxy//github.com/tsg/gopacket/@v/v0.0.0-20190320122513-dd3d0e41124a.mod -> github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20190320122513-dd3d0e41124a.mod mirror://goproxy//github.com/urfave/cli/@v/v0.0.0-20171014202726-7bc6a0acffa5.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.mod mirror://goproxy//github.com/urso/go-bin/@v/v0.0.0-20180220135811-781c575c9f0e.zip -> github.com%2Furso%2Fgo-bin%2F@v%2Fv0.0.0-20180220135811-781c575c9f0e.zip mirror://goproxy//github.com/urso/go-bin/@v/v0.0.0-20180220135811-781c575c9f0e.mod -> github.com%2Furso%2Fgo-bin%2F@v%2Fv0.0.0-20180220135811-781c575c9f0e.mod mirror://goproxy//github.com/urso/magetools/@v/v0.0.0-20190919040553-290c89e0c230.mod -> github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20190919040553-290c89e0c230.mod mirror://goproxy//github.com/urso/magetools/@v/v0.0.0-20200106130147-61080ed7b22b.zip -> github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20200106130147-61080ed7b22b.zip mirror://goproxy//github.com/urso/magetools/@v/v0.0.0-20200106130147-61080ed7b22b.mod -> github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20200106130147-61080ed7b22b.mod mirror://goproxy//github.com/urso/qcgen/@v/v0.0.0-20180131103024-0b059e7db4f4.zip -> github.com%2Furso%2Fqcgen%2F@v%2Fv0.0.0-20180131103024-0b059e7db4f4.zip mirror://goproxy//github.com/urso/qcgen/@v/v0.0.0-20180131103024-0b059e7db4f4.mod -> github.com%2Furso%2Fqcgen%2F@v%2Fv0.0.0-20180131103024-0b059e7db4f4.mod mirror://goproxy//github.com/vbatts/tar-split/@v/v0.11.1.mod -> github.com%2Fvbatts%2Ftar-split%2F@v%2Fv0.11.1.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.0.0-20170802214208-2cad15190b41.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.0.0-20170802214208-2cad15190b41.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.0.0-20170802214208-2cad15190b41.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.0.0-20170802214208-2cad15190b41.mod mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.22.3.zip -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.22.3.zip mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.22.3.mod -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.22.3.mod mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.zip -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.zip mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.mod -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.mod mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.zip -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.mod -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20190905194746-02993c407bfb.zip -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20190905194746-02993c407bfb.zip mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20190905194746-02993c407bfb.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20190905194746-02993c407bfb.mod mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.zip -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.zip mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.mod -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20180618132009-1d523034197f.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20181112162635-ac52e6811b56.zip -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20181112162635-ac52e6811b56.zip mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20181112162635-ac52e6811b56.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20181112162635-ac52e6811b56.mod mirror://goproxy//github.com/yuin/gopher-lua/@v/v0.0.0-20170403160031-b402f3114ec7.zip -> github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20170403160031-b402f3114ec7.zip mirror://goproxy//github.com/yuin/gopher-lua/@v/v0.0.0-20170403160031-b402f3114ec7.mod -> github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20170403160031-b402f3114ec7.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.zip -> go.opencensus.io%2F@v%2Fv0.22.0.zip mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.zip -> go.opencensus.io%2F@v%2Fv0.22.2.zip mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.1.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.3.1.zip mirror://goproxy//go.uber.org/atomic/@v/v1.3.1.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.1.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.1-0.20170829224307-fb7d312c2c04.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.1-0.20170829224307-fb7d312c2c04.zip mirror://goproxy//go.uber.org/multierr/@v/v1.1.1-0.20170829224307-fb7d312c2c04.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.1-0.20170829224307-fb7d312c2c04.mod mirror://goproxy//go.uber.org/zap/@v/v1.7.1.zip -> go.uber.org%2Fzap%2F@v%2Fv1.7.1.zip mirror://goproxy//go.uber.org/zap/@v/v1.7.1.mod -> go.uber.org%2Fzap%2F@v%2Fv1.7.1.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20171113213409-9f005a07e0d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20171113213409-9f005a07e0d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181025213731-e84da0312774.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181025213731-e84da0312774.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190404164418-38d8ce5564a5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190404164418-38d8ce5564a5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200204104054-c9f3fb736b72.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200204104054-c9f3fb736b72.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200204104054-c9f3fb736b72.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200204104054-c9f3fb736b72.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.zip -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.zip mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181108082009-03003ca0c849.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181108082009-03003ca0c849.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190206173232-65e2d4e15006.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190206173232-65e2d4e15006.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191002035440-2ec189313ef0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191002035440-2ec189313ef0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191021144547-ec77196f6094.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191021144547-ec77196f6094.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191112182307-2180aed22343.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191112182307-2180aed22343.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181106182150-f42d05182288.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181106182150-f42d05182288.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190130055435-99b60b757ec1.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190130055435-99b60b757ec1.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190405154228-4b34438f7a67.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190405154228-4b34438f7a67.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190514135907-3a4b5fb9f71f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190514135907-3a4b5fb9f71f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190616124812-15dcb6c0061f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190801041406-cbf593c0f2f3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191025021431-6c3a3bfe00ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191025021431-6c3a3bfe00ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191112214154-59a1497f0cea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191112214154-59a1497f0cea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200102141924-c96a22e43c9c.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200102141924-c96a22e43c9c.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200102141924-c96a22e43c9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200102141924-c96a22e43c9c.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20181227161524-e6919f6577db.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20161028155119-f51c12702a4d.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20161028155119-f51c12702a4d.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.zip mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.2.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.3.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.3.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190927181202-20e1ac93f88c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190927181202-20e1ac93f88c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.24.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.0.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.0.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.0.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.0.mod mirror://goproxy//gopkg.in/jcmturner/aescts.v1/@v/v1.0.1.zip -> gopkg.in%2Fjcmturner%2Faescts.v1%2F@v%2Fv1.0.1.zip mirror://goproxy//gopkg.in/jcmturner/aescts.v1/@v/v1.0.1.mod -> gopkg.in%2Fjcmturner%2Faescts.v1%2F@v%2Fv1.0.1.mod mirror://goproxy//gopkg.in/jcmturner/dnsutils.v1/@v/v1.0.1.zip -> gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.zip mirror://goproxy//gopkg.in/jcmturner/dnsutils.v1/@v/v1.0.1.mod -> gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.mod mirror://goproxy//gopkg.in/jcmturner/goidentity.v3/@v/v3.0.0.zip -> gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.zip mirror://goproxy//gopkg.in/jcmturner/goidentity.v3/@v/v3.0.0.mod -> gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.mod mirror://goproxy//gopkg.in/jcmturner/gokrb5.v7/@v/v7.2.3.mod -> gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.2.3.mod mirror://goproxy//gopkg.in/jcmturner/gokrb5.v7/@v/v7.3.0.zip -> gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.3.0.zip mirror://goproxy//gopkg.in/jcmturner/gokrb5.v7/@v/v7.3.0.mod -> gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.3.0.mod mirror://goproxy//gopkg.in/jcmturner/rpc.v1/@v/v1.1.0.zip -> gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.zip mirror://goproxy//gopkg.in/jcmturner/rpc.v1/@v/v1.1.0.mod -> gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20160818020120-3f83fa500528.zip -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20160818020120-3f83fa500528.zip mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20160818020120-3f83fa500528.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20160818020120-3f83fa500528.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.3.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//howett.net/plist/@v/v0.0.0-20181124034731-591f970eefbb.zip -> howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.zip mirror://goproxy//howett.net/plist/@v/v0.0.0-20181124034731-591f970eefbb.mod -> howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20190620084959-7cf5895f2711.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190620084959-7cf5895f2711.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20190722141453-b90922c02518.zip -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190722141453-b90922c02518.zip mirror://goproxy//k8s.io/api/@v/v0.0.0-20190722141453-b90922c02518.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190722141453-b90922c02518.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190612205821-1799e75a0719.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190612205821-1799e75a0719.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190719140911-bfcf53abc9f8.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190719140911-bfcf53abc9f8.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190719140911-bfcf53abc9f8.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190719140911-bfcf53abc9f8.mod mirror://goproxy//k8s.io/client-go/@v/v0.0.0-20190620085101-78d2af792bab.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.0.0-20190620085101-78d2af792bab.zip mirror://goproxy//k8s.io/client-go/@v/v0.0.0-20190620085101-78d2af792bab.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.0.0-20190620085101-78d2af792bab.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v0.3.1.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.1.mod mirror://goproxy//k8s.io/klog/@v/v0.3.4-0.20190719014911-6a023d6d0e09.zip -> k8s.io%2Fklog%2F@v%2Fv0.3.4-0.20190719014911-6a023d6d0e09.zip mirror://goproxy//k8s.io/klog/@v/v0.3.4-0.20190719014911-6a023d6d0e09.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.4-0.20190719014911-6a023d6d0e09.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190228160746-b3a7cee44a30.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190228160746-b3a7cee44a30.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190709113604-33be087ad058.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190709113604-33be087ad058.mod mirror://goproxy//k8s.io/kubernetes/@v/v1.13.0.mod -> k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190221042446-c2654d5206da.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190221042446-c2654d5206da.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190712204705-3dccf664f023.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190712204705-3dccf664f023.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190712204705-3dccf664f023.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190712204705-3dccf664f023.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.1-0.20190704183835-4cd0c284b15f.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.1-0.20190704183835-4cd0c284b15f.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.1-0.20190704183835-4cd0c284b15f.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.1-0.20190704183835-4cd0c284b15f.mod
-_eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=3d0e23af43cfe1202f317a4cc2903b34
diff --git a/metadata/md5-cache/app-admin/filebeat-7.9.1 b/metadata/md5-cache/app-admin/filebeat-7.9.3
similarity index 99%
rename from metadata/md5-cache/app-admin/filebeat-7.9.1
rename to metadata/md5-cache/app-admin/filebeat-7.9.3
index 7022d5283af0..53f99c8d044d 100644
--- a/metadata/md5-cache/app-admin/filebeat-7.9.1
+++ b/metadata/md5-cache/app-admin/filebeat-7.9.3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0 BSD-2 MIT
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/elastic/beats/archive/v7.9.1.tar.gz -> filebeat-7.9.1.tar.gz mirror://goproxy//4d63.com/embedfiles/@v/v0.0.0-20190311033909-995e0740726f.zip -> 4d63.com%2Fembedfiles%2F@v%2Fv0.0.0-20190311033909-995e0740726f.zip mirror://goproxy//4d63.com/embedfiles/@v/v0.0.0-20190311033909-995e0740726f.mod -> 4d63.com%2Fembedfiles%2F@v%2Fv0.0.0-20190311033909-995e0740726f.mod mirror://goproxy//4d63.com/tz/@v/v1.1.1-0.20191124060701-6d37baae851b.zip -> 4d63.com%2Ftz%2F@v%2Fv1.1.1-0.20191124060701-6d37baae851b.zip mirror://goproxy//4d63.com/tz/@v/v1.1.1-0.20191124060701-6d37baae851b.mod -> 4d63.com%2Ftz%2F@v%2Fv1.1.1-0.20191124060701-6d37baae851b.mod mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.51.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.51.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.zip -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.zip mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.zip -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.zip mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.zip -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.zip mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.zip mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//code.cloudfoundry.org/go-diodes/@v/v0.0.0-20190809170250-f77fb823c7ee.zip -> code.cloudfoundry.org%2Fgo-diodes%2F@v%2Fv0.0.0-20190809170250-f77fb823c7ee.zip mirror://goproxy//code.cloudfoundry.org/go-diodes/@v/v0.0.0-20190809170250-f77fb823c7ee.mod -> code.cloudfoundry.org%2Fgo-diodes%2F@v%2Fv0.0.0-20190809170250-f77fb823c7ee.mod mirror://goproxy//code.cloudfoundry.org/go-loggregator/@v/v7.4.0+incompatible.zip -> code.cloudfoundry.org%2Fgo-loggregator%2F@v%2Fv7.4.0+incompatible.zip mirror://goproxy//code.cloudfoundry.org/go-loggregator/@v/v7.4.0+incompatible.mod -> code.cloudfoundry.org%2Fgo-loggregator%2F@v%2Fv7.4.0+incompatible.mod mirror://goproxy//code.cloudfoundry.org/gofileutils/@v/v0.0.0-20170111115228-4d0c80011a0f.zip -> code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a0f.zip mirror://goproxy//code.cloudfoundry.org/gofileutils/@v/v0.0.0-20170111115228-4d0c80011a0f.mod -> code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a0f.mod mirror://goproxy//code.cloudfoundry.org/rfc5424/@v/v0.0.0-20180905210152-236a6d29298a.zip -> code.cloudfoundry.org%2Frfc5424%2F@v%2Fv0.0.0-20180905210152-236a6d29298a.zip mirror://goproxy//code.cloudfoundry.org/rfc5424/@v/v0.0.0-20180905210152-236a6d29298a.mod -> code.cloudfoundry.org%2Frfc5424%2F@v%2Fv0.0.0-20180905210152-236a6d29298a.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/azure-amqp-common-go/v3/@v/v3.0.0.zip -> github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//github.com/!azure/azure-amqp-common-go/v3/@v/v3.0.0.mod -> github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/!azure/azure-event-hubs-go/v3/@v/v3.1.2.zip -> github.com%2F!azure%2Fazure-event-hubs-go%2Fv3%2F@v%2Fv3.1.2.zip mirror://goproxy//github.com/!azure/azure-event-hubs-go/v3/@v/v3.1.2.mod -> github.com%2F!azure%2Fazure-event-hubs-go%2Fv3%2F@v%2Fv3.1.2.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.1.8.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.1.9.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.1.9.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.1.zip -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.1.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v37.1.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv37.1.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v37.1.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv37.1.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.6.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.8.0.zip -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.8.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-amqp/@v/v0.12.6.zip -> github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.6.zip mirror://goproxy//github.com/!azure/go-amqp/@v/v0.12.6.mod -> github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.6.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.4.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.4.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.4.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.4.2.zip -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/!masterminds/semver/@v/v1.4.2.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.zip -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.zip mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.mod -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod mirror://goproxy//github.com/!sirupsen/logrus/@v/v1.0.1-0.20170608221441-85b1699d5056.mod -> github.com%2F!sirupsen%2Flogrus%2F@v%2Fv1.0.1-0.20170608221441-85b1699d5056.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20170221213301-9f32b5905fd6.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20170221213301-9f32b5905fd6.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20170221213301-9f32b5905fd6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20170221213301-9f32b5905fd6.mod mirror://goproxy//github.com/adriansr/fsnotify/@v/v0.0.0-20180417234312-c9bbe1f46f1d.zip -> github.com%2Fadriansr%2Ffsnotify%2F@v%2Fv0.0.0-20180417234312-c9bbe1f46f1d.zip mirror://goproxy//github.com/adriansr/fsnotify/@v/v0.0.0-20180417234312-c9bbe1f46f1d.mod -> github.com%2Fadriansr%2Ffsnotify%2F@v%2Fv0.0.0-20180417234312-c9bbe1f46f1d.mod mirror://goproxy//github.com/adriansr/gopacket/@v/v1.1.18-0.20200327165309-dd62abfa8a41.zip -> github.com%2Fadriansr%2Fgopacket%2F@v%2Fv1.1.18-0.20200327165309-dd62abfa8a41.zip mirror://goproxy//github.com/adriansr/gopacket/@v/v1.1.18-0.20200327165309-dd62abfa8a41.mod -> github.com%2Fadriansr%2Fgopacket%2F@v%2Fv1.1.18-0.20200327165309-dd62abfa8a41.mod mirror://goproxy//github.com/aerospike/aerospike-client-go/@v/v1.27.1-0.20170612174108-0f3b54da6bdc.zip -> github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv1.27.1-0.20170612174108-0f3b54da6bdc.zip mirror://goproxy//github.com/aerospike/aerospike-client-go/@v/v1.27.1-0.20170612174108-0f3b54da6bdc.mod -> github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv1.27.1-0.20170612174108-0f3b54da6bdc.mod mirror://goproxy//github.com/akavel/rsrc/@v/v0.8.0.zip -> github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/akavel/rsrc/@v/v0.8.0.mod -> github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.zip -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.zip mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.zip -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.zip mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/andrewkroh/goja/@v/v0.0.0-20190128172624-dd2ac4456e20.zip -> github.com%2Fandrewkroh%2Fgoja%2F@v%2Fv0.0.0-20190128172624-dd2ac4456e20.zip mirror://goproxy//github.com/andrewkroh/goja/@v/v0.0.0-20190128172624-dd2ac4456e20.mod -> github.com%2Fandrewkroh%2Fgoja%2F@v%2Fv0.0.0-20190128172624-dd2ac4456e20.mod mirror://goproxy//github.com/andrewkroh/sys/@v/v0.0.0-20151128191922-287798fe3e43.zip -> github.com%2Fandrewkroh%2Fsys%2F@v%2Fv0.0.0-20151128191922-287798fe3e43.zip mirror://goproxy//github.com/andrewkroh/sys/@v/v0.0.0-20151128191922-287798fe3e43.mod -> github.com%2Fandrewkroh%2Fsys%2F@v%2Fv0.0.0-20151128191922-287798fe3e43.mod mirror://goproxy//github.com/antihax/optional/@v/v0.0.0-20180407024304-ca021399b1a6.mod -> github.com%2Fantihax%2Foptional%2F@v%2Fv0.0.0-20180407024304-ca021399b1a6.mod mirror://goproxy//github.com/antlr/antlr4/@v/v0.0.0-20200326173327-a4c66dc863bb.zip -> github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200326173327-a4c66dc863bb.zip mirror://goproxy//github.com/antlr/antlr4/@v/v0.0.0-20200326173327-a4c66dc863bb.mod -> github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200326173327-a4c66dc863bb.mod mirror://goproxy//github.com/apoydence/eachers/@v/v0.0.0-20181020210610-23942921fe77.zip -> github.com%2Fapoydence%2Feachers%2F@v%2Fv0.0.0-20181020210610-23942921fe77.zip mirror://goproxy//github.com/apoydence/eachers/@v/v0.0.0-20181020210610-23942921fe77.mod -> github.com%2Fapoydence%2Feachers%2F@v%2Fv0.0.0-20181020210610-23942921fe77.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.zip -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.zip mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.mod -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.mod mirror://goproxy//github.com/aws/aws-lambda-go/@v/v1.6.0.zip -> github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/aws/aws-lambda-go/@v/v1.6.0.mod -> github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v0.9.0.zip -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v0.9.0.mod -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/awslabs/goformation/v3/@v/v3.1.0.mod -> github.com%2Fawslabs%2Fgoformation%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/awslabs/goformation/v4/@v/v4.1.0.zip -> github.com%2Fawslabs%2Fgoformation%2Fv4%2F@v%2Fv4.1.0.zip mirror://goproxy//github.com/awslabs/goformation/v4/@v/v4.1.0.mod -> github.com%2Fawslabs%2Fgoformation%2Fv4%2F@v%2Fv4.1.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20150311145944-8bd4349a67f2.zip -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20150311145944-8bd4349a67f2.zip mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20150311145944-8bd4349a67f2.mod -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20150311145944-8bd4349a67f2.mod mirror://goproxy//github.com/blang/semver/@v/v3.1.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.mod mirror://goproxy//github.com/bradleyfalzon/ghinstallation/@v/v1.1.0.zip -> github.com%2Fbradleyfalzon%2Fghinstallation%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/bradleyfalzon/ghinstallation/@v/v1.1.0.mod -> github.com%2Fbradleyfalzon%2Fghinstallation%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/bsm/sarama-cluster/@v/v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.zip -> github.com%2Fbsm%2Fsarama-cluster%2F@v%2Fv2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.zip mirror://goproxy//github.com/bsm/sarama-cluster/@v/v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.mod -> github.com%2Fbsm%2Fsarama-cluster%2F@v%2Fv2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.mod mirror://goproxy//github.com/cavaliercoder/badio/@v/v0.0.0-20160213150051-ce5280129e9e.zip -> github.com%2Fcavaliercoder%2Fbadio%2F@v%2Fv0.0.0-20160213150051-ce5280129e9e.zip mirror://goproxy//github.com/cavaliercoder/badio/@v/v0.0.0-20160213150051-ce5280129e9e.mod -> github.com%2Fcavaliercoder%2Fbadio%2F@v%2Fv0.0.0-20160213150051-ce5280129e9e.mod mirror://goproxy//github.com/cavaliercoder/go-rpm/@v/v0.0.0-20190131055624-7a9c54e3d83e.zip -> github.com%2Fcavaliercoder%2Fgo-rpm%2F@v%2Fv0.0.0-20190131055624-7a9c54e3d83e.zip mirror://goproxy//github.com/cavaliercoder/go-rpm/@v/v0.0.0-20190131055624-7a9c54e3d83e.mod -> github.com%2Fcavaliercoder%2Fgo-rpm%2F@v%2Fv0.0.0-20190131055624-7a9c54e3d83e.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cloudfoundry-community/go-cfclient/@v/v0.0.0-20190808214049-35bcce23fc5f.zip -> github.com%2Fcloudfoundry-community%2Fgo-cfclient%2F@v%2Fv0.0.0-20190808214049-35bcce23fc5f.zip mirror://goproxy//github.com/cloudfoundry-community/go-cfclient/@v/v0.0.0-20190808214049-35bcce23fc5f.mod -> github.com%2Fcloudfoundry-community%2Fgo-cfclient%2F@v%2Fv0.0.0-20190808214049-35bcce23fc5f.mod mirror://goproxy//github.com/cloudfoundry/noaa/@v/v2.1.0+incompatible.zip -> github.com%2Fcloudfoundry%2Fnoaa%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/cloudfoundry/noaa/@v/v2.1.0+incompatible.mod -> github.com%2Fcloudfoundry%2Fnoaa%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/cloudfoundry/sonde-go/@v/v0.0.0-20171206171820-b33733203bb4.zip -> github.com%2Fcloudfoundry%2Fsonde-go%2F@v%2Fv0.0.0-20171206171820-b33733203bb4.zip mirror://goproxy//github.com/cloudfoundry/sonde-go/@v/v0.0.0-20171206171820-b33733203bb4.mod -> github.com%2Fcloudfoundry%2Fsonde-go%2F@v%2Fv0.0.0-20171206171820-b33733203bb4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/codegangsta/inject/@v/v0.0.0-20150114235600-33e0aa1cb7c0.zip -> github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.zip mirror://goproxy//github.com/codegangsta/inject/@v/v0.0.0-20150114235600-33e0aa1cb7c0.mod -> github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190919134610-bf292b21730f.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190919134610-bf292b21730f.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20180822173158-c12b1e7919c1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.3.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.3.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190426062206-aaeac12a7ffc.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200107194136-26c1120b8d41.zip -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200107194136-26c1120b8d41.zip mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200107194136-26c1120b8d41.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200107194136-26c1120b8d41.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190226154929-a9fb20d87448.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190226154929-a9fb20d87448.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190816180239-bda0ff6ed73c.zip -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190816180239-bda0ff6ed73c.zip mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190816180239-bda0ff6ed73c.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190816180239-bda0ff6ed73c.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20180907222934-5a6d9f37cfa3.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828154514-0e0f228740de.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180108230652-97fdf19511ea.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.zip mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180108230652-97fdf19511ea.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.mod mirror://goproxy//github.com/cucumber/godog/@v/v0.8.1.zip -> github.com%2Fcucumber%2Fgodog%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/cucumber/godog/@v/v0.8.1.mod -> github.com%2Fcucumber%2Fgodog%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.zip -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.mod -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/davecgh/go-xdr/@v/v0.0.0-20161123171359-e6a2ba005892.zip -> github.com%2Fdavecgh%2Fgo-xdr%2F@v%2Fv0.0.0-20161123171359-e6a2ba005892.zip mirror://goproxy//github.com/davecgh/go-xdr/@v/v0.0.0-20161123171359-e6a2ba005892.mod -> github.com%2Fdavecgh%2Fgo-xdr%2F@v%2Fv0.0.0-20161123171359-e6a2ba005892.mod mirror://goproxy//github.com/denisenkom/go-mssqldb/@v/v0.0.0-20200206145737-bbfc9a55622e.zip -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200206145737-bbfc9a55622e.zip mirror://goproxy//github.com/denisenkom/go-mssqldb/@v/v0.0.0-20200206145737-bbfc9a55622e.mod -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200206145737-bbfc9a55622e.mod mirror://goproxy//github.com/devigned/tab/@v/v0.1.1.mod -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/devigned/tab/@v/v0.1.2-0.20190607222403-0c15cf42f9a2.zip -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.2-0.20190607222403-0c15cf42f9a2.zip mirror://goproxy//github.com/devigned/tab/@v/v0.1.2-0.20190607222403-0c15cf42f9a2.mod -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.2-0.20190607222403-0c15cf42f9a2.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.mod mirror://goproxy//github.com/digitalocean/go-libvirt/@v/v0.0.0-20180301200012-6075ea3c39a1.zip -> github.com%2Fdigitalocean%2Fgo-libvirt%2F@v%2Fv0.0.0-20180301200012-6075ea3c39a1.zip mirror://goproxy//github.com/digitalocean/go-libvirt/@v/v0.0.0-20180301200012-6075ea3c39a1.mod -> github.com%2Fdigitalocean%2Fgo-libvirt%2F@v%2Fv0.0.0-20180301200012-6075ea3c39a1.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.7-0.20171009020623-7632a260cbaf.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.7-0.20171009020623-7632a260cbaf.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.7-0.20171009020623-7632a260cbaf.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.7-0.20171009020623-7632a260cbaf.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/engine/@v/v0.0.0-20191113042239-ea84732a7725.zip -> github.com%2Fdocker%2Fengine%2F@v%2Fv0.0.0-20191113042239-ea84732a7725.zip mirror://goproxy//github.com/docker/engine/@v/v0.0.0-20191113042239-ea84732a7725.mod -> github.com%2Fdocker%2Fengine%2F@v%2Fv0.0.0-20191113042239-ea84732a7725.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.zip -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.zip -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.zip mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dop251/goja_nodejs/@v/v0.0.0-20171011081505-adff31b136e6.zip -> github.com%2Fdop251%2Fgoja_nodejs%2F@v%2Fv0.0.0-20171011081505-adff31b136e6.zip mirror://goproxy//github.com/dop251/goja_nodejs/@v/v0.0.0-20171011081505-adff31b136e6.mod -> github.com%2Fdop251%2Fgoja_nodejs%2F@v%2Fv0.0.0-20171011081505-adff31b136e6.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.2.0.zip -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.2.0.mod -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.zip -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.zip mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.mod -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.zip -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.mod -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.1-0.20200121105743-0d940dd29fd2.zip -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.1-0.20200121105743-0d940dd29fd2.zip mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.1-0.20200121105743-0d940dd29fd2.mod -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.1-0.20200121105743-0d940dd29fd2.mod mirror://goproxy//github.com/elastic/dhcp/@v/v0.0.0-20200227161230-57ec251c7eb3.zip -> github.com%2Felastic%2Fdhcp%2F@v%2Fv0.0.0-20200227161230-57ec251c7eb3.zip mirror://goproxy//github.com/elastic/dhcp/@v/v0.0.0-20200227161230-57ec251c7eb3.mod -> github.com%2Felastic%2Fdhcp%2F@v%2Fv0.0.0-20200227161230-57ec251c7eb3.mod mirror://goproxy//github.com/elastic/ecs/@v/v1.5.0.zip -> github.com%2Felastic%2Fecs%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/elastic/ecs/@v/v1.5.0.mod -> github.com%2Felastic%2Fecs%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/elastic/elastic-agent-client/v7/@v/v7.0.0-20200709172729-d43b7ad5833a.zip -> github.com%2Felastic%2Felastic-agent-client%2Fv7%2F@v%2Fv7.0.0-20200709172729-d43b7ad5833a.zip mirror://goproxy//github.com/elastic/elastic-agent-client/v7/@v/v7.0.0-20200709172729-d43b7ad5833a.mod -> github.com%2Felastic%2Felastic-agent-client%2Fv7%2F@v%2Fv7.0.0-20200709172729-d43b7ad5833a.mod mirror://goproxy//github.com/elastic/fsevents/@v/v0.0.0-20181029231046-e1d381a4d270.zip -> github.com%2Felastic%2Ffsevents%2F@v%2Fv0.0.0-20181029231046-e1d381a4d270.zip mirror://goproxy//github.com/elastic/fsevents/@v/v0.0.0-20181029231046-e1d381a4d270.mod -> github.com%2Felastic%2Ffsevents%2F@v%2Fv0.0.0-20181029231046-e1d381a4d270.mod mirror://goproxy//github.com/elastic/go-concert/@v/v0.0.3.zip -> github.com%2Felastic%2Fgo-concert%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/elastic/go-concert/@v/v0.0.3.mod -> github.com%2Felastic%2Fgo-concert%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/elastic/go-libaudit/v2/@v/v2.0.0-20200515221334-92371bef3fb8.zip -> github.com%2Felastic%2Fgo-libaudit%2Fv2%2F@v%2Fv2.0.0-20200515221334-92371bef3fb8.zip mirror://goproxy//github.com/elastic/go-libaudit/v2/@v/v2.0.0-20200515221334-92371bef3fb8.mod -> github.com%2Felastic%2Fgo-libaudit%2Fv2%2F@v%2Fv2.0.0-20200515221334-92371bef3fb8.mod mirror://goproxy//github.com/elastic/go-licenser/@v/v0.3.1.zip -> github.com%2Felastic%2Fgo-licenser%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/elastic/go-licenser/@v/v0.3.1.mod -> github.com%2Felastic%2Fgo-licenser%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/elastic/go-lookslike/@v/v0.3.0.zip -> github.com%2Felastic%2Fgo-lookslike%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/elastic/go-lookslike/@v/v0.3.0.mod -> github.com%2Felastic%2Fgo-lookslike%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/elastic/go-lumber/@v/v0.1.0.zip -> github.com%2Felastic%2Fgo-lumber%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/elastic/go-lumber/@v/v0.1.0.mod -> github.com%2Felastic%2Fgo-lumber%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/elastic/go-perf/@v/v0.0.0-20191212140718-9c656876f595.zip -> github.com%2Felastic%2Fgo-perf%2F@v%2Fv0.0.0-20191212140718-9c656876f595.zip mirror://goproxy//github.com/elastic/go-perf/@v/v0.0.0-20191212140718-9c656876f595.mod -> github.com%2Felastic%2Fgo-perf%2F@v%2Fv0.0.0-20191212140718-9c656876f595.mod mirror://goproxy//github.com/elastic/go-plugins-helpers/@v/v0.0.0-20200207104224-bdf17607b79f.zip -> github.com%2Felastic%2Fgo-plugins-helpers%2F@v%2Fv0.0.0-20200207104224-bdf17607b79f.zip mirror://goproxy//github.com/elastic/go-plugins-helpers/@v/v0.0.0-20200207104224-bdf17607b79f.mod -> github.com%2Felastic%2Fgo-plugins-helpers%2F@v%2Fv0.0.0-20200207104224-bdf17607b79f.mod mirror://goproxy//github.com/elastic/go-seccomp-bpf/@v/v1.1.0.zip -> github.com%2Felastic%2Fgo-seccomp-bpf%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/elastic/go-seccomp-bpf/@v/v1.1.0.mod -> github.com%2Felastic%2Fgo-seccomp-bpf%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/elastic/go-structform/@v/v0.0.7.zip -> github.com%2Felastic%2Fgo-structform%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/elastic/go-structform/@v/v0.0.7.mod -> github.com%2Felastic%2Fgo-structform%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/elastic/go-sysinfo/@v/v1.1.1.mod -> github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/elastic/go-sysinfo/@v/v1.3.0.zip -> github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/elastic/go-sysinfo/@v/v1.3.0.mod -> github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/elastic/go-txfile/@v/v0.0.7.zip -> github.com%2Felastic%2Fgo-txfile%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/elastic/go-txfile/@v/v0.0.7.mod -> github.com%2Felastic%2Fgo-txfile%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/elastic/go-ucfg/@v/v0.7.0.mod -> github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/elastic/go-ucfg/@v/v0.8.3.zip -> github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.8.3.zip mirror://goproxy//github.com/elastic/go-ucfg/@v/v0.8.3.mod -> github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.8.3.mod mirror://goproxy//github.com/elastic/go-windows/@v/v1.0.0.mod -> github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elastic/go-windows/@v/v1.0.1.zip -> github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/elastic/go-windows/@v/v1.0.1.mod -> github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/elastic/gosigar/@v/v0.10.6-0.20200715000138-f115143bb233.zip -> github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.6-0.20200715000138-f115143bb233.zip mirror://goproxy//github.com/elastic/gosigar/@v/v0.10.6-0.20200715000138-f115143bb233.mod -> github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.6-0.20200715000138-f115143bb233.mod mirror://goproxy//github.com/elastic/sarama/@v/v1.19.1-0.20200629123429-0e7b69039eec.zip -> github.com%2Felastic%2Fsarama%2F@v%2Fv1.19.1-0.20200629123429-0e7b69039eec.zip mirror://goproxy//github.com/elastic/sarama/@v/v1.19.1-0.20200629123429-0e7b69039eec.mod -> github.com%2Felastic%2Fsarama%2F@v%2Fv1.19.1-0.20200629123429-0e7b69039eec.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.zip -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.zip mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.5.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.5.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.zip -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.mod -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.7.2.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.7.2.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/garyburd/redigo/@v/v1.0.1-0.20160525165706-b8dc90050f24.zip -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv1.0.1-0.20160525165706-b8dc90050f24.zip mirror://goproxy//github.com/garyburd/redigo/@v/v1.0.1-0.20160525165706-b8dc90050f24.mod -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv1.0.1-0.20160525165706-b8dc90050f24.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.zip -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-martini/martini/@v/v0.0.0-20170121215854-22fa46961aab.zip -> github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.zip mirror://goproxy//github.com/go-martini/martini/@v/v0.0.0-20170121215854-22fa46961aab.mod -> github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.5-0.20190920104607-14974a1cf647.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.5-0.20190920104607-14974a1cf647.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.5-0.20190920104607-14974a1cf647.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.5-0.20190920104607-14974a1cf647.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-sourcemap/sourcemap/@v/v2.1.2+incompatible.zip -> github.com%2Fgo-sourcemap%2Fsourcemap%2F@v%2Fv2.1.2+incompatible.zip mirror://goproxy//github.com/go-sourcemap/sourcemap/@v/v2.1.2+incompatible.mod -> github.com%2Fgo-sourcemap%2Fsourcemap%2F@v%2Fv2.1.2+incompatible.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gobuffalo/here/@v/v0.6.0.zip -> github.com%2Fgobuffalo%2Fhere%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/gobuffalo/here/@v/v0.6.0.mod -> github.com%2Fgobuffalo%2Fhere%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/gocarina/gocsv/@v/v0.0.0-20170324095351-ffef3ffc77be.zip -> github.com%2Fgocarina%2Fgocsv%2F@v%2Fv0.0.0-20170324095351-ffef3ffc77be.zip mirror://goproxy//github.com/gocarina/gocsv/@v/v0.0.0-20170324095351-ffef3ffc77be.mod -> github.com%2Fgocarina%2Fgocsv%2F@v%2Fv0.0.0-20170324095351-ffef3ffc77be.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.zip -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.zip mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/godror/godror/@v/v0.10.4.zip -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.10.4.zip mirror://goproxy//github.com/godror/godror/@v/v0.10.4.mod -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.10.4.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.7.1.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.7.2-0.20190320160742-5135e617513b.zip -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.2-0.20190320160742-5135e617513b.zip mirror://goproxy//github.com/gofrs/flock/@v/v0.7.2-0.20190320160742-5135e617513b.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.2-0.20190320160742-5135e617513b.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.3.0+incompatible.zip -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.3.0+incompatible.zip mirror://goproxy//github.com/gofrs/uuid/@v/v3.3.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.3.0+incompatible.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang-sql/civil/@v/v0.0.0-20190719163853-cb61b32ac6fe.zip -> github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.zip mirror://goproxy//github.com/golang-sql/civil/@v/v0.0.0-20190719163853-cb61b32ac6fe.mod -> github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/flatbuffers/@v/v1.7.2-0.20170925184458-7a6b2bf521e9.zip -> github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.7.2-0.20170925184458-7a6b2bf521e9.zip mirror://goproxy//github.com/google/flatbuffers/@v/v1.7.2-0.20170925184458-7a6b2bf521e9.mod -> github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.7.2-0.20170925184458-7a6b2bf521e9.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-github/v28/@v/v28.1.1.zip -> github.com%2Fgoogle%2Fgo-github%2Fv28%2F@v%2Fv28.1.1.zip mirror://goproxy//github.com/google/go-github/v28/@v/v28.1.1.mod -> github.com%2Fgoogle%2Fgo-github%2Fv28%2F@v%2Fv28.1.1.mod mirror://goproxy//github.com/google/go-github/v29/@v/v29.0.2.zip -> github.com%2Fgoogle%2Fgo-github%2Fv29%2F@v%2Fv29.0.2.zip mirror://goproxy//github.com/google/go-github/v29/@v/v29.0.2.mod -> github.com%2Fgoogle%2Fgo-github%2Fv29%2F@v%2Fv29.0.2.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/licenseclassifier/@v/v0.0.0-20200402202327-879cb1424de0.zip -> github.com%2Fgoogle%2Flicenseclassifier%2F@v%2Fv0.0.0-20200402202327-879cb1424de0.zip mirror://goproxy//github.com/google/licenseclassifier/@v/v0.0.0-20200402202327-879cb1424de0.mod -> github.com%2Fgoogle%2Flicenseclassifier%2F@v%2Fv0.0.0-20200402202327-879cb1424de0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/subcommands/@v/v1.0.1.mod -> github.com%2Fgoogle%2Fsubcommands%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2-0.20190416172445-c2e93f3ae59f.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2-0.20190416172445-c2e93f3ae59f.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.2-0.20190416172445-c2e93f3ae59f.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2-0.20190416172445-c2e93f3ae59f.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.1.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.1-0.20190624222214-25d8b0b66985.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.1-0.20190624222214-25d8b0b66985.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.1-0.20190624222214-25d8b0b66985.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.1-0.20190624222214-25d8b0b66985.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorhill/cronexpr/@v/v0.0.0-20161205141322-d520615e531a.zip -> github.com%2Fgorhill%2Fcronexpr%2F@v%2Fv0.0.0-20161205141322-d520615e531a.zip mirror://goproxy//github.com/gorhill/cronexpr/@v/v0.0.0-20161205141322-d520615e531a.mod -> github.com%2Fgorhill%2Fcronexpr%2F@v%2Fv0.0.0-20161205141322-d520615e531a.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.13.0.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.13.0.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.13.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/h2non/filetype/@v/v1.0.12.zip -> github.com%2Fh2non%2Ffiletype%2F@v%2Fv1.0.12.zip mirror://goproxy//github.com/h2non/filetype/@v/v1.0.12.mod -> github.com%2Fh2non%2Ffiletype%2F@v%2Fv1.0.12.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v0.0.0-20141028054710-7554cd9344ce.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v0.0.0-20141028054710-7554cd9344ce.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v0.0.0-20161216184304-ed905158d874.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.2-0.20190520140433-59383c442f7d.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.2-0.20190520140433-59383c442f7d.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.2-0.20190520140433-59383c442f7d.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.2-0.20190520140433-59383c442f7d.mod mirror://goproxy//github.com/haya14busa/go-actions-toolkit/@v/v0.0.0-20200105081403-ca0307860f01.zip -> github.com%2Fhaya14busa%2Fgo-actions-toolkit%2F@v%2Fv0.0.0-20200105081403-ca0307860f01.zip mirror://goproxy//github.com/haya14busa/go-actions-toolkit/@v/v0.0.0-20200105081403-ca0307860f01.mod -> github.com%2Fhaya14busa%2Fgo-actions-toolkit%2F@v%2Fv0.0.0-20200105081403-ca0307860f01.mod mirror://goproxy//github.com/haya14busa/go-checkstyle/@v/v0.0.0-20170303121022-5e9d09f51fa1.mod -> github.com%2Fhaya14busa%2Fgo-checkstyle%2F@v%2Fv0.0.0-20170303121022-5e9d09f51fa1.mod mirror://goproxy//github.com/haya14busa/secretbox/@v/v0.0.0-20180525171038-07c7ecf409f5.mod -> github.com%2Fhaya14busa%2Fsecretbox%2F@v%2Fv0.0.0-20180525171038-07c7ecf409f5.mod mirror://goproxy//github.com/hectane/go-acl/@v/v0.0.0-20190604041725-da78bae5fc95.zip -> github.com%2Fhectane%2Fgo-acl%2F@v%2Fv0.0.0-20190604041725-da78bae5fc95.zip mirror://goproxy//github.com/hectane/go-acl/@v/v0.0.0-20190604041725-da78bae5fc95.mod -> github.com%2Fhectane%2Fgo-acl%2F@v%2Fv0.0.0-20190604041725-da78bae5fc95.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jcmturner/gofork/@v/v1.0.0.zip -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jcmturner/gofork/@v/v1.0.0.mod -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jessevdk/go-flags/@v/v1.4.0.mod -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmoiron/sqlx/@v/v1.2.1-0.20190826204134-d7d95172beb5.zip -> github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.1-0.20190826204134-d7d95172beb5.zip mirror://goproxy//github.com/jmoiron/sqlx/@v/v1.2.1-0.20190826204134-d7d95172beb5.mod -> github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.1-0.20190826204134-d7d95172beb5.mod mirror://goproxy//github.com/joeshaw/multierror/@v/v0.0.0-20140124173710-69b34d4ec901.zip -> github.com%2Fjoeshaw%2Fmultierror%2F@v%2Fv0.0.0-20140124173710-69b34d4ec901.zip mirror://goproxy//github.com/joeshaw/multierror/@v/v0.0.0-20140124173710-69b34d4ec901.mod -> github.com%2Fjoeshaw%2Fmultierror%2F@v%2Fv0.0.0-20140124173710-69b34d4ec901.mod mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.zip -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/josephspurrier/goversioninfo/@v/v0.0.0-20200309025242-14b0ab84c6ca.zip -> github.com%2Fjosephspurrier%2Fgoversioninfo%2F@v%2Fv0.0.0-20200309025242-14b0ab84c6ca.zip mirror://goproxy//github.com/josephspurrier/goversioninfo/@v/v0.0.0-20200309025242-14b0ab84c6ca.mod -> github.com%2Fjosephspurrier%2Fgoversioninfo%2F@v%2Fv0.0.0-20200309025242-14b0ab84c6ca.mod mirror://goproxy//github.com/jpillora/backoff/@v/v0.0.0-20180909062703-3050d21c67d7.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv0.0.0-20180909062703-3050d21c67d7.mod mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.zip -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.zip -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/justinas/nosurf/@v/v1.1.0.mod -> github.com%2Fjustinas%2Fnosurf%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.15.6.zip -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.15.6.zip mirror://goproxy//github.com/karrick/godirwalk/@v/v1.15.6.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.15.6.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.9.8.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.8.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.9.8.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.8.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.zip -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.zip mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.zip -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.0.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.2-0.20190507191818-2ff3cb3adc01.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.2-0.20190507191818-2ff3cb3adc01.zip mirror://goproxy//github.com/lib/pq/@v/v1.1.2-0.20190507191818-2ff3cb3adc01.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.2-0.20190507191818-2ff3cb3adc01.mod mirror://goproxy//github.com/magefile/mage/@v/v1.9.0.zip -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/magefile/mage/@v/v1.9.0.mod -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/magefile/mage/@v/v1.10.0.zip -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/magefile/mage/@v/v1.10.0.mod -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.1.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.1.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/markbates/pkger/@v/v0.17.0.zip -> github.com%2Fmarkbates%2Fpkger%2F@v%2Fv0.17.0.zip mirror://goproxy//github.com/markbates/pkger/@v/v0.17.0.mod -> github.com%2Fmarkbates%2Fpkger%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/martini-contrib/render/@v/v0.0.0-20150707142108-ec18f8345a11.zip -> github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.zip mirror://goproxy//github.com/martini-contrib/render/@v/v0.0.0-20150707142108-ec18f8345a11.mod -> github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.8.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20190610004146-91bb50d98149.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190610004146-91bb50d98149.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20191113090002-7c0f6868bffe.zip -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20191113090002-7c0f6868bffe.zip mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20191113090002-7c0f6868bffe.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20191113090002-7c0f6868bffe.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.2.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.7.zip -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.7.zip mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.7.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.7.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.9.0.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.9.0.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.15.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.15.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170116052023-ab25296c0f51.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170116052023-ab25296c0f51.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170116052023-ab25296c0f51.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170116052023-ab25296c0f51.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.zip -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.5.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.2.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.0.20190228220655-ac19fd6e7483.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.0.20190228220655-ac19fd6e7483.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.0.20190228220655-ac19fd6e7483.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.0.20190228220655-ac19fd6e7483.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.2-0.20190823105129-775207bd45b6.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.2-0.20190823105129-775207bd45b6.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.2-0.20190823105129-775207bd45b6.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.2-0.20190823105129-775207bd45b6.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.0.0-20190115041553-12f6a991201f.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.0.0-20190115041553-12f6a991201f.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v0.1.2-0.20190507144316-5b71a03e2700.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv0.1.2-0.20190507144316-5b71a03e2700.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runtime-tools/@v/v0.0.0-20181011054405-1d69bd0f9c39.mod -> github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod mirror://goproxy//github.com/oxtoacart/bpool/@v/v0.0.0-20150712133111-4e1c5567d7c2.zip -> github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.zip mirror://goproxy//github.com/oxtoacart/bpool/@v/v0.0.0-20150712133111-4e1c5567d7c2.mod -> github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.4.1+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.4.1+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.4.1+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.4.1+incompatible.mod mirror://goproxy//github.com/pierrre/gotestcover/@v/v0.0.0-20160113212533-7b94f124d338.zip -> github.com%2Fpierrre%2Fgotestcover%2F@v%2Fv0.0.0-20160113212533-7b94f124d338.zip mirror://goproxy//github.com/pierrre/gotestcover/@v/v0.0.0-20160113212533-7b94f124d338.mod -> github.com%2Fpierrre%2Fgotestcover%2F@v%2Fv0.0.0-20160113212533-7b94f124d338.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1-0.20170505043639-c605e284fe17.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20170505043639-c605e284fe17.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1-0.20171018195549-f15c970de5b7.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20171018195549-f15c970de5b7.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/poy/eachers/@v/v0.0.0-20181020210610-23942921fe77.zip -> github.com%2Fpoy%2Feachers%2F@v%2Fv0.0.0-20181020210610-23942921fe77.zip mirror://goproxy//github.com/poy/eachers/@v/v0.0.0-20181020210610-23942921fe77.mod -> github.com%2Fpoy%2Feachers%2F@v%2Fv0.0.0-20181020210610-23942921fe77.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.1-0.20190913103102-20428fa0bffc.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.1-0.20190913103102-20428fa0bffc.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.1-0.20190913103102-20428fa0bffc.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.1-0.20190913103102-20428fa0bffc.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190425082905-87a4384529e0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190425082905-87a4384529e0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.5.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.11.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.11.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.11.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/prometheus/prometheus/@v/v2.5.0+incompatible.zip -> github.com%2Fprometheus%2Fprometheus%2F@v%2Fv2.5.0+incompatible.zip mirror://goproxy//github.com/prometheus/prometheus/@v/v2.5.0+incompatible.mod -> github.com%2Fprometheus%2Fprometheus%2F@v%2Fv2.5.0+incompatible.mod mirror://goproxy//github.com/rakyll/statik/@v/v0.1.6.mod -> github.com%2Frakyll%2Fstatik%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20190826022208-cac0b30c2563.zip -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20190826022208-cac0b30c2563.zip mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20190826022208-cac0b30c2563.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20190826022208-cac0b30c2563.mod mirror://goproxy//github.com/reviewdog/errorformat/@v/v0.0.0-20200109134752-8983be9bc7dd.zip -> github.com%2Freviewdog%2Ferrorformat%2F@v%2Fv0.0.0-20200109134752-8983be9bc7dd.zip mirror://goproxy//github.com/reviewdog/errorformat/@v/v0.0.0-20200109134752-8983be9bc7dd.mod -> github.com%2Freviewdog%2Ferrorformat%2F@v%2Fv0.0.0-20200109134752-8983be9bc7dd.mod mirror://goproxy//github.com/reviewdog/reviewdog/@v/v0.9.17.zip -> github.com%2Freviewdog%2Freviewdog%2F@v%2Fv0.9.17.zip mirror://goproxy//github.com/reviewdog/reviewdog/@v/v0.9.17.mod -> github.com%2Freviewdog%2Freviewdog%2F@v%2Fv0.9.17.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v1.2.0.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/samuel/go-parser/@v/v0.0.0-20130731160455-ca8abbf65d0e.zip -> github.com%2Fsamuel%2Fgo-parser%2F@v%2Fv0.0.0-20130731160455-ca8abbf65d0e.zip mirror://goproxy//github.com/samuel/go-parser/@v/v0.0.0-20130731160455-ca8abbf65d0e.mod -> github.com%2Fsamuel%2Fgo-parser%2F@v%2Fv0.0.0-20130731160455-ca8abbf65d0e.mod mirror://goproxy//github.com/samuel/go-thrift/@v/v0.0.0-20140522043831-2187045faa54.zip -> github.com%2Fsamuel%2Fgo-thrift%2F@v%2Fv0.0.0-20140522043831-2187045faa54.zip mirror://goproxy//github.com/samuel/go-thrift/@v/v0.0.0-20140522043831-2187045faa54.mod -> github.com%2Fsamuel%2Fgo-thrift%2F@v%2Fv0.0.0-20140522043831-2187045faa54.mod mirror://goproxy//github.com/sanathkr/go-yaml/@v/v0.0.0-20170819195128-ed9d249f429b.zip -> github.com%2Fsanathkr%2Fgo-yaml%2F@v%2Fv0.0.0-20170819195128-ed9d249f429b.zip mirror://goproxy//github.com/sanathkr/go-yaml/@v/v0.0.0-20170819195128-ed9d249f429b.mod -> github.com%2Fsanathkr%2Fgo-yaml%2F@v%2Fv0.0.0-20170819195128-ed9d249f429b.mod mirror://goproxy//github.com/sanathkr/yaml/@v/v0.0.0-20170819201035-0056894fa522.mod -> github.com%2Fsanathkr%2Fyaml%2F@v%2Fv0.0.0-20170819201035-0056894fa522.mod mirror://goproxy//github.com/sanathkr/yaml/@v/v1.0.1-0.20170819201035-0056894fa522.zip -> github.com%2Fsanathkr%2Fyaml%2F@v%2Fv1.0.1-0.20170819201035-0056894fa522.zip mirror://goproxy//github.com/sanathkr/yaml/@v/v1.0.1-0.20170819201035-0056894fa522.mod -> github.com%2Fsanathkr%2Fyaml%2F@v%2Fv1.0.1-0.20170819201035-0056894fa522.mod mirror://goproxy//github.com/santhosh-tekuri/jsonschema/@v/v1.2.4.zip -> github.com%2Fsanthosh-tekuri%2Fjsonschema%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/santhosh-tekuri/jsonschema/@v/v1.2.4.mod -> github.com%2Fsanthosh-tekuri%2Fjsonschema%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.zip -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v2.19.11+incompatible.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.19.11+incompatible.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v2.19.11+incompatible.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.19.11+incompatible.mod mirror://goproxy//github.com/shopspring/decimal/@v/v1.2.0.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/shopspring/decimal/@v/v1.2.0.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.4-0.20170822132746-89742aefa4b2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.4-0.20170822132746-89742aefa4b2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.1.5-0.20170601210322-f6abca593680.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.1.5-0.20170601210322-f6abca593680.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20170704070218-db04d3cc01c8.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.mod mirror://goproxy//github.com/tsg/go-daemon/@v/v0.0.0-20200207173439-e704b93fd89b.zip -> github.com%2Ftsg%2Fgo-daemon%2F@v%2Fv0.0.0-20200207173439-e704b93fd89b.zip mirror://goproxy//github.com/tsg/go-daemon/@v/v0.0.0-20200207173439-e704b93fd89b.mod -> github.com%2Ftsg%2Fgo-daemon%2F@v%2Fv0.0.0-20200207173439-e704b93fd89b.mod mirror://goproxy//github.com/tsg/gopacket/@v/v0.0.0-20200626092518-2ab8e397a786.zip -> github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20200626092518-2ab8e397a786.zip mirror://goproxy//github.com/tsg/gopacket/@v/v0.0.0-20200626092518-2ab8e397a786.mod -> github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20200626092518-2ab8e397a786.mod mirror://goproxy//github.com/urfave/cli/@v/v0.0.0-20171014202726-7bc6a0acffa5.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.mod mirror://goproxy//github.com/urso/diag/@v/v0.0.0-20200210123136-21b3cc8eb797.zip -> github.com%2Furso%2Fdiag%2F@v%2Fv0.0.0-20200210123136-21b3cc8eb797.zip mirror://goproxy//github.com/urso/diag/@v/v0.0.0-20200210123136-21b3cc8eb797.mod -> github.com%2Furso%2Fdiag%2F@v%2Fv0.0.0-20200210123136-21b3cc8eb797.mod mirror://goproxy//github.com/urso/go-bin/@v/v0.0.0-20180220135811-781c575c9f0e.zip -> github.com%2Furso%2Fgo-bin%2F@v%2Fv0.0.0-20180220135811-781c575c9f0e.zip mirror://goproxy//github.com/urso/go-bin/@v/v0.0.0-20180220135811-781c575c9f0e.mod -> github.com%2Furso%2Fgo-bin%2F@v%2Fv0.0.0-20180220135811-781c575c9f0e.mod mirror://goproxy//github.com/urso/magetools/@v/v0.0.0-20190919040553-290c89e0c230.zip -> github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20190919040553-290c89e0c230.zip mirror://goproxy//github.com/urso/magetools/@v/v0.0.0-20190919040553-290c89e0c230.mod -> github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20190919040553-290c89e0c230.mod mirror://goproxy//github.com/urso/qcgen/@v/v0.0.0-20180131103024-0b059e7db4f4.zip -> github.com%2Furso%2Fqcgen%2F@v%2Fv0.0.0-20180131103024-0b059e7db4f4.zip mirror://goproxy//github.com/urso/qcgen/@v/v0.0.0-20180131103024-0b059e7db4f4.mod -> github.com%2Furso%2Fqcgen%2F@v%2Fv0.0.0-20180131103024-0b059e7db4f4.mod mirror://goproxy//github.com/urso/sderr/@v/v0.0.0-20200210124243-c2a16f3d43ec.zip -> github.com%2Furso%2Fsderr%2F@v%2Fv0.0.0-20200210124243-c2a16f3d43ec.zip mirror://goproxy//github.com/urso/sderr/@v/v0.0.0-20200210124243-c2a16f3d43ec.mod -> github.com%2Furso%2Fsderr%2F@v%2Fv0.0.0-20200210124243-c2a16f3d43ec.mod mirror://goproxy//github.com/vbatts/tar-split/@v/v0.11.1.mod -> github.com%2Fvbatts%2Ftar-split%2F@v%2Fv0.11.1.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.0.0-20170802214208-2cad15190b41.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.0.0-20170802214208-2cad15190b41.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.0.0-20170802214208-2cad15190b41.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.0.0-20170802214208-2cad15190b41.mod mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.22.3.zip -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.22.3.zip mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.22.3.mod -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.22.3.mod mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.zip -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.zip mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.mod -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.mod mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.zip -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.mod -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20190905194746-02993c407bfb.zip -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20190905194746-02993c407bfb.zip mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20190905194746-02993c407bfb.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20190905194746-02993c407bfb.mod mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.zip -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.zip mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.mod -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20180618132009-1d523034197f.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20181112162635-ac52e6811b56.zip -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20181112162635-ac52e6811b56.zip mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20181112162635-ac52e6811b56.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20181112162635-ac52e6811b56.mod mirror://goproxy//github.com/yuin/gopher-lua/@v/v0.0.0-20170403160031-b402f3114ec7.zip -> github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20170403160031-b402f3114ec7.zip mirror://goproxy//github.com/yuin/gopher-lua/@v/v0.0.0-20170403160031-b402f3114ec7.mod -> github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20170403160031-b402f3114ec7.mod mirror://goproxy//go.elastic.co/apm/@v/v1.7.2.zip -> go.elastic.co%2Fapm%2F@v%2Fv1.7.2.zip mirror://goproxy//go.elastic.co/apm/@v/v1.7.2.mod -> go.elastic.co%2Fapm%2F@v%2Fv1.7.2.mod mirror://goproxy//go.elastic.co/apm/module/apmelasticsearch/@v/v1.7.2.zip -> go.elastic.co%2Fapm%2Fmodule%2Fapmelasticsearch%2F@v%2Fv1.7.2.zip mirror://goproxy//go.elastic.co/apm/module/apmelasticsearch/@v/v1.7.2.mod -> go.elastic.co%2Fapm%2Fmodule%2Fapmelasticsearch%2F@v%2Fv1.7.2.mod mirror://goproxy//go.elastic.co/apm/module/apmhttp/@v/v1.7.2.zip -> go.elastic.co%2Fapm%2Fmodule%2Fapmhttp%2F@v%2Fv1.7.2.zip mirror://goproxy//go.elastic.co/apm/module/apmhttp/@v/v1.7.2.mod -> go.elastic.co%2Fapm%2Fmodule%2Fapmhttp%2F@v%2Fv1.7.2.mod mirror://goproxy//go.elastic.co/ecszap/@v/v0.1.1-0.20200424093508-cdd95a104193.zip -> go.elastic.co%2Fecszap%2F@v%2Fv0.1.1-0.20200424093508-cdd95a104193.zip mirror://goproxy//go.elastic.co/ecszap/@v/v0.1.1-0.20200424093508-cdd95a104193.mod -> go.elastic.co%2Fecszap%2F@v%2Fv0.1.1-0.20200424093508-cdd95a104193.mod mirror://goproxy//go.elastic.co/fastjson/@v/v1.0.0.zip -> go.elastic.co%2Ffastjson%2F@v%2Fv1.0.0.zip mirror://goproxy//go.elastic.co/fastjson/@v/v1.0.0.mod -> go.elastic.co%2Ffastjson%2F@v%2Fv1.0.0.mod mirror://goproxy//go.elastic.co/go-licence-detector/@v/v0.4.0.zip -> go.elastic.co%2Fgo-licence-detector%2F@v%2Fv0.4.0.zip mirror://goproxy//go.elastic.co/go-licence-detector/@v/v0.4.0.mod -> go.elastic.co%2Fgo-licence-detector%2F@v%2Fv0.4.0.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.4.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.4.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.4.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.4.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.zip -> go.opencensus.io%2F@v%2Fv0.22.2.zip mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.zip mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.3.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.3.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.zip -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.zip mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.14.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.14.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.14.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.14.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20171113213409-9f005a07e0d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20171113213409-9f005a07e0d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190325154230-a5d413f7728c.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200204104054-c9f3fb736b72.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200204104054-c9f3fb736b72.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200510223506-06a226fb4e37.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200510223506-06a226fb4e37.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.zip -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.zip mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181108082009-03003ca0c849.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181108082009-03003ca0c849.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191002035440-2ec189313ef0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191002035440-2ec189313ef0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191021144547-ec77196f6094.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191021144547-ec77196f6094.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191112182307-2180aed22343.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191112182307-2180aed22343.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181106182150-f42d05182288.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181106182150-f42d05182288.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190130055435-99b60b757ec1.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190130055435-99b60b757ec1.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170608164803-0b25a408a500.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170608164803-0b25a408a500.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190405154228-4b34438f7a67.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190405154228-4b34438f7a67.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190514135907-3a4b5fb9f71f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190514135907-3a4b5fb9f71f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190529164535-6a60838ec259.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190529164535-6a60838ec259.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190801041406-cbf593c0f2f3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191025021431-6c3a3bfe00ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191025021431-6c3a3bfe00ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191112214154-59a1497f0cea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191112214154-59a1497f0cea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200102141924-c96a22e43c9c.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200102141924-c96a22e43c9c.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200102141924-c96a22e43c9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200102141924-c96a22e43c9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200602230032-c00d67ef29d0.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200602230032-c00d67ef29d0.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200602230032-c00d67ef29d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200602230032-c00d67ef29d0.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.zip mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.2.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.3.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.3.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190927181202-20e1ac93f88c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190927181202-20e1ac93f88c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.24.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.zip -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/jcmturner/aescts.v1/@v/v1.0.1.zip -> gopkg.in%2Fjcmturner%2Faescts.v1%2F@v%2Fv1.0.1.zip mirror://goproxy//gopkg.in/jcmturner/aescts.v1/@v/v1.0.1.mod -> gopkg.in%2Fjcmturner%2Faescts.v1%2F@v%2Fv1.0.1.mod mirror://goproxy//gopkg.in/jcmturner/dnsutils.v1/@v/v1.0.1.zip -> gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.zip mirror://goproxy//gopkg.in/jcmturner/dnsutils.v1/@v/v1.0.1.mod -> gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.mod mirror://goproxy//gopkg.in/jcmturner/goidentity.v3/@v/v3.0.0.zip -> gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.zip mirror://goproxy//gopkg.in/jcmturner/goidentity.v3/@v/v3.0.0.mod -> gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.mod mirror://goproxy//gopkg.in/jcmturner/gokrb5.v7/@v/v7.5.0.zip -> gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.5.0.zip mirror://goproxy//gopkg.in/jcmturner/gokrb5.v7/@v/v7.5.0.mod -> gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.5.0.mod mirror://goproxy//gopkg.in/jcmturner/rpc.v1/@v/v1.1.0.zip -> gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.zip mirror://goproxy//gopkg.in/jcmturner/rpc.v1/@v/v1.1.0.mod -> gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20160818020120-3f83fa500528.zip -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20160818020120-3f83fa500528.zip mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20160818020120-3f83fa500528.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20160818020120-3f83fa500528.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.3.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//howett.net/plist/@v/v0.0.0-20181124034731-591f970eefbb.zip -> howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.zip mirror://goproxy//howett.net/plist/@v/v0.0.0-20181124034731-591f970eefbb.mod -> howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.mod mirror://goproxy//k8s.io/api/@v/v0.18.3.zip -> k8s.io%2Fapi%2F@v%2Fv0.18.3.zip mirror://goproxy//k8s.io/api/@v/v0.18.3.mod -> k8s.io%2Fapi%2F@v%2Fv0.18.3.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.18.3.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.3.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.18.3.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.3.mod mirror://goproxy//k8s.io/client-go/@v/v0.18.3.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.18.3.zip mirror://goproxy//k8s.io/client-go/@v/v0.18.3.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.18.3.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200410145947-61e04a5be9a6.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410145947-61e04a5be9a6.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200410145947-61e04a5be9a6.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410145947-61e04a5be9a6.mod mirror://goproxy//k8s.io/kubernetes/@v/v1.13.0.mod -> k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0-20200116222232-67a7b8c61874.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod
+SRC_URI=https://github.com/elastic/beats/archive/v7.9.3.tar.gz -> filebeat-7.9.3.tar.gz mirror://goproxy//4d63.com/embedfiles/@v/v0.0.0-20190311033909-995e0740726f.zip -> 4d63.com%2Fembedfiles%2F@v%2Fv0.0.0-20190311033909-995e0740726f.zip mirror://goproxy//4d63.com/embedfiles/@v/v0.0.0-20190311033909-995e0740726f.mod -> 4d63.com%2Fembedfiles%2F@v%2Fv0.0.0-20190311033909-995e0740726f.mod mirror://goproxy//4d63.com/tz/@v/v1.1.1-0.20191124060701-6d37baae851b.zip -> 4d63.com%2Ftz%2F@v%2Fv1.1.1-0.20191124060701-6d37baae851b.zip mirror://goproxy//4d63.com/tz/@v/v1.1.1-0.20191124060701-6d37baae851b.mod -> 4d63.com%2Ftz%2F@v%2Fv1.1.1-0.20191124060701-6d37baae851b.mod mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.51.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.51.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.zip -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.zip mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.zip -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.zip mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.zip -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.zip mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.zip mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//code.cloudfoundry.org/go-diodes/@v/v0.0.0-20190809170250-f77fb823c7ee.zip -> code.cloudfoundry.org%2Fgo-diodes%2F@v%2Fv0.0.0-20190809170250-f77fb823c7ee.zip mirror://goproxy//code.cloudfoundry.org/go-diodes/@v/v0.0.0-20190809170250-f77fb823c7ee.mod -> code.cloudfoundry.org%2Fgo-diodes%2F@v%2Fv0.0.0-20190809170250-f77fb823c7ee.mod mirror://goproxy//code.cloudfoundry.org/go-loggregator/@v/v7.4.0+incompatible.zip -> code.cloudfoundry.org%2Fgo-loggregator%2F@v%2Fv7.4.0+incompatible.zip mirror://goproxy//code.cloudfoundry.org/go-loggregator/@v/v7.4.0+incompatible.mod -> code.cloudfoundry.org%2Fgo-loggregator%2F@v%2Fv7.4.0+incompatible.mod mirror://goproxy//code.cloudfoundry.org/gofileutils/@v/v0.0.0-20170111115228-4d0c80011a0f.zip -> code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a0f.zip mirror://goproxy//code.cloudfoundry.org/gofileutils/@v/v0.0.0-20170111115228-4d0c80011a0f.mod -> code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a0f.mod mirror://goproxy//code.cloudfoundry.org/rfc5424/@v/v0.0.0-20180905210152-236a6d29298a.zip -> code.cloudfoundry.org%2Frfc5424%2F@v%2Fv0.0.0-20180905210152-236a6d29298a.zip mirror://goproxy//code.cloudfoundry.org/rfc5424/@v/v0.0.0-20180905210152-236a6d29298a.mod -> code.cloudfoundry.org%2Frfc5424%2F@v%2Fv0.0.0-20180905210152-236a6d29298a.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/azure-amqp-common-go/v3/@v/v3.0.0.zip -> github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//github.com/!azure/azure-amqp-common-go/v3/@v/v3.0.0.mod -> github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/!azure/azure-event-hubs-go/v3/@v/v3.1.2.zip -> github.com%2F!azure%2Fazure-event-hubs-go%2Fv3%2F@v%2Fv3.1.2.zip mirror://goproxy//github.com/!azure/azure-event-hubs-go/v3/@v/v3.1.2.mod -> github.com%2F!azure%2Fazure-event-hubs-go%2Fv3%2F@v%2Fv3.1.2.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.1.8.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.1.9.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.1.9.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.1.zip -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.1.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v37.1.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv37.1.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v37.1.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv37.1.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.6.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.8.0.zip -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.8.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-amqp/@v/v0.12.6.zip -> github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.6.zip mirror://goproxy//github.com/!azure/go-amqp/@v/v0.12.6.mod -> github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.6.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.4.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.4.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.4.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.4.2.zip -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/!masterminds/semver/@v/v1.4.2.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.zip -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.zip mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.mod -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod mirror://goproxy//github.com/!sirupsen/logrus/@v/v1.0.1-0.20170608221441-85b1699d5056.mod -> github.com%2F!sirupsen%2Flogrus%2F@v%2Fv1.0.1-0.20170608221441-85b1699d5056.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20170221213301-9f32b5905fd6.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20170221213301-9f32b5905fd6.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20170221213301-9f32b5905fd6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20170221213301-9f32b5905fd6.mod mirror://goproxy//github.com/adriansr/fsnotify/@v/v0.0.0-20180417234312-c9bbe1f46f1d.zip -> github.com%2Fadriansr%2Ffsnotify%2F@v%2Fv0.0.0-20180417234312-c9bbe1f46f1d.zip mirror://goproxy//github.com/adriansr/fsnotify/@v/v0.0.0-20180417234312-c9bbe1f46f1d.mod -> github.com%2Fadriansr%2Ffsnotify%2F@v%2Fv0.0.0-20180417234312-c9bbe1f46f1d.mod mirror://goproxy//github.com/adriansr/gopacket/@v/v1.1.18-0.20200327165309-dd62abfa8a41.zip -> github.com%2Fadriansr%2Fgopacket%2F@v%2Fv1.1.18-0.20200327165309-dd62abfa8a41.zip mirror://goproxy//github.com/adriansr/gopacket/@v/v1.1.18-0.20200327165309-dd62abfa8a41.mod -> github.com%2Fadriansr%2Fgopacket%2F@v%2Fv1.1.18-0.20200327165309-dd62abfa8a41.mod mirror://goproxy//github.com/aerospike/aerospike-client-go/@v/v1.27.1-0.20170612174108-0f3b54da6bdc.zip -> github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv1.27.1-0.20170612174108-0f3b54da6bdc.zip mirror://goproxy//github.com/aerospike/aerospike-client-go/@v/v1.27.1-0.20170612174108-0f3b54da6bdc.mod -> github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv1.27.1-0.20170612174108-0f3b54da6bdc.mod mirror://goproxy//github.com/akavel/rsrc/@v/v0.8.0.zip -> github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/akavel/rsrc/@v/v0.8.0.mod -> github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.zip -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.zip mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.zip -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.zip mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/andrewkroh/goja/@v/v0.0.0-20190128172624-dd2ac4456e20.zip -> github.com%2Fandrewkroh%2Fgoja%2F@v%2Fv0.0.0-20190128172624-dd2ac4456e20.zip mirror://goproxy//github.com/andrewkroh/goja/@v/v0.0.0-20190128172624-dd2ac4456e20.mod -> github.com%2Fandrewkroh%2Fgoja%2F@v%2Fv0.0.0-20190128172624-dd2ac4456e20.mod mirror://goproxy//github.com/andrewkroh/sys/@v/v0.0.0-20151128191922-287798fe3e43.zip -> github.com%2Fandrewkroh%2Fsys%2F@v%2Fv0.0.0-20151128191922-287798fe3e43.zip mirror://goproxy//github.com/andrewkroh/sys/@v/v0.0.0-20151128191922-287798fe3e43.mod -> github.com%2Fandrewkroh%2Fsys%2F@v%2Fv0.0.0-20151128191922-287798fe3e43.mod mirror://goproxy//github.com/antihax/optional/@v/v0.0.0-20180407024304-ca021399b1a6.mod -> github.com%2Fantihax%2Foptional%2F@v%2Fv0.0.0-20180407024304-ca021399b1a6.mod mirror://goproxy//github.com/antlr/antlr4/@v/v0.0.0-20200326173327-a4c66dc863bb.zip -> github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200326173327-a4c66dc863bb.zip mirror://goproxy//github.com/antlr/antlr4/@v/v0.0.0-20200326173327-a4c66dc863bb.mod -> github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200326173327-a4c66dc863bb.mod mirror://goproxy//github.com/apoydence/eachers/@v/v0.0.0-20181020210610-23942921fe77.zip -> github.com%2Fapoydence%2Feachers%2F@v%2Fv0.0.0-20181020210610-23942921fe77.zip mirror://goproxy//github.com/apoydence/eachers/@v/v0.0.0-20181020210610-23942921fe77.mod -> github.com%2Fapoydence%2Feachers%2F@v%2Fv0.0.0-20181020210610-23942921fe77.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.zip -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.zip mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.mod -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.mod mirror://goproxy//github.com/aws/aws-lambda-go/@v/v1.6.0.zip -> github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/aws/aws-lambda-go/@v/v1.6.0.mod -> github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v0.9.0.zip -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v0.9.0.mod -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/awslabs/goformation/v3/@v/v3.1.0.mod -> github.com%2Fawslabs%2Fgoformation%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/awslabs/goformation/v4/@v/v4.1.0.zip -> github.com%2Fawslabs%2Fgoformation%2Fv4%2F@v%2Fv4.1.0.zip mirror://goproxy//github.com/awslabs/goformation/v4/@v/v4.1.0.mod -> github.com%2Fawslabs%2Fgoformation%2Fv4%2F@v%2Fv4.1.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20150311145944-8bd4349a67f2.zip -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20150311145944-8bd4349a67f2.zip mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20150311145944-8bd4349a67f2.mod -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20150311145944-8bd4349a67f2.mod mirror://goproxy//github.com/blang/semver/@v/v3.1.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.mod mirror://goproxy//github.com/bradleyfalzon/ghinstallation/@v/v1.1.0.zip -> github.com%2Fbradleyfalzon%2Fghinstallation%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/bradleyfalzon/ghinstallation/@v/v1.1.0.mod -> github.com%2Fbradleyfalzon%2Fghinstallation%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/bsm/sarama-cluster/@v/v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.zip -> github.com%2Fbsm%2Fsarama-cluster%2F@v%2Fv2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.zip mirror://goproxy//github.com/bsm/sarama-cluster/@v/v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.mod -> github.com%2Fbsm%2Fsarama-cluster%2F@v%2Fv2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.mod mirror://goproxy//github.com/cavaliercoder/badio/@v/v0.0.0-20160213150051-ce5280129e9e.zip -> github.com%2Fcavaliercoder%2Fbadio%2F@v%2Fv0.0.0-20160213150051-ce5280129e9e.zip mirror://goproxy//github.com/cavaliercoder/badio/@v/v0.0.0-20160213150051-ce5280129e9e.mod -> github.com%2Fcavaliercoder%2Fbadio%2F@v%2Fv0.0.0-20160213150051-ce5280129e9e.mod mirror://goproxy//github.com/cavaliercoder/go-rpm/@v/v0.0.0-20190131055624-7a9c54e3d83e.zip -> github.com%2Fcavaliercoder%2Fgo-rpm%2F@v%2Fv0.0.0-20190131055624-7a9c54e3d83e.zip mirror://goproxy//github.com/cavaliercoder/go-rpm/@v/v0.0.0-20190131055624-7a9c54e3d83e.mod -> github.com%2Fcavaliercoder%2Fgo-rpm%2F@v%2Fv0.0.0-20190131055624-7a9c54e3d83e.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cloudfoundry-community/go-cfclient/@v/v0.0.0-20190808214049-35bcce23fc5f.zip -> github.com%2Fcloudfoundry-community%2Fgo-cfclient%2F@v%2Fv0.0.0-20190808214049-35bcce23fc5f.zip mirror://goproxy//github.com/cloudfoundry-community/go-cfclient/@v/v0.0.0-20190808214049-35bcce23fc5f.mod -> github.com%2Fcloudfoundry-community%2Fgo-cfclient%2F@v%2Fv0.0.0-20190808214049-35bcce23fc5f.mod mirror://goproxy//github.com/cloudfoundry/noaa/@v/v2.1.0+incompatible.zip -> github.com%2Fcloudfoundry%2Fnoaa%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/cloudfoundry/noaa/@v/v2.1.0+incompatible.mod -> github.com%2Fcloudfoundry%2Fnoaa%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/cloudfoundry/sonde-go/@v/v0.0.0-20171206171820-b33733203bb4.zip -> github.com%2Fcloudfoundry%2Fsonde-go%2F@v%2Fv0.0.0-20171206171820-b33733203bb4.zip mirror://goproxy//github.com/cloudfoundry/sonde-go/@v/v0.0.0-20171206171820-b33733203bb4.mod -> github.com%2Fcloudfoundry%2Fsonde-go%2F@v%2Fv0.0.0-20171206171820-b33733203bb4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/codegangsta/inject/@v/v0.0.0-20150114235600-33e0aa1cb7c0.zip -> github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.zip mirror://goproxy//github.com/codegangsta/inject/@v/v0.0.0-20150114235600-33e0aa1cb7c0.mod -> github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190919134610-bf292b21730f.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190919134610-bf292b21730f.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20180822173158-c12b1e7919c1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.3.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.3.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190426062206-aaeac12a7ffc.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200107194136-26c1120b8d41.zip -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200107194136-26c1120b8d41.zip mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200107194136-26c1120b8d41.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200107194136-26c1120b8d41.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190226154929-a9fb20d87448.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190226154929-a9fb20d87448.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190816180239-bda0ff6ed73c.zip -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190816180239-bda0ff6ed73c.zip mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190816180239-bda0ff6ed73c.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190816180239-bda0ff6ed73c.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20180907222934-5a6d9f37cfa3.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828154514-0e0f228740de.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180108230652-97fdf19511ea.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.zip mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180108230652-97fdf19511ea.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.mod mirror://goproxy//github.com/cucumber/godog/@v/v0.8.1.zip -> github.com%2Fcucumber%2Fgodog%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/cucumber/godog/@v/v0.8.1.mod -> github.com%2Fcucumber%2Fgodog%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.zip -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.mod -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/davecgh/go-xdr/@v/v0.0.0-20161123171359-e6a2ba005892.zip -> github.com%2Fdavecgh%2Fgo-xdr%2F@v%2Fv0.0.0-20161123171359-e6a2ba005892.zip mirror://goproxy//github.com/davecgh/go-xdr/@v/v0.0.0-20161123171359-e6a2ba005892.mod -> github.com%2Fdavecgh%2Fgo-xdr%2F@v%2Fv0.0.0-20161123171359-e6a2ba005892.mod mirror://goproxy//github.com/denisenkom/go-mssqldb/@v/v0.0.0-20200206145737-bbfc9a55622e.zip -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200206145737-bbfc9a55622e.zip mirror://goproxy//github.com/denisenkom/go-mssqldb/@v/v0.0.0-20200206145737-bbfc9a55622e.mod -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200206145737-bbfc9a55622e.mod mirror://goproxy//github.com/devigned/tab/@v/v0.1.1.mod -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/devigned/tab/@v/v0.1.2-0.20190607222403-0c15cf42f9a2.zip -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.2-0.20190607222403-0c15cf42f9a2.zip mirror://goproxy//github.com/devigned/tab/@v/v0.1.2-0.20190607222403-0c15cf42f9a2.mod -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.2-0.20190607222403-0c15cf42f9a2.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.mod mirror://goproxy//github.com/digitalocean/go-libvirt/@v/v0.0.0-20180301200012-6075ea3c39a1.zip -> github.com%2Fdigitalocean%2Fgo-libvirt%2F@v%2Fv0.0.0-20180301200012-6075ea3c39a1.zip mirror://goproxy//github.com/digitalocean/go-libvirt/@v/v0.0.0-20180301200012-6075ea3c39a1.mod -> github.com%2Fdigitalocean%2Fgo-libvirt%2F@v%2Fv0.0.0-20180301200012-6075ea3c39a1.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.7-0.20171009020623-7632a260cbaf.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.7-0.20171009020623-7632a260cbaf.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.7-0.20171009020623-7632a260cbaf.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.7-0.20171009020623-7632a260cbaf.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/engine/@v/v0.0.0-20191113042239-ea84732a7725.zip -> github.com%2Fdocker%2Fengine%2F@v%2Fv0.0.0-20191113042239-ea84732a7725.zip mirror://goproxy//github.com/docker/engine/@v/v0.0.0-20191113042239-ea84732a7725.mod -> github.com%2Fdocker%2Fengine%2F@v%2Fv0.0.0-20191113042239-ea84732a7725.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.zip -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.zip -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.zip mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dop251/goja_nodejs/@v/v0.0.0-20171011081505-adff31b136e6.zip -> github.com%2Fdop251%2Fgoja_nodejs%2F@v%2Fv0.0.0-20171011081505-adff31b136e6.zip mirror://goproxy//github.com/dop251/goja_nodejs/@v/v0.0.0-20171011081505-adff31b136e6.mod -> github.com%2Fdop251%2Fgoja_nodejs%2F@v%2Fv0.0.0-20171011081505-adff31b136e6.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.2.0.zip -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.2.0.mod -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.zip -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.zip mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.mod -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.zip -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.mod -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.1-0.20200121105743-0d940dd29fd2.zip -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.1-0.20200121105743-0d940dd29fd2.zip mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.1-0.20200121105743-0d940dd29fd2.mod -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.1-0.20200121105743-0d940dd29fd2.mod mirror://goproxy//github.com/elastic/dhcp/@v/v0.0.0-20200227161230-57ec251c7eb3.zip -> github.com%2Felastic%2Fdhcp%2F@v%2Fv0.0.0-20200227161230-57ec251c7eb3.zip mirror://goproxy//github.com/elastic/dhcp/@v/v0.0.0-20200227161230-57ec251c7eb3.mod -> github.com%2Felastic%2Fdhcp%2F@v%2Fv0.0.0-20200227161230-57ec251c7eb3.mod mirror://goproxy//github.com/elastic/ecs/@v/v1.5.0.zip -> github.com%2Felastic%2Fecs%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/elastic/ecs/@v/v1.5.0.mod -> github.com%2Felastic%2Fecs%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/elastic/elastic-agent-client/v7/@v/v7.0.0-20200709172729-d43b7ad5833a.zip -> github.com%2Felastic%2Felastic-agent-client%2Fv7%2F@v%2Fv7.0.0-20200709172729-d43b7ad5833a.zip mirror://goproxy//github.com/elastic/elastic-agent-client/v7/@v/v7.0.0-20200709172729-d43b7ad5833a.mod -> github.com%2Felastic%2Felastic-agent-client%2Fv7%2F@v%2Fv7.0.0-20200709172729-d43b7ad5833a.mod mirror://goproxy//github.com/elastic/fsevents/@v/v0.0.0-20181029231046-e1d381a4d270.zip -> github.com%2Felastic%2Ffsevents%2F@v%2Fv0.0.0-20181029231046-e1d381a4d270.zip mirror://goproxy//github.com/elastic/fsevents/@v/v0.0.0-20181029231046-e1d381a4d270.mod -> github.com%2Felastic%2Ffsevents%2F@v%2Fv0.0.0-20181029231046-e1d381a4d270.mod mirror://goproxy//github.com/elastic/go-concert/@v/v0.0.3.zip -> github.com%2Felastic%2Fgo-concert%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/elastic/go-concert/@v/v0.0.3.mod -> github.com%2Felastic%2Fgo-concert%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/elastic/go-libaudit/v2/@v/v2.0.0-20200515221334-92371bef3fb8.zip -> github.com%2Felastic%2Fgo-libaudit%2Fv2%2F@v%2Fv2.0.0-20200515221334-92371bef3fb8.zip mirror://goproxy//github.com/elastic/go-libaudit/v2/@v/v2.0.0-20200515221334-92371bef3fb8.mod -> github.com%2Felastic%2Fgo-libaudit%2Fv2%2F@v%2Fv2.0.0-20200515221334-92371bef3fb8.mod mirror://goproxy//github.com/elastic/go-licenser/@v/v0.3.1.zip -> github.com%2Felastic%2Fgo-licenser%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/elastic/go-licenser/@v/v0.3.1.mod -> github.com%2Felastic%2Fgo-licenser%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/elastic/go-lookslike/@v/v0.3.0.zip -> github.com%2Felastic%2Fgo-lookslike%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/elastic/go-lookslike/@v/v0.3.0.mod -> github.com%2Felastic%2Fgo-lookslike%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/elastic/go-lumber/@v/v0.1.0.zip -> github.com%2Felastic%2Fgo-lumber%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/elastic/go-lumber/@v/v0.1.0.mod -> github.com%2Felastic%2Fgo-lumber%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/elastic/go-perf/@v/v0.0.0-20191212140718-9c656876f595.zip -> github.com%2Felastic%2Fgo-perf%2F@v%2Fv0.0.0-20191212140718-9c656876f595.zip mirror://goproxy//github.com/elastic/go-perf/@v/v0.0.0-20191212140718-9c656876f595.mod -> github.com%2Felastic%2Fgo-perf%2F@v%2Fv0.0.0-20191212140718-9c656876f595.mod mirror://goproxy//github.com/elastic/go-plugins-helpers/@v/v0.0.0-20200207104224-bdf17607b79f.zip -> github.com%2Felastic%2Fgo-plugins-helpers%2F@v%2Fv0.0.0-20200207104224-bdf17607b79f.zip mirror://goproxy//github.com/elastic/go-plugins-helpers/@v/v0.0.0-20200207104224-bdf17607b79f.mod -> github.com%2Felastic%2Fgo-plugins-helpers%2F@v%2Fv0.0.0-20200207104224-bdf17607b79f.mod mirror://goproxy//github.com/elastic/go-seccomp-bpf/@v/v1.1.0.zip -> github.com%2Felastic%2Fgo-seccomp-bpf%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/elastic/go-seccomp-bpf/@v/v1.1.0.mod -> github.com%2Felastic%2Fgo-seccomp-bpf%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/elastic/go-structform/@v/v0.0.7.zip -> github.com%2Felastic%2Fgo-structform%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/elastic/go-structform/@v/v0.0.7.mod -> github.com%2Felastic%2Fgo-structform%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/elastic/go-sysinfo/@v/v1.1.1.mod -> github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/elastic/go-sysinfo/@v/v1.3.0.zip -> github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/elastic/go-sysinfo/@v/v1.3.0.mod -> github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/elastic/go-txfile/@v/v0.0.7.zip -> github.com%2Felastic%2Fgo-txfile%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/elastic/go-txfile/@v/v0.0.7.mod -> github.com%2Felastic%2Fgo-txfile%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/elastic/go-ucfg/@v/v0.7.0.mod -> github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/elastic/go-ucfg/@v/v0.8.3.zip -> github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.8.3.zip mirror://goproxy//github.com/elastic/go-ucfg/@v/v0.8.3.mod -> github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.8.3.mod mirror://goproxy//github.com/elastic/go-windows/@v/v1.0.0.mod -> github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elastic/go-windows/@v/v1.0.1.zip -> github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/elastic/go-windows/@v/v1.0.1.mod -> github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/elastic/gosigar/@v/v0.10.6-0.20200715000138-f115143bb233.zip -> github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.6-0.20200715000138-f115143bb233.zip mirror://goproxy//github.com/elastic/gosigar/@v/v0.10.6-0.20200715000138-f115143bb233.mod -> github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.6-0.20200715000138-f115143bb233.mod mirror://goproxy//github.com/elastic/sarama/@v/v1.19.1-0.20200629123429-0e7b69039eec.zip -> github.com%2Felastic%2Fsarama%2F@v%2Fv1.19.1-0.20200629123429-0e7b69039eec.zip mirror://goproxy//github.com/elastic/sarama/@v/v1.19.1-0.20200629123429-0e7b69039eec.mod -> github.com%2Felastic%2Fsarama%2F@v%2Fv1.19.1-0.20200629123429-0e7b69039eec.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.zip -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.zip mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.5.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.5.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.zip -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.mod -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.7.2.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.7.2.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/garyburd/redigo/@v/v1.0.1-0.20160525165706-b8dc90050f24.zip -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv1.0.1-0.20160525165706-b8dc90050f24.zip mirror://goproxy//github.com/garyburd/redigo/@v/v1.0.1-0.20160525165706-b8dc90050f24.mod -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv1.0.1-0.20160525165706-b8dc90050f24.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.zip -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-martini/martini/@v/v0.0.0-20170121215854-22fa46961aab.zip -> github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.zip mirror://goproxy//github.com/go-martini/martini/@v/v0.0.0-20170121215854-22fa46961aab.mod -> github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.5-0.20190920104607-14974a1cf647.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.5-0.20190920104607-14974a1cf647.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.5-0.20190920104607-14974a1cf647.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.5-0.20190920104607-14974a1cf647.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-sourcemap/sourcemap/@v/v2.1.2+incompatible.zip -> github.com%2Fgo-sourcemap%2Fsourcemap%2F@v%2Fv2.1.2+incompatible.zip mirror://goproxy//github.com/go-sourcemap/sourcemap/@v/v2.1.2+incompatible.mod -> github.com%2Fgo-sourcemap%2Fsourcemap%2F@v%2Fv2.1.2+incompatible.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gobuffalo/here/@v/v0.6.0.zip -> github.com%2Fgobuffalo%2Fhere%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/gobuffalo/here/@v/v0.6.0.mod -> github.com%2Fgobuffalo%2Fhere%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/gocarina/gocsv/@v/v0.0.0-20170324095351-ffef3ffc77be.zip -> github.com%2Fgocarina%2Fgocsv%2F@v%2Fv0.0.0-20170324095351-ffef3ffc77be.zip mirror://goproxy//github.com/gocarina/gocsv/@v/v0.0.0-20170324095351-ffef3ffc77be.mod -> github.com%2Fgocarina%2Fgocsv%2F@v%2Fv0.0.0-20170324095351-ffef3ffc77be.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.zip -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.zip mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/godror/godror/@v/v0.10.4.zip -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.10.4.zip mirror://goproxy//github.com/godror/godror/@v/v0.10.4.mod -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.10.4.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.7.1.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.7.2-0.20190320160742-5135e617513b.zip -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.2-0.20190320160742-5135e617513b.zip mirror://goproxy//github.com/gofrs/flock/@v/v0.7.2-0.20190320160742-5135e617513b.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.2-0.20190320160742-5135e617513b.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.3.0+incompatible.zip -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.3.0+incompatible.zip mirror://goproxy//github.com/gofrs/uuid/@v/v3.3.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.3.0+incompatible.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang-sql/civil/@v/v0.0.0-20190719163853-cb61b32ac6fe.zip -> github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.zip mirror://goproxy//github.com/golang-sql/civil/@v/v0.0.0-20190719163853-cb61b32ac6fe.mod -> github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/flatbuffers/@v/v1.7.2-0.20170925184458-7a6b2bf521e9.zip -> github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.7.2-0.20170925184458-7a6b2bf521e9.zip mirror://goproxy//github.com/google/flatbuffers/@v/v1.7.2-0.20170925184458-7a6b2bf521e9.mod -> github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.7.2-0.20170925184458-7a6b2bf521e9.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-github/v28/@v/v28.1.1.zip -> github.com%2Fgoogle%2Fgo-github%2Fv28%2F@v%2Fv28.1.1.zip mirror://goproxy//github.com/google/go-github/v28/@v/v28.1.1.mod -> github.com%2Fgoogle%2Fgo-github%2Fv28%2F@v%2Fv28.1.1.mod mirror://goproxy//github.com/google/go-github/v29/@v/v29.0.2.zip -> github.com%2Fgoogle%2Fgo-github%2Fv29%2F@v%2Fv29.0.2.zip mirror://goproxy//github.com/google/go-github/v29/@v/v29.0.2.mod -> github.com%2Fgoogle%2Fgo-github%2Fv29%2F@v%2Fv29.0.2.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/licenseclassifier/@v/v0.0.0-20200402202327-879cb1424de0.zip -> github.com%2Fgoogle%2Flicenseclassifier%2F@v%2Fv0.0.0-20200402202327-879cb1424de0.zip mirror://goproxy//github.com/google/licenseclassifier/@v/v0.0.0-20200402202327-879cb1424de0.mod -> github.com%2Fgoogle%2Flicenseclassifier%2F@v%2Fv0.0.0-20200402202327-879cb1424de0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/subcommands/@v/v1.0.1.mod -> github.com%2Fgoogle%2Fsubcommands%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2-0.20190416172445-c2e93f3ae59f.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2-0.20190416172445-c2e93f3ae59f.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.2-0.20190416172445-c2e93f3ae59f.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2-0.20190416172445-c2e93f3ae59f.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.1.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.1-0.20190624222214-25d8b0b66985.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.1-0.20190624222214-25d8b0b66985.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.1-0.20190624222214-25d8b0b66985.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.1-0.20190624222214-25d8b0b66985.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorhill/cronexpr/@v/v0.0.0-20161205141322-d520615e531a.zip -> github.com%2Fgorhill%2Fcronexpr%2F@v%2Fv0.0.0-20161205141322-d520615e531a.zip mirror://goproxy//github.com/gorhill/cronexpr/@v/v0.0.0-20161205141322-d520615e531a.mod -> github.com%2Fgorhill%2Fcronexpr%2F@v%2Fv0.0.0-20161205141322-d520615e531a.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.13.0.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.13.0.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.13.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/h2non/filetype/@v/v1.0.12.zip -> github.com%2Fh2non%2Ffiletype%2F@v%2Fv1.0.12.zip mirror://goproxy//github.com/h2non/filetype/@v/v1.0.12.mod -> github.com%2Fh2non%2Ffiletype%2F@v%2Fv1.0.12.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v0.0.0-20141028054710-7554cd9344ce.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v0.0.0-20141028054710-7554cd9344ce.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v0.0.0-20161216184304-ed905158d874.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.2-0.20190520140433-59383c442f7d.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.2-0.20190520140433-59383c442f7d.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.2-0.20190520140433-59383c442f7d.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.2-0.20190520140433-59383c442f7d.mod mirror://goproxy//github.com/haya14busa/go-actions-toolkit/@v/v0.0.0-20200105081403-ca0307860f01.zip -> github.com%2Fhaya14busa%2Fgo-actions-toolkit%2F@v%2Fv0.0.0-20200105081403-ca0307860f01.zip mirror://goproxy//github.com/haya14busa/go-actions-toolkit/@v/v0.0.0-20200105081403-ca0307860f01.mod -> github.com%2Fhaya14busa%2Fgo-actions-toolkit%2F@v%2Fv0.0.0-20200105081403-ca0307860f01.mod mirror://goproxy//github.com/haya14busa/go-checkstyle/@v/v0.0.0-20170303121022-5e9d09f51fa1.mod -> github.com%2Fhaya14busa%2Fgo-checkstyle%2F@v%2Fv0.0.0-20170303121022-5e9d09f51fa1.mod mirror://goproxy//github.com/haya14busa/secretbox/@v/v0.0.0-20180525171038-07c7ecf409f5.mod -> github.com%2Fhaya14busa%2Fsecretbox%2F@v%2Fv0.0.0-20180525171038-07c7ecf409f5.mod mirror://goproxy//github.com/hectane/go-acl/@v/v0.0.0-20190604041725-da78bae5fc95.zip -> github.com%2Fhectane%2Fgo-acl%2F@v%2Fv0.0.0-20190604041725-da78bae5fc95.zip mirror://goproxy//github.com/hectane/go-acl/@v/v0.0.0-20190604041725-da78bae5fc95.mod -> github.com%2Fhectane%2Fgo-acl%2F@v%2Fv0.0.0-20190604041725-da78bae5fc95.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jcmturner/gofork/@v/v1.0.0.zip -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jcmturner/gofork/@v/v1.0.0.mod -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jessevdk/go-flags/@v/v1.4.0.mod -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmoiron/sqlx/@v/v1.2.1-0.20190826204134-d7d95172beb5.zip -> github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.1-0.20190826204134-d7d95172beb5.zip mirror://goproxy//github.com/jmoiron/sqlx/@v/v1.2.1-0.20190826204134-d7d95172beb5.mod -> github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.1-0.20190826204134-d7d95172beb5.mod mirror://goproxy//github.com/joeshaw/multierror/@v/v0.0.0-20140124173710-69b34d4ec901.zip -> github.com%2Fjoeshaw%2Fmultierror%2F@v%2Fv0.0.0-20140124173710-69b34d4ec901.zip mirror://goproxy//github.com/joeshaw/multierror/@v/v0.0.0-20140124173710-69b34d4ec901.mod -> github.com%2Fjoeshaw%2Fmultierror%2F@v%2Fv0.0.0-20140124173710-69b34d4ec901.mod mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.zip -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/josephspurrier/goversioninfo/@v/v0.0.0-20200309025242-14b0ab84c6ca.zip -> github.com%2Fjosephspurrier%2Fgoversioninfo%2F@v%2Fv0.0.0-20200309025242-14b0ab84c6ca.zip mirror://goproxy//github.com/josephspurrier/goversioninfo/@v/v0.0.0-20200309025242-14b0ab84c6ca.mod -> github.com%2Fjosephspurrier%2Fgoversioninfo%2F@v%2Fv0.0.0-20200309025242-14b0ab84c6ca.mod mirror://goproxy//github.com/jpillora/backoff/@v/v0.0.0-20180909062703-3050d21c67d7.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv0.0.0-20180909062703-3050d21c67d7.mod mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.zip -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.zip -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/justinas/nosurf/@v/v1.1.0.mod -> github.com%2Fjustinas%2Fnosurf%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.15.6.zip -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.15.6.zip mirror://goproxy//github.com/karrick/godirwalk/@v/v1.15.6.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.15.6.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.9.8.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.8.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.9.8.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.8.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.zip -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.zip mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.zip -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.0.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.2-0.20190507191818-2ff3cb3adc01.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.2-0.20190507191818-2ff3cb3adc01.zip mirror://goproxy//github.com/lib/pq/@v/v1.1.2-0.20190507191818-2ff3cb3adc01.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.2-0.20190507191818-2ff3cb3adc01.mod mirror://goproxy//github.com/magefile/mage/@v/v1.9.0.zip -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/magefile/mage/@v/v1.9.0.mod -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/magefile/mage/@v/v1.10.0.zip -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/magefile/mage/@v/v1.10.0.mod -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.1.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.1.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/markbates/pkger/@v/v0.17.0.zip -> github.com%2Fmarkbates%2Fpkger%2F@v%2Fv0.17.0.zip mirror://goproxy//github.com/markbates/pkger/@v/v0.17.0.mod -> github.com%2Fmarkbates%2Fpkger%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/martini-contrib/render/@v/v0.0.0-20150707142108-ec18f8345a11.zip -> github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.zip mirror://goproxy//github.com/martini-contrib/render/@v/v0.0.0-20150707142108-ec18f8345a11.mod -> github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.8.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20190610004146-91bb50d98149.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190610004146-91bb50d98149.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20191113090002-7c0f6868bffe.zip -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20191113090002-7c0f6868bffe.zip mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20191113090002-7c0f6868bffe.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20191113090002-7c0f6868bffe.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.2.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.7.zip -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.7.zip mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.7.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.7.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.9.0.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.9.0.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.15.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.15.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170116052023-ab25296c0f51.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170116052023-ab25296c0f51.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170116052023-ab25296c0f51.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170116052023-ab25296c0f51.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.zip -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.5.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.2.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.0.20190228220655-ac19fd6e7483.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.0.20190228220655-ac19fd6e7483.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.0.20190228220655-ac19fd6e7483.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.0.20190228220655-ac19fd6e7483.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.2-0.20190823105129-775207bd45b6.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.2-0.20190823105129-775207bd45b6.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.2-0.20190823105129-775207bd45b6.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.2-0.20190823105129-775207bd45b6.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.0.0-20190115041553-12f6a991201f.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.0.0-20190115041553-12f6a991201f.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v0.1.2-0.20190507144316-5b71a03e2700.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv0.1.2-0.20190507144316-5b71a03e2700.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runtime-tools/@v/v0.0.0-20181011054405-1d69bd0f9c39.mod -> github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod mirror://goproxy//github.com/oxtoacart/bpool/@v/v0.0.0-20150712133111-4e1c5567d7c2.zip -> github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.zip mirror://goproxy//github.com/oxtoacart/bpool/@v/v0.0.0-20150712133111-4e1c5567d7c2.mod -> github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.4.1+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.4.1+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.4.1+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.4.1+incompatible.mod mirror://goproxy//github.com/pierrre/gotestcover/@v/v0.0.0-20160113212533-7b94f124d338.zip -> github.com%2Fpierrre%2Fgotestcover%2F@v%2Fv0.0.0-20160113212533-7b94f124d338.zip mirror://goproxy//github.com/pierrre/gotestcover/@v/v0.0.0-20160113212533-7b94f124d338.mod -> github.com%2Fpierrre%2Fgotestcover%2F@v%2Fv0.0.0-20160113212533-7b94f124d338.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1-0.20170505043639-c605e284fe17.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20170505043639-c605e284fe17.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1-0.20171018195549-f15c970de5b7.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20171018195549-f15c970de5b7.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/poy/eachers/@v/v0.0.0-20181020210610-23942921fe77.zip -> github.com%2Fpoy%2Feachers%2F@v%2Fv0.0.0-20181020210610-23942921fe77.zip mirror://goproxy//github.com/poy/eachers/@v/v0.0.0-20181020210610-23942921fe77.mod -> github.com%2Fpoy%2Feachers%2F@v%2Fv0.0.0-20181020210610-23942921fe77.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.1-0.20190913103102-20428fa0bffc.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.1-0.20190913103102-20428fa0bffc.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.1-0.20190913103102-20428fa0bffc.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.1-0.20190913103102-20428fa0bffc.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190425082905-87a4384529e0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190425082905-87a4384529e0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.5.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.11.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.11.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.11.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/prometheus/prometheus/@v/v2.5.0+incompatible.zip -> github.com%2Fprometheus%2Fprometheus%2F@v%2Fv2.5.0+incompatible.zip mirror://goproxy//github.com/prometheus/prometheus/@v/v2.5.0+incompatible.mod -> github.com%2Fprometheus%2Fprometheus%2F@v%2Fv2.5.0+incompatible.mod mirror://goproxy//github.com/rakyll/statik/@v/v0.1.6.mod -> github.com%2Frakyll%2Fstatik%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20190826022208-cac0b30c2563.zip -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20190826022208-cac0b30c2563.zip mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20190826022208-cac0b30c2563.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20190826022208-cac0b30c2563.mod mirror://goproxy//github.com/reviewdog/errorformat/@v/v0.0.0-20200109134752-8983be9bc7dd.zip -> github.com%2Freviewdog%2Ferrorformat%2F@v%2Fv0.0.0-20200109134752-8983be9bc7dd.zip mirror://goproxy//github.com/reviewdog/errorformat/@v/v0.0.0-20200109134752-8983be9bc7dd.mod -> github.com%2Freviewdog%2Ferrorformat%2F@v%2Fv0.0.0-20200109134752-8983be9bc7dd.mod mirror://goproxy//github.com/reviewdog/reviewdog/@v/v0.9.17.zip -> github.com%2Freviewdog%2Freviewdog%2F@v%2Fv0.9.17.zip mirror://goproxy//github.com/reviewdog/reviewdog/@v/v0.9.17.mod -> github.com%2Freviewdog%2Freviewdog%2F@v%2Fv0.9.17.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v1.2.0.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/samuel/go-parser/@v/v0.0.0-20130731160455-ca8abbf65d0e.zip -> github.com%2Fsamuel%2Fgo-parser%2F@v%2Fv0.0.0-20130731160455-ca8abbf65d0e.zip mirror://goproxy//github.com/samuel/go-parser/@v/v0.0.0-20130731160455-ca8abbf65d0e.mod -> github.com%2Fsamuel%2Fgo-parser%2F@v%2Fv0.0.0-20130731160455-ca8abbf65d0e.mod mirror://goproxy//github.com/samuel/go-thrift/@v/v0.0.0-20140522043831-2187045faa54.zip -> github.com%2Fsamuel%2Fgo-thrift%2F@v%2Fv0.0.0-20140522043831-2187045faa54.zip mirror://goproxy//github.com/samuel/go-thrift/@v/v0.0.0-20140522043831-2187045faa54.mod -> github.com%2Fsamuel%2Fgo-thrift%2F@v%2Fv0.0.0-20140522043831-2187045faa54.mod mirror://goproxy//github.com/sanathkr/go-yaml/@v/v0.0.0-20170819195128-ed9d249f429b.zip -> github.com%2Fsanathkr%2Fgo-yaml%2F@v%2Fv0.0.0-20170819195128-ed9d249f429b.zip mirror://goproxy//github.com/sanathkr/go-yaml/@v/v0.0.0-20170819195128-ed9d249f429b.mod -> github.com%2Fsanathkr%2Fgo-yaml%2F@v%2Fv0.0.0-20170819195128-ed9d249f429b.mod mirror://goproxy//github.com/sanathkr/yaml/@v/v0.0.0-20170819201035-0056894fa522.mod -> github.com%2Fsanathkr%2Fyaml%2F@v%2Fv0.0.0-20170819201035-0056894fa522.mod mirror://goproxy//github.com/sanathkr/yaml/@v/v1.0.1-0.20170819201035-0056894fa522.zip -> github.com%2Fsanathkr%2Fyaml%2F@v%2Fv1.0.1-0.20170819201035-0056894fa522.zip mirror://goproxy//github.com/sanathkr/yaml/@v/v1.0.1-0.20170819201035-0056894fa522.mod -> github.com%2Fsanathkr%2Fyaml%2F@v%2Fv1.0.1-0.20170819201035-0056894fa522.mod mirror://goproxy//github.com/santhosh-tekuri/jsonschema/@v/v1.2.4.zip -> github.com%2Fsanthosh-tekuri%2Fjsonschema%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/santhosh-tekuri/jsonschema/@v/v1.2.4.mod -> github.com%2Fsanthosh-tekuri%2Fjsonschema%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.zip -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v2.19.11+incompatible.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.19.11+incompatible.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v2.19.11+incompatible.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.19.11+incompatible.mod mirror://goproxy//github.com/shopspring/decimal/@v/v1.2.0.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/shopspring/decimal/@v/v1.2.0.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.4-0.20170822132746-89742aefa4b2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.4-0.20170822132746-89742aefa4b2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.1.5-0.20170601210322-f6abca593680.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.1.5-0.20170601210322-f6abca593680.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20170704070218-db04d3cc01c8.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.mod mirror://goproxy//github.com/tsg/go-daemon/@v/v0.0.0-20200207173439-e704b93fd89b.zip -> github.com%2Ftsg%2Fgo-daemon%2F@v%2Fv0.0.0-20200207173439-e704b93fd89b.zip mirror://goproxy//github.com/tsg/go-daemon/@v/v0.0.0-20200207173439-e704b93fd89b.mod -> github.com%2Ftsg%2Fgo-daemon%2F@v%2Fv0.0.0-20200207173439-e704b93fd89b.mod mirror://goproxy//github.com/tsg/gopacket/@v/v0.0.0-20200626092518-2ab8e397a786.zip -> github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20200626092518-2ab8e397a786.zip mirror://goproxy//github.com/tsg/gopacket/@v/v0.0.0-20200626092518-2ab8e397a786.mod -> github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20200626092518-2ab8e397a786.mod mirror://goproxy//github.com/urfave/cli/@v/v0.0.0-20171014202726-7bc6a0acffa5.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.mod mirror://goproxy//github.com/urso/diag/@v/v0.0.0-20200210123136-21b3cc8eb797.zip -> github.com%2Furso%2Fdiag%2F@v%2Fv0.0.0-20200210123136-21b3cc8eb797.zip mirror://goproxy//github.com/urso/diag/@v/v0.0.0-20200210123136-21b3cc8eb797.mod -> github.com%2Furso%2Fdiag%2F@v%2Fv0.0.0-20200210123136-21b3cc8eb797.mod mirror://goproxy//github.com/urso/go-bin/@v/v0.0.0-20180220135811-781c575c9f0e.zip -> github.com%2Furso%2Fgo-bin%2F@v%2Fv0.0.0-20180220135811-781c575c9f0e.zip mirror://goproxy//github.com/urso/go-bin/@v/v0.0.0-20180220135811-781c575c9f0e.mod -> github.com%2Furso%2Fgo-bin%2F@v%2Fv0.0.0-20180220135811-781c575c9f0e.mod mirror://goproxy//github.com/urso/magetools/@v/v0.0.0-20190919040553-290c89e0c230.zip -> github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20190919040553-290c89e0c230.zip mirror://goproxy//github.com/urso/magetools/@v/v0.0.0-20190919040553-290c89e0c230.mod -> github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20190919040553-290c89e0c230.mod mirror://goproxy//github.com/urso/qcgen/@v/v0.0.0-20180131103024-0b059e7db4f4.zip -> github.com%2Furso%2Fqcgen%2F@v%2Fv0.0.0-20180131103024-0b059e7db4f4.zip mirror://goproxy//github.com/urso/qcgen/@v/v0.0.0-20180131103024-0b059e7db4f4.mod -> github.com%2Furso%2Fqcgen%2F@v%2Fv0.0.0-20180131103024-0b059e7db4f4.mod mirror://goproxy//github.com/urso/sderr/@v/v0.0.0-20200210124243-c2a16f3d43ec.zip -> github.com%2Furso%2Fsderr%2F@v%2Fv0.0.0-20200210124243-c2a16f3d43ec.zip mirror://goproxy//github.com/urso/sderr/@v/v0.0.0-20200210124243-c2a16f3d43ec.mod -> github.com%2Furso%2Fsderr%2F@v%2Fv0.0.0-20200210124243-c2a16f3d43ec.mod mirror://goproxy//github.com/vbatts/tar-split/@v/v0.11.1.mod -> github.com%2Fvbatts%2Ftar-split%2F@v%2Fv0.11.1.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.0.0-20170802214208-2cad15190b41.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.0.0-20170802214208-2cad15190b41.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.0.0-20170802214208-2cad15190b41.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.0.0-20170802214208-2cad15190b41.mod mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.22.3.zip -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.22.3.zip mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.22.3.mod -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.22.3.mod mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.zip -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.zip mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.mod -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.mod mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.zip -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.mod -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20190905194746-02993c407bfb.zip -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20190905194746-02993c407bfb.zip mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20190905194746-02993c407bfb.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20190905194746-02993c407bfb.mod mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.zip -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.zip mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.mod -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20180618132009-1d523034197f.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20181112162635-ac52e6811b56.zip -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20181112162635-ac52e6811b56.zip mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20181112162635-ac52e6811b56.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20181112162635-ac52e6811b56.mod mirror://goproxy//github.com/yuin/gopher-lua/@v/v0.0.0-20170403160031-b402f3114ec7.zip -> github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20170403160031-b402f3114ec7.zip mirror://goproxy//github.com/yuin/gopher-lua/@v/v0.0.0-20170403160031-b402f3114ec7.mod -> github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20170403160031-b402f3114ec7.mod mirror://goproxy//go.elastic.co/apm/@v/v1.7.2.zip -> go.elastic.co%2Fapm%2F@v%2Fv1.7.2.zip mirror://goproxy//go.elastic.co/apm/@v/v1.7.2.mod -> go.elastic.co%2Fapm%2F@v%2Fv1.7.2.mod mirror://goproxy//go.elastic.co/apm/module/apmelasticsearch/@v/v1.7.2.zip -> go.elastic.co%2Fapm%2Fmodule%2Fapmelasticsearch%2F@v%2Fv1.7.2.zip mirror://goproxy//go.elastic.co/apm/module/apmelasticsearch/@v/v1.7.2.mod -> go.elastic.co%2Fapm%2Fmodule%2Fapmelasticsearch%2F@v%2Fv1.7.2.mod mirror://goproxy//go.elastic.co/apm/module/apmhttp/@v/v1.7.2.zip -> go.elastic.co%2Fapm%2Fmodule%2Fapmhttp%2F@v%2Fv1.7.2.zip mirror://goproxy//go.elastic.co/apm/module/apmhttp/@v/v1.7.2.mod -> go.elastic.co%2Fapm%2Fmodule%2Fapmhttp%2F@v%2Fv1.7.2.mod mirror://goproxy//go.elastic.co/ecszap/@v/v0.1.1-0.20200424093508-cdd95a104193.zip -> go.elastic.co%2Fecszap%2F@v%2Fv0.1.1-0.20200424093508-cdd95a104193.zip mirror://goproxy//go.elastic.co/ecszap/@v/v0.1.1-0.20200424093508-cdd95a104193.mod -> go.elastic.co%2Fecszap%2F@v%2Fv0.1.1-0.20200424093508-cdd95a104193.mod mirror://goproxy//go.elastic.co/fastjson/@v/v1.0.0.zip -> go.elastic.co%2Ffastjson%2F@v%2Fv1.0.0.zip mirror://goproxy//go.elastic.co/fastjson/@v/v1.0.0.mod -> go.elastic.co%2Ffastjson%2F@v%2Fv1.0.0.mod mirror://goproxy//go.elastic.co/go-licence-detector/@v/v0.4.0.zip -> go.elastic.co%2Fgo-licence-detector%2F@v%2Fv0.4.0.zip mirror://goproxy//go.elastic.co/go-licence-detector/@v/v0.4.0.mod -> go.elastic.co%2Fgo-licence-detector%2F@v%2Fv0.4.0.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.4.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.4.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.4.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.4.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.zip -> go.opencensus.io%2F@v%2Fv0.22.2.zip mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.zip mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.3.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.3.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.zip -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.zip mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.14.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.14.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.14.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.14.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20171113213409-9f005a07e0d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20171113213409-9f005a07e0d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190325154230-a5d413f7728c.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200204104054-c9f3fb736b72.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200204104054-c9f3fb736b72.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200510223506-06a226fb4e37.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200510223506-06a226fb4e37.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.zip -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.zip mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181108082009-03003ca0c849.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181108082009-03003ca0c849.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191002035440-2ec189313ef0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191002035440-2ec189313ef0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191021144547-ec77196f6094.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191021144547-ec77196f6094.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191112182307-2180aed22343.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191112182307-2180aed22343.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181106182150-f42d05182288.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181106182150-f42d05182288.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190130055435-99b60b757ec1.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190130055435-99b60b757ec1.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170608164803-0b25a408a500.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170608164803-0b25a408a500.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190405154228-4b34438f7a67.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190405154228-4b34438f7a67.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190514135907-3a4b5fb9f71f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190514135907-3a4b5fb9f71f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190529164535-6a60838ec259.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190529164535-6a60838ec259.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190801041406-cbf593c0f2f3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191025021431-6c3a3bfe00ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191025021431-6c3a3bfe00ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191112214154-59a1497f0cea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191112214154-59a1497f0cea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200102141924-c96a22e43c9c.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200102141924-c96a22e43c9c.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200102141924-c96a22e43c9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200102141924-c96a22e43c9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200602230032-c00d67ef29d0.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200602230032-c00d67ef29d0.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200602230032-c00d67ef29d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200602230032-c00d67ef29d0.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.zip mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.2.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.3.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.3.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190927181202-20e1ac93f88c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190927181202-20e1ac93f88c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.24.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.zip -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/jcmturner/aescts.v1/@v/v1.0.1.zip -> gopkg.in%2Fjcmturner%2Faescts.v1%2F@v%2Fv1.0.1.zip mirror://goproxy//gopkg.in/jcmturner/aescts.v1/@v/v1.0.1.mod -> gopkg.in%2Fjcmturner%2Faescts.v1%2F@v%2Fv1.0.1.mod mirror://goproxy//gopkg.in/jcmturner/dnsutils.v1/@v/v1.0.1.zip -> gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.zip mirror://goproxy//gopkg.in/jcmturner/dnsutils.v1/@v/v1.0.1.mod -> gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.mod mirror://goproxy//gopkg.in/jcmturner/goidentity.v3/@v/v3.0.0.zip -> gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.zip mirror://goproxy//gopkg.in/jcmturner/goidentity.v3/@v/v3.0.0.mod -> gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.mod mirror://goproxy//gopkg.in/jcmturner/gokrb5.v7/@v/v7.5.0.zip -> gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.5.0.zip mirror://goproxy//gopkg.in/jcmturner/gokrb5.v7/@v/v7.5.0.mod -> gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.5.0.mod mirror://goproxy//gopkg.in/jcmturner/rpc.v1/@v/v1.1.0.zip -> gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.zip mirror://goproxy//gopkg.in/jcmturner/rpc.v1/@v/v1.1.0.mod -> gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20160818020120-3f83fa500528.zip -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20160818020120-3f83fa500528.zip mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20160818020120-3f83fa500528.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20160818020120-3f83fa500528.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.3.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//howett.net/plist/@v/v0.0.0-20181124034731-591f970eefbb.zip -> howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.zip mirror://goproxy//howett.net/plist/@v/v0.0.0-20181124034731-591f970eefbb.mod -> howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.mod mirror://goproxy//k8s.io/api/@v/v0.18.3.zip -> k8s.io%2Fapi%2F@v%2Fv0.18.3.zip mirror://goproxy//k8s.io/api/@v/v0.18.3.mod -> k8s.io%2Fapi%2F@v%2Fv0.18.3.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.18.3.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.3.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.18.3.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.3.mod mirror://goproxy//k8s.io/client-go/@v/v0.18.3.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.18.3.zip mirror://goproxy//k8s.io/client-go/@v/v0.18.3.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.18.3.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200410145947-61e04a5be9a6.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410145947-61e04a5be9a6.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200410145947-61e04a5be9a6.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410145947-61e04a5be9a6.mod mirror://goproxy//k8s.io/kubernetes/@v/v1.13.0.mod -> k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0-20200116222232-67a7b8c61874.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod
 _eclasses_=go-module	92660621959e7fab813173772987588b
 _md5_=b9cf89a337e97de5a8218bf18295301e
diff --git a/metadata/md5-cache/app-admin/gopass-1.10.1 b/metadata/md5-cache/app-admin/gopass-1.10.1
deleted file mode 100644
index 83b1f7f01e12..000000000000
--- a/metadata/md5-cache/app-admin/gopass-1.10.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=install postinst unpack
-DEPEND=>=dev-lang/go-1.11
-DESCRIPTION=a simple but powerful password manager for the terminal
-EAPI=7
-HOMEPAGE=https://www.gopass.pw/
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=MIT Apache-2.0 BSD MPL-2.0 BSD-2
-RDEPEND=dev-vcs/git >=app-crypt/gnupg-2
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/gopasspw/gopass/archive/v1.10.1.tar.gz -> gopass-1.10.1.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//filippo.io/age/@v/v1.0.0-beta4.zip -> filippo.io%2Fage%2F@v%2Fv1.0.0-beta4.zip mirror://goproxy//filippo.io/age/@v/v1.0.0-beta4.mod -> filippo.io%2Fage%2F@v%2Fv1.0.0-beta4.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/alecthomas/binary/@v/v0.0.0-20190922233330-fb1b1d9c299c.zip -> github.com%2Falecthomas%2Fbinary%2F@v%2Fv0.0.0-20190922233330-fb1b1d9c299c.zip mirror://goproxy//github.com/alecthomas/binary/@v/v0.0.0-20190922233330-fb1b1d9c299c.mod -> github.com%2Falecthomas%2Fbinary%2F@v%2Fv0.0.0-20190922233330-fb1b1d9c299c.mod mirror://goproxy//github.com/atotto/clipboard/@v/v0.1.2.zip -> github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/atotto/clipboard/@v/v0.1.2.mod -> github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/blang/semver/@v/v0.0.0-20190414182527-1a9109f8c4a1.zip -> github.com%2Fblang%2Fsemver%2F@v%2Fv0.0.0-20190414182527-1a9109f8c4a1.zip mirror://goproxy//github.com/blang/semver/@v/v0.0.0-20190414182527-1a9109f8c4a1.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv0.0.0-20190414182527-1a9109f8c4a1.mod mirror://goproxy//github.com/caspr-io/yamlpath/@v/v0.0.0-20200722075116-502e8d113a9b.zip -> github.com%2Fcaspr-io%2Fyamlpath%2F@v%2Fv0.0.0-20200722075116-502e8d113a9b.zip mirror://goproxy//github.com/caspr-io/yamlpath/@v/v0.0.0-20200722075116-502e8d113a9b.mod -> github.com%2Fcaspr-io%2Fyamlpath%2F@v%2Fv0.0.0-20200722075116-502e8d113a9b.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.zip -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.zip -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.zip -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.zip mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.zip -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.zip mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.zip -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.zip mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dominikschulz/github-releases/@v/v0.0.3.zip -> github.com%2Fdominikschulz%2Fgithub-releases%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/dominikschulz/github-releases/@v/v0.0.3.mod -> github.com%2Fdominikschulz%2Fgithub-releases%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190623212516-8a1682060722.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190623212516-8a1682060722.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190623212516-8a1682060722.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190623212516-8a1682060722.mod mirror://goproxy//github.com/gokyle/twofactor/@v/v1.0.1.zip -> github.com%2Fgokyle%2Ftwofactor%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/gokyle/twofactor/@v/v1.0.1.mod -> github.com%2Fgokyle%2Ftwofactor%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.zip -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.zip mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.mod -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/jsimonetti/pwscheme/@v/v0.0.0-20160922125227-76804708ecad.zip -> github.com%2Fjsimonetti%2Fpwscheme%2F@v%2Fv0.0.0-20160922125227-76804708ecad.zip mirror://goproxy//github.com/jsimonetti/pwscheme/@v/v0.0.0-20160922125227-76804708ecad.mod -> github.com%2Fjsimonetti%2Fpwscheme%2F@v%2Fv0.0.0-20160922125227-76804708ecad.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.zip -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.mod -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.3.zip -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.3.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.3.1.zip -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/klauspost/cpuid/@v/v1.3.1.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/martinhoefling/goxkcdpwgen/@v/v0.0.0-20190331205820-7dc3d102eca3.zip -> github.com%2Fmartinhoefling%2Fgoxkcdpwgen%2F@v%2Fv0.0.0-20190331205820-7dc3d102eca3.zip mirror://goproxy//github.com/martinhoefling/goxkcdpwgen/@v/v0.0.0-20190331205820-7dc3d102eca3.mod -> github.com%2Fmartinhoefling%2Fgoxkcdpwgen%2F@v%2Fv0.0.0-20190331205820-7dc3d102eca3.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.7.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.7.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/minio/md5-simd/@v/v1.1.0.zip -> github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/minio/md5-simd/@v/v1.1.0.mod -> github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/minio/minio-go/v6/@v/v6.0.57.zip -> github.com%2Fminio%2Fminio-go%2Fv6%2F@v%2Fv6.0.57.zip mirror://goproxy//github.com/minio/minio-go/v6/@v/v6.0.57.mod -> github.com%2Fminio%2Fminio-go%2Fv6%2F@v%2Fv6.0.57.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.zip -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-ps/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-ps/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/muesli/crunchy/@v/v0.4.0.zip -> github.com%2Fmuesli%2Fcrunchy%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/muesli/crunchy/@v/v0.4.0.mod -> github.com%2Fmuesli%2Fcrunchy%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/nbutton23/zxcvbn-go/@v/v0.0.0-20180912185939-ae427f1e4c1d.zip -> github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20180912185939-ae427f1e4c1d.zip mirror://goproxy//github.com/nbutton23/zxcvbn-go/@v/v0.0.0-20180912185939-ae427f1e4c1d.mod -> github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20180912185939-ae427f1e4c1d.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/schollz/closestmatch/@v/v0.0.0-20190308193919-1fbe626be92e.zip -> github.com%2Fschollz%2Fclosestmatch%2F@v%2Fv0.0.0-20190308193919-1fbe626be92e.zip mirror://goproxy//github.com/schollz/closestmatch/@v/v0.0.0-20190308193919-1fbe626be92e.mod -> github.com%2Fschollz%2Fclosestmatch%2F@v%2Fv0.0.0-20190308193919-1fbe626be92e.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.5.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/skip2/go-qrcode/@v/v0.0.0-20200617195104-da1b6568686e.zip -> github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20200617195104-da1b6568686e.zip mirror://goproxy//github.com/skip2/go-qrcode/@v/v0.0.0-20200617195104-da1b6568686e.mod -> github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20200617195104-da1b6568686e.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v1.0.0.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v1.0.0.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/urfave/cli/v2/@v/v2.2.0.zip -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.zip mirror://goproxy//github.com/urfave/cli/v2/@v/v2.2.0.mod -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//github.com/xrash/smetrics/@v/v0.0.0-20170218160415-a3153f7040e9.zip -> github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20170218160415-a3153f7040e9.zip mirror://goproxy//github.com/xrash/smetrics/@v/v0.0.0-20170218160415-a3153f7040e9.mod -> github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20170218160415-a3153f7040e9.mod mirror://goproxy//github.com/xrash/smetrics/@v/v0.0.0-20200730060457-89a2a8a1fb0b.zip -> github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20200730060457-89a2a8a1fb0b.zip mirror://goproxy//github.com/xrash/smetrics/@v/v0.0.0-20200730060457-89a2a8a1fb0b.mod -> github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20200730060457-89a2a8a1fb0b.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190513172903-22d7a77e9e5f.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190513172903-22d7a77e9e5f.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200323165209-0ec3e9974c59.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200728195943-123391ffb6de.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200728195943-123391ffb6de.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200808120158-1030fc2bf1d9.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200808120158-1030fc2bf1d9.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200808120158-1030fc2bf1d9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200808120158-1030fc2bf1d9.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.42.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.42.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.57.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.57.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200121175148-a6ecf24a6d71.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200121175148-a6ecf24a6d71.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//rsc.io/qr/@v/v0.2.0.zip -> rsc.io%2Fqr%2F@v%2Fv0.2.0.zip mirror://goproxy//rsc.io/qr/@v/v0.2.0.mod -> rsc.io%2Fqr%2F@v%2Fv0.2.0.mod
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	go-module	92660621959e7fab813173772987588b	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9b5d7c865303c0b438788f3763e4b8cb
diff --git a/metadata/md5-cache/app-admin/gopass-1.10.1-r2 b/metadata/md5-cache/app-admin/gopass-1.10.1-r2
index b98cab59681a..5a79af4d5285 100644
--- a/metadata/md5-cache/app-admin/gopass-1.10.1-r2
+++ b/metadata/md5-cache/app-admin/gopass-1.10.1-r2
@@ -4,11 +4,11 @@ DEPEND=>=dev-lang/go-1.11
 DESCRIPTION=a simple but powerful password manager for the terminal
 EAPI=7
 HOMEPAGE=https://www.gopass.pw/
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=MIT Apache-2.0 BSD MPL-2.0 BSD-2
 RDEPEND=dev-vcs/git >=app-crypt/gnupg-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/gopasspw/gopass/archive/v1.10.1.tar.gz -> gopass-1.10.1.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//filippo.io/age/@v/v1.0.0-beta4.zip -> filippo.io%2Fage%2F@v%2Fv1.0.0-beta4.zip mirror://goproxy//filippo.io/age/@v/v1.0.0-beta4.mod -> filippo.io%2Fage%2F@v%2Fv1.0.0-beta4.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/alecthomas/binary/@v/v0.0.0-20190922233330-fb1b1d9c299c.zip -> github.com%2Falecthomas%2Fbinary%2F@v%2Fv0.0.0-20190922233330-fb1b1d9c299c.zip mirror://goproxy//github.com/alecthomas/binary/@v/v0.0.0-20190922233330-fb1b1d9c299c.mod -> github.com%2Falecthomas%2Fbinary%2F@v%2Fv0.0.0-20190922233330-fb1b1d9c299c.mod mirror://goproxy//github.com/atotto/clipboard/@v/v0.1.2.zip -> github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/atotto/clipboard/@v/v0.1.2.mod -> github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/blang/semver/@v/v0.0.0-20190414182527-1a9109f8c4a1.zip -> github.com%2Fblang%2Fsemver%2F@v%2Fv0.0.0-20190414182527-1a9109f8c4a1.zip mirror://goproxy//github.com/blang/semver/@v/v0.0.0-20190414182527-1a9109f8c4a1.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv0.0.0-20190414182527-1a9109f8c4a1.mod mirror://goproxy//github.com/caspr-io/yamlpath/@v/v0.0.0-20200722075116-502e8d113a9b.zip -> github.com%2Fcaspr-io%2Fyamlpath%2F@v%2Fv0.0.0-20200722075116-502e8d113a9b.zip mirror://goproxy//github.com/caspr-io/yamlpath/@v/v0.0.0-20200722075116-502e8d113a9b.mod -> github.com%2Fcaspr-io%2Fyamlpath%2F@v%2Fv0.0.0-20200722075116-502e8d113a9b.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.zip -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.zip -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.zip -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.zip mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.zip -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.zip mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.zip -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.zip mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dominikschulz/github-releases/@v/v0.0.3.zip -> github.com%2Fdominikschulz%2Fgithub-releases%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/dominikschulz/github-releases/@v/v0.0.3.mod -> github.com%2Fdominikschulz%2Fgithub-releases%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190623212516-8a1682060722.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190623212516-8a1682060722.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190623212516-8a1682060722.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190623212516-8a1682060722.mod mirror://goproxy//github.com/gokyle/twofactor/@v/v1.0.1.zip -> github.com%2Fgokyle%2Ftwofactor%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/gokyle/twofactor/@v/v1.0.1.mod -> github.com%2Fgokyle%2Ftwofactor%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.zip -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.zip mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.mod -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/jsimonetti/pwscheme/@v/v0.0.0-20160922125227-76804708ecad.zip -> github.com%2Fjsimonetti%2Fpwscheme%2F@v%2Fv0.0.0-20160922125227-76804708ecad.zip mirror://goproxy//github.com/jsimonetti/pwscheme/@v/v0.0.0-20160922125227-76804708ecad.mod -> github.com%2Fjsimonetti%2Fpwscheme%2F@v%2Fv0.0.0-20160922125227-76804708ecad.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.zip -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.mod -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.3.zip -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.3.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.3.1.zip -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/klauspost/cpuid/@v/v1.3.1.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/martinhoefling/goxkcdpwgen/@v/v0.0.0-20190331205820-7dc3d102eca3.zip -> github.com%2Fmartinhoefling%2Fgoxkcdpwgen%2F@v%2Fv0.0.0-20190331205820-7dc3d102eca3.zip mirror://goproxy//github.com/martinhoefling/goxkcdpwgen/@v/v0.0.0-20190331205820-7dc3d102eca3.mod -> github.com%2Fmartinhoefling%2Fgoxkcdpwgen%2F@v%2Fv0.0.0-20190331205820-7dc3d102eca3.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.7.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.7.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/minio/md5-simd/@v/v1.1.0.zip -> github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/minio/md5-simd/@v/v1.1.0.mod -> github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/minio/minio-go/v6/@v/v6.0.57.zip -> github.com%2Fminio%2Fminio-go%2Fv6%2F@v%2Fv6.0.57.zip mirror://goproxy//github.com/minio/minio-go/v6/@v/v6.0.57.mod -> github.com%2Fminio%2Fminio-go%2Fv6%2F@v%2Fv6.0.57.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.zip -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-ps/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-ps/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/muesli/crunchy/@v/v0.4.0.zip -> github.com%2Fmuesli%2Fcrunchy%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/muesli/crunchy/@v/v0.4.0.mod -> github.com%2Fmuesli%2Fcrunchy%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/nbutton23/zxcvbn-go/@v/v0.0.0-20180912185939-ae427f1e4c1d.zip -> github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20180912185939-ae427f1e4c1d.zip mirror://goproxy//github.com/nbutton23/zxcvbn-go/@v/v0.0.0-20180912185939-ae427f1e4c1d.mod -> github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20180912185939-ae427f1e4c1d.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/schollz/closestmatch/@v/v0.0.0-20190308193919-1fbe626be92e.zip -> github.com%2Fschollz%2Fclosestmatch%2F@v%2Fv0.0.0-20190308193919-1fbe626be92e.zip mirror://goproxy//github.com/schollz/closestmatch/@v/v0.0.0-20190308193919-1fbe626be92e.mod -> github.com%2Fschollz%2Fclosestmatch%2F@v%2Fv0.0.0-20190308193919-1fbe626be92e.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.5.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/skip2/go-qrcode/@v/v0.0.0-20200617195104-da1b6568686e.zip -> github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20200617195104-da1b6568686e.zip mirror://goproxy//github.com/skip2/go-qrcode/@v/v0.0.0-20200617195104-da1b6568686e.mod -> github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20200617195104-da1b6568686e.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v1.0.0.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v1.0.0.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/urfave/cli/v2/@v/v2.2.0.zip -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.zip mirror://goproxy//github.com/urfave/cli/v2/@v/v2.2.0.mod -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//github.com/xrash/smetrics/@v/v0.0.0-20170218160415-a3153f7040e9.zip -> github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20170218160415-a3153f7040e9.zip mirror://goproxy//github.com/xrash/smetrics/@v/v0.0.0-20170218160415-a3153f7040e9.mod -> github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20170218160415-a3153f7040e9.mod mirror://goproxy//github.com/xrash/smetrics/@v/v0.0.0-20200730060457-89a2a8a1fb0b.zip -> github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20200730060457-89a2a8a1fb0b.zip mirror://goproxy//github.com/xrash/smetrics/@v/v0.0.0-20200730060457-89a2a8a1fb0b.mod -> github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20200730060457-89a2a8a1fb0b.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190513172903-22d7a77e9e5f.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190513172903-22d7a77e9e5f.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200323165209-0ec3e9974c59.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200728195943-123391ffb6de.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200728195943-123391ffb6de.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200808120158-1030fc2bf1d9.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200808120158-1030fc2bf1d9.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200808120158-1030fc2bf1d9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200808120158-1030fc2bf1d9.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.42.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.42.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.57.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.57.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200121175148-a6ecf24a6d71.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200121175148-a6ecf24a6d71.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//rsc.io/qr/@v/v0.2.0.zip -> rsc.io%2Fqr%2F@v%2Fv0.2.0.zip mirror://goproxy//rsc.io/qr/@v/v0.2.0.mod -> rsc.io%2Fqr%2F@v%2Fv0.2.0.mod
 _eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=d8a40dfe31fcc4f35afc79381eced7c3
+_md5_=e08d59df43495e19a3fe9cec446e032b
diff --git a/metadata/md5-cache/app-admin/gopass-1.9.2 b/metadata/md5-cache/app-admin/gopass-1.9.2
deleted file mode 100644
index 271b2744aea7..000000000000
--- a/metadata/md5-cache/app-admin/gopass-1.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=install postinst unpack
-DEPEND=>=dev-lang/go-1.11
-DESCRIPTION=a simple but powerful password manager for the terminal
-EAPI=7
-HOMEPAGE=https://www.gopass.pw/
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=MIT Apache-2.0 BSD MPL-2.0 BSD-2
-RDEPEND=dev-vcs/git >=app-crypt/gnupg-2
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/gopasspw/gopass/archive/v1.9.2.tar.gz -> gopass-1.9.2.tar.gz mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!d!a!t!a-!d!o!g/go-sqlmock/@v/v1.3.3.zip -> github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/!d!a!t!a-!d!o!g/go-sqlmock/@v/v1.3.3.mod -> github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/!proton!mail/go-appdir/@v/v1.1.0.zip -> github.com%2F!proton!mail%2Fgo-appdir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/!proton!mail/go-appdir/@v/v1.1.0.mod -> github.com%2F!proton!mail%2Fgo-appdir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/alecthomas/binary/@v/v0.0.0-20190922233330-fb1b1d9c299c.zip -> github.com%2Falecthomas%2Fbinary%2F@v%2Fv0.0.0-20190922233330-fb1b1d9c299c.zip mirror://goproxy//github.com/alecthomas/binary/@v/v0.0.0-20190922233330-fb1b1d9c299c.mod -> github.com%2Falecthomas%2Fbinary%2F@v%2Fv0.0.0-20190922233330-fb1b1d9c299c.mod mirror://goproxy//github.com/atotto/clipboard/@v/v0.1.2.zip -> github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/atotto/clipboard/@v/v0.1.2.mod -> github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/blang/semver/@v/v0.0.0-20190414182527-1a9109f8c4a1.zip -> github.com%2Fblang%2Fsemver%2F@v%2Fv0.0.0-20190414182527-1a9109f8c4a1.zip mirror://goproxy//github.com/blang/semver/@v/v0.0.0-20190414182527-1a9109f8c4a1.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv0.0.0-20190414182527-1a9109f8c4a1.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.zip -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dominikschulz/github-releases/@v/v0.0.2.zip -> github.com%2Fdominikschulz%2Fgithub-releases%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/dominikschulz/github-releases/@v/v0.0.2.mod -> github.com%2Fdominikschulz%2Fgithub-releases%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/doronbehar/gocui/@v/v0.4.2.zip -> github.com%2Fdoronbehar%2Fgocui%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/doronbehar/gocui/@v/v0.4.2.mod -> github.com%2Fdoronbehar%2Fgocui%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/doronbehar/termbox-go/@v/v0.0.0-20191006141301-8c9470559e05.zip -> github.com%2Fdoronbehar%2Ftermbox-go%2F@v%2Fv0.0.0-20191006141301-8c9470559e05.zip mirror://goproxy//github.com/doronbehar/termbox-go/@v/v0.0.0-20191006141301-8c9470559e05.mod -> github.com%2Fdoronbehar%2Ftermbox-go%2F@v%2Fv0.0.0-20191006141301-8c9470559e05.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/gdamore/encoding/@v/v1.0.0.zip -> github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/gdamore/encoding/@v/v1.0.0.mod -> github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gdamore/tcell/@v/v1.3.0.zip -> github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/gdamore/tcell/@v/v1.3.0.mod -> github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190623212516-8a1682060722.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190623212516-8a1682060722.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190623212516-8a1682060722.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190623212516-8a1682060722.mod mirror://goproxy//github.com/gokyle/twofactor/@v/v1.0.1.zip -> github.com%2Fgokyle%2Ftwofactor%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/gokyle/twofactor/@v/v1.0.1.mod -> github.com%2Fgokyle%2Ftwofactor%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.zip -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.zip mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.mod -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/jsimonetti/pwscheme/@v/v0.0.0-20160922125227-76804708ecad.zip -> github.com%2Fjsimonetti%2Fpwscheme%2F@v%2Fv0.0.0-20160922125227-76804708ecad.zip mirror://goproxy//github.com/jsimonetti/pwscheme/@v/v0.0.0-20160922125227-76804708ecad.mod -> github.com%2Fjsimonetti%2Fpwscheme%2F@v%2Fv0.0.0-20160922125227-76804708ecad.mod mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.zip -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.mod -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.0.2.zip -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.0.2.mod -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.0.3.zip -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.0.3.mod -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/martinhoefling/goxkcdpwgen/@v/v0.0.0-20190331205820-7dc3d102eca3.zip -> github.com%2Fmartinhoefling%2Fgoxkcdpwgen%2F@v%2Fv0.0.0-20190331205820-7dc3d102eca3.zip mirror://goproxy//github.com/martinhoefling/goxkcdpwgen/@v/v0.0.0-20190331205820-7dc3d102eca3.mod -> github.com%2Fmartinhoefling%2Fgoxkcdpwgen%2F@v%2Fv0.0.0-20190331205820-7dc3d102eca3.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-ps/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-ps/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/muesli/crunchy/@v/v0.4.0.zip -> github.com%2Fmuesli%2Fcrunchy%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/muesli/crunchy/@v/v0.4.0.mod -> github.com%2Fmuesli%2Fcrunchy%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/muesli/goprogressbar/@v/v0.0.0-20190807022807-e540249d2ac1.zip -> github.com%2Fmuesli%2Fgoprogressbar%2F@v%2Fv0.0.0-20190807022807-e540249d2ac1.zip mirror://goproxy//github.com/muesli/goprogressbar/@v/v0.0.0-20190807022807-e540249d2ac1.mod -> github.com%2Fmuesli%2Fgoprogressbar%2F@v%2Fv0.0.0-20190807022807-e540249d2ac1.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/schollz/closestmatch/@v/v0.0.0-20190308193919-1fbe626be92e.zip -> github.com%2Fschollz%2Fclosestmatch%2F@v%2Fv0.0.0-20190308193919-1fbe626be92e.zip mirror://goproxy//github.com/schollz/closestmatch/@v/v0.0.0-20190308193919-1fbe626be92e.mod -> github.com%2Fschollz%2Fclosestmatch%2F@v%2Fv0.0.0-20190308193919-1fbe626be92e.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/skip2/go-qrcode/@v/v0.0.0-20191027152451-9434209cb086.zip -> github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20191027152451-9434209cb086.zip mirror://goproxy//github.com/skip2/go-qrcode/@v/v0.0.0-20191027152451-9434209cb086.mod -> github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20191027152451-9434209cb086.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/urfave/cli/v2/@v/v2.2.0.zip -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.zip mirror://goproxy//github.com/urfave/cli/v2/@v/v2.2.0.mod -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//github.com/xrash/smetrics/@v/v0.0.0-20170218160415-a3153f7040e9.zip -> github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20170218160415-a3153f7040e9.zip mirror://goproxy//github.com/xrash/smetrics/@v/v0.0.0-20170218160415-a3153f7040e9.mod -> github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20170218160415-a3153f7040e9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190701094942-4def268fd1a4.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190701094942-4def268fd1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200423211502-4bdfaf469ed5.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200423211502-4bdfaf469ed5.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200423211502-4bdfaf469ed5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200423211502-4bdfaf469ed5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200421231249-e086a090c8fd.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200421231249-e086a090c8fd.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200421231249-e086a090c8fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200421231249-e086a090c8fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190626150813-e07cf5db2756.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200420163511-1957bb5e6d1f.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200420163511-1957bb5e6d1f.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200420163511-1957bb5e6d1f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200420163511-1957bb5e6d1f.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//rsc.io/qr/@v/v0.2.0.zip -> rsc.io%2Fqr%2F@v%2Fv0.2.0.zip mirror://goproxy//rsc.io/qr/@v/v0.2.0.mod -> rsc.io%2Fqr%2F@v%2Fv0.2.0.mod
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	go-module	92660621959e7fab813173772987588b	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8576fae1dd2228885bcaa67b69c9391f
diff --git a/metadata/md5-cache/app-admin/kpcli-3.4 b/metadata/md5-cache/app-admin/kpcli-3.4
deleted file mode 100644
index 886b981e79f2..000000000000
--- a/metadata/md5-cache/app-admin/kpcli-3.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=A command line interface to KeePass database files
-EAPI=7
-HOMEPAGE=http://kpcli.sourceforge.net
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl dev-perl/Clone dev-perl/Crypt-Rijndael dev-perl/TermReadKey dev-perl/Sort-Naturally dev-perl/Term-ShellUI dev-perl/File-KeePass virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-Digest-MD5 virtual/perl-Digest-SHA virtual/perl-Data-Dumper virtual/perl-Term-ANSIColor virtual/perl-Time-Piece virtual/perl-Carp
-SLOT=0
-SRC_URI=https://downloads.sourceforge.net/project/kpcli/kpcli-3.4.pl
-_eclasses_=optfeature	6c9aa35fc16df43d7142ef2660e00e25
-_md5_=820ebb3c982bac10d3cadcc43aa91436
diff --git a/metadata/md5-cache/app-admin/kpcli-3.6 b/metadata/md5-cache/app-admin/kpcli-3.6
index 7d13615731b0..6f2ad160cfb6 100644
--- a/metadata/md5-cache/app-admin/kpcli-3.6
+++ b/metadata/md5-cache/app-admin/kpcli-3.6
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=A command line interface to KeePass database files
 EAPI=7
 HOMEPAGE=http://kpcli.sourceforge.net
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Clone dev-perl/Crypt-Rijndael dev-perl/File-KeePass dev-perl/Math-Random-ISAAC dev-perl/Sort-Naturally dev-perl/Sub-Install dev-perl/TermReadKey dev-perl/Term-ReadLine-Gnu dev-perl/Term-ShellUI
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/kpcli/kpcli-3.6.pl
 _eclasses_=optfeature	6c9aa35fc16df43d7142ef2660e00e25
-_md5_=2d8597b099da4216a411fb314639a220
+_md5_=977cb61c78bff916acec2e905235b921
diff --git a/metadata/md5-cache/app-admin/logstash-bin-6.8.12 b/metadata/md5-cache/app-admin/logstash-bin-6.8.12
deleted file mode 100644
index 7288abde5a7c..000000000000
--- a/metadata/md5-cache/app-admin/logstash-bin-6.8.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare setup
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Tool for managing events and logs
-EAPI=7
-HOMEPAGE=https://www.elastic.co/products/logstash
-IUSE=x-pack elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 MIT x-pack? ( Elastic )
-RDEPEND=acct-group/logstash acct-user/logstash virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
-RESTRICT=strip
-SLOT=0
-SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-6.8.12.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-oss-6.8.12.tar.gz )
-_eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888
-_md5_=dbac9b904838829ca2428d9fb59b0f8e
diff --git a/metadata/md5-cache/app-admin/logstash-bin-6.8.11 b/metadata/md5-cache/app-admin/logstash-bin-6.8.13
similarity index 84%
rename from metadata/md5-cache/app-admin/logstash-bin-6.8.11
rename to metadata/md5-cache/app-admin/logstash-bin-6.8.13
index b548e5920bec..a16a13bb90b2 100644
--- a/metadata/md5-cache/app-admin/logstash-bin-6.8.11
+++ b/metadata/md5-cache/app-admin/logstash-bin-6.8.13
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0 MIT x-pack? ( Elastic )
 RDEPEND=acct-group/logstash acct-user/logstash virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
 RESTRICT=strip
 SLOT=0
-SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-6.8.11.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-oss-6.8.11.tar.gz )
+SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-6.8.13.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-oss-6.8.13.tar.gz )
 _eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888
 _md5_=dbac9b904838829ca2428d9fb59b0f8e
diff --git a/metadata/md5-cache/app-admin/logstash-bin-7.7.0 b/metadata/md5-cache/app-admin/logstash-bin-7.10.0
similarity index 75%
rename from metadata/md5-cache/app-admin/logstash-bin-7.7.0
rename to metadata/md5-cache/app-admin/logstash-bin-7.10.0
index 8d0fc2a5b6c7..0b53b780ed98 100644
--- a/metadata/md5-cache/app-admin/logstash-bin-7.7.0
+++ b/metadata/md5-cache/app-admin/logstash-bin-7.10.0
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0 MIT x-pack? ( Elastic )
 RDEPEND=acct-group/logstash acct-user/logstash virtual/jre >=dev-java/java-config-2.2.0-r3
 RESTRICT=strip
 SLOT=0
-SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-7.7.0.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-oss-7.7.0.tar.gz )
+SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-7.10.0-linux-x86_64.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-oss-7.10.0-linux-x86_64.tar.gz )
 _eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888
-_md5_=6b77ac7e3fee24fce90f8767827f44ee
+_md5_=b389f2593ec938410f22ab89099e06be
diff --git a/metadata/md5-cache/app-admin/logstash-bin-7.6.2 b/metadata/md5-cache/app-admin/logstash-bin-7.6.2
deleted file mode 100644
index 2a5ed901b5af..000000000000
--- a/metadata/md5-cache/app-admin/logstash-bin-7.6.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare setup
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Tool for managing events and logs
-EAPI=7
-HOMEPAGE=https://www.elastic.co/products/logstash
-IUSE=x-pack elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 MIT x-pack? ( Elastic )
-RDEPEND=acct-group/logstash acct-user/logstash virtual/jre >=dev-java/java-config-2.2.0-r3
-RESTRICT=strip
-SLOT=0
-SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-7.6.2.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-oss-7.6.2.tar.gz )
-_eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888
-_md5_=6b77ac7e3fee24fce90f8767827f44ee
diff --git a/metadata/md5-cache/app-admin/logstash-bin-7.9.1 b/metadata/md5-cache/app-admin/logstash-bin-7.9.3
similarity index 84%
rename from metadata/md5-cache/app-admin/logstash-bin-7.9.1
rename to metadata/md5-cache/app-admin/logstash-bin-7.9.3
index ba298fdb2368..6ab565e9e84d 100644
--- a/metadata/md5-cache/app-admin/logstash-bin-7.9.1
+++ b/metadata/md5-cache/app-admin/logstash-bin-7.9.3
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0 MIT x-pack? ( Elastic )
 RDEPEND=acct-group/logstash acct-user/logstash virtual/jre >=dev-java/java-config-2.2.0-r3
 RESTRICT=strip
 SLOT=0
-SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-7.9.1.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-oss-7.9.1.tar.gz )
+SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-7.9.3.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-oss-7.9.3.tar.gz )
 _eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888
 _md5_=88105e159e3ec40141e807cbe7ae61e6
diff --git a/metadata/md5-cache/app-admin/rex-9999 b/metadata/md5-cache/app-admin/rex-9999
index 1d60396bbf57..93da91ff8c38 100644
--- a/metadata/md5-cache/app-admin/rex-9999
+++ b/metadata/md5-cache/app-admin/rex-9999
@@ -1,4 +1,4 @@
-BDEPEND=!minimal? ( dev-perl/DBI dev-perl/Expect dev-perl/IPC-Shareable dev-perl/XML-LibXML ) virtual/perl-Carp virtual/perl-Data-Dumper dev-perl/Data-Validate-IP dev-perl/Devel-Caller dev-perl/Digest-HMAC virtual/perl-Digest-MD5 virtual/perl-Exporter virtual/perl-File-Spec dev-perl/HTTP-Message dev-perl/Hash-Merge virtual/perl-IO dev-perl/IO-String dev-perl/IO-Tty dev-perl/JSON-MaybeXS virtual/perl-MIME-Base64 dev-perl/Net-OpenSSH dev-perl/Net-SFTP-Foreign virtual/perl-Scalar-List-Utils dev-perl/Parallel-ForkManager dev-perl/Sort-Naturally dev-perl/String-Escape virtual/perl-Storable dev-perl/TermReadKey virtual/perl-Test-Simple dev-perl/Text-Glob virtual/perl-Text-Tabs+Wrap virtual/perl-Time-HiRes dev-perl/URI dev-perl/XML-Simple dev-perl/libwww-perl dev-perl/YAML virtual/perl-version >=virtual/perl-CPAN-Meta-Requirements-2.120.620 >=virtual/perl-ExtUtils-MakeMaker-7.110.100 >=dev-perl/File-ShareDir-Install-0.60.0 virtual/perl-Module-Metadata test? ( virtual/perl-File-Temp dev-perl/Test-Deep dev-perl/Test-Output dev-perl/Test-UseAllModules virtual/perl-autodie ) dev-perl/Dist-Zilla dev-perl/Dist-Zilla-Plugin-CheckExtraTests dev-perl/Dist-Zilla-Plugin-ContributorsFile dev-perl/Dist-Zilla-Plugin-Git dev-perl/Dist-Zilla-Plugin-Git-Contributors dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome dev-perl/Dist-Zilla-Plugin-Meta-Contributors dev-perl/Dist-Zilla-Plugin-MetaProvides-Package dev-perl/Dist-Zilla-Plugin-NextVersion-Semantic dev-perl/Dist-Zilla-Plugin-OSPrereqs dev-perl/Dist-Zilla-Plugin-OurPkgVersion dev-perl/Dist-Zilla-Plugin-Run dev-perl/Software-License dev-lang/perl >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=!minimal? ( dev-perl/DBI dev-perl/Expect dev-perl/IPC-Shareable dev-perl/XML-LibXML ) virtual/perl-Carp virtual/perl-Data-Dumper dev-perl/Data-Validate-IP dev-perl/Devel-Caller dev-perl/Digest-HMAC virtual/perl-Digest-MD5 virtual/perl-Exporter virtual/perl-File-Spec dev-perl/HTTP-Message dev-perl/Hash-Merge virtual/perl-IO dev-perl/IO-String dev-perl/IO-Tty dev-perl/JSON-MaybeXS virtual/perl-MIME-Base64 dev-perl/Net-OpenSSH dev-perl/Net-SFTP-Foreign >=virtual/perl-Scalar-List-Utils-1.450.0 dev-perl/Parallel-ForkManager dev-perl/Sort-Naturally dev-perl/String-Escape virtual/perl-Storable dev-perl/TermReadKey virtual/perl-Test-Simple dev-perl/Text-Glob virtual/perl-Text-Tabs+Wrap virtual/perl-Time-HiRes dev-perl/URI dev-perl/XML-Simple dev-perl/libwww-perl dev-perl/YAML virtual/perl-version >=virtual/perl-CPAN-Meta-Requirements-2.120.620 >=virtual/perl-ExtUtils-MakeMaker-7.110.100 >=dev-perl/File-ShareDir-Install-0.60.0 virtual/perl-Module-Metadata test? ( !minimal? ( dev-perl/File-LibMagic ) virtual/perl-File-Temp dev-perl/Test-Deep dev-perl/Test-Output dev-perl/Test-UseAllModules virtual/perl-autodie ) dev-perl/Dist-Zilla dev-perl/Dist-Zilla-Plugin-CheckExtraTests dev-perl/Dist-Zilla-Plugin-ContributorsFile dev-perl/Dist-Zilla-Plugin-Git dev-perl/Dist-Zilla-Plugin-Git-Contributors dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome dev-perl/Dist-Zilla-Plugin-Meta-Contributors dev-perl/Dist-Zilla-Plugin-MetaProvides-Package dev-perl/Dist-Zilla-Plugin-NextVersion-Semantic dev-perl/Dist-Zilla-Plugin-OSPrereqs dev-perl/Dist-Zilla-Plugin-OurPkgVersion dev-perl/Dist-Zilla-Plugin-Run dev-perl/Software-License dev-lang/perl >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=dev-lang/perl
 DESCRIPTION=(R)?ex, the friendly automation framework
@@ -7,8 +7,8 @@ HOMEPAGE=https://metacpan.org/release/rex
 IUSE=minimal test
 LICENSE=|| ( Artistic GPL-1+ )
 PROPERTIES=live
-RDEPEND=!minimal? ( dev-perl/DBI dev-perl/Expect dev-perl/IPC-Shareable dev-perl/XML-LibXML ) virtual/perl-Carp virtual/perl-Data-Dumper dev-perl/Data-Validate-IP dev-perl/Devel-Caller dev-perl/Digest-HMAC virtual/perl-Digest-MD5 virtual/perl-Exporter virtual/perl-File-Spec dev-perl/HTTP-Message dev-perl/Hash-Merge virtual/perl-IO dev-perl/IO-String dev-perl/IO-Tty dev-perl/JSON-MaybeXS virtual/perl-MIME-Base64 dev-perl/Net-OpenSSH dev-perl/Net-SFTP-Foreign virtual/perl-Scalar-List-Utils dev-perl/Parallel-ForkManager dev-perl/Sort-Naturally dev-perl/String-Escape virtual/perl-Storable dev-perl/TermReadKey virtual/perl-Test-Simple dev-perl/Text-Glob virtual/perl-Text-Tabs+Wrap virtual/perl-Time-HiRes dev-perl/URI dev-perl/XML-Simple dev-perl/libwww-perl dev-perl/YAML virtual/perl-version dev-lang/perl:=
+RDEPEND=!minimal? ( dev-perl/DBI dev-perl/Expect dev-perl/IPC-Shareable dev-perl/XML-LibXML ) virtual/perl-Carp virtual/perl-Data-Dumper dev-perl/Data-Validate-IP dev-perl/Devel-Caller dev-perl/Digest-HMAC virtual/perl-Digest-MD5 virtual/perl-Exporter virtual/perl-File-Spec dev-perl/HTTP-Message dev-perl/Hash-Merge virtual/perl-IO dev-perl/IO-String dev-perl/IO-Tty dev-perl/JSON-MaybeXS virtual/perl-MIME-Base64 dev-perl/Net-OpenSSH dev-perl/Net-SFTP-Foreign >=virtual/perl-Scalar-List-Utils-1.450.0 dev-perl/Parallel-ForkManager dev-perl/Sort-Naturally dev-perl/String-Escape virtual/perl-Storable dev-perl/TermReadKey virtual/perl-Test-Simple dev-perl/Text-Glob virtual/perl-Text-Tabs+Wrap virtual/perl-Time-HiRes dev-perl/URI dev-perl/XML-Simple dev-perl/libwww-perl dev-perl/YAML virtual/perl-version dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3b2b78a5ad8965fd8a0961f9b228ff6d
+_md5_=619f3025496ab79aa0079a101d5a4d8d
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.3_p1 b/metadata/md5-cache/app-admin/sudo-1.9.3_p1
index fe0ac968ad91..4e17fe77b632 100644
--- a/metadata/md5-cache/app-admin/sudo-1.9.3_p1
+++ b/metadata/md5-cache/app-admin/sudo-1.9.3_p1
@@ -5,11 +5,11 @@ DESCRIPTION=Allows users or groups to run commands as other users
 EAPI=7
 HOMEPAGE=https://www.sudo.ws/
 IUSE=gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~sparc-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris
 LICENSE=ISC BSD
 RDEPEND=sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( dev-libs/cyrus-sasl net-nds/openldap[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sssd? ( sys-auth/sssd[sudo] ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
 REQUIRED_USE=?? ( pam skey ) ?? ( gcrypt ssl )
 SLOT=0
 SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.9.3p1.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.3p1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	pam	226d8d2ff588bdfd7d188512dbdb189d	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5adcdddb60fb5b9575e3d281c15e2d90
+_md5_=2169dfea8e25251322d0f7efcbc51698
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index f6a7981eaec7..4369c2370204 100644
Binary files a/metadata/md5-cache/app-arch/Manifest.gz and b/metadata/md5-cache/app-arch/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/duff-0.5.2 b/metadata/md5-cache/app-arch/duff-0.5.2
index 2ccfe381f9b4..42cd79e6014a 100644
--- a/metadata/md5-cache/app-arch/duff-0.5.2
+++ b/metadata/md5-cache/app-arch/duff-0.5.2
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install
 DESCRIPTION=Command-line utility for quickly finding duplicates in a given set of files
-EAPI=5
+EAPI=7
 HOMEPAGE=http://duff.sourceforge.net/
 KEYWORDS=~amd64 ~x86
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=mirror://sourceforge/duff/duff-0.5.2.tar.bz2
-_md5_=3b55590e9df469b002ca927c7e226b46
+_md5_=fa8c703a39cf22fac5bada21f63b1810
diff --git a/metadata/md5-cache/app-arch/fastjar-0.98-r3 b/metadata/md5-cache/app-arch/fastjar-0.98-r3
index 5f794fdaeab0..78ec6c1470a1 100644
--- a/metadata/md5-cache/app-arch/fastjar-0.98-r3
+++ b/metadata/md5-cache/app-arch/fastjar-0.98-r3
@@ -1,11 +1,11 @@
-DEFINED_PHASES=prepare
+DEFINED_PHASES=-
+DEPEND=sys-libs/zlib
 DESCRIPTION=A jar program written in C
-EAPI=5
+EAPI=7
 HOMEPAGE=https://savannah.nongnu.org/projects/fastjar
 KEYWORDS=amd64 ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris
 LICENSE=GPL-2
-RDEPEND=!<=dev-java/kaffe-1.1.7-r5
+RDEPEND=sys-libs/zlib !<=dev-java/kaffe-1.1.7-r5
 SLOT=0
 SRC_URI=mirror://nongnu/fastjar/fastjar-0.98.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=05515a4188735f8f3278645bdbb9a250
+_md5_=468e6ca5aef0500f924d6473743d3189
diff --git a/metadata/md5-cache/app-arch/gtk-splitter-2.2.1-r1 b/metadata/md5-cache/app-arch/gtk-splitter-2.2.1-r1
deleted file mode 100644
index d048de7021d6..000000000000
--- a/metadata/md5-cache/app-arch/gtk-splitter-2.2.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/gtk+:2 virtual/libintl:0 crypt? ( >=app-crypt/mhash-0.8:0 ) virtual/pkgconfig:*
-DESCRIPTION=Split files into smaller pieces and combine them back together
-EAPI=5
-HOMEPAGE=http://gtk-splitter.sourceforge.net
-IUSE=crypt
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 virtual/libintl:0 crypt? ( >=app-crypt/mhash-0.8:0 )
-SLOT=0
-SRC_URI=mirror://sourceforge/gtk-splitter/gtk-splitter-2.2.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e2abcd674fde4c410b24f7d661b17538
diff --git a/metadata/md5-cache/app-arch/gtk-splitter-2.2.1-r2 b/metadata/md5-cache/app-arch/gtk-splitter-2.2.1-r2
new file mode 100644
index 000000000000..8c3ab3ef2b33
--- /dev/null
+++ b/metadata/md5-cache/app-arch/gtk-splitter-2.2.1-r2
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=x11-libs/gtk+:2 virtual/libintl:0 crypt? ( >=app-crypt/mhash-0.8:0 )
+DESCRIPTION=Split files into smaller pieces and combine them back together
+EAPI=7
+HOMEPAGE=http://gtk-splitter.sourceforge.net
+IUSE=crypt
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:2 virtual/libintl:0 crypt? ( >=app-crypt/mhash-0.8:0 )
+SLOT=0
+SRC_URI=mirror://sourceforge/gtk-splitter/gtk-splitter-2.2.1.tar.gz
+_md5_=00fa5e4c09d97aaa868b1ea64a80f9b4
diff --git a/metadata/md5-cache/app-arch/libpar2-0.4 b/metadata/md5-cache/app-arch/libpar2-0.4
index 8ccce568554b..7f92e8fb4514 100644
--- a/metadata/md5-cache/app-arch/libpar2-0.4
+++ b/metadata/md5-cache/app-arch/libpar2-0.4
@@ -1,13 +1,12 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libsigc++:2 virtual/pkgconfig >=app-portage/elt-patches-20170815
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/libsigc++:2
 DESCRIPTION=A library for par2, extracted from par2cmdline
-EAPI=5
+EAPI=7
 HOMEPAGE=https://launchpad.net/libpar2/
-IUSE=static-libs
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libsigc++:2
 SLOT=0
 SRC_URI=https://launchpad.net/libpar2/trunk/0.4/+download/libpar2-0.4.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=76a41989dfed6bf9269353979119b995
+_md5_=4fc68ac1ecb3561351a96f03cd2a9d02
diff --git a/metadata/md5-cache/app-arch/mscompress-0.3-r1 b/metadata/md5-cache/app-arch/mscompress-0.3-r1
index fdff851f0372..058691b2a898 100644
--- a/metadata/md5-cache/app-arch/mscompress-0.3-r1
+++ b/metadata/md5-cache/app-arch/mscompress-0.3-r1
@@ -1,10 +1,10 @@
-DEFINED_PHASES=configure install prepare
+DEFINED_PHASES=configure install
 DESCRIPTION=Microsoft compress.exe/expand.exe compatible (de)compressor
-EAPI=5
+EAPI=7
 HOMEPAGE=http://gnuwin32.sourceforge.net/packages/mscompress.htm
 KEYWORDS=amd64 ~arm hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.penguin.cz/pub/users/mhi/mscompress/mscompress-0.3.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=df7cbe0599114ad899e764bc612c2c70
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=27af7be6e6086f1507f42784ec2288ba
diff --git a/metadata/md5-cache/app-arch/tarsync-0.2.1-r1 b/metadata/md5-cache/app-arch/tarsync-0.2.1-r1
index 76b66c28dcba..8eaf1500e976 100644
--- a/metadata/md5-cache/app-arch/tarsync-0.2.1-r1
+++ b/metadata/md5-cache/app-arch/tarsync-0.2.1-r1
@@ -1,12 +1,12 @@
-DEFINED_PHASES=install prepare setup
+DEFINED_PHASES=configure install
 DEPEND=>=dev-util/diffball-0.7
 DESCRIPTION=Delta compression suite for using/generating binary patches
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=amd64 ~hppa ppc x86 ~amd64-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-util/diffball-0.7
 SLOT=0
 SRC_URI=mirror://gentoo/tarsync-0.2.1.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f7cf23615334391f790e9198b75af9f3
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9caf67455a8aa693a8d6ed4234209f7f
diff --git a/metadata/md5-cache/app-arch/wimlib-1.12.0 b/metadata/md5-cache/app-arch/wimlib-1.12.0
index 73629c45bc9a..459d9361ea82 100644
--- a/metadata/md5-cache/app-arch/wimlib-1.12.0
+++ b/metadata/md5-cache/app-arch/wimlib-1.12.0
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure prepare unpack
+DEFINED_PHASES=compile configure install prepare unpack
 DEPEND=dev-libs/libxml2:2 ntfs? ( sys-fs/ntfs3g ) fuse? ( sys-fs/fuse:0 ) openssl? ( dev-libs/openssl:0 ) iso? ( app-arch/cabextract app-cdr/cdrtools ) cpu_flags_x86_ssse3? ( yasm? ( dev-lang/yasm ) !yasm? ( dev-lang/nasm ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=The open source Windows Imaging (WIM) library
 EAPI=6
@@ -11,4 +11,4 @@ REQUIRED_USE=cpu_flags_x86_ssse3? ( !openssl )
 SLOT=0
 SRC_URI=https://wimlib.net/downloads/wimlib-1.12.0.tar.gz -> wimlib-1.12.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=ee2293f955978bfd1288f88fd0f1bf0f
+_md5_=eddd98bbb26d7d984e09f9c40cbc4401
diff --git a/metadata/md5-cache/app-arch/wimlib-1.13.0 b/metadata/md5-cache/app-arch/wimlib-1.13.0
index 069477abfb85..8570a3a37643 100644
--- a/metadata/md5-cache/app-arch/wimlib-1.13.0
+++ b/metadata/md5-cache/app-arch/wimlib-1.13.0
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure prepare unpack
+DEFINED_PHASES=compile configure install prepare unpack
 DEPEND=dev-libs/libxml2:2 ntfs? ( sys-fs/ntfs3g ) fuse? ( sys-fs/fuse:0 ) openssl? ( dev-libs/openssl:0 ) iso? ( app-arch/cabextract app-cdr/cdrtools ) cpu_flags_x86_ssse3? ( yasm? ( dev-lang/yasm ) !yasm? ( dev-lang/nasm ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=The open source Windows Imaging (WIM) library
 EAPI=6
@@ -11,4 +11,4 @@ REQUIRED_USE=cpu_flags_x86_ssse3? ( !openssl )
 SLOT=0
 SRC_URI=https://wimlib.net/downloads/wimlib-1.13.0.tar.gz -> wimlib-1.13.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=ee2293f955978bfd1288f88fd0f1bf0f
+_md5_=eddd98bbb26d7d984e09f9c40cbc4401
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index a58a1039bb91..8ccf48d43a29 100644
Binary files a/metadata/md5-cache/app-backup/Manifest.gz and b/metadata/md5-cache/app-backup/Manifest.gz differ
diff --git a/metadata/md5-cache/app-backup/borgmatic-1.5.10 b/metadata/md5-cache/app-backup/borgmatic-1.5.10
index 938796b51765..94e38b714bf6 100644
--- a/metadata/md5-cache/app-backup/borgmatic-1.5.10
+++ b/metadata/md5-cache/app-backup/borgmatic-1.5.10
@@ -4,7 +4,7 @@ DESCRIPTION=Automatically create, prune and verify backups with borgbackup
 EAPI=7
 HOMEPAGE=https://torsion.org/borgmatic/
 IUSE=test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-3
 RDEPEND=app-backup/borgbackup python_single_target_python3_6? ( dev-python/colorama[python_targets_python3_6(-)] >=dev-python/pykwalify-1.6.0[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] <dev-python/ruamel-yaml-0.17.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/colorama[python_targets_python3_7(-)] >=dev-python/pykwalify-1.6.0[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] <dev-python/ruamel-yaml-0.17.0[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/colorama[python_targets_python3_8(-)] >=dev-python/pykwalify-1.6.0[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] <dev-python/ruamel-yaml-0.17.0[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/borgmatic/borgmatic-1.5.10.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=49ddc676fe55c5f9461a009b539d5f16
+_md5_=ae0f84fac72ce73e768ebdf55a8a7263
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index 9a121b1d786d..9afc53d7bdcd 100644
Binary files a/metadata/md5-cache/app-benchmarks/Manifest.gz and b/metadata/md5-cache/app-benchmarks/Manifest.gz differ
diff --git a/metadata/md5-cache/app-benchmarks/geekbench-5.3.0 b/metadata/md5-cache/app-benchmarks/geekbench-5.3.1
similarity index 81%
rename from metadata/md5-cache/app-benchmarks/geekbench-5.3.0
rename to metadata/md5-cache/app-benchmarks/geekbench-5.3.1
index 482a7def8e4e..afb669f4493b 100644
--- a/metadata/md5-cache/app-benchmarks/geekbench-5.3.0
+++ b/metadata/md5-cache/app-benchmarks/geekbench-5.3.1
@@ -6,5 +6,5 @@ KEYWORDS=-* ~amd64
 LICENSE=geekbench
 RESTRICT=bindist mirror
 SLOT=5
-SRC_URI=https://cdn.geekbench.com/Geekbench-5.3.0-Linux.tar.gz
+SRC_URI=https://cdn.geekbench.com/Geekbench-5.3.1-Linux.tar.gz
 _md5_=9023cd43554c9ec192eb5cebc3907fe1
diff --git a/metadata/md5-cache/app-benchmarks/stress-ng-0.11.23 b/metadata/md5-cache/app-benchmarks/stress-ng-0.11.24
similarity index 97%
rename from metadata/md5-cache/app-benchmarks/stress-ng-0.11.23
rename to metadata/md5-cache/app-benchmarks/stress-ng-0.11.24
index 366c7b1c6911..0bbd32d60a89 100644
--- a/metadata/md5-cache/app-benchmarks/stress-ng-0.11.23
+++ b/metadata/md5-cache/app-benchmarks/stress-ng-0.11.24
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib
 SLOT=0
-SRC_URI=https://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-0.11.23.tar.xz
+SRC_URI=https://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-0.11.24.tar.xz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6cb418caa929271fe1bbfba4f9912573
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 587949328381..1a75035c0d13 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/cardpeek-0.7.2 b/metadata/md5-cache/app-crypt/cardpeek-0.7.2
index 4876b48c800d..751d79652654 100644
--- a/metadata/md5-cache/app-crypt/cardpeek-0.7.2
+++ b/metadata/md5-cache/app-crypt/cardpeek-0.7.2
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=-
-DEPEND=>=x11-libs/gtk+-2.12:2 sys-apps/pcsc-lite dev-lang/lua:0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+DEFINED_PHASES=postinst postrm preinst prepare
+DEPEND=>=x11-libs/gtk+-2.12:2 sys-apps/pcsc-lite dev-lang/lua:0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Tool to read the contents of smartcards
 EAPI=7
 HOMEPAGE=http://pannetrat.com/Cardpeek
@@ -10,4 +10,5 @@ LICENSE=GPL-3
 RDEPEND=>=x11-libs/gtk+-2.12:2 sys-apps/pcsc-lite dev-lang/lua:0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
 SRC_URI=https://cardpeek.googlecode.com/files/cardpeek-0.7.2.tar.gz
-_md5_=039977fbe9c1ef23e836619eba15531c
+_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9d073d6a030e4a62aa74499ff1d55629
diff --git a/metadata/md5-cache/app-crypt/cardpeek-0.8.4 b/metadata/md5-cache/app-crypt/cardpeek-0.8.4
index 87f5ceef13ba..0961f310eaa5 100644
--- a/metadata/md5-cache/app-crypt/cardpeek-0.8.4
+++ b/metadata/md5-cache/app-crypt/cardpeek-0.8.4
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=setup
-DEPEND=lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) sys-apps/pcsc-lite x11-libs/gtk+:3 net-misc/curl !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+DEFINED_PHASES=postinst postrm preinst prepare setup
+DEPEND=lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) sys-apps/pcsc-lite x11-libs/gtk+:3 net-misc/curl !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Tool to read the contents of smartcards
 EAPI=7
 HOMEPAGE=http://pannetrat.com/Cardpeek
@@ -10,5 +10,5 @@ RDEPEND=lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) sys-apps/pcsc-lite x11-li
 REQUIRED_USE=^^ ( lua_single_target_lua5-2 )
 SLOT=0
 SRC_URI=http://downloads.pannetrat.com/install/cardpeek-0.8.4.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c525fa6fd2830cc92f3f9f459b62b403
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6f3a123be74efaf5456f489fcb95b78f
diff --git a/metadata/md5-cache/app-crypt/dieharder-3.31.1-r3 b/metadata/md5-cache/app-crypt/dieharder-3.31.1-r3
index 03b3c25b51e3..bce0843751a3 100644
--- a/metadata/md5-cache/app-crypt/dieharder-3.31.1-r3
+++ b/metadata/md5-cache/app-crypt/dieharder-3.31.1-r3
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install setup test
+DEFINED_PHASES=compile configure install setup test
 DEPEND=sci-libs/gsl doc? ( dev-tex/latex2html )
 DESCRIPTION=An advanced suite for testing the randomness of RNG's
 EAPI=7
@@ -10,4 +10,4 @@ RDEPEND=sci-libs/gsl
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.phy.duke.edu/~rgb/General/dieharder/dieharder-3.31.1.tgz
-_md5_=11deafc3299859f13fd78bbaf5e3dcc6
+_md5_=b8083824bf9df0c9413ba229b9f2d7f6
diff --git a/metadata/md5-cache/app-crypt/easy-rsa-3.0.6 b/metadata/md5-cache/app-crypt/easy-rsa-3.0.6
index de95e95af78a..86ef748f7d34 100644
--- a/metadata/md5-cache/app-crypt/easy-rsa-3.0.6
+++ b/metadata/md5-cache/app-crypt/easy-rsa-3.0.6
@@ -4,9 +4,9 @@ DESCRIPTION=Small RSA key management package, based on OpenSSL
 EAPI=7
 HOMEPAGE=https://openvpn.net/
 IUSE=libressl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!libressl? ( >=dev-libs/openssl-0.9.6:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
 SRC_URI=https://github.com/OpenVPN/easy-rsa/archive/v3.0.6.tar.gz -> easy-rsa-3.0.6.tar.gz
-_md5_=230913328733a7eb51e88930723d633c
+_md5_=b9ede724abdcc95021e38a07c2ba6725
diff --git a/metadata/md5-cache/app-crypt/easy-rsa-3.0.7 b/metadata/md5-cache/app-crypt/easy-rsa-3.0.7
index 03185915617a..e05d726940a4 100644
--- a/metadata/md5-cache/app-crypt/easy-rsa-3.0.7
+++ b/metadata/md5-cache/app-crypt/easy-rsa-3.0.7
@@ -4,9 +4,9 @@ DESCRIPTION=Small RSA key management package, based on OpenSSL
 EAPI=7
 HOMEPAGE=https://openvpn.net/
 IUSE=libressl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!libressl? ( >=dev-libs/openssl-0.9.6:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
 SRC_URI=https://github.com/OpenVPN/easy-rsa/archive/v3.0.7.tar.gz -> easy-rsa-3.0.7.tar.gz
-_md5_=230913328733a7eb51e88930723d633c
+_md5_=b9ede724abdcc95021e38a07c2ba6725
diff --git a/metadata/md5-cache/app-crypt/easy-rsa-3.0.8 b/metadata/md5-cache/app-crypt/easy-rsa-3.0.8
new file mode 100644
index 000000000000..e5608edf289f
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/easy-rsa-3.0.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=!libressl? ( >=dev-libs/openssl-0.9.6:0= ) libressl? ( dev-libs/libressl:0= )
+DESCRIPTION=Small RSA key management package, based on OpenSSL
+EAPI=7
+HOMEPAGE=https://openvpn.net/
+IUSE=libressl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!libressl? ( >=dev-libs/openssl-0.9.6:0= ) libressl? ( dev-libs/libressl:0= )
+SLOT=0
+SRC_URI=https://github.com/OpenVPN/easy-rsa/archive/v3.0.8.tar.gz -> easy-rsa-3.0.8.tar.gz
+_md5_=230913328733a7eb51e88930723d633c
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.14.0 b/metadata/md5-cache/app-crypt/gpgme-1.14.0
index b1116bf931ec..71e920763d6f 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.14.0
+++ b/metadata/md5-cache/app-crypt/gpgme-1.14.0
@@ -5,11 +5,11 @@ DESCRIPTION=GnuPG Made Easy is a library for making GnuPG easier to use
 EAPI=7
 HOMEPAGE=http://www.gnupg.org/related_software/gpgme
 IUSE=common-lisp static-libs +cxx python qt5 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.5.3:= >=dev-libs/libgpg-error-1.29:= python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) qt5? ( dev-qt/qtcore:5 )
 REQUIRED_USE=qt5? ( cxx ) python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=1/11
 SRC_URI=mirror://gnupg/gpgme/gpgme-1.14.0.tar.bz2
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f92ec069f9190d0737719f1ee8a13e91
+_md5_=ee6bf94290acd9658f55bf17dc85a27a
diff --git a/metadata/md5-cache/app-crypt/ima-evm-utils-1.1-r1 b/metadata/md5-cache/app-crypt/ima-evm-utils-1.1-r1
index 9fca375eeb03..5751d85b9698 100644
--- a/metadata/md5-cache/app-crypt/ima-evm-utils-1.1-r1
+++ b/metadata/md5-cache/app-crypt/ima-evm-utils-1.1-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure prepare
+DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/openssl:0= sys-apps/keyutils:= app-text/asciidoc app-text/docbook-xsl-stylesheets dev-libs/libxslt >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Supporting tools for IMA and EVM
 EAPI=6
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/openssl:0= sys-apps/keyutils:=
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-ima/ima-evm-utils-1.1.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=66f14d856087cd63ee61a550f88cdd10
+_md5_=eba26e65a8d15df1fa81d1218a06f2ab
diff --git a/metadata/md5-cache/app-crypt/ima-evm-utils-9999 b/metadata/md5-cache/app-crypt/ima-evm-utils-9999
index beceb213a616..ad5f44d1f1fd 100644
--- a/metadata/md5-cache/app-crypt/ima-evm-utils-9999
+++ b/metadata/md5-cache/app-crypt/ima-evm-utils-9999
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure prepare unpack
+DEFINED_PHASES=configure install prepare unpack
 DEPEND=dev-libs/openssl:0= sys-apps/keyutils:= app-text/asciidoc app-text/docbook-xsl-stylesheets dev-libs/libxslt >=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]
 DESCRIPTION=Supporting tools for IMA and EVM
 EAPI=6
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=dev-libs/openssl:0= sys-apps/keyutils:=
 SLOT=0
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=830a633f120a0a3285977cc97b6ff475
+_md5_=56c5e1ffb398b0c3d4d087dcd67482ad
diff --git a/metadata/md5-cache/app-crypt/libu2f-host-1.1.10 b/metadata/md5-cache/app-crypt/libu2f-host-1.1.10
index 08239a627aaf..82cce3bcbcf2 100644
--- a/metadata/md5-cache/app-crypt/libu2f-host-1.1.10
+++ b/metadata/md5-cache/app-crypt/libu2f-host-1.1.10
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=install postinst setup
+DEFINED_PHASES=configure install postinst setup
 DEPEND=dev-libs/hidapi dev-libs/json-c:=
 DESCRIPTION=Yubico Universal 2nd Factor (U2F) Host C Library
 EAPI=7
 HOMEPAGE=https://developers.yubico.com/libu2f-host/
-IUSE=kernel_linux static-libs systemd kernel_linux
+IUSE=kernel_linux systemd kernel_linux
 KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=LGPL-2
 RDEPEND=dev-libs/hidapi dev-libs/json-c:= !systemd? ( acct-group/plugdev ) systemd? ( sys-apps/systemd[acl] )
 SLOT=0
 SRC_URI=https://developers.yubico.com/libu2f-host/Releases/libu2f-host-1.1.10.tar.xz
 _eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=8cd993ec6c3ce9e867908e2efedf37e7
+_md5_=cedb31b80b6c05f5d97b1d779d10a2a7
diff --git a/metadata/md5-cache/app-crypt/signify-30 b/metadata/md5-cache/app-crypt/signify-30
new file mode 100644
index 000000000000..7bc17f021155
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/signify-30
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=dev-libs/libbsd-0.7
+DESCRIPTION=Cryptographically sign and verify files
+EAPI=7
+HOMEPAGE=http://www.openbsd.org/ https://github.com/aperezdc/signify
+KEYWORDS=~amd64
+LICENSE=BSD-1
+RDEPEND=>=dev-libs/libbsd-0.7
+SLOT=0
+SRC_URI=https://github.com/aperezdc/signify/archive/v30.tar.gz -> signify-30.tar.gz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1fcf07b226b7262c1493cf73a5aec507
diff --git a/metadata/md5-cache/app-crypt/simple-tpm-pk11-0.06 b/metadata/md5-cache/app-crypt/simple-tpm-pk11-0.06
index 85498338a6c3..9206955a4b7d 100644
--- a/metadata/md5-cache/app-crypt/simple-tpm-pk11-0.06
+++ b/metadata/md5-cache/app-crypt/simple-tpm-pk11-0.06
@@ -1,4 +1,4 @@
-DEFINED_PHASES=prepare
+DEFINED_PHASES=configure install prepare
 DEPEND=app-crypt/tpm-tools[pkcs11] dev-libs/opencryptoki[tpm] app-crypt/trousers !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Simple PKCS11 provider for TPM chips
 EAPI=6
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ThomasHabets/simple-tpm-pk11/archive/0.06.tar.gz -> simple-tpm-pk11-0.06.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=378b1a09274e9a6f38d5dd95c6245e69
+_md5_=b2aeec59a99201ecae1fb99c8a29988d
diff --git a/metadata/md5-cache/app-crypt/trousers-0.3.15 b/metadata/md5-cache/app-crypt/trousers-0.3.15
new file mode 100644
index 000000000000..af38bbfb3e93
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/trousers-0.3.15
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=configure install prepare setup
+DEPEND=acct-group/tss acct-user/tss >=dev-libs/glib-2 !libressl? ( >=dev-libs/openssl-0.9.7:0= ) libressl? ( dev-libs/libressl:0= )
+DESCRIPTION=An open-source TCG Software Stack (TSS) v1.1 implementation
+EAPI=7
+HOMEPAGE=http://trousers.sf.net
+IUSE=doc libressl selinux kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~s390 ~x86
+LICENSE=CPL-1.0 GPL-2
+RDEPEND=acct-group/tss acct-user/tss >=dev-libs/glib-2 !libressl? ( >=dev-libs/openssl-0.9.7:0= ) libressl? ( dev-libs/libressl:0= ) selinux? ( sec-policy/selinux-tcsd )
+SLOT=0
+SRC_URI=mirror://sourceforge/trousers/trousers/trousers-0.3.15.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=2b757999e7805d49ebfdbf4fb2a3f7a1
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index b1ce6ef81b46..93ce039263e6 100644
Binary files a/metadata/md5-cache/app-dicts/Manifest.gz and b/metadata/md5-cache/app-dicts/Manifest.gz differ
diff --git a/metadata/md5-cache/app-dicts/libydpdict-1.0.4 b/metadata/md5-cache/app-dicts/libydpdict-1.0.4
index 5a1ec8556ac9..cbdf9be54923 100644
--- a/metadata/md5-cache/app-dicts/libydpdict-1.0.4
+++ b/metadata/md5-cache/app-dicts/libydpdict-1.0.4
@@ -1,5 +1,5 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=configure install prepare
 DESCRIPTION=Library for handling the Collins Dictionary database
 EAPI=7
 HOMEPAGE=https://github.com/wojtekka/libydpdict
@@ -8,4 +8,4 @@ LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://github.com/wojtekka/libydpdict/archive/1.0.4.tar.gz -> libydpdict-1.0.4.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ea634325cd148d5abc3e1b9702f4ca55
+_md5_=84551431c5eaca2b9cbc0a2a6b73c7f9
diff --git a/metadata/md5-cache/app-dicts/sword-Josephus-1.1 b/metadata/md5-cache/app-dicts/sword-Josephus-1.1
index b54b1a13bf15..5321908c73cf 100644
--- a/metadata/md5-cache/app-dicts/sword-Josephus-1.1
+++ b/metadata/md5-cache/app-dicts/sword-Josephus-1.1
@@ -3,10 +3,10 @@ DEFINED_PHASES=install
 DESCRIPTION=Josephus: The Complete Works
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Josephus
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=public-domain
 RDEPEND=>=app-text/sword-1.5.3
 SLOT=0
 SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Josephus.zip -> Josephus-1.1.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=3008194190954dd994158bfb624b7bb9
+_md5_=30e048752810e22557827c804480f719
diff --git a/metadata/md5-cache/app-dicts/sword-KJV-2.9 b/metadata/md5-cache/app-dicts/sword-KJV-2.9
index 6511cd0faafd..5cdb27debe3e 100644
--- a/metadata/md5-cache/app-dicts/sword-KJV-2.9
+++ b/metadata/md5-cache/app-dicts/sword-KJV-2.9
@@ -3,10 +3,10 @@ DEFINED_PHASES=install
 DESCRIPTION=King James Version (1769) with Strongs Numbers and Morphology
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KJV
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=freedist
 RDEPEND=>=app-text/sword-1.7.0
 SLOT=0
 SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/KJV.zip -> KJV-2.9.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=525aeee220e1b5f72006e12133dfb71e
+_md5_=a30e57ab67a34075ad3f722102faece0
diff --git a/metadata/md5-cache/app-dicts/sword-KJVA-3.0.1 b/metadata/md5-cache/app-dicts/sword-KJVA-3.0.1
index 38dc050c169c..9bec5b7ee58f 100644
--- a/metadata/md5-cache/app-dicts/sword-KJVA-3.0.1
+++ b/metadata/md5-cache/app-dicts/sword-KJVA-3.0.1
@@ -3,10 +3,10 @@ DEFINED_PHASES=install
 DESCRIPTION=King James Version (1769) incl. Apocrypha, with Strongs Numbers and Morphology
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KJVA
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=freedist
 RDEPEND=>=app-text/sword-1.6.0
 SLOT=0
 SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/KJVA.zip -> KJVA-3.0.1.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=9980f2594766528dc6758ca6cfc0290e
+_md5_=db377f8c5105e5d9c70933f2d9e31ce4
diff --git a/metadata/md5-cache/app-dicts/sword-Scofield-1.0 b/metadata/md5-cache/app-dicts/sword-Scofield-1.0
index f1019cc07c85..03eb36ee1f20 100644
--- a/metadata/md5-cache/app-dicts/sword-Scofield-1.0
+++ b/metadata/md5-cache/app-dicts/sword-Scofield-1.0
@@ -3,10 +3,10 @@ DEFINED_PHASES=install
 DESCRIPTION=Scofield Reference Notes, 1917 Edition
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Scofield
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=public-domain
 RDEPEND=>=app-text/sword-1.5.1a
 SLOT=0
 SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Scofield.zip -> Scofield-1.0.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=56566c9cb5088b3865b2de8c530fb5b2
+_md5_=ce19b56fd40ed53ad9f044682ccad52a
diff --git a/metadata/md5-cache/app-dicts/sword-StrongsGreek-1.2 b/metadata/md5-cache/app-dicts/sword-StrongsGreek-1.2
index 26116c61db63..4bee3717efbe 100644
--- a/metadata/md5-cache/app-dicts/sword-StrongsGreek-1.2
+++ b/metadata/md5-cache/app-dicts/sword-StrongsGreek-1.2
@@ -3,10 +3,10 @@ DEFINED_PHASES=install
 DESCRIPTION=Strong's Greek Bible Dictionary
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=StrongsGreek
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=public-domain
 RDEPEND=>=app-text/sword-1.5.1a
 SLOT=0
 SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/StrongsGreek.zip -> StrongsGreek-1.2.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=ea77eb82bb30ff1e8cc5a364daf30cd5
+_md5_=a567a23c1b6fdf4ef0192b10ec10342f
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index ef6342ddc7aa..ddb0c0399104 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/libdsk-1.5.8 b/metadata/md5-cache/app-emulation/libdsk-1.5.8
index ad66ab511fd7..4911d1862143 100644
--- a/metadata/md5-cache/app-emulation/libdsk-1.5.8
+++ b/metadata/md5-cache/app-emulation/libdsk-1.5.8
@@ -1,10 +1,10 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=configure install
 DESCRIPTION=LIBDSK is a library for accessing discs and disc image files
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.seasip.info/Unix/LibDsk/
 IUSE=doc
 KEYWORDS=amd64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.seasip.info/Unix/LibDsk/libdsk-1.5.8.tar.gz
-_md5_=3b8136743e1ed01804fed219771ef5ff
+_md5_=5e41016d538f4b0fce0807f75130e646
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-5.0.2 b/metadata/md5-cache/app-emulation/wine-vanilla-5.0.2
index 626e57e8fde9..5822f7eda90e 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-5.0.2
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-5.0.2
@@ -4,7 +4,7 @@ DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchse
 EAPI=6
 HOMEPAGE=https://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* ~amd64 x86
+KEYWORDS=-* amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.9.4 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 ) vkd3d? ( vulkan )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5.0.2
 SRC_URI=https://dl.winehq.org/wine/source/5.0/wine-5.0.2.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20191222.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b9e5386fa9510c5294a2e7ecfe39bcfd
+_md5_=e892cd9917c7fb7f956bdd5b9abcbde0
diff --git a/metadata/md5-cache/app-emulation/winetricks-20200412 b/metadata/md5-cache/app-emulation/winetricks-20200412
index 256a49d15c69..ee550c2ba59d 100644
--- a/metadata/md5-cache/app-emulation/winetricks-20200412
+++ b/metadata/md5-cache/app-emulation/winetricks-20200412
@@ -5,11 +5,11 @@ DESCRIPTION=Easy way to install DLLs needed to work around problems in Wine
 EAPI=7
 HOMEPAGE=https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winetricks
 IUSE=gtk kde rar test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=app-arch/cabextract app-arch/p7zip app-arch/unzip net-misc/wget virtual/wine x11-misc/xdg-utils gtk? ( gnome-extra/zenity ) kde? ( kde-apps/kdialog ) rar? ( app-arch/unrar )
-RESTRICT=!test? ( test )
+RESTRICT=!test? ( test ) x86? ( test )
 SLOT=0
 SRC_URI=https://github.com/Winetricks/winetricks/archive/20200412.tar.gz -> winetricks-20200412.tar.gz gtk? ( https://dev.gentoo.org/~chiitoo/distfiles/winetricks-gentoo-2012.11.24.tar.bz2 ) kde? ( https://dev.gentoo.org/~chiitoo/distfiles/winetricks-gentoo-2012.11.24.tar.bz2 )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a7e6649d18b251cd51ef245f54cf5cdd
+_md5_=1c3206f5b87634d5d9052b06c8ea1fe2
diff --git a/metadata/md5-cache/app-emulation/winetricks-99999999 b/metadata/md5-cache/app-emulation/winetricks-99999999
index b53f8add0a61..39cbc45443c8 100644
--- a/metadata/md5-cache/app-emulation/winetricks-99999999
+++ b/metadata/md5-cache/app-emulation/winetricks-99999999
@@ -8,8 +8,8 @@ IUSE=gtk kde rar test
 LICENSE=LGPL-2.1+
 PROPERTIES=live
 RDEPEND=app-arch/cabextract app-arch/p7zip app-arch/unzip net-misc/wget virtual/wine x11-misc/xdg-utils gtk? ( gnome-extra/zenity ) kde? ( kde-apps/kdialog ) rar? ( app-arch/unrar )
-RESTRICT=!test? ( test )
+RESTRICT=!test? ( test ) x86? ( test )
 SLOT=0
 SRC_URI=gtk? ( https://dev.gentoo.org/~chiitoo/distfiles/winetricks-gentoo-2012.11.24.tar.bz2 ) kde? ( https://dev.gentoo.org/~chiitoo/distfiles/winetricks-gentoo-2012.11.24.tar.bz2 )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	git-r3	3e7ec3d6619213460c85e2aa48398441	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a7e6649d18b251cd51ef245f54cf5cdd
+_md5_=06b9f5c3f3c1d476a6fffd0dbea69eb1
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 52a86585adee..e6c5f8c978d7 100644
Binary files a/metadata/md5-cache/app-i18n/Manifest.gz and b/metadata/md5-cache/app-i18n/Manifest.gz differ
diff --git a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.10.0 b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.10.1
similarity index 98%
rename from metadata/md5-cache/app-i18n/ibus-typing-booster-2.10.0
rename to metadata/md5-cache/app-i18n/ibus-typing-booster-2.10.1
index d8cb27acd441..7ee6733e92b9 100644
--- a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.10.0
+++ b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.10.1
@@ -11,6 +11,6 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-l
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.10.0/ibus-typing-booster-2.10.0.tar.gz
+SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.10.1/ibus-typing-booster-2.10.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9b324c564bd840dc2c47b73b1768e052
diff --git a/metadata/md5-cache/app-i18n/libchewing-0.5.1 b/metadata/md5-cache/app-i18n/libchewing-0.5.1
index c32992b929cc..a5658198a4b4 100644
--- a/metadata/md5-cache/app-i18n/libchewing-0.5.1
+++ b/metadata/md5-cache/app-i18n/libchewing-0.5.1
@@ -10,6 +10,6 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-db/sqlite:3
 RESTRICT=!test? ( test )
 SLOT=0/3
-SRC_URI=https://github.com/chewing/libchewing/releases/download/v0.5.1/libchewing-0.5.1.tar.bz2
+SRC_URI=https://github.com/chewing/libchewing/releases/download/v0.5.1/libchewing-0.5.1.tar.bz2 https://dev.gentoo.org/~juippis/distfiles/tmp/libchewing-0.5.1-autoconf-archive-2019.01.06.patch
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=28ca1c269c609296853d5c07d53127f5
+_md5_=0fdc09beadecc0b17491370dd6f00cb5
diff --git a/metadata/md5-cache/app-i18n/libchewing-9999 b/metadata/md5-cache/app-i18n/libchewing-9999
index e7cd90be71a9..2dff666837c2 100644
--- a/metadata/md5-cache/app-i18n/libchewing-9999
+++ b/metadata/md5-cache/app-i18n/libchewing-9999
@@ -10,5 +10,6 @@ PROPERTIES=live
 RDEPEND=dev-db/sqlite:3
 RESTRICT=!test? ( test )
 SLOT=0/3
+SRC_URI=https://dev.gentoo.org/~juippis/distfiles/tmp/libchewing-0.5.1-autoconf-archive-2019.01.06.patch
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3309f108d3e9320545625e578d61402f
+_md5_=71a6f75f8e7c495712dd01513d97719a
diff --git a/metadata/md5-cache/app-i18n/mozc-2.23.2815.102 b/metadata/md5-cache/app-i18n/mozc-2.23.2815.102
index 929df86ad8eb..d5fe08414e83 100644
--- a/metadata/md5-cache/app-i18n/mozc-2.23.2815.102
+++ b/metadata/md5-cache/app-i18n/mozc-2.23.2815.102
@@ -11,6 +11,6 @@ RDEPEND=>=dev-libs/protobuf-3.0.0:= emacs? ( app-editors/emacs:* ) fcitx4? ( app
 REQUIRED_USE=|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/google/mozc/archive/afb03ddfe72dde4cf2409863a3bfea160f7a66d8.tar.gz -> mozc-2.23.2815.102.tar.gz https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/e5b3425575734c323e1d947009dd74709437b684.tar.gz -> japanese-usage-dictionary-20120416091336.tar.gz fcitx4? ( https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-2.23.2815.102.1.patch )
+SRC_URI=https://github.com/google/mozc/archive/afb03ddfe72dde4cf2409863a3bfea160f7a66d8.tar.gz -> mozc-2.23.2815.102.tar.gz https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/e5b3425575734c323e1d947009dd74709437b684.tar.gz -> japanese-usage-dictionary-20120416091336.tar.gz https://dev.gentoo.org/~juippis/distfiles/tmp/mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch fcitx4? ( https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-2.23.2815.102.1.patch )
 _eclasses_=elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d7351e586bb7f58d5a33a1bb98a4b24c
+_md5_=6bfdb34ee539346f3f1a3a50b75ad47b
diff --git a/metadata/md5-cache/app-i18n/mozc-9999 b/metadata/md5-cache/app-i18n/mozc-9999
index 61dfdca69402..54d0d403fe91 100644
--- a/metadata/md5-cache/app-i18n/mozc-9999
+++ b/metadata/md5-cache/app-i18n/mozc-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=elisp-common	34cc2b6f6d8914019a353fe39cff43ce	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fc07feba3aecb704a2f48dfa72ee370c
+_md5_=3ff10e0ed9ebba90e392f155fef7631e
diff --git a/metadata/md5-cache/app-i18n/scim-anthy-1.2.7-r1 b/metadata/md5-cache/app-i18n/scim-anthy-1.2.7-r1
index 636fabc43c10..66f1c23ea163 100644
--- a/metadata/md5-cache/app-i18n/scim-anthy-1.2.7-r1
+++ b/metadata/md5-cache/app-i18n/scim-anthy-1.2.7-r1
@@ -8,6 +8,6 @@ KEYWORDS=~alpha amd64 ~arm ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=>=app-i18n/scim-1.2[gtk3=] >=app-i18n/anthy-5900 nls? ( virtual/libintl ) gtk3? ( x11-libs/gtk+:3 ) kasumi? ( app-dicts/kasumi )
 SLOT=0
-SRC_URI=mirror://sourceforge.jp/scim-imengine/37309/scim-anthy-1.2.7.tar.gz gtk3? ( https://dev.gentoo.org/~heroxbd/scim-anthy-1.2.7-patches.tar.xz )
+SRC_URI=mirror://sourceforge.jp/scim-imengine/37309/scim-anthy-1.2.7.tar.gz https://dev.gentoo.org/~juippis/distfiles/tmp/scim-anthy-1.2.7-gtk2_build.patch gtk3? ( https://dev.gentoo.org/~heroxbd/scim-anthy-1.2.7-patches.tar.xz )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=46d185bb6cab1f4d0f8ebe567d4ee910
+_md5_=6a994d7ba83cabf94cda7f4a06fdf739
diff --git a/metadata/md5-cache/app-i18n/scim-m17n-0.2.3 b/metadata/md5-cache/app-i18n/scim-m17n-0.2.3
index c0f2c34c780b..dca0ebe06550 100644
--- a/metadata/md5-cache/app-i18n/scim-m17n-0.2.3
+++ b/metadata/md5-cache/app-i18n/scim-m17n-0.2.3
@@ -1,4 +1,4 @@
-DEFINED_PHASES=postinst
+DEFINED_PHASES=configure install postinst
 DEPEND=>=app-i18n/scim-1.4 >=dev-libs/m17n-lib-1.2.0 virtual/pkgconfig
 DESCRIPTION=An input module for Smart Common Input Method (SCIM) which uses m17n as backend
 EAPI=6
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=>=app-i18n/scim-1.4 >=dev-libs/m17n-lib-1.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/scim/scim-m17n-0.2.3.tar.gz
-_md5_=c8df4b905b973dde7cfa5a27af6e6fdd
+_md5_=57bd437dfad7c3647437737382953a5a
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 56c689a72f37..46a59c4a1368 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/ca-certificates-20200601.3.59 b/metadata/md5-cache/app-misc/ca-certificates-20200601.3.59
new file mode 100644
index 000000000000..a9193cd2dd47
--- /dev/null
+++ b/metadata/md5-cache/app-misc/ca-certificates-20200601.3.59
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare setup unpack
+DEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 )
+DESCRIPTION=Common CA Certificates PEM files
+EAPI=6
+HOMEPAGE=https://packages.debian.org/sid/ca-certificates
+IUSE=cacert
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=MPL-1.1
+RDEPEND=app-misc/c_rehash sys-apps/debianutils
+SLOT=0
+SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20200601.tar.xz https://archive.mozilla.org/pub/security/nss/releases/NSS_3_59_RTM/src/nss-3.59.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2366ad431f915fecf230e35712cdba6c
diff --git a/metadata/md5-cache/app-misc/egads-0.9.5-r1 b/metadata/md5-cache/app-misc/egads-0.9.5-r1
index 7cff2b22f080..01a2db14f99b 100644
--- a/metadata/md5-cache/app-misc/egads-0.9.5-r1
+++ b/metadata/md5-cache/app-misc/egads-0.9.5-r1
@@ -7,4 +7,4 @@ LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.securesoftware.com/egads/egads-0.9.5.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0ad636a0ce170275dadccc325b2000eb
+_md5_=4bd9eac8b2975b9370618b8b10863516
diff --git a/metadata/md5-cache/app-misc/elasticsearch-6.8.11 b/metadata/md5-cache/app-misc/elasticsearch-6.8.13
similarity index 82%
rename from metadata/md5-cache/app-misc/elasticsearch-6.8.11
rename to metadata/md5-cache/app-misc/elasticsearch-6.8.13
index 6b7f558ba64f..ab268166a6a4 100644
--- a/metadata/md5-cache/app-misc/elasticsearch-6.8.11
+++ b/metadata/md5-cache/app-misc/elasticsearch-6.8.13
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )
 RDEPEND=acct-group/elasticsearch acct-user/elasticsearch virtual/jre:1.8
 SLOT=0
-SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.8.11.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-6.8.11.tar.gz )
+SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.8.13.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-6.8.13.tar.gz )
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f128dbfbcd7c8c986a755963384845d9
diff --git a/metadata/md5-cache/app-misc/elasticsearch-6.8.12 b/metadata/md5-cache/app-misc/elasticsearch-7.10.0
similarity index 57%
rename from metadata/md5-cache/app-misc/elasticsearch-6.8.12
rename to metadata/md5-cache/app-misc/elasticsearch-7.10.0
index c06439a1a4f8..4dc4db70c4b4 100644
--- a/metadata/md5-cache/app-misc/elasticsearch-6.8.12
+++ b/metadata/md5-cache/app-misc/elasticsearch-7.10.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.elastic.co/products/elasticsearch
 IUSE=x-pack
 KEYWORDS=~amd64
 LICENSE=Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )
-RDEPEND=acct-group/elasticsearch acct-user/elasticsearch virtual/jre:1.8
+RDEPEND=acct-group/elasticsearch acct-user/elasticsearch virtual/jre virtual/tmpfiles
 SLOT=0
-SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.8.12.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-6.8.12.tar.gz )
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f128dbfbcd7c8c986a755963384845d9
+SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.10.0-no-jdk-linux-x86_64.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-7.10.0-no-jdk-linux-x86_64.tar.gz )
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=96e33ca7a9dfc15c6b5350cc811676a2
diff --git a/metadata/md5-cache/app-misc/elasticsearch-7.6.2 b/metadata/md5-cache/app-misc/elasticsearch-7.6.2
deleted file mode 100644
index f1b0f7d3a14d..000000000000
--- a/metadata/md5-cache/app-misc/elasticsearch-7.6.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst prepare
-DESCRIPTION=Open Source, Distributed, RESTful, Search Engine
-EAPI=7
-HOMEPAGE=https://www.elastic.co/products/elasticsearch
-IUSE=x-pack
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )
-RDEPEND=acct-group/elasticsearch acct-user/elasticsearch virtual/jre
-SLOT=0
-SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.6.2-no-jdk-linux-x86_64.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-7.6.2-no-jdk-linux-x86_64.tar.gz )
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ac0a2be0cb4bdda546bc229d14ec2e7b
diff --git a/metadata/md5-cache/app-misc/elasticsearch-7.7.0 b/metadata/md5-cache/app-misc/elasticsearch-7.7.0
deleted file mode 100644
index 3ddaf47e0469..000000000000
--- a/metadata/md5-cache/app-misc/elasticsearch-7.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst prepare
-DESCRIPTION=Open Source, Distributed, RESTful, Search Engine
-EAPI=7
-HOMEPAGE=https://www.elastic.co/products/elasticsearch
-IUSE=x-pack
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )
-RDEPEND=acct-group/elasticsearch acct-user/elasticsearch virtual/jre
-SLOT=0
-SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.7.0-no-jdk-linux-x86_64.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-7.7.0-no-jdk-linux-x86_64.tar.gz )
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ac0a2be0cb4bdda546bc229d14ec2e7b
diff --git a/metadata/md5-cache/app-misc/elasticsearch-7.9.1 b/metadata/md5-cache/app-misc/elasticsearch-7.9.3
similarity index 65%
rename from metadata/md5-cache/app-misc/elasticsearch-7.9.1
rename to metadata/md5-cache/app-misc/elasticsearch-7.9.3
index 3b16a480a511..d0259ccbaeec 100644
--- a/metadata/md5-cache/app-misc/elasticsearch-7.9.1
+++ b/metadata/md5-cache/app-misc/elasticsearch-7.9.3
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.elastic.co/products/elasticsearch
 IUSE=x-pack
 KEYWORDS=~amd64
 LICENSE=Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )
-RDEPEND=acct-group/elasticsearch acct-user/elasticsearch virtual/jre
+RDEPEND=acct-group/elasticsearch acct-user/elasticsearch virtual/jre virtual/tmpfiles
 SLOT=0
-SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.9.1-no-jdk-linux-x86_64.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-7.9.1-no-jdk-linux-x86_64.tar.gz )
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ac0a2be0cb4bdda546bc229d14ec2e7b
+SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.9.3-no-jdk-linux-x86_64.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-7.9.3-no-jdk-linux-x86_64.tar.gz )
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=96e33ca7a9dfc15c6b5350cc811676a2
diff --git a/metadata/md5-cache/app-misc/gcstar-1.7.1-r1 b/metadata/md5-cache/app-misc/gcstar-1.7.1-r1
index ab6628da8373..8d1f7e5ea475 100644
--- a/metadata/md5-cache/app-misc/gcstar-1.7.1-r1
+++ b/metadata/md5-cache/app-misc/gcstar-1.7.1-r1
@@ -1,5 +1,5 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=dev-lang/perl dev-perl/Archive-Zip dev-perl/DateTime-Format-Strptime dev-perl/Gtk2 dev-perl/HTML-Parser dev-perl/libwww-perl dev-perl/URI dev-perl/XML-Parser dev-perl/XML-Simple virtual/perl-Archive-Tar virtual/perl-Encode virtual/perl-Getopt-Long virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO-Compress virtual/perl-libnet virtual/perl-Storable virtual/perl-Time-Piece cddb? ( dev-perl/Net-FreeDB ) mp3? ( dev-perl/MP3-Info dev-perl/MP3-Tag ) spell? ( dev-perl/gtk2-spell ) stats? ( dev-perl/Date-Calc dev-perl/GD[png,truetype] ) tellico? ( virtual/perl-Digest-MD5 virtual/perl-MIME-Base64 ) vorbis? ( dev-perl/Ogg-Vorbis-Header-PurePerl )
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-lang/perl dev-perl/Archive-Zip dev-perl/DateTime-Format-Strptime dev-perl/Gtk2 dev-perl/HTML-Parser dev-perl/libwww-perl dev-perl/URI dev-perl/XML-Parser dev-perl/XML-Simple virtual/perl-Archive-Tar virtual/perl-Encode virtual/perl-Getopt-Long virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO-Compress virtual/perl-libnet virtual/perl-Storable virtual/perl-Time-Piece cddb? ( dev-perl/Net-FreeDB ) mp3? ( dev-perl/MP3-Info dev-perl/MP3-Tag ) spell? ( dev-perl/gtk2-spell ) stats? ( dev-perl/Date-Calc dev-perl/GD[png,truetype] ) tellico? ( virtual/perl-Digest-MD5 virtual/perl-MIME-Base64 ) vorbis? ( dev-perl/Ogg-Vorbis-Header-PurePerl ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Manage your collections of movies, games, books, music and more
 EAPI=6
 HOMEPAGE=http://www.gcstar.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-perl/Archive-Zip dev-perl/DateTime-Format-Strptime dev-perl/Gtk2 dev-perl/HTML-Parser dev-perl/libwww-perl dev-perl/URI dev-perl/XML-Parser dev-perl/XML-Simple virtual/perl-Archive-Tar virtual/perl-Encode virtual/perl-Getopt-Long virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO-Compress virtual/perl-libnet virtual/perl-Storable virtual/perl-Time-Piece cddb? ( dev-perl/Net-FreeDB ) mp3? ( dev-perl/MP3-Info dev-perl/MP3-Tag ) spell? ( dev-perl/gtk2-spell ) stats? ( dev-perl/Date-Calc dev-perl/GD[png,truetype] ) tellico? ( virtual/perl-Digest-MD5 virtual/perl-MIME-Base64 ) vorbis? ( dev-perl/Ogg-Vorbis-Header-PurePerl )
 SLOT=0
 SRC_URI=https://launchpad.net/gcstar/1.7/1.7.1/+download/gcstar-1.7.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cb5fda223639a4ad34f8918ca5ead7c2
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=49d73b4a1109b332767367b24c0add5d
diff --git a/metadata/md5-cache/app-misc/gramps-5.1.3 b/metadata/md5-cache/app-misc/gramps-5.1.3
index 3b42f1766968..2d642d93a18f 100644
--- a/metadata/md5-cache/app-misc/gramps-5.1.3
+++ b/metadata/md5-cache/app-misc/gramps-5.1.3
@@ -4,7 +4,7 @@ DESCRIPTION=Genealogical Research and Analysis Management Programming System
 EAPI=7
 HOMEPAGE=https://gramps-project.org/
 IUSE=+rcs +reports exif geo postscript spell test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_6? ( dev-python/bsddb3[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_6(-)] dev-python/PyICU[python_targets_python3_6(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_6(-),introspection] ) ) python_single_target_python3_7? ( dev-python/bsddb3[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_7(-)] dev-python/PyICU[python_targets_python3_7(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_7(-),introspection] ) ) python_single_target_python3_8? ( dev-python/bsddb3[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_8(-)] dev-python/PyICU[python_targets_python3_8(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_8(-),introspection] ) ) python_single_target_python3_9? ( dev-python/bsddb3[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_9(-)] dev-python/PyICU[python_targets_python3_9(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_9(-),introspection] ) ) gnome-base/librsvg:2 >x11-libs/gtk+-3.14.8:3[introspection] x11-libs/pango[introspection] x11-misc/xdg-utils reports? ( media-gfx/graphviz[postscript?] ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) spell? ( app-text/gtkspell:3[introspection] ) rcs? ( dev-vcs/rcs ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gramps-project/gramps/archive/v5.1.3.tar.gz -> gramps-5.1.3.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0595453621ca902e7ba01b02326efee9
+_md5_=00eae0843590d0af6e47b2b6164d7d0a
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.14 b/metadata/md5-cache/app-misc/hivex-1.3.14
index 834351917826..35cedf484db8 100644
--- a/metadata/md5-cache/app-misc/hivex-1.3.14
+++ b/metadata/md5-cache/app-misc/hivex-1.3.14
@@ -3,7 +3,7 @@ DEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/oca
 DESCRIPTION=Library for reading and writing Windows Registry 'hive' binary files
 EAPI=6
 HOMEPAGE=http://libguestfs.org
-IUSE=ocaml readline +perl python test static-libs ruby test ruby_targets_ruby25 +python_single_target_python3_6
+IUSE=ocaml readline +perl python test ruby test ruby_targets_ruby25 +python_single_target_python3_6
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline:0 ) perl? ( dev-lang/perl:= dev-perl/IO-stringy ) ruby? ( ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) ruby_targets_ruby25? ( ruby? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ) dev-lang/perl:=
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://libguestfs.org/download/hivex/hivex-1.3.14.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=028f79b065bfd9120d1fe241adaa497e
+_md5_=6a2471e9871813e912d7225fa478bdff
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.18 b/metadata/md5-cache/app-misc/hivex-1.3.18
index ff382e5e6548..5437a27e8552 100644
--- a/metadata/md5-cache/app-misc/hivex-1.3.18
+++ b/metadata/md5-cache/app-misc/hivex-1.3.18
@@ -4,7 +4,7 @@ DEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/oca
 DESCRIPTION=Library for reading and writing Windows Registry 'hive' binary files
 EAPI=7
 HOMEPAGE=http://libguestfs.org
-IUSE=ocaml readline +perl python test static-libs ruby test ruby_targets_ruby25 ruby_targets_ruby26 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=ocaml readline +perl python test ruby test ruby_targets_ruby25 ruby_targets_ruby26 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline:0 ) perl? ( dev-lang/perl:= dev-perl/IO-stringy ) ruby? ( ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) ruby_targets_ruby25? ( ruby? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( ruby? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) dev-lang/perl:=
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://libguestfs.org/download/hivex/hivex-1.3.18.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5d8e8b8ea7ca3d8549f5c67ce615b6ca
+_md5_=29c4052f162e084e74387118838abfa1
diff --git a/metadata/md5-cache/app-misc/ps3pf_utils-2.3 b/metadata/md5-cache/app-misc/ps3pf_utils-2.3
index e4b753b038c5..924028675b45 100644
--- a/metadata/md5-cache/app-misc/ps3pf_utils-2.3
+++ b/metadata/md5-cache/app-misc/ps3pf_utils-2.3
@@ -1,4 +1,4 @@
-DEFINED_PHASES=-
+DEFINED_PHASES=configure install
 DESCRIPTION=Utilities to set the ps3 specific features
 EAPI=7
 HOMEPAGE=http://www.playstation.com/ps3-openplatform/index.html
@@ -6,4 +6,4 @@ KEYWORDS=~ppc ~ppc64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/geoff/cell/ps3-utils/ps3-utils-2.3.tar.bz2
-_md5_=33e1759daeb46840fa139a2da56fc425
+_md5_=dd615b32d19bcb40fb241769bf779998
diff --git a/metadata/md5-cache/app-misc/ranger-1.9.2 b/metadata/md5-cache/app-misc/ranger-1.9.2
index e31a24fb6863..ab0245d0350b 100644
--- a/metadata/md5-cache/app-misc/ranger-1.9.2
+++ b/metadata/md5-cache/app-misc/ranger-1.9.2
@@ -1,5 +1,6 @@
 BDEPEND=test? ( virtual/pager >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A vim-inspired file manager for the console
 EAPI=7
 HOMEPAGE=https://ranger.github.io/
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ranger/ranger/archive/v1.9.2.tar.gz -> ranger-1.9.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c69d2c0f5af681b8f20e4251aef8c44b
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5865a6963353c641b2fdaaf234181a5c
diff --git a/metadata/md5-cache/app-misc/ranger-1.9.3 b/metadata/md5-cache/app-misc/ranger-1.9.3
index ffce84ae2a3a..cfe482b46bc9 100644
--- a/metadata/md5-cache/app-misc/ranger-1.9.3
+++ b/metadata/md5-cache/app-misc/ranger-1.9.3
@@ -1,5 +1,6 @@
 BDEPEND=test? ( virtual/pager >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A vim-inspired file manager for the console
 EAPI=7
 HOMEPAGE=https://ranger.github.io/
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ranger/ranger/archive/v1.9.3.tar.gz -> ranger-1.9.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4b5e4d787fe451444cc53a1b96b9632b
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ddf2dbc760f14817f26cc05d9cd0e9a4
diff --git a/metadata/md5-cache/app-misc/ranger-9999 b/metadata/md5-cache/app-misc/ranger-9999
index cf4c213aa8c6..29e49b2f9fa3 100644
--- a/metadata/md5-cache/app-misc/ranger-9999
+++ b/metadata/md5-cache/app-misc/ranger-9999
@@ -1,5 +1,6 @@
 BDEPEND=test? ( virtual/pager >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) >=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(-)] >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A vim-inspired file manager for the console
 EAPI=7
 HOMEPAGE=https://ranger.github.io/
@@ -10,5 +11,5 @@ RDEPEND=virtual/pager python_targets_python3_6? ( dev-lang/python:3.6[ncurses] )
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4b5e4d787fe451444cc53a1b96b9632b
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ddf2dbc760f14817f26cc05d9cd0e9a4
diff --git a/metadata/md5-cache/app-misc/reptyr-0.8.0 b/metadata/md5-cache/app-misc/reptyr-0.8.0
index a6c1712e5e56..4f1ce28b4ea1 100644
--- a/metadata/md5-cache/app-misc/reptyr-0.8.0
+++ b/metadata/md5-cache/app-misc/reptyr-0.8.0
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare unpack
 DESCRIPTION=A utility to attach a running program to a new terminal
 EAPI=7
 HOMEPAGE=https://github.com/nelhage/reptyr
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/nelhage/reptyr/archive/reptyr-0.8.0.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=479eafa3fafdde05a31d6850cfcd8e8b
+_md5_=acebf14367917c9dd837d739f765ddbd
diff --git a/metadata/md5-cache/app-misc/tmux-3.1b b/metadata/md5-cache/app-misc/tmux-3.1b
deleted file mode 100644
index a9ced068dcb0..000000000000
--- a/metadata/md5-cache/app-misc/tmux-3.1b
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/yacc >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/libevent:0= sys-libs/ncurses:0= utempter? ( sys-libs/libutempter )
-DESCRIPTION=Terminal multiplexer
-EAPI=7
-HOMEPAGE=https://tmux.github.io/
-IUSE=debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=ISC
-RDEPEND=dev-libs/libevent:0= sys-libs/ncurses:0= utempter? ( sys-libs/libutempter ) selinux? ( sec-policy/selinux-screen ) vim-syntax? ( app-vim/vim-tmux )
-SLOT=0
-SRC_URI=https://github.com/tmux/tmux/releases/download/3.1b/tmux-3.1b.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0b8e1a6570f8d96e6d2c3ea72dd22630
diff --git a/metadata/md5-cache/app-misc/tmux-3.1c b/metadata/md5-cache/app-misc/tmux-3.1c
index dd19f7ce2320..848362c952a4 100644
--- a/metadata/md5-cache/app-misc/tmux-3.1c
+++ b/metadata/md5-cache/app-misc/tmux-3.1c
@@ -5,10 +5,10 @@ DESCRIPTION=Terminal multiplexer
 EAPI=7
 HOMEPAGE=https://tmux.github.io/
 IUSE=debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=ISC
 RDEPEND=dev-libs/libevent:0= sys-libs/ncurses:0= utempter? ( sys-libs/libutempter ) selinux? ( sec-policy/selinux-screen ) vim-syntax? ( app-vim/vim-tmux )
 SLOT=0
 SRC_URI=https://github.com/tmux/tmux/releases/download/3.1c/tmux-3.1c.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c6af1dfcd306261548e7339231153fb9
+_md5_=0b8e1a6570f8d96e6d2c3ea72dd22630
diff --git a/metadata/md5-cache/app-misc/xmind-3.5.3.201506180105-r2 b/metadata/md5-cache/app-misc/xmind-3.5.3.201506180105-r2
index 274cdab9f8e1..c4bda163931e 100644
--- a/metadata/md5-cache/app-misc/xmind-3.5.3.201506180105-r2
+++ b/metadata/md5-cache/app-misc/xmind-3.5.3.201506180105-r2
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst
-DEPEND=app-arch/unzip
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-arch/unzip dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A brainstorming and mind mapping software tool
 EAPI=5
 HOMEPAGE=https://www.xmind.net
@@ -8,5 +8,5 @@ LICENSE=EPL-1.0 LGPL-3
 RDEPEND=>=virtual/jre-1.5 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://dl2.xmind.net/xmind-downloads/xmind-portable-3.5.3.201506180105.zip https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=980a30f2c5f0942b176905ad98ce7ca0
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	optfeature	6c9aa35fc16df43d7142ef2660e00e25	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a57b1628da385d1f25e05c4ad926fd40
diff --git a/metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814 b/metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814
index f53c13fa8dcf..853090c7dbc9 100644
--- a/metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814
+++ b/metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A brainstorming and mind mapping software tool
 EAPI=6
 HOMEPAGE=https://www.xmind.net
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0 LGPL-3
 RDEPEND=>=virtual/jre-1.8 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://dl2.xmind.net/xmind-downloads/xmind-8-update7-linux.zip https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5d504e92de06c1ffc574af2ada3cdf61
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	optfeature	6c9aa35fc16df43d7142ef2660e00e25	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=074cba93764fac3718bbda1696eedf7a
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 77c807e5fa08..aed2c0af4637 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/texmaker-5.0.3 b/metadata/md5-cache/app-office/texmaker-5.0.3
index 6951e6abc20f..63a939701956 100644
--- a/metadata/md5-cache/app-office/texmaker-5.0.3
+++ b/metadata/md5-cache/app-office/texmaker-5.0.3
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=app-text/hunspell:= app-text/poppler[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtlockedfile dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=app-text/hunspell:= app-text/poppler[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtlockedfile dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A nice LaTeX-IDE
 EAPI=7
 HOMEPAGE=https://xm1math.net/texmaker/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/hunspell:= app-text/poppler[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtlockedfile dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
 SLOT=0
 SRC_URI=https://xm1math.net/texmaker/texmaker-5.0.3.tar.bz2
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=69ec23e54407299c5fc78dd07b80d1c8
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ffc9f8ba20f942ce2404a11c51b21acd
diff --git a/metadata/md5-cache/app-office/texmaker-5.0.4 b/metadata/md5-cache/app-office/texmaker-5.0.4
index 2a16f8562f8d..6af76a748fb9 100644
--- a/metadata/md5-cache/app-office/texmaker-5.0.4
+++ b/metadata/md5-cache/app-office/texmaker-5.0.4
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=app-text/hunspell:= app-text/poppler[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtlockedfile dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=app-text/hunspell:= app-text/poppler[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtlockedfile dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A nice LaTeX-IDE
 EAPI=7
 HOMEPAGE=https://xm1math.net/texmaker/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/hunspell:= app-text/poppler[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtlockedfile dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
 SLOT=0
 SRC_URI=https://xm1math.net/texmaker/texmaker-5.0.4.tar.bz2
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=038b894a3e3144a95b1994d7e12b512a
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=21c0e461eb0e613c46e88b3a573ab616
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 0ca4b8c276a3..091c7867b71c 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.4.6 b/metadata/md5-cache/app-portage/gentoolkit-0.4.6
index 2f82a2e4e246..06c54f6b2dc5 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.4.6
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.4.6
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/gentoolkit-0.4.6.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=47248f940395a6c322894fbc57540025
+_md5_=8e369e409bcb3736a58a01057c6e193c
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.4.7 b/metadata/md5-cache/app-portage/gentoolkit-0.4.7
index 22d9c869ea26..07ae3269cd90 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.4.7
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.4.7
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/gentoolkit-0.4.7.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ca64906deadabb4c4d4f8412b2b7a483
+_md5_=97311a33d6e42ab83e8df7efa19a7c18
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.4.8 b/metadata/md5-cache/app-portage/gentoolkit-0.4.8
index 4f9ef8f3cbd6..9fd8c38148a7 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.4.8
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.4.8
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/gentoolkit-0.4.8.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8f80a561f7be3f6e56b77cd33472fef1
+_md5_=06296208bac1822c7477c841098c248e
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.5.0-r2 b/metadata/md5-cache/app-portage/gentoolkit-0.5.0-r2
index 6775dc05ec83..40aee5c948c2 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.5.0-r2
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.5.0-r2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/gentoolkit-0.5.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0bf32a2cfdd5a1dde0341a2fc0751e62
+_md5_=f61a4579eabe134eb7edd00e0e1b28e3
diff --git a/metadata/md5-cache/app-portage/gentoolkit-9999 b/metadata/md5-cache/app-portage/gentoolkit-9999
index 57dcaee89178..e4ec060953a1 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-9999
+++ b/metadata/md5-cache/app-portage/gentoolkit-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1eabd8b04cb41aba6db3b37c1feab36f
+_md5_=7b7b5d3a13c6eb5881ea52527a4fdcb4
diff --git a/metadata/md5-cache/app-portage/pfl-3.1-r1 b/metadata/md5-cache/app-portage/pfl-3.1-r1
index 18bf18dcfcda..5aeae2e41cf3 100644
--- a/metadata/md5-cache/app-portage/pfl-3.1-r1
+++ b/metadata/md5-cache/app-portage/pfl-3.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Searchable online file/package database for Gentoo
 EAPI=7
 HOMEPAGE=http://www.portagefilelist.de https://github.com/portagefilelist/client
 IUSE=+network-cron python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-2
 RDEPEND=dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/curl sys-apps/portage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] network-cron? ( sys-apps/util-linux[caps] ) 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(-)]
 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/portagefilelist/client/archive/3.1.tar.gz -> pfl-3.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3d0aa125d709b3ffba76d9325f33ca0f
+_md5_=bde567aa00a622809ded9d6a65d1cd1d
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.90 b/metadata/md5-cache/app-portage/portage-utils-0.90
index 7207c24584e3..0bb84caac10d 100644
--- a/metadata/md5-cache/app-portage/portage-utils-0.90
+++ b/metadata/md5-cache/app-portage/portage-utils-0.90
@@ -4,9 +4,9 @@ DESCRIPTION=Small and fast Portage helper tools written in C
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
 IUSE=nls static openmp +qmanifest +qtegrity libressl
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=qmanifest? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( app-crypt/libb2:=[static-libs] !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) sys-libs/zlib:=[static-libs] app-crypt/gpgme:=[static-libs] ) !static? ( app-crypt/libb2:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:= app-crypt/gpgme:= ) ) qtegrity? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) !static? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~grobian/distfiles/portage-utils-0.90.tar.xz
-_md5_=68ddafb93da029a54f29d008cb1615b1
+_md5_=cc29a946a03eaa514f2eb799d8cfaf09
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index fe143a3eaf42..f74314d69f69 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/bibletime-3.0 b/metadata/md5-cache/app-text/bibletime-3.0
index 8f77f9c6ba97..34a9439b295e 100644
--- a/metadata/md5-cache/app-text/bibletime-3.0
+++ b/metadata/md5-cache/app-text/bibletime-3.0
@@ -5,11 +5,11 @@ DESCRIPTION=Qt Bible-study application using the SWORD library
 EAPI=7
 HOMEPAGE=http://bibletime.info/
 IUSE=test
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/sword-1.8.1 dev-cpp/clucene dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bibletime/bibletime/releases/download/v3.0/bibletime-3.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d218e5146599243a50de1f83e04c053f
+_md5_=62e024e9ab9fa8bfc572a695447fccdf
diff --git a/metadata/md5-cache/app-text/fbreader-0.99.4-r5 b/metadata/md5-cache/app-text/fbreader-0.99.4-r5
index 639273b9d9b9..c30fc007f87e 100644
--- a/metadata/md5-cache/app-text/fbreader-0.99.4-r5
+++ b/metadata/md5-cache/app-text/fbreader-0.99.4-r5
@@ -9,6 +9,6 @@ KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 dev-db/sqlite dev-libs/expat dev-libs/fribidi dev-libs/libunibreak dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 net-misc/curl sys-libs/zlib
 SLOT=0
-SRC_URI=https://www.fbreader.org/files/desktop/fbreader-sources-0.99.4.tgz
+SRC_URI=https://www.fbreader.org/files/desktop/fbreader-sources-0.99.4.tgz https://dev.gentoo.org/~juippis/distfiles/tmp/fbreader-0.99.4-combined.patch
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=07b3511a31e72b6a32922669bd410bb1
+_md5_=ad793174b9781710ec3a1bb919de1326
diff --git a/metadata/md5-cache/app-text/flpsed-0.7.3 b/metadata/md5-cache/app-text/flpsed-0.7.3
index c75e887d1fd8..c4a6ea28d0f1 100644
--- a/metadata/md5-cache/app-text/flpsed-0.7.3
+++ b/metadata/md5-cache/app-text/flpsed-0.7.3
@@ -1,5 +1,5 @@
-DEFINED_PHASES=install
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft >=x11-libs/fltk-1.3.0:1 app-text/ghostscript-gpl[X]
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft >=x11-libs/fltk-1.3.0:1 app-text/ghostscript-gpl[X] dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Pseudo PostScript editor
 EAPI=7
 HOMEPAGE=https://flpsed.org/flpsed.html
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft >=x11-libs/fltk-1.3.0:1 app-text/ghostscript-gpl[X]
 SLOT=0
 SRC_URI=https://flpsed.org/flpsed-0.7.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8
-_md5_=4a95e669373a9442e3976ff9db92e8f4
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=711acbc4805e874fef52b21e7ffafffe
diff --git a/metadata/md5-cache/app-text/gnome-doc-utils-0.20.10-r2 b/metadata/md5-cache/app-text/gnome-doc-utils-0.20.10-r2
index be8ffc96f798..29f577a28599 100644
--- a/metadata/md5-cache/app-text/gnome-doc-utils-0.20.10-r2
+++ b/metadata/md5-cache/app-text/gnome-doc-utils-0.20.10-r2
@@ -9,6 +9,6 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-libs/libxml2-2.6.12:2[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-libs/libxslt-1.1.8
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.10.tar.xz
+SRC_URI=mirror://gnome/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.10.tar.xz https://dev.gentoo.org/~juippis/distfiles/tmp/gnome-doc-utils-0.20.10-python3.patch
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fd8124ced4761b17eb925b815d013fa3
+_md5_=873b71958dfbd5ec051bf34fc6cb0c33
diff --git a/metadata/md5-cache/app-text/llpp-33 b/metadata/md5-cache/app-text/llpp-33
index 460242ab63a0..46b4cb87719d 100644
--- a/metadata/md5-cache/app-text/llpp-33
+++ b/metadata/md5-cache/app-text/llpp-33
@@ -5,11 +5,11 @@ DESCRIPTION=Graphical PDF viewer which aims to superficially resemble less(1)
 EAPI=7
 HOMEPAGE=https://github.com/moosotc/llpp
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=public-domain
 RDEPEND=>=app-text/mupdf-1.17.0:0= app-arch/bzip2 media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/jbig2dec:= media-libs/openjpeg:2 sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-misc/xsel
 RESTRICT=!ocamlopt? ( strip )
 SLOT=0
 SRC_URI=https://github.com/moosotc/llpp/archive/v33.tar.gz -> llpp-33.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d3e39de34fe3a0d7a6dcce80c508b4f7
+_md5_=c4435f4f15273afb8d2f9bfb33815a9d
diff --git a/metadata/md5-cache/app-text/sigil-1.3.0 b/metadata/md5-cache/app-text/sigil-1.3.0
index 19cd5815bb3c..114dea4a5c0c 100644
--- a/metadata/md5-cache/app-text/sigil-1.3.0
+++ b/metadata/md5-cache/app-text/sigil-1.3.0
@@ -5,11 +5,11 @@ DESCRIPTION=Multi-platform WYSIWYG ebook editor for ePub format
 EAPI=7
 HOMEPAGE=https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil
 IUSE=+plugins system-mathjax python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+ Apache-2.0
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[tk] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-text/hunspell:= dev-libs/libpcre:3=[pcre16] python_single_target_python3_6? ( dev-python/css-parser[python_targets_python3_6(-)] dev-python/lxml[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/css-parser[python_targets_python3_7(-)] dev-python/lxml[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/css-parser[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] ) >=dev-qt/qtconcurrent-5.12:5 >=dev-qt/qtcore-5.12:5 >=dev-qt/qtgui-5.12:5 >=dev-qt/qtprintsupport-5.12:5 >=dev-qt/qtwebengine-5.12:5[widgets] >=dev-qt/qtwidgets-5.12:5 sys-libs/zlib[minizip] plugins? ( python_single_target_python3_6? ( dev-python/chardet[python_targets_python3_6(-)] dev-python/cssselect[python_targets_python3_6(-)] dev-python/dulwich[python_targets_python3_6(-)] dev-python/html5lib[python_targets_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)] dev-python/regex[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/cssselect[python_targets_python3_7(-)] dev-python/dulwich[python_targets_python3_7(-)] dev-python/html5lib[python_targets_python3_7(-)] dev-python/pillow[python_targets_python3_7(-)] dev-python/regex[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cssselect[python_targets_python3_8(-)] dev-python/dulwich[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/regex[python_targets_python3_8(-)] ) ) system-mathjax? ( dev-libs/mathjax )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/Sigil-Ebook/Sigil/archive/1.3.0.tar.gz -> sigil-1.3.0.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=754ae3097c834d144946d9e01f846868
+_md5_=4ef11e08fc765a0a0852625950e9c024
diff --git a/metadata/md5-cache/app-text/talkfilters-2.3.8-r1 b/metadata/md5-cache/app-text/talkfilters-2.3.8-r1
index c615b456a5fd..72c361a6b3a4 100644
--- a/metadata/md5-cache/app-text/talkfilters-2.3.8-r1
+++ b/metadata/md5-cache/app-text/talkfilters-2.3.8-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=prepare
+DEFINED_PHASES=configure install prepare
 DESCRIPTION=Convert ordinary English text into text that mimics a stereotyped dialect
 EAPI=5
 HOMEPAGE=http://www.hyperrealm.com/talkfilters/talkfilters.html
@@ -7,4 +7,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.hyperrealm.com/talkfilters/talkfilters-2.3.8.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=783bbdf5beb2a1bd053f308d13e1a0d6
+_md5_=f3fd26bfb1171ad25663d01a89c4fc4e
diff --git a/metadata/md5-cache/app-text/vgrep-2.5.1 b/metadata/md5-cache/app-text/vgrep-2.5.1
new file mode 100644
index 000000000000..3ab7b310fd0a
--- /dev/null
+++ b/metadata/md5-cache/app-text/vgrep-2.5.1
@@ -0,0 +1,12 @@
+BDEPEND=dev-go/go-md2man >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=A pager for grep, git-grep and similar grep implementations
+EAPI=7
+HOMEPAGE=https://github.com/vrothberg/vgrep
+KEYWORDS=~amd64
+LICENSE=BSD GPL-3+ MIT MIT-with-advertising
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/vrothberg/vgrep/archive/v2.5.1.tar.gz -> vgrep-2.5.1.tar.gz
+_eclasses_=go-module	92660621959e7fab813173772987588b
+_md5_=fbb74f251d011634fb3acfbf527d1a02
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 6f2c9aeca4ed..568d926a49ee 100644
Binary files a/metadata/md5-cache/app-vim/Manifest.gz and b/metadata/md5-cache/app-vim/Manifest.gz differ
diff --git a/metadata/md5-cache/app-vim/csound-syntax-0.8.1 b/metadata/md5-cache/app-vim/csound-syntax-0.8.1
new file mode 100644
index 000000000000..486ee23c3f51
--- /dev/null
+++ b/metadata/md5-cache/app-vim/csound-syntax-0.8.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: set of tools for editing Csound files with vim
+EAPI=7
+HOMEPAGE=https://github.com/luisjure/csound
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/luisjure/csound-vim/archive/v0.8.1.tar.gz -> csound-syntax-0.8.1.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=ae89201f360a888a34f7bc90b73749f5
diff --git a/metadata/md5-cache/app-vim/csound-syntax-20160804 b/metadata/md5-cache/app-vim/csound-syntax-20160804
index ac17feaf84a6..590a7a7ffde4 100644
--- a/metadata/md5-cache/app-vim/csound-syntax-20160804
+++ b/metadata/md5-cache/app-vim/csound-syntax-20160804
@@ -9,4 +9,4 @@ RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/csound-syntax-20160804.tar.bz2 https://dev.gentoo.org/~radhermit/vim/csound-syntax-20160804.tar.bz2
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=d7a8f14159e306c57d33456843c0ee3e
+_md5_=429083dd57ae1f5cf93d7ce196a0596c
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index e341db2d5a52..570441364796 100644
Binary files a/metadata/md5-cache/dev-cpp/Manifest.gz and b/metadata/md5-cache/dev-cpp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-cpp/eigen-3.3.7-r1 b/metadata/md5-cache/dev-cpp/eigen-3.3.7-r1
index cc68d155c60b..e49afcdbb2e7 100644
--- a/metadata/md5-cache/dev-cpp/eigen-3.3.7-r1
+++ b/metadata/md5-cache/dev-cpp/eigen-3.3.7-r1
@@ -5,10 +5,10 @@ DESCRIPTION=C++ template library for linear algebra
 EAPI=7
 HOMEPAGE=http://eigen.tuxfamily.org/index.php?title=Main_Page
 IUSE=cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_ppc_vsx cuda debug doc openmp test
-KEYWORDS=~amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MPL-2.0
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://gitlab.com/libeigen/eigen/-/archive/3.3.7/eigen-3.3.7.tar.bz2 -> eigen-3.3.7-gitlab.tar.bz2
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a8dd6a1fbcc254d847da3a2b21dfbf78
+_md5_=50a140350e3b5e0456b7c43f7e4c96b3
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 927058e73098..a015f10a9f21 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/mariadb-10.2.32-r3 b/metadata/md5-cache/dev-db/mariadb-10.2.32-r3
index 30d6c7848432..deb90c95a07c 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.2.32-r3
+++ b/metadata/md5-cache/dev-db/mariadb-10.2.32-r3
@@ -4,7 +4,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=6
 HOMEPAGE=https://mariadb.org/
 IUSE=+backup bindist client-libs cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup sst-xtrabackup static systemd systemtap tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1+
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )
 RDEPEND=selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mariadb:0 !dev-db/mariadb:5.5 !dev-db/mariadb:10.1 !dev-db/mariadb:10.3 !dev-db/mariadb:10.4 !dev-db/mariadb:10.5 !<virtual/mysql-5.6-r11 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
@@ -13,4 +13,4 @@ RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=10.2/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.2.32/source/mariadb-10.2.32.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.2.32-patches-03.tar.xz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f340c777bb586670a461d68e3fff79a7
+_md5_=9eaf45ec8672073855c4413d7a07eef7
diff --git a/metadata/md5-cache/dev-db/mariadb-10.3.23-r3 b/metadata/md5-cache/dev-db/mariadb-10.3.23-r3
index ce747f6eccf5..3e2a6eef9960 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.3.23-r3
+++ b/metadata/md5-cache/dev-db/mariadb-10.3.23-r3
@@ -4,7 +4,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=6
 HOMEPAGE=https://mariadb.org/
 IUSE=+backup bindist client-libs cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup static systemd systemtap tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1+
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
 RDEPEND=selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mariadb:0 !dev-db/mariadb:5.5 !dev-db/mariadb:10.1 !dev-db/mariadb:10.2 !dev-db/mariadb:10.4 !dev-db/mariadb:10.5 !<virtual/mysql-5.6-r11 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
@@ -13,4 +13,4 @@ RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=10.3/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.3.23/source/mariadb-10.3.23.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.3.23-patches-03.tar.xz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f3b0199472b66eaafbe4dae99060eab2
+_md5_=76ff4007c14de71a86bd16254f46cec5
diff --git a/metadata/md5-cache/dev-db/mariadb-10.4.13-r3 b/metadata/md5-cache/dev-db/mariadb-10.4.13-r3
index 2e92317a398e..32b630806147 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.4.13-r3
+++ b/metadata/md5-cache/dev-db/mariadb-10.4.13-r3
@@ -5,7 +5,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=7
 HOMEPAGE=https://mariadb.org/
 IUSE=+backup bindist cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup static systemd systemtap tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1+
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
 RDEPEND=selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mariadb:0 !dev-db/mariadb:5.5 !dev-db/mariadb:10.1 !dev-db/mariadb:10.2 !dev-db/mariadb:10.3 !dev-db/mariadb:10.5 !<virtual/mysql-5.6-r11 !<virtual/libmysqlclient-18-r1 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-26* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
@@ -14,4 +14,4 @@ RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=10.4/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.4.13/source/mariadb-10.4.13.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.4.13-patches-03.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7b13240731aa1c54ddd8d1bd15feba99
+_md5_=75642efb49a58c1b984849568e88c128
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.31 b/metadata/md5-cache/dev-db/mysql-5.7.31
index 7f2a82e4c41d..ce1c117fcc9c 100644
--- a/metadata/md5-cache/dev-db/mysql-5.7.31
+++ b/metadata/md5-cache/dev-db/mysql-5.7.31
@@ -5,7 +5,7 @@ DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
 EAPI=7
 HOMEPAGE=https://www.mysql.com/
 IUSE=cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa +perl profiling selinux +server static static-libs systemtap tcmalloc test kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
 RDEPEND=sys-libs/ncurses:0= client-libs? ( >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] !libressl? ( >=dev-libs/openssl-1.0.0: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(-)?,static-libs?] ) libressl? ( dev-libs/libressl: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(-)?,static-libs?] ) ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=sys-libs/zlib-1.2.3:0= !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) server? ( >=app-arch/lz4-0_p131:= cjk? ( app-text/mecab:= ) experimental? ( dev-libs/libevent:=[ssl] dev-libs/protobuf:= net-libs/libtirpc:= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mysql:0 !dev-db/mysql:8.0 client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c dev-libs/protobuf:= ) selinux? ( sec-policy/selinux-mysql ) server? ( !prefix? ( acct-group/mysql acct-user/mysql dev-db/mysql-init-scripts ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) libressl? ( test )
 SLOT=5.7/18
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.31.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.31.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.31.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-5.7.31-patches-01.tar.xz
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=36c7f0f921402a4efce3d388f841cc86
+_md5_=4e726db8b682dc9ba5d64bcd96033b35
diff --git a/metadata/md5-cache/dev-db/mysql-8.0.21-r1 b/metadata/md5-cache/dev-db/mysql-8.0.21-r1
index 58f46f3a6d15..30fa9ee5f7f7 100644
--- a/metadata/md5-cache/dev-db/mysql-8.0.21-r1
+++ b/metadata/md5-cache/dev-db/mysql-8.0.21-r1
@@ -5,7 +5,7 @@ DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
 EAPI=7
 HOMEPAGE=https://www.mysql.com/
 IUSE=cjk cracklib debug jemalloc latin1 libressl numa +perl profiling router selinux +server tcmalloc test kernel_linux
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
 RDEPEND=>=app-arch/lz4-0_p131:= app-arch/zstd:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( >=dev-libs/openssl-1.0.0:0= ) server? ( dev-libs/icu:= dev-libs/libevent:=[ssl] >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= cjk? ( app-text/mecab:= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) tcmalloc? ( dev-util/google-perftools:0= ) ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mysql:0 !dev-db/mysql:5.7 selinux? ( sec-policy/selinux-mysql ) !prefix? ( acct-group/mysql acct-user/mysql dev-db/mysql-init-scripts )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) libressl? ( test )
 SLOT=8.0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.21.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.21.tar.gz http://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.21.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-8.0.21-patches-01.tar.xz
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=97dcec83acc537d86004bf27e686ace4
+_md5_=87b72d260e18e9ad2188d3fc5af93001
diff --git a/metadata/md5-cache/dev-db/postgresql-10.15 b/metadata/md5-cache/dev-db/postgresql-10.15
new file mode 100644
index 000000000000..1e29c1e20480
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-10.15
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=7
+HOMEPAGE=https://www.postgresql.org/
+IUSE=debug doc icu kerberos kernel_linux ldap libressl nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=10
+SRC_URI=https://ftp.postgresql.org/pub/source/v10.15/postgresql-10.15.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	pam	226d8d2ff588bdfd7d188512dbdb189d	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=380d1e0ca017294f0a605a4cb12116d1
diff --git a/metadata/md5-cache/dev-db/postgresql-11.10 b/metadata/md5-cache/dev-db/postgresql-11.10
new file mode 100644
index 000000000000..952fa41a39ee
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-11.10
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=7
+HOMEPAGE=https://www.postgresql.org/
+IUSE=debug doc icu kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=11
+SRC_URI=https://ftp.postgresql.org/pub/source/v11.10/postgresql-11.10.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	pam	226d8d2ff588bdfd7d188512dbdb189d	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=a85cc72e3a688bf6c9d39fb6f9900b88
diff --git a/metadata/md5-cache/dev-db/postgresql-12.5 b/metadata/md5-cache/dev-db/postgresql-12.5
new file mode 100644
index 000000000000..9d0b6a0aa0a3
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-12.5
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=7
+HOMEPAGE=https://www.postgresql.org/
+IUSE=debug doc icu kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=12
+SRC_URI=https://ftp.postgresql.org/pub/source/v12.5/postgresql-12.5.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	pam	226d8d2ff588bdfd7d188512dbdb189d	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ccc3dcabe62dac0ef7067a98e7189022
diff --git a/metadata/md5-cache/dev-db/postgresql-13.1 b/metadata/md5-cache/dev-db/postgresql-13.1
new file mode 100644
index 000000000000..089e5adf4d76
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-13.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=7
+HOMEPAGE=https://www.postgresql.org/
+IUSE=debug doc icu kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=13
+SRC_URI=https://ftp.postgresql.org/pub/source/v13.1/postgresql-13.1.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	pam	226d8d2ff588bdfd7d188512dbdb189d	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=40ffbbd801f1340a7bf59c18286c9103
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.24 b/metadata/md5-cache/dev-db/postgresql-9.5.24
new file mode 100644
index 000000000000..bb8c1ca056b6
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.24
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=7
+HOMEPAGE=https://www.postgresql.org/
+IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg-legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=9.5
+SRC_URI=https://ftp.postgresql.org/pub/source/v9.5.24/postgresql-9.5.24.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	pam	226d8d2ff588bdfd7d188512dbdb189d	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f7ee7866a2030fa0d5f3ecc0a88301dd
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.20 b/metadata/md5-cache/dev-db/postgresql-9.6.20
new file mode 100644
index 000000000000..7a7789aa8693
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.20
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=7
+HOMEPAGE=https://www.postgresql.org/
+IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg-legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=9.6
+SRC_URI=https://ftp.postgresql.org/pub/source/v9.6.20/postgresql-9.6.20.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	pam	226d8d2ff588bdfd7d188512dbdb189d	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=0f81ca06a6559ae4a4f2178a1abc02e4
diff --git a/metadata/md5-cache/dev-db/postgresql-9999 b/metadata/md5-cache/dev-db/postgresql-9999
index 161badf689a2..c2b4fcc0cc78 100644
--- a/metadata/md5-cache/dev-db/postgresql-9999
+++ b/metadata/md5-cache/dev-db/postgresql-9999
@@ -11,4 +11,4 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postg
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=9999
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	pam	226d8d2ff588bdfd7d188512dbdb189d	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9702e8a9515aed6e1d107f3b05765caa
+_md5_=7212bff35debcfd4b423b4a471094cf9
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index b3c0f6468d2c..49894f186b8b 100644
Binary files a/metadata/md5-cache/dev-embedded/Manifest.gz and b/metadata/md5-cache/dev-embedded/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-embedded/avrdude-6.3 b/metadata/md5-cache/dev-embedded/avrdude-6.3
index ffd5a53d9a30..0ddaa29eaf91 100644
--- a/metadata/md5-cache/dev-embedded/avrdude-6.3
+++ b/metadata/md5-cache/dev-embedded/avrdude-6.3
@@ -10,4 +10,4 @@ RDEPEND=virtual/libusb:1 virtual/libusb:0 ftdi? ( dev-embedded/libftdi:= ) ncurs
 SLOT=0
 SRC_URI=mirror://nongnu/avrdude/avrdude-6.3.tar.gz doc? ( mirror://nongnu/avrdude/avrdude-doc-6.3.tar.gz mirror://nongnu/avrdude/avrdude-doc-6.3.pdf )
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=541541cd5b7ad2c007dc883e864041bf
+_md5_=9e8591e523f9b737e3271b18ff6802e0
diff --git a/metadata/md5-cache/dev-embedded/avrdude-9999 b/metadata/md5-cache/dev-embedded/avrdude-9999
index 57b7becdfe32..db5e3fbda148 100644
--- a/metadata/md5-cache/dev-embedded/avrdude-9999
+++ b/metadata/md5-cache/dev-embedded/avrdude-9999
@@ -10,4 +10,4 @@ RDEPEND=virtual/libusb:1 virtual/libusb:0 ftdi? ( dev-embedded/libftdi:= ) ncurs
 SLOT=0
 SRC_URI=doc? ( mirror://nongnu/avrdude/avrdude-doc-6.3.tar.gz mirror://nongnu/avrdude/avrdude-doc-6.3.pdf )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	estack	686eaab303305a908fd57b2fd7617800	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	subversion	ed3498da4fb92dcfb0d6089c85d1465f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=376af261a23990d0355c967d009dc171
+_md5_=fca682fa0ac9452ba708ab37dd494665
diff --git a/metadata/md5-cache/dev-embedded/mcu8051ide-1.4.10 b/metadata/md5-cache/dev-embedded/mcu8051ide-1.4.10
index bd711c5d856d..d0b92d92d18d 100644
--- a/metadata/md5-cache/dev-embedded/mcu8051ide-1.4.10
+++ b/metadata/md5-cache/dev-embedded/mcu8051ide-1.4.10
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-embedded/sdcc-2.5[mcs51] >=app-doc/doxygen-1.7 >=dev-util/indent-2.2 >=app-text/hunspell-1.3 >=dev-tcltk/bwidget-1.8 >dev-tcltk/itcl-3.3 >=dev-lang/tcl-8.5.9:* >=dev-tcltk/tdom-0.8 >=dev-tcltk/tcllib-1.11 >=dev-lang/tk-8.5.9:* >=dev-tcltk/tkimg-1.4 >=dev-tcltk/tclx-8.4 sys-devel/make >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-embedded/sdcc-2.5[mcs51] >=app-doc/doxygen-1.7 >=dev-util/indent-2.2 >=app-text/hunspell-1.3 >=dev-tcltk/bwidget-1.8 >dev-tcltk/itcl-3.3 >=dev-lang/tcl-8.5.9:* >=dev-tcltk/tdom-0.8 >=dev-tcltk/tcllib-1.11 >=dev-lang/tk-8.5.9:* >=dev-tcltk/tkimg-1.4 >=dev-tcltk/tclx-8.4 sys-devel/make >=dev-util/cmake-3.9.6 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Graphical IDE for microcontrollers based on 8051.
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-embedded/sdcc-2.5[mcs51] >=app-doc/doxygen-1.7 >=dev-util/indent-2.2 >=app-text/hunspell-1.3 >=dev-tcltk/bwidget-1.8 >dev-tcltk/itcl-3.3 >=dev-lang/tcl-8.5.9:* >=dev-tcltk/tdom-0.8 >=dev-tcltk/tcllib-1.11 >=dev-lang/tk-8.5.9:* >=dev-tcltk/tkimg-1.4 >=dev-tcltk/tclx-8.4
 SLOT=0
 SRC_URI=mirror://gentoo/mcu8051ide-1.4.10.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fc8928b5a0b33124375a6373eb571064
+_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a58ab4d4973c6baeee58fc31dd809007
diff --git a/metadata/md5-cache/dev-embedded/stlink-1.6.0 b/metadata/md5-cache/dev-embedded/stlink-1.6.0
index e09931231829..82fae5378a09 100644
--- a/metadata/md5-cache/dev-embedded/stlink-1.6.0
+++ b/metadata/md5-cache/dev-embedded/stlink-1.6.0
@@ -10,4 +10,4 @@ RDEPEND=virtual/libusb:1 >=dev-libs/glib-2.32.0:2 x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://github.com/texane/stlink/archive/v1.6.0.tar.gz -> stlink-1.6.0.tar.gz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2d83a8395aa2dcb2a6ebc258b9942553
+_md5_=9ecfb910bcb597e4d0cb7e4759a017c6
diff --git a/metadata/md5-cache/dev-embedded/stlink-9999 b/metadata/md5-cache/dev-embedded/stlink-9999
index 6c02476c0b88..862127908b95 100644
--- a/metadata/md5-cache/dev-embedded/stlink-9999
+++ b/metadata/md5-cache/dev-embedded/stlink-9999
@@ -8,4 +8,4 @@ PROPERTIES=live
 RDEPEND=virtual/libusb:1 >=dev-libs/glib-2.32.0:2 x11-libs/gtk+:3
 SLOT=0
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=75fe97e13f6219c742448206d9d6c87e
+_md5_=18eec9f8ed5a90d8681372962fdf52e2
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 2d259c329b10..92ffbf5135f9 100644
Binary files a/metadata/md5-cache/dev-games/Manifest.gz and b/metadata/md5-cache/dev-games/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-games/libmaitretarot-0.1.98 b/metadata/md5-cache/dev-games/libmaitretarot-0.1.98
index 832fad9211e4..6d0a2e366d88 100644
--- a/metadata/md5-cache/dev-games/libmaitretarot-0.1.98
+++ b/metadata/md5-cache/dev-games/libmaitretarot-0.1.98
@@ -1,4 +1,4 @@
-DEFINED_PHASES=-
+DEFINED_PHASES=configure install
 DEPEND=dev-libs/glib:2 dev-libs/libxml2 virtual/pkgconfig
 DESCRIPTION=backend library for the maitretarot games
 EAPI=5
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/maitretarot/libmaitretarot.pkg/0.1.98/libmaitretarot-0.1.98.tar.bz2
-_md5_=e324b114abfad10a9ac5fb255a35bb77
+_md5_=9c4bf4a9d647119fae1b2ae18060e277
diff --git a/metadata/md5-cache/dev-games/libmt_client-0.1.98 b/metadata/md5-cache/dev-games/libmt_client-0.1.98
index 6b7931db1775..0e7305dc7784 100644
--- a/metadata/md5-cache/dev-games/libmt_client-0.1.98
+++ b/metadata/md5-cache/dev-games/libmt_client-0.1.98
@@ -1,4 +1,4 @@
-DEFINED_PHASES=prepare
+DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot
 DESCRIPTION=backend library for the maitretarot clients
 EAPI=5
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/maitretarot/libmt_client.pkg/0.1.98/libmt_client-0.1.98.tar.bz2
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6375a57714a8c2bab28bd66451024516
+_md5_=f33e627242e9152305df26e272e9b3a7
diff --git a/metadata/md5-cache/dev-games/libnw-1.30.02 b/metadata/md5-cache/dev-games/libnw-1.30.02
index 65f647b8f5ec..cb9301a0bdbc 100644
--- a/metadata/md5-cache/dev-games/libnw-1.30.02
+++ b/metadata/md5-cache/dev-games/libnw-1.30.02
@@ -1,7 +1,7 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-devel/bison sys-devel/flex
+BDEPEND=sys-devel/bison sys-devel/flex
+DEFINED_PHASES=configure install prepare
 DESCRIPTION=Tools and libraries for NWN file manipulation
-EAPI=5
+EAPI=7
 HOMEPAGE=http://openknights.sourceforge.net/
 KEYWORDS=amd64 x86
 LICENSE=openknights
@@ -9,4 +9,4 @@ RDEPEND=!sci-biology/newick-utils
 SLOT=0
 SRC_URI=mirror://sourceforge/openknights/libnw-1.30.02.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2badb3f23b99442081e0c04bfb294c17
+_md5_=e50ca3acc94e7bd5e9f58a07948ac4b1
diff --git a/metadata/md5-cache/dev-games/paklib-0.3 b/metadata/md5-cache/dev-games/paklib-0.3
index b48c4b627e47..be075a8692e6 100644
--- a/metadata/md5-cache/dev-games/paklib-0.3
+++ b/metadata/md5-cache/dev-games/paklib-0.3
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install
 DESCRIPTION=library for accessing Quake pak files
-EAPI=5
+EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/paklib/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/paklib/pak-0.3.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fadc7b48585906e1d55f5cdc90f72437
+_md5_=4758aa5e2db2469026d1cc4ca15d584f
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 07856e1f9ab5..fbcd332902cd 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.57 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.57
deleted file mode 100644
index c71dc333bc6a..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.57
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.1
-SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.57/src/apache-tomcat-8.5.57-src.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d510dc7570208381c53dc37309a7423f
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.58 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.58
deleted file mode 100644
index eb9bb26f0721..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.58
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.1
-SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.58/src/apache-tomcat-8.5.58-src.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d510dc7570208381c53dc37309a7423f
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.59 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.59
index 3044b4ba8fca..5ed5a5683818 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.59
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.59
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.59/src/apache-tomcat-8.5.59-src.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e84d4d9947bcacec3f75a829714926e8
+_md5_=d510dc7570208381c53dc37309a7423f
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.37 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.37
deleted file mode 100644
index b8aef3b7193f..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.37
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.0
-SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.37/src/apache-tomcat-9.0.37-src.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7189b1c34ea1f047ad7f66282b610c9f
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 61475c044e34..1be71403e93a 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/duktape-2.6.0 b/metadata/md5-cache/dev-lang/duktape-2.6.0
new file mode 100644
index 000000000000..a7c6a25075a6
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/duktape-2.6.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Embeddable Javascript engine
+EAPI=7
+HOMEPAGE=https://duktape.org
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+SLOT=0/2.6.0
+SRC_URI=https://duktape.org/duktape-2.6.0.tar.xz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2a40032ffb6dff1bd1ebc83b14845c04
diff --git a/metadata/md5-cache/dev-lang/elixir-1.11.1 b/metadata/md5-cache/dev-lang/elixir-1.11.1
deleted file mode 100644
index 379579ba1a0f..000000000000
--- a/metadata/md5-cache/dev-lang/elixir-1.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-lang/erlang-21:0=[ssl] test? ( dev-vcs/git )
-DESCRIPTION=Elixir programming language
-EAPI=7
-HOMEPAGE=https://elixir-lang.org
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0 ErlPL-1.1
-RDEPEND=>=dev-lang/erlang-21:0=[ssl] !!sci-biology/phylip
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/elixir-lang/elixir/archive/v1.11.1.tar.gz -> elixir-1.11.1.tar.gz
-_md5_=fb7c81f64587feae492fc7a17015e3b8
diff --git a/metadata/md5-cache/dev-lang/erlang-23.1.1 b/metadata/md5-cache/dev-lang/erlang-23.1.1
index d991c87ae1f0..f040865552e7 100644
--- a/metadata/md5-cache/dev-lang/erlang-23.1.1
+++ b/metadata/md5-cache/dev-lang/erlang-23.1.1
@@ -5,10 +5,10 @@ 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
+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.1
 SRC_URI=https://github.com/erlang/otp/archive/OTP-23.1.1.tar.gz -> erlang-23.1.1.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	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=bd1b4480f8b2409abb888cee67b70f7a
+_md5_=f9ed637583f845dd9eec29a3386e83ce
diff --git a/metadata/md5-cache/dev-lang/go-1.14.10 b/metadata/md5-cache/dev-lang/go-1.14.10
deleted file mode 100644
index 709c22dc6e5f..000000000000
--- a/metadata/md5-cache/dev-lang/go-1.14.10
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=|| ( dev-lang/go dev-lang/go-bootstrap )
-DEFINED_PHASES=compile install test
-DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=7
-HOMEPAGE=https://golang.org
-KEYWORDS=-* amd64 arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=!<dev-go/go-tools-0_pre20150902
-RESTRICT=strip
-SLOT=0/1.14.10
-SRC_URI=https://storage.googleapis.com/golang/go1.14.10.src.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a2aa868919b788bb4d82133f273839d7
diff --git a/metadata/md5-cache/dev-lang/go-1.14.11 b/metadata/md5-cache/dev-lang/go-1.14.11
deleted file mode 100644
index c4360d4eddb7..000000000000
--- a/metadata/md5-cache/dev-lang/go-1.14.11
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=|| ( dev-lang/go dev-lang/go-bootstrap )
-DEFINED_PHASES=compile install test
-DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=7
-HOMEPAGE=https://golang.org
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=!<dev-go/go-tools-0_pre20150902
-RESTRICT=strip
-SLOT=0/1.14.11
-SRC_URI=https://storage.googleapis.com/golang/go1.14.11.src.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=59df96eb097dc2dc822830a3de3b2bf2
diff --git a/metadata/md5-cache/dev-lang/go-1.14.12 b/metadata/md5-cache/dev-lang/go-1.14.12
index a11cadf628e2..b426f1ba2f79 100644
--- a/metadata/md5-cache/dev-lang/go-1.14.12
+++ b/metadata/md5-cache/dev-lang/go-1.14.12
@@ -3,11 +3,11 @@ DEFINED_PHASES=compile install postinst test
 DESCRIPTION=A concurrent garbage collected and typesafe programming language
 EAPI=7
 HOMEPAGE=https://golang.org
-KEYWORDS=-* amd64 arm arm64 ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=!<dev-go/go-tools-0_pre20150902
 RESTRICT=strip
 SLOT=0/1.14.12
 SRC_URI=https://storage.googleapis.com/golang/go1.14.12.src.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5ce6abaecfb2e20915218e84af2f7fbe
+_md5_=3a1d8d47cdea53faae9e395e351e2b49
diff --git a/metadata/md5-cache/dev-lang/go-1.15.3 b/metadata/md5-cache/dev-lang/go-1.15.3
deleted file mode 100644
index 264e5c9bc093..000000000000
--- a/metadata/md5-cache/dev-lang/go-1.15.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=|| ( dev-lang/go dev-lang/go-bootstrap )
-DEFINED_PHASES=compile install test
-DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=7
-HOMEPAGE=https://golang.org
-KEYWORDS=-* amd64 arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=!<dev-go/go-tools-0_pre20150902
-RESTRICT=strip
-SLOT=0/1.15.3
-SRC_URI=https://storage.googleapis.com/golang/go1.15.3.src.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a2aa868919b788bb4d82133f273839d7
diff --git a/metadata/md5-cache/dev-lang/go-1.15.4 b/metadata/md5-cache/dev-lang/go-1.15.4
deleted file mode 100644
index 224ad5e1e85f..000000000000
--- a/metadata/md5-cache/dev-lang/go-1.15.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=|| ( dev-lang/go dev-lang/go-bootstrap )
-DEFINED_PHASES=compile install test
-DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=7
-HOMEPAGE=https://golang.org
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=!<dev-go/go-tools-0_pre20150902
-RESTRICT=strip
-SLOT=0/1.15.4
-SRC_URI=https://storage.googleapis.com/golang/go1.15.4.src.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=59df96eb097dc2dc822830a3de3b2bf2
diff --git a/metadata/md5-cache/dev-lang/go-1.15.5 b/metadata/md5-cache/dev-lang/go-1.15.5
index 523a9c3964b5..cf582041d834 100644
--- a/metadata/md5-cache/dev-lang/go-1.15.5
+++ b/metadata/md5-cache/dev-lang/go-1.15.5
@@ -3,11 +3,11 @@ DEFINED_PHASES=compile install postinst test
 DESCRIPTION=A concurrent garbage collected and typesafe programming language
 EAPI=7
 HOMEPAGE=https://golang.org
-KEYWORDS=-* amd64 arm arm64 ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=!<dev-go/go-tools-0_pre20150902
 RESTRICT=strip
 SLOT=0/1.15.5
 SRC_URI=https://storage.googleapis.com/golang/go1.15.5.src.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5ce6abaecfb2e20915218e84af2f7fbe
+_md5_=3a1d8d47cdea53faae9e395e351e2b49
diff --git a/metadata/md5-cache/dev-lang/lua-5.1.5-r105 b/metadata/md5-cache/dev-lang/lua-5.1.5-r105
new file mode 100644
index 000000000000..913607367835
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/lua-5.1.5-r105
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=readline? ( >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-eselect/eselect-lua !dev-lang/lua:0 sys-devel/libtool
+DESCRIPTION=A powerful light-weight programming language designed for extending applications
+EAPI=5
+HOMEPAGE=http://www.lua.org/
+IUSE=+deprecated emacs readline static 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-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+PDEPEND=emacs? ( app-emacs/lua-mode )
+RDEPEND=readline? ( >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-eselect/eselect-lua !dev-lang/lua:0
+SLOT=5.1
+SRC_URI=http://www.lua.org/ftp/lua-5.1.5.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=8a13b30eb5cd792bc4ad227b7177663f
diff --git a/metadata/md5-cache/dev-lang/lua-5.3.6 b/metadata/md5-cache/dev-lang/lua-5.3.6
new file mode 100644
index 000000000000..5274238f27d0
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/lua-5.3.6
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0 sys-devel/libtool >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A powerful light-weight programming language designed for extending applications
+EAPI=5
+HOMEPAGE=http://www.lua.org/
+IUSE=+deprecated emacs readline static test test-complete 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-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+PDEPEND=emacs? ( app-emacs/lua-mode )
+RDEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0
+RESTRICT=!test? ( test )
+SLOT=5.3
+SRC_URI=http://www.lua.org/ftp/lua-5.3.6.tar.gz test? ( https://www.lua.org/tests/lua-5.3.4-tests.tar.gz )
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=78b82e72deda513db158e5b05b9ba68e
diff --git a/metadata/md5-cache/dev-lang/open-cobol-1.1 b/metadata/md5-cache/dev-lang/open-cobol-1.1
index f7af3a3522fd..0531cfb2d068 100644
--- a/metadata/md5-cache/dev-lang/open-cobol-1.1
+++ b/metadata/md5-cache/dev-lang/open-cobol-1.1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure
+DEFINED_PHASES=configure install
 DEPEND=dev-libs/gmp:0= berkdb? ( sys-libs/db:4.8= ) sys-libs/ncurses readline? ( sys-libs/readline ) sys-devel/libtool
 DESCRIPTION=an open-source COBOL compiler
 EAPI=7
@@ -9,4 +9,4 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-libs/gmp:0= berkdb? ( sys-libs/db:4.8= ) sys-libs/ncurses readline? ( sys-libs/readline )
 SLOT=0
 SRC_URI=mirror://sourceforge/open-cobol/open-cobol-1.1.tar.gz
-_md5_=df6f740145c6708c5e90abf1d0b4322d
+_md5_=1323393bba58535ed06abf0e70b65c97
diff --git a/metadata/md5-cache/dev-lang/python-3.8.6 b/metadata/md5-cache/dev-lang/python-3.8.6
index f5c164e06760..996ba24632cd 100644
--- a/metadata/md5-cache/dev-lang/python-3.8.6
+++ b/metadata/md5-cache/dev-lang/python-3.8.6
@@ -5,7 +5,7 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=7
 HOMEPAGE=https://www.python.org/
 IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=PSF-2
 PDEPEND=>=app-eselect/eselect-python-20140125-r1
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3.8
 SRC_URI=https://www.python.org/ftp/python/3.8.6/Python-3.8.6.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.6.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=94ea499c26da2fbc9924243b240d82cd
+_md5_=c5831fff6c91b4b089c3fc5d2418116e
diff --git a/metadata/md5-cache/dev-lang/rust-1.45.2 b/metadata/md5-cache/dev-lang/rust-1.45.2
index 007246f347b2..08496e0a1b50 100644
--- a/metadata/md5-cache/dev-lang/rust-1.45.2
+++ b/metadata/md5-cache/dev-lang/rust-1.45.2
@@ -11,6 +11,6 @@ RDEPEND=>=dev-libs/libgit2-0.99:= net-libs/libssh2:= net-libs/http-parser:= net-
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) miri? ( nightly ) parallel-compiler? ( nightly ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
 RESTRICT=test
 SLOT=stable/1.45
-SRC_URI=https://static.rust-lang.org/dist/rustc-1.45.2-src.tar.xz -> rustc-1.45.2-src.tar.xz !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.44.1-x86_64-unknown-linux-gnu.tar.xz ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.44.1-x86_64-unknown-linux-musl.tar.xz ) ) arm? ( https://static.rust-lang.org/dist/rust-1.44.1-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.44.1-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.44.1-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.44.1-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.44.1-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.44.1-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.44.1-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.44.1-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.44.1-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.44.1-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.44.1-s390x-unknown-linux-gnu.tar.xz ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.44.1-i686-unknown-linux-gnu.tar.xz ) )
+SRC_URI=https://static.rust-lang.org/dist/rustc-1.45.2-src.tar.xz !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.44.1-x86_64-unknown-linux-gnu.tar.xz ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.44.1-x86_64-unknown-linux-musl.tar.xz ) ) arm? ( https://static.rust-lang.org/dist/rust-1.44.1-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.44.1-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.44.1-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.44.1-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.44.1-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.44.1-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.44.1-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.44.1-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.44.1-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.44.1-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.44.1-s390x-unknown-linux-gnu.tar.xz ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.44.1-i686-unknown-linux-gnu.tar.xz ) )
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	rust-toolchain	70000bd1329808f6a050a7ae3cb277fd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=63d9a72bd41592ce478ecf3c586c1837
+_md5_=a9b5f9d348443a0dffe75575e574284e
diff --git a/metadata/md5-cache/dev-lang/rust-1.46.0 b/metadata/md5-cache/dev-lang/rust-1.46.0
index 4483461b603a..b7a0f1ab7baf 100644
--- a/metadata/md5-cache/dev-lang/rust-1.46.0
+++ b/metadata/md5-cache/dev-lang/rust-1.46.0
@@ -11,6 +11,6 @@ RDEPEND=>=dev-libs/libgit2-0.99:= net-libs/libssh2:= net-libs/http-parser:= net-
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) miri? ( nightly ) parallel-compiler? ( nightly ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
 RESTRICT=test
 SLOT=stable/1.46
-SRC_URI=https://static.rust-lang.org/dist/rustc-1.46.0-src.tar.xz -> rustc-1.46.0-src.tar.xz !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.45.1-x86_64-unknown-linux-gnu.tar.xz ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.45.1-x86_64-unknown-linux-musl.tar.xz ) ) arm? ( https://static.rust-lang.org/dist/rust-1.45.1-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.45.1-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.45.1-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.45.1-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.45.1-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.45.1-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.45.1-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.45.1-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.45.1-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.45.1-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.45.1-s390x-unknown-linux-gnu.tar.xz ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.45.1-i686-unknown-linux-gnu.tar.xz ) )
+SRC_URI=https://static.rust-lang.org/dist/rustc-1.46.0-src.tar.xz !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.45.1-x86_64-unknown-linux-gnu.tar.xz ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.45.1-x86_64-unknown-linux-musl.tar.xz ) ) arm? ( https://static.rust-lang.org/dist/rust-1.45.1-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.45.1-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.45.1-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.45.1-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.45.1-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.45.1-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.45.1-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.45.1-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.45.1-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.45.1-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.45.1-s390x-unknown-linux-gnu.tar.xz ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.45.1-i686-unknown-linux-gnu.tar.xz ) )
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	rust-toolchain	70000bd1329808f6a050a7ae3cb277fd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=77092b5893a6aa55683162a10fc4bd66
+_md5_=42636cad085ff34a2999debf17f2b42f
diff --git a/metadata/md5-cache/dev-lang/rust-1.47.0-r1 b/metadata/md5-cache/dev-lang/rust-1.47.0-r1
index 2838617396ce..ed726d33ed32 100644
--- a/metadata/md5-cache/dev-lang/rust-1.47.0-r1
+++ b/metadata/md5-cache/dev-lang/rust-1.47.0-r1
@@ -11,6 +11,6 @@ RDEPEND=>=dev-libs/libgit2-0.99:= net-libs/libssh2:= net-libs/http-parser:= net-
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) miri? ( nightly ) parallel-compiler? ( nightly ) test? ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
 RESTRICT=test
 SLOT=stable/1.47
-SRC_URI=https://static.rust-lang.org/dist/rustc-1.47.0-src.tar.xz -> rustc-1.47.0-src.tar.xz !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.46.0-x86_64-unknown-linux-gnu.tar.xz ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.46.0-x86_64-unknown-linux-musl.tar.xz ) ) arm? ( https://static.rust-lang.org/dist/rust-1.46.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.46.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.46.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.46.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.46.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.46.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.46.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.46.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.46.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.46.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.46.0-s390x-unknown-linux-gnu.tar.xz ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.46.0-i686-unknown-linux-gnu.tar.xz ) )
+SRC_URI=https://static.rust-lang.org/dist/rustc-1.47.0-src.tar.xz !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.46.0-x86_64-unknown-linux-gnu.tar.xz ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.46.0-x86_64-unknown-linux-musl.tar.xz ) ) arm? ( https://static.rust-lang.org/dist/rust-1.46.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.46.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.46.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.46.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.46.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.46.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.46.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.46.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.46.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.46.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.46.0-s390x-unknown-linux-gnu.tar.xz ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.46.0-i686-unknown-linux-gnu.tar.xz ) )
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	rust-toolchain	70000bd1329808f6a050a7ae3cb277fd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2e68b29e39f16c57da53356d4bcb5ab6
+_md5_=2549d0bf37287a9f2b32a1845b21ef7a
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-78.4.1 b/metadata/md5-cache/dev-lang/spidermonkey-78.4.1
index 5cd4e20d9e22..8fb36580232e 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-78.4.1
+++ b/metadata/md5-cache/dev-lang/spidermonkey-78.4.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=78
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/78.4.1esr/source/firefox-78.4.1esr.source.tar.xz -> firefox-78.4.1esr.source.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-04.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-04.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-04.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/spidermonkey-78-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/spidermonkey-78-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/spidermonkey-78-patches-02.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f3db18dd790577bd492a3b6ac6c932bf
+_md5_=02ef9845eb4ffae6f5a4d7e0b8bd6777
diff --git a/metadata/md5-cache/dev-lang/vala-0.46.13 b/metadata/md5-cache/dev-lang/vala-0.46.13
index 92c4a687f334..a97440ceb2cb 100644
--- a/metadata/md5-cache/dev-lang/vala-0.46.13
+++ b/metadata/md5-cache/dev-lang/vala-0.46.13
@@ -4,11 +4,11 @@ DESCRIPTION=Compiler for the GObject type system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 IUSE=test valadoc
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.46.13 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala]
 RESTRICT=!test? ( test )
 SLOT=0.46
 SRC_URI=mirror://gnome/sources/vala/0.46/vala-0.46.13.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5ff7f9d751c72f90c1e4bf2c85d10d97
+_md5_=26fff79121905a3f53d09259594d9080
diff --git a/metadata/md5-cache/dev-lang/vala-0.48.9 b/metadata/md5-cache/dev-lang/vala-0.48.9
index 949f2ee23ceb..20c91bf1fa5a 100644
--- a/metadata/md5-cache/dev-lang/vala-0.48.9
+++ b/metadata/md5-cache/dev-lang/vala-0.48.9
@@ -4,11 +4,11 @@ DESCRIPTION=Compiler for the GObject type system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 IUSE=test valadoc
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.48.9 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala]
 RESTRICT=!test? ( test )
 SLOT=0.48
 SRC_URI=mirror://gnome/sources/vala/0.48/vala-0.48.9.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=873962b3d6431336bc961c12405d90ad
+_md5_=6dec72e7571ee650d3f122e7bfabde9c
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 39b2f86f07d3..36c06dd106fd 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/atk-2.36.0 b/metadata/md5-cache/dev-libs/atk-2.36.0
index 6e09302ac623..3299d56b43ab 100644
--- a/metadata/md5-cache/dev-libs/atk-2.36.0
+++ b/metadata/md5-cache/dev-libs/atk-2.36.0
@@ -5,10 +5,10 @@ DESCRIPTION=GTK+ & GNOME Accessibility Toolkit
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Accessibility
 IUSE=gtk-doc +introspection abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.38.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/atk/2.36/atk-2.36.0.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6c3a6b574c1bd4b590fd35143e36dc1d
+_md5_=e8301f6ba48d4da490dc4b0c9daaac41
diff --git a/metadata/md5-cache/dev-libs/bareos-fastlzlib-0_pre20150524 b/metadata/md5-cache/dev-libs/bareos-fastlzlib-0_pre20150524
index 66ec2b0b6bd7..9ac3f4557fde 100644
--- a/metadata/md5-cache/dev-libs/bareos-fastlzlib-0_pre20150524
+++ b/metadata/md5-cache/dev-libs/bareos-fastlzlib-0_pre20150524
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install
+DEFINED_PHASES=configure install
 DESCRIPTION=Fork of zlib-like interface to fast block compression (LZ4 or FastLZ) libraries
 EAPI=5
 HOMEPAGE=https://github.com/bareos/fastlzlib
@@ -8,4 +8,4 @@ RDEPEND=!app-arch/lz4
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mschiff/distfiles/bareos-fastlzlib-0_pre20150524.zip
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ab5801198fe880d4f8ad7e51fd25ba67
+_md5_=d6f68fa26f3ec1f194815f6c9cd847ec
diff --git a/metadata/md5-cache/dev-libs/botan-2.16.0 b/metadata/md5-cache/dev-libs/botan-2.16.0
index d06c66d57361..974a67f24072 100644
--- a/metadata/md5-cache/dev-libs/botan-2.16.0
+++ b/metadata/md5-cache/dev-libs/botan-2.16.0
@@ -5,11 +5,11 @@ DESCRIPTION=C++ crypto library
 EAPI=7
 HOMEPAGE=https://botan.randombit.net/
 IUSE=bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~ppc-macos
+KEYWORDS=amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~ppc-macos
 LICENSE=BSD-2
 RDEPEND=boost? ( >=dev-libs/boost-1.48:= ) bzip2? ( >=app-arch/bzip2-1.0.5:= ) lzma? ( app-arch/xz-utils:= ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) ssl? ( !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) ) sqlite? ( dev-db/sqlite:3= ) zlib? ( >=sys-libs/zlib-1.2.3:= )
 REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=2/2.16
 SRC_URI=https://botan.randombit.net/releases/Botan-2.16.0.tar.xz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1ac81eb5127ad40c60a4deb32224a8dc
+_md5_=ba4d181d4b8ab38379980aa148e1afcd
diff --git a/metadata/md5-cache/dev-libs/botan-2.17.1 b/metadata/md5-cache/dev-libs/botan-2.17.2
similarity index 97%
rename from metadata/md5-cache/dev-libs/botan-2.17.1
rename to metadata/md5-cache/dev-libs/botan-2.17.2
index 69d459fb9a37..8baff1f95d97 100644
--- a/metadata/md5-cache/dev-libs/botan-2.17.1
+++ b/metadata/md5-cache/dev-libs/botan-2.17.2
@@ -10,6 +10,6 @@ LICENSE=BSD-2
 RDEPEND=boost? ( >=dev-libs/boost-1.48:= ) bzip2? ( >=app-arch/bzip2-1.0.5:= ) lzma? ( app-arch/xz-utils:= ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) ssl? ( !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) ) sqlite? ( dev-db/sqlite:3= ) zlib? ( >=sys-libs/zlib-1.2.3:= )
 REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=2/2.17
-SRC_URI=https://botan.randombit.net/releases/Botan-2.17.1.tar.xz
+SRC_URI=https://botan.randombit.net/releases/Botan-2.17.2.tar.xz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2e3dab1aa986a0b7cd353154d3e7885b
diff --git a/metadata/md5-cache/dev-libs/busybee-0.7.0 b/metadata/md5-cache/dev-libs/busybee-0.7.0
index b68d861b41c1..8adcea746fdf 100644
--- a/metadata/md5-cache/dev-libs/busybee-0.7.0
+++ b/metadata/md5-cache/dev-libs/busybee-0.7.0
@@ -1,4 +1,4 @@
-DEFINED_PHASES=-
+DEFINED_PHASES=configure install
 DEPEND=>=dev-libs/libpo6-0.8 >=dev-libs/libe-0.11
 DESCRIPTION=A messaging abstraction on top of TCP sockets used in HyperDex
 EAPI=7
@@ -8,4 +8,4 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libpo6-0.8 >=dev-libs/libe-0.11
 SLOT=0
 SRC_URI=http://hyperdex.org/src/busybee-0.7.0.tar.gz
-_md5_=c0793725a387f4c80cbdb6e238084034
+_md5_=59880fe2413738e3322151f8aa7d2d82
diff --git a/metadata/md5-cache/dev-libs/dotconf-1.3-r1 b/metadata/md5-cache/dev-libs/dotconf-1.3-r1
index 910088c665c4..5ba2f189b7cc 100644
--- a/metadata/md5-cache/dev-libs/dotconf-1.3-r1
+++ b/metadata/md5-cache/dev-libs/dotconf-1.3-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile postinst
+DEFINED_PHASES=compile configure postinst
 DEPEND=>=sys-devel/autoconf-2.58
 DESCRIPTION=dot.conf configuration file parser
 EAPI=6
@@ -8,4 +8,4 @@ LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://gentoo/dotconf-1.3.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e16ad66cd788819559521cae94872e8c
+_md5_=3ef409e47c0fabbdde5d817481e4afb1
diff --git a/metadata/md5-cache/dev-libs/dqlite-1.6.0 b/metadata/md5-cache/dev-libs/dqlite-1.6.0
index e5d82e96e195..2612131051fa 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
+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	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6a1ae292a568a7d6dd78e0f60b51ea5b
+_md5_=2abd86d9abc0224f5aee247e84bd852d
diff --git a/metadata/md5-cache/dev-libs/eb-4.4.1-r1 b/metadata/md5-cache/dev-libs/eb-4.4.1-r1
index a8092b8c4a7c..8176403f7ab6 100644
--- a/metadata/md5-cache/dev-libs/eb-4.4.1-r1
+++ b/metadata/md5-cache/dev-libs/eb-4.4.1-r1
@@ -1,7 +1,8 @@
-DEFINED_PHASES=configure
-DEPEND=sys-libs/zlib nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
+BDEPEND=nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure install
+DEPEND=sys-libs/zlib nls? ( virtual/libintl )
 DESCRIPTION=EB is a C library and utilities for accessing CD-ROM books
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.sra.co.jp/people/m-kasahr/eb/
 IUSE=ipv6 nls threads
 KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86
@@ -9,4 +10,4 @@ LICENSE=BSD
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.sra.co.jp/pub/misc/eb/eb-4.4.1.tar.lzma
-_md5_=03bf496eefbd9cf83588acf18f93a14c
+_md5_=a606dabfe61243101b8fb116128a2d46
diff --git a/metadata/md5-cache/dev-libs/faxpp-0.4-r1 b/metadata/md5-cache/dev-libs/faxpp-0.4-r1
index b3339ff4f651..1f3b1e47db92 100644
--- a/metadata/md5-cache/dev-libs/faxpp-0.4-r1
+++ b/metadata/md5-cache/dev-libs/faxpp-0.4-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install
+DEFINED_PHASES=configure install
 DESCRIPTION=Small, fast and conformant XML pull parser written in C
 EAPI=7
 HOMEPAGE=http://faxpp.sourceforge.net/
@@ -7,4 +7,4 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/faxpp/faxpp-0.4.tar.gz
-_md5_=41d0d0a344257e25cd5333e2c0630f60
+_md5_=11772b0027ac387ab329da080a3b7dce
diff --git a/metadata/md5-cache/dev-libs/glib-2.64.5 b/metadata/md5-cache/dev-libs/glib-2.64.5
index 7b5d9f6b5a48..137b893e8231 100644
--- a/metadata/md5-cache/dev-libs/glib-2.64.5
+++ b/metadata/md5-cache/dev-libs/glib-2.64.5
@@ -5,7 +5,7 @@ DESCRIPTION=The GLib library of C routines
 EAPI=7
 HOMEPAGE=https://www.gtk.org/
 IUSE=dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 PDEPEND=dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
 RDEPEND=!<dev-util/gdbus-codegen-2.64.5 >=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(-)?] )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.64/glib-2.64.5.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	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_=dc58f436082c250ed9c17f18d645f6e8
+_md5_=7270416e45c1a7a1e25d078d2edaccc2
diff --git a/metadata/md5-cache/dev-libs/gmp-6.2.1 b/metadata/md5-cache/dev-libs/gmp-6.2.1
new file mode 100644
index 000000000000..d6c463b4370d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/gmp-6.2.1
@@ -0,0 +1,12 @@
+BDEPEND=sys-devel/m4 app-arch/xz-utils >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Library for arbitrary-precision arithmetic on different type of numbers
+EAPI=7
+HOMEPAGE=https://gmplib.org/
+IUSE=+asm doc +cxx pic 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( LGPL-3+ GPL-2+ )
+SLOT=0/10.4
+SRC_URI=ftp://ftp.gmplib.org/pub/gmp-6.2.1/gmp-6.2.1.tar.xz mirror://gnu/gmp/gmp-6.2.1.tar.xz doc? ( https://gmplib.org/gmp-man-6.2.0.pdf )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=cf05928d3c93fd252f42f4bf477be19a
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.64.1-r1 b/metadata/md5-cache/dev-libs/gobject-introspection-1.64.1-r1
index e56e327718f7..c6a4e20ef32a 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.64.1-r1
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.64.1-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Introspection system for GObject-based libraries
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
 IUSE=doctool gtk-doc test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+ GPL-2+
 RDEPEND=>=dev-libs/gobject-introspection-common-1.64.1 >=dev-libs/glib-2.58.0:2 dev-libs/libffi:= doctool? ( python_single_target_python3_6? ( dev-python/mako[python_targets_python3_6(-)] dev-python/markdown[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mako[python_targets_python3_7(-)] dev-python/markdown[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) ) virtual/pkgconfig python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.64/gobject-introspection-1.64.1.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=213bfa233239d529ca718c2f761a4aeb
+_md5_=1798cd194f2906becb336e2d14fbc9bc
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.64.1 b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.64.1
index 5b4c20d2c578..00130de2c70a 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.64.1
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.64.1
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install
 DESCRIPTION=Build infrastructure for GObject Introspection
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=HPND
 RDEPEND=!<dev-libs/gobject-introspection-1.64.1
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.64/gobject-introspection-1.64.1.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a
-_md5_=ca28c9e93c5692a52f1e4a8f15fa0186
+_md5_=fba5f441e3127aeef60fcf4ab8362782
diff --git a/metadata/md5-cache/dev-libs/gumbo-0.10.1 b/metadata/md5-cache/dev-libs/gumbo-0.10.1
index e54d7a4a287f..a87e4750f2f2 100644
--- a/metadata/md5-cache/dev-libs/gumbo-0.10.1
+++ b/metadata/md5-cache/dev-libs/gumbo-0.10.1
@@ -1,7 +1,8 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=test? ( dev-cpp/gtest ) doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=test? ( dev-cpp/gtest )
 DESCRIPTION=The HTML5 parsing algorithm implemented as a pure C99 library
-EAPI=5
+EAPI=7
 HOMEPAGE=https://github.com/google/gumbo-parser#readme
 IUSE=doc test
 KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
@@ -10,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/gumbo-parser/archive/v0.10.1.tar.gz -> gumbo-0.10.1.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9e8544b7bccf68f40edfe515535032e6
+_md5_=ce027ce5e29c0b9792a9a61a603aebea
diff --git a/metadata/md5-cache/dev-libs/hiredis-1.0.0 b/metadata/md5-cache/dev-libs/hiredis-1.0.0
index 296c99f98f6a..639a85669b65 100644
--- a/metadata/md5-cache/dev-libs/hiredis-1.0.0
+++ b/metadata/md5-cache/dev-libs/hiredis-1.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Minimalistic C client library for the Redis database
 EAPI=7
 HOMEPAGE=https://github.com/redis/hiredis
 IUSE=examples ssl static-libs test
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~x64-solaris
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/1.0.0
 SRC_URI=https://github.com/redis/hiredis/archive/v1.0.0.tar.gz -> hiredis-1.0.0.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=aef074eeaef03702dae06b48b51ac5be
+_md5_=3d8a81ae1a15c82b7ef1f2ed68d06bc4
diff --git a/metadata/md5-cache/dev-libs/http-fetcher-1.1.0-r1 b/metadata/md5-cache/dev-libs/http-fetcher-1.1.0-r1
index 4a83f4bf4d97..1330129724e7 100644
--- a/metadata/md5-cache/dev-libs/http-fetcher-1.1.0-r1
+++ b/metadata/md5-cache/dev-libs/http-fetcher-1.1.0-r1
@@ -9,4 +9,4 @@ LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/http-fetcher/http_fetcher-1.1.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5e3dfd763fec81e41847692f450fa1bd
+_md5_=3d25196bfbf8cacd7c173764c22d5210
diff --git a/metadata/md5-cache/dev-libs/hyperleveldb-1.2.2-r1 b/metadata/md5-cache/dev-libs/hyperleveldb-1.2.2-r1
index d585d84c9c35..4d4704af6c68 100644
--- a/metadata/md5-cache/dev-libs/hyperleveldb-1.2.2-r1
+++ b/metadata/md5-cache/dev-libs/hyperleveldb-1.2.2-r1
@@ -1,12 +1,13 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-libs/leveldb:=[snappy] >=app-portage/elt-patches-20170815 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=>=app-portage/elt-patches-20170815 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/leveldb:=[snappy]
 DESCRIPTION=Hyperdex fork/extension of leveldb
-EAPI=5
+EAPI=7
 HOMEPAGE=http://hyperdex.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/leveldb:=[snappy]
 SLOT=0
 SRC_URI=http://hyperdex.org/src/hyperleveldb-1.2.2.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e6156106403df436369d27416f3cb2aa
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=54a8c2cf8a7b8198a47be50e82c733de
diff --git a/metadata/md5-cache/dev-libs/igraph-0.8.3 b/metadata/md5-cache/dev-libs/igraph-0.8.3
new file mode 100644
index 000000000000..b51b07154be0
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/igraph-0.8.3
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/gmp:0= dev-libs/libxml2 sci-libs/arpack sci-libs/cxsparse sci-mathematics/glpk:= virtual/blas virtual/lapack
+DESCRIPTION=Creating and manipulating undirected and directed graphs
+EAPI=7
+HOMEPAGE=http://www.igraph.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/gmp:0= dev-libs/libxml2 sci-libs/arpack sci-libs/cxsparse sci-mathematics/glpk:= virtual/blas virtual/lapack
+SLOT=0/0
+SRC_URI=https://github.com/igraph/igraph/releases/download/0.8.3/igraph-0.8.3.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d9b7f507e45f35b0eb3aa8ab417d954f
diff --git a/metadata/md5-cache/dev-libs/isl-0.23 b/metadata/md5-cache/dev-libs/isl-0.23-r1
similarity index 63%
rename from metadata/md5-cache/dev-libs/isl-0.23
rename to metadata/md5-cache/dev-libs/isl-0.23-r1
index 745590d4edf2..17cda02468f1 100644
--- a/metadata/md5-cache/dev-libs/isl-0.23
+++ b/metadata/md5-cache/dev-libs/isl-0.23-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-5.1.3-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(-)?]
 SLOT=0/23
 SRC_URI=http://isl.gforge.inria.fr/isl-0.23.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1b54a20953b246130b3aeff63ba703cb
+_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d38c18e7b6ceccfc494ef370914791e1
diff --git a/metadata/md5-cache/dev-libs/jsoncpp-1.9.4 b/metadata/md5-cache/dev-libs/jsoncpp-1.9.4
index 317c73dccc11..c6b709a4ab5d 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
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 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	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ce4bb8059d1f8bb31e636475f8337590
+_md5_=6dc5e6829a3029f5edd787f0a7c3c54b
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.12.2 b/metadata/md5-cache/dev-libs/leatherman-1.12.2
index 50db9f813054..03a842555ede 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.12.2
+++ b/metadata/md5-cache/dev-libs/leatherman-1.12.2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/1.12.2
 SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.12.2.tar.gz -> leatherman-1.12.2.tar.gz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ea098845ee8e70935ecd8dad6c1cca82
+_md5_=08a4f38990ebf288dd7e3a8f297b2b35
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.12.3 b/metadata/md5-cache/dev-libs/leatherman-1.12.3
new file mode 100644
index 000000000000..346d55c2df3a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/leatherman-1.12.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/boost-1.73:=[nls] net-misc/curl >=sys-devel/gcc-4.8:*
+DESCRIPTION=A C++ toolkit
+EAPI=7
+HOMEPAGE=https://github.com/puppetlabs/leatherman
+IUSE=debug static-libs test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=net-misc/curl
+RESTRICT=test
+SLOT=0/1.12.3
+SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.12.3.tar.gz -> leatherman-1.12.3.tar.gz
+_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ea098845ee8e70935ecd8dad6c1cca82
diff --git a/metadata/md5-cache/dev-libs/libdbh-5.0.19 b/metadata/md5-cache/dev-libs/libdbh-5.0.19
index 1a6dda82a76a..094fc54e1ef8 100644
--- a/metadata/md5-cache/dev-libs/libdbh-5.0.19
+++ b/metadata/md5-cache/dev-libs/libdbh-5.0.19
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install prepare setup
+DEFINED_PHASES=configure install prepare setup
 DEPEND=dev-util/gtk-doc-am 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
 DESCRIPTION=a small library to create and manage 64-bit disk based hash tables
 EAPI=5
@@ -8,4 +8,4 @@ LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/dbh/dbh/5.0.19/libdbh2-5.0.19.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8f4fd5cec3476b5e5e187b4317306d37
+_md5_=70c6d1e642a5d169c26f6bebf2db551e
diff --git a/metadata/md5-cache/dev-libs/libdbh-5.0.22 b/metadata/md5-cache/dev-libs/libdbh-5.0.22
index ccbd6eff842d..75ec9c2bf08d 100644
--- a/metadata/md5-cache/dev-libs/libdbh-5.0.22
+++ b/metadata/md5-cache/dev-libs/libdbh-5.0.22
@@ -1,11 +1,11 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-util/gtk-doc-am 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
+BDEPEND=dev-util/gtk-doc-am 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
 DESCRIPTION=A small library to create and manage 64-bit disk based hash tables
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libdbh/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 SLOT=0
 SRC_URI=mirror://sourceforge/dbh/dbh/5.0.22/libdbh2-5.0.22.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d417f683b3128fac2bebe4d55213f230
+_md5_=34ad713f04eb6daf4fff04b2b0432f2e
diff --git a/metadata/md5-cache/dev-libs/liblinear-241 b/metadata/md5-cache/dev-libs/liblinear-241
index da80966cb646..3cb214d8a0c7 100644
--- a/metadata/md5-cache/dev-libs/liblinear-241
+++ b/metadata/md5-cache/dev-libs/liblinear-241
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=A Library for Large Linear Classification
 EAPI=7
 HOMEPAGE=https://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos
 LICENSE=BSD
 SLOT=0/4
 SRC_URI=https://github.com/cjlin1/liblinear/archive/v241.tar.gz -> liblinear-241.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=298dd2e1c4a61ce16fb223da866f44e2
+_md5_=20d6276b24de5e85f7169bb925b66ec4
diff --git a/metadata/md5-cache/dev-libs/liblogging-1.0.6 b/metadata/md5-cache/dev-libs/liblogging-1.0.6
index 65455575a69c..95115be51966 100644
--- a/metadata/md5-cache/dev-libs/liblogging-1.0.6
+++ b/metadata/md5-cache/dev-libs/liblogging-1.0.6
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
-DEPEND=systemd? ( sys-apps/systemd ) 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
+DEPEND=systemd? ( sys-apps/systemd )
 DESCRIPTION=Liblogging is an easy to use, portable, open source library for system logging
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.liblogging.org
-IUSE=rfc3195 static-libs +stdlog systemd
+IUSE=rfc3195 +stdlog systemd
 KEYWORDS=amd64 arm ~arm64 hppa x86
 LICENSE=BSD-2
 RDEPEND=systemd? ( sys-apps/systemd )
 SLOT=0/0
 SRC_URI=http://download.rsyslog.com/liblogging/liblogging-1.0.6.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7a72c929ffd535f9db24a19a4af7d6c5
+_md5_=483ba8ae0b63fd72f4e26e63877733fa
diff --git a/metadata/md5-cache/dev-libs/liblouis-3.10.0 b/metadata/md5-cache/dev-libs/liblouis-3.10.0
index 2adc80e45673..5cde6866f552 100644
--- a/metadata/md5-cache/dev-libs/liblouis-3.10.0
+++ b/metadata/md5-cache/dev-libs/liblouis-3.10.0
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/liblouis/liblouis/archive/v3.10.0.tar.gz -> liblouis-3.10.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=59beada53755ff7e1725b463bc3dc9eb
+_md5_=42194760bb9d3a366afacf45e4375ddd
diff --git a/metadata/md5-cache/dev-libs/liblouis-3.13.0 b/metadata/md5-cache/dev-libs/liblouis-3.13.0
index 022ad9716286..0d8569bdbcb4 100644
--- a/metadata/md5-cache/dev-libs/liblouis-3.13.0
+++ b/metadata/md5-cache/dev-libs/liblouis-3.13.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/20
 SRC_URI=https://github.com/liblouis/liblouis/releases/download/v3.13.0/liblouis-3.13.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8481cfb02e622871a390f870e5b640e8
+_md5_=096c234c456c1e22ab0b5fbb06e088d4
diff --git a/metadata/md5-cache/dev-libs/libpo6-0.8.0 b/metadata/md5-cache/dev-libs/libpo6-0.8.0
index 81630ca43641..26b79c2b415b 100644
--- a/metadata/md5-cache/dev-libs/libpo6-0.8.0
+++ b/metadata/md5-cache/dev-libs/libpo6-0.8.0
@@ -1,4 +1,4 @@
-DEFINED_PHASES=-
+DEFINED_PHASES=configure install
 DESCRIPTION=Hyperdex libpo6 support library
 EAPI=7
 HOMEPAGE=http://hyperdex.org
@@ -6,4 +6,4 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://hyperdex.org/src/libpo6-0.8.0.tar.gz
-_md5_=a6cea32b405c613ea4ce454bfc2ca96b
+_md5_=9a5586061ea49c5162ba6049584fcf99
diff --git a/metadata/md5-cache/dev-libs/libpreludedb-5.1.0 b/metadata/md5-cache/dev-libs/libpreludedb-5.1.0
index d53484b5ffcf..c754822e37b8 100644
--- a/metadata/md5-cache/dev-libs/libpreludedb-5.1.0
+++ b/metadata/md5-cache/dev-libs/libpreludedb-5.1.0
@@ -10,6 +10,6 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/libprelude-5.1.0 <dev-libs/libprelude-6 net-libs/gnutls:= mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) sqlite? ( dev-db/sqlite:3 )
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0
-SRC_URI=https://www.prelude-siem.org/pkg/src/5.1.0/libpreludedb-5.1.0.tar.gz
+SRC_URI=https://www.prelude-siem.org/pkg/src/5.1.0/libpreludedb-5.1.0.tar.gz https://dev.gentoo.org/~juippis/distfiles/tmp/libpreludedb-5.1.0-update_m4_postgresql.patch
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2b1ec5a8abb4e51f5c196f743136d312
+_md5_=f696c3f0ba03088e81ba7cb534a4d1a7
diff --git a/metadata/md5-cache/dev-libs/libpreludedb-5.2.0 b/metadata/md5-cache/dev-libs/libpreludedb-5.2.0
index 7f60a9d454d6..b848c1efd274 100644
--- a/metadata/md5-cache/dev-libs/libpreludedb-5.2.0
+++ b/metadata/md5-cache/dev-libs/libpreludedb-5.2.0
@@ -10,6 +10,6 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/libprelude-5.2.0 <dev-libs/libprelude-6 net-libs/gnutls:= mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) sqlite? ( dev-db/sqlite:3 )
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
-SRC_URI=https://www.prelude-siem.org/pkg/src/5.2.0/libpreludedb-5.2.0.tar.gz
+SRC_URI=https://www.prelude-siem.org/pkg/src/5.2.0/libpreludedb-5.2.0.tar.gz https://dev.gentoo.org/~juippis/distfiles/tmp/libpreludedb-5.1.0-update_m4_postgresql.patch
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=95f3e25560564a44fc1168f6d25a425c
+_md5_=46bf643eddc6167a2d9f13cd3579d7b4
diff --git a/metadata/md5-cache/dev-libs/libstroke-0.5.1-r1 b/metadata/md5-cache/dev-libs/libstroke-0.5.1-r1
index 9e59c17359b8..c2b4ebf2b4c2 100644
--- a/metadata/md5-cache/dev-libs/libstroke-0.5.1-r1
+++ b/metadata/md5-cache/dev-libs/libstroke-0.5.1-r1
@@ -1,6 +1,6 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=install prepare
-DEPEND=x11-base/xorg-proto x11-libs/libX11
+DEFINED_PHASES=configure install prepare
+DEPEND=x11-libs/libX11 x11-base/xorg-proto
 DESCRIPTION=A Stroke and Gesture recognition Library
 EAPI=7
 HOMEPAGE=http://www.etla.net/libstroke/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://www.etla.net/libstroke/libstroke-0.5.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=eef1dc20ffdf03832833d6760c6bf313
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a5adcb8f69bffb47ff5593e2736892fa
diff --git a/metadata/md5-cache/dev-libs/libtreadstone-0.2.0 b/metadata/md5-cache/dev-libs/libtreadstone-0.2.0
index 86da20dc1e7c..808bec6e448e 100644
--- a/metadata/md5-cache/dev-libs/libtreadstone-0.2.0
+++ b/metadata/md5-cache/dev-libs/libtreadstone-0.2.0
@@ -1,4 +1,4 @@
-DEFINED_PHASES=-
+DEFINED_PHASES=configure install
 DEPEND=>=dev-libs/libpo6-0.7.0 >=dev-libs/libe-0.10.0
 DESCRIPTION=Hyperdex libtreadstone support library
 EAPI=7
@@ -8,4 +8,4 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libpo6-0.7.0 >=dev-libs/libe-0.10.0
 SLOT=0
 SRC_URI=http://hyperdex.org/src/libtreadstone-0.2.0.tar.gz
-_md5_=45c22dea23dff0c1351eac45580814f2
+_md5_=8df01676198802ad5ceed8c214835705
diff --git a/metadata/md5-cache/dev-libs/libtubo-5.0.15 b/metadata/md5-cache/dev-libs/libtubo-5.0.15
index f63cdfbbe8e2..d452c0fbcc23 100644
--- a/metadata/md5-cache/dev-libs/libtubo-5.0.15
+++ b/metadata/md5-cache/dev-libs/libtubo-5.0.15
@@ -1,11 +1,10 @@
-DEFINED_PHASES=install setup
-DEPEND=virtual/pkgconfig
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install
 DESCRIPTION=small and simple interprocess communication library
-EAPI=5
+EAPI=7
 HOMEPAGE=http://xffm.org/libtubo
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/xffm/libtubo/libtubo0-5.0.15.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ddba54049ff8156e6c9bb1593a8e8310
+_md5_=ac43d5716075752e6863d718f2670609
diff --git a/metadata/md5-cache/dev-libs/libusb-1.0.23-r1 b/metadata/md5-cache/dev-libs/libusb-1.0.23-r1
index 74e5e134986b..2e83922f3e32 100644
--- a/metadata/md5-cache/dev-libs/libusb-1.0.23-r1
+++ b/metadata/md5-cache/dev-libs/libusb-1.0.23-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Userspace access to USB devices
 EAPI=7
 HOMEPAGE=https://libusb.info/ https://github.com/libusb/libusb
 IUSE=debug doc examples static-libs test udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=udev? ( >=virtual/libudev-208:=[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(-)?] )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/libusb/libusb/releases/download/v1.0.23/libusb-1.0.23.tar.bz2
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=fa333b79b7b3ceb5d8c3c8f80da6a6ae
+_md5_=86903f4eb8750003b82d46aca652de01
diff --git a/metadata/md5-cache/dev-libs/libxslt-1.1.34-r1 b/metadata/md5-cache/dev-libs/libxslt-1.1.34-r1
index 58e99a69b630..b82f89440765 100644
--- a/metadata/md5-cache/dev-libs/libxslt-1.1.34-r1
+++ b/metadata/md5-cache/dev-libs/libxslt-1.1.34-r1
@@ -5,10 +5,10 @@ DESCRIPTION=XSLT libraries and tools
 EAPI=7
 HOMEPAGE=http://www.xmlsoft.org/
 IUSE=crypt debug examples static-libs elibc_Darwin 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.9.10:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=ftp://xmlsoft.org/libxslt/libxslt-1.1.34.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=20f5ba2c967997a9a693fcae778da95d
+_md5_=31aae98f4e06bda1c3dbcb8962492861
diff --git a/metadata/md5-cache/dev-libs/log4cxx-0.10.0-r1 b/metadata/md5-cache/dev-libs/log4cxx-0.10.0-r1
index 1963202f1587..599bec1a71ec 100644
--- a/metadata/md5-cache/dev-libs/log4cxx-0.10.0-r1
+++ b/metadata/md5-cache/dev-libs/log4cxx-0.10.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=configure install setup
 DEPEND=dev-libs/apr:1 dev-libs/apr-util:1 odbc? ( iodbc? ( >=dev-db/libiodbc-3.52.4 ) !iodbc? ( dev-db/unixODBC ) ) smtp? ( net-libs/libesmtp )
 DESCRIPTION=Library of C++ classes for logging to files, syslog and other destinations
-EAPI=6
+EAPI=7
 HOMEPAGE=https://logging.apache.org/log4cxx/
 IUSE=iodbc unicode odbc smtp
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/apr:1 dev-libs/apr-util:1 odbc? ( iodbc? ( >=dev-db/libiodbc-3.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/logging/log4cxx/0.10.0/apache-log4cxx-0.10.0.tar.gz
-_md5_=b425e6d977cb51b0bab74b6be3655822
+_md5_=f896a3cb8ab498fcf96bb5465dc40328
diff --git a/metadata/md5-cache/dev-libs/msgpack-3.3.0 b/metadata/md5-cache/dev-libs/msgpack-3.3.0
index d40af855c933..775244bba315 100644
--- a/metadata/md5-cache/dev-libs/msgpack-3.3.0
+++ b/metadata/md5-cache/dev-libs/msgpack-3.3.0
@@ -5,11 +5,11 @@ DESCRIPTION=MessagePack is a binary-based efficient data interchange format
 EAPI=7
 HOMEPAGE=https://msgpack.org/ https://github.com/msgpack/msgpack-c/
 IUSE=boost +cxx doc examples 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=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Boost-1.0
 RDEPEND=boost? ( dev-libs/boost[context,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=0/2
 SRC_URI=https://github.com/msgpack/msgpack-c/releases/download/cpp-3.3.0/msgpack-3.3.0.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0f4bafa74422a14624a1ae6b0d5a48a0
+_md5_=028cdd18fa5e79520d73e7e27141b8bc
diff --git a/metadata/md5-cache/dev-libs/mxml-3.1 b/metadata/md5-cache/dev-libs/mxml-3.1
deleted file mode 100644
index 450e9c2bfa20..000000000000
--- a/metadata/md5-cache/dev-libs/mxml-3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare test
-DESCRIPTION=A small XML parsing library that you can use to read XML data files or strings
-EAPI=7
-HOMEPAGE=https://github.com/michaelrsweet/mxml https://www.msweet.org/mxml/
-IUSE=static-libs threads
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86
-LICENSE=Mini-XML
-SLOT=0
-SRC_URI=https://github.com/michaelrsweet/mxml/archive/v3.1.tar.gz -> mxml-3.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c01e8dd2057130a0cba615043ada17fa
diff --git a/metadata/md5-cache/dev-libs/mxml-3.2 b/metadata/md5-cache/dev-libs/mxml-3.2
index 50467904af85..c978c909411d 100644
--- a/metadata/md5-cache/dev-libs/mxml-3.2
+++ b/metadata/md5-cache/dev-libs/mxml-3.2
@@ -4,9 +4,9 @@ DESCRIPTION=A small XML parsing library that you can use to read XML data files
 EAPI=7
 HOMEPAGE=https://github.com/michaelrsweet/mxml https://www.msweet.org/mxml/
 IUSE=static-libs threads
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86
 LICENSE=Mini-XML
 SLOT=0
 SRC_URI=https://github.com/michaelrsweet/mxml/archive/v3.2.tar.gz -> mxml-3.2.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a0b5aa30403df2b0f1618018d19ed93e
+_md5_=3e4a24de1de70658003c4953444c72b1
diff --git a/metadata/md5-cache/dev-libs/nss-3.55 b/metadata/md5-cache/dev-libs/nss-3.55
deleted file mode 100644
index e59b573be966..000000000000
--- a/metadata/md5-cache/dev-libs/nss-3.55
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-libs/nspr-4.26[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
-DESCRIPTION=Mozilla's Network Security Services library that implements PKI support
-EAPI=7
-HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/
-IUSE=cacert utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
-RDEPEND=>=dev-libs/nspr-4.26[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_55_RTM/src/nss-3.55.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8429058c40a6db0a27db3f8aab452e6d
diff --git a/metadata/md5-cache/dev-libs/nss-3.57 b/metadata/md5-cache/dev-libs/nss-3.59
similarity index 97%
rename from metadata/md5-cache/dev-libs/nss-3.57
rename to metadata/md5-cache/dev-libs/nss-3.59
index 397cdbc5a9cf..63c3d6e46487 100644
--- a/metadata/md5-cache/dev-libs/nss-3.57
+++ b/metadata/md5-cache/dev-libs/nss-3.59
@@ -9,6 +9,6 @@ LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 RDEPEND=>=dev-libs/nspr-4.29[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
 RESTRICT=test
 SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_57_RTM/src/nss-3.57.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
+SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_59_RTM/src/nss-3.59.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c5a01b40e3decaac64b2166fd6f3cbff
diff --git a/metadata/md5-cache/dev-libs/pakchois-0.4-r2 b/metadata/md5-cache/dev-libs/pakchois-0.4-r2
index 194e77342fda..4c40f7d32aa1 100644
--- a/metadata/md5-cache/dev-libs/pakchois-0.4-r2
+++ b/metadata/md5-cache/dev-libs/pakchois-0.4-r2
@@ -8,4 +8,4 @@ LICENSE=LGPL-2
 SLOT=0
 SRC_URI=http://www.manyfish.co.uk/pakchois/pakchois-0.4.tar.gz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2f40f69751e49dce768c5deaea6ed6fd
+_md5_=aeb0c03df1d620d78af2943c1e04aa33
diff --git a/metadata/md5-cache/dev-libs/pcl-1.12-r1 b/metadata/md5-cache/dev-libs/pcl-1.12-r1
index b2d5e1235b7a..6dc53f3c642d 100644
--- a/metadata/md5-cache/dev-libs/pcl-1.12-r1
+++ b/metadata/md5-cache/dev-libs/pcl-1.12-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=-
+DEFINED_PHASES=configure install
 DESCRIPTION=Portable Coroutine Library
 EAPI=7
 HOMEPAGE=http://xmailserver.org/libpcl.html
@@ -6,4 +6,4 @@ KEYWORDS=amd64 arm arm64 ppc64 x86
 LICENSE=GPL-2
 SLOT=0/1
 SRC_URI=http://xmailserver.org/pcl-1.12.tar.gz
-_md5_=69238a399ee9911e27c1a7c337cc6dab
+_md5_=6917819508c73207504b4484f7987d5d
diff --git a/metadata/md5-cache/dev-libs/popt-1.18 b/metadata/md5-cache/dev-libs/popt-1.18
index a7a7d76760e4..07946867c141 100644
--- a/metadata/md5-cache/dev-libs/popt-1.18
+++ b/metadata/md5-cache/dev-libs/popt-1.18
@@ -5,10 +5,10 @@ DESCRIPTION=Parse Options - Command line parser
 EAPI=7
 HOMEPAGE=https://github.com/rpm-software-management/popt
 IUSE=nls 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
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
 LICENSE=MIT
 RDEPEND=nls? ( >=virtual/libintl-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(-)?] )
 SLOT=0
 SRC_URI=http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=472c347597894a85a0d9a75b3e9e65e3
+_md5_=80ddb28d93748fa7978f09967fc36d94
diff --git a/metadata/md5-cache/dev-libs/ppl-1.2-r3 b/metadata/md5-cache/dev-libs/ppl-1.2-r3
index ee9e70b09744..e9b597a53ce8 100644
--- a/metadata/md5-cache/dev-libs/ppl-1.2-r3
+++ b/metadata/md5-cache/dev-libs/ppl-1.2-r3
@@ -10,6 +10,6 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/gmp-6[cxx] lpsol? ( sci-mathematics/glpk )
 RESTRICT=!test? ( test )
 SLOT=0/4.14
-SRC_URI=http://bugseng.com/products/ppl/download/ftp/releases/1.2/ppl-1.2.tar.xz
+SRC_URI=http://bugseng.com/products/ppl/download/ftp/releases/1.2/ppl-1.2.tar.xz https://dev.gentoo.org/~juippis/distfiles/tmp/ppl-1.2-r3-disable-boeing-tests.patch
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0b5e3fe57f0bf98f5fade82ab562e89d
+_md5_=cb10394fe8760140f962f069f0221a5a
diff --git a/metadata/md5-cache/dev-libs/protobuf-c-1.3.3 b/metadata/md5-cache/dev-libs/protobuf-c-1.3.3
index 74375ec42245..7e4a19feaaf5 100644
--- a/metadata/md5-cache/dev-libs/protobuf-c-1.3.3
+++ b/metadata/md5-cache/dev-libs/protobuf-c-1.3.3
@@ -5,11 +5,11 @@ DESCRIPTION=Protocol Buffers implementation in C
 EAPI=7
 HOMEPAGE=https://github.com/protobuf-c/protobuf-c
 IUSE=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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=BSD-2
 RDEPEND=>=dev-libs/protobuf-3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=0/1.0.0
 SRC_URI=https://github.com/protobuf-c/protobuf-c/releases/download/v1.3.3/protobuf-c-1.3.3.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=86cf2323d7c6a931872baf10864d7554
+_md5_=3af5d9fd3352fdbf4c6e37f60b0e717e
diff --git a/metadata/md5-cache/dev-libs/raft-0.9.25 b/metadata/md5-cache/dev-libs/raft-0.9.25
index c2fccff73520..72db42d66896 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
+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	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f86cabc3ee356dca547f33471f7d76bf
+_md5_=18b7da7a46478124754aa7da9516ee0c
diff --git a/metadata/md5-cache/dev-libs/rocclr-3.9.0 b/metadata/md5-cache/dev-libs/rocclr-3.9.0
new file mode 100644
index 000000000000..688b2fc97cda
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/rocclr-3.9.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/rocm-comgr-3.9.0 >=dev-libs/rocr-runtime-3.9.0 >=dev-libs/rocm-comgr-3.9.0 virtual/opengl >=dev-util/rocm-cmake-3.9.0
+DESCRIPTION=Radeon Open Compute Common Language Runtime
+EAPI=7
+HOMEPAGE=https://github.com/ROCm-Developer-Tools/ROCclr
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-libs/rocm-comgr-3.9.0 >=dev-libs/rocr-runtime-3.9.0
+SLOT=0/3.9
+SRC_URI=https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-3.9.0.tar.gz -> rocclr-3.9.0.tar.gz https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-3.9.0.tar.gz -> rocm-opencl-runtime-3.9.0.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=42fbc29b244b38ebf46de85ff27a698d
diff --git a/metadata/md5-cache/dev-libs/rocm-comgr-3.7.0 b/metadata/md5-cache/dev-libs/rocm-comgr-3.9.0
similarity index 76%
rename from metadata/md5-cache/dev-libs/rocm-comgr-3.7.0
rename to metadata/md5-cache/dev-libs/rocm-comgr-3.9.0
index ef280fda3d51..86167a9883e9 100644
--- a/metadata/md5-cache/dev-libs/rocm-comgr-3.7.0
+++ b/metadata/md5-cache/dev-libs/rocm-comgr-3.9.0
@@ -1,13 +1,13 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/rocm-device-libs-3.7.0 >=sys-devel/llvm-roc-3.7.0:=
+DEPEND=>=dev-libs/rocm-device-libs-3.9.0 >=sys-devel/llvm-roc-3.9.0:=
 DESCRIPTION=Radeon Open Compute Code Object Manager
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=>=dev-libs/rocm-device-libs-3.7.0 >=sys-devel/llvm-roc-3.7.0:=
-SLOT=0/3.7
-SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-3.7.0.tar.gz -> rocm-comgr-3.7.0.tar.gz
+RDEPEND=>=dev-libs/rocm-device-libs-3.9.0 >=sys-devel/llvm-roc-3.9.0:=
+SLOT=0/3.9
+SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-3.9.0.tar.gz -> rocm-comgr-3.9.0.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d86040964c8507cd24f7a2d01318f864
+_md5_=240b3e4819452e393942c318099a9775
diff --git a/metadata/md5-cache/dev-libs/rocm-comgr-3.8.0 b/metadata/md5-cache/dev-libs/rocm-device-libs-3.9.0-r1
similarity index 58%
rename from metadata/md5-cache/dev-libs/rocm-comgr-3.8.0
rename to metadata/md5-cache/dev-libs/rocm-device-libs-3.9.0-r1
index 2f61886bf750..f1b06070c545 100644
--- a/metadata/md5-cache/dev-libs/rocm-comgr-3.8.0
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-3.9.0-r1
@@ -1,13 +1,13 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/rocm-device-libs-3.8.0 >=sys-devel/llvm-roc-3.8.0:=
-DESCRIPTION=Radeon Open Compute Code Object Manager
+DEPEND=>=sys-devel/llvm-roc-3.9.0:=
+DESCRIPTION=Radeon Open Compute Device Libraries
 EAPI=7
-HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport
+HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-Device-Libs
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=>=dev-libs/rocm-device-libs-3.8.0 >=sys-devel/llvm-roc-3.8.0:=
-SLOT=0/3.8
-SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-3.8.0.tar.gz -> rocm-comgr-3.8.0.tar.gz
+RDEPEND=>=sys-devel/llvm-roc-3.9.0:=
+SLOT=0/3.9
+SRC_URI=https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-3.9.0.tar.gz -> rocm-device-libs-3.9.0.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d86040964c8507cd24f7a2d01318f864
+_md5_=5cbe443b21909418c0dca55037023a65
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.9.0 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.9.0
new file mode 100644
index 000000000000..c2ddfc294fdd
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.9.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-util/rocm-cmake-3.9.0 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/rocr-runtime-3.9.0 >=dev-libs/rocclr-3.9.0 >=dev-libs/rocm-comgr-3.9.0 >=dev-libs/rocm-device-libs-3.9.0 >=virtual/opencl-3 media-libs/mesa dev-lang/ocaml dev-ml/findlib
+DESCRIPTION=Radeon Open Compute OpenCL Compatible Runtime
+EAPI=7
+HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 MIT
+RDEPEND=>=dev-libs/rocr-runtime-3.9.0 >=dev-libs/rocclr-3.9.0 >=dev-libs/rocm-comgr-3.9.0 >=dev-libs/rocm-device-libs-3.9.0 >=virtual/opencl-3 media-libs/mesa
+SLOT=0/3.9
+SRC_URI=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-3.9.0.tar.gz -> rocm-opencl-runtime-3.9.0.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=792e2e57ee5b94053068f5b6299f6dd7
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-3.8.0 b/metadata/md5-cache/dev-libs/rocr-runtime-3.8.0
index 11a8cd634b70..d1085a87c996 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-3.8.0
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-3.8.0
@@ -1,6 +1,6 @@
 BDEPEND=app-editors/vim-core dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-process/numactl dev-libs/elfutils:= >=dev-libs/roct-thunk-interface-3.8.0 >=dev-libs/rocm-device-libs-3.8.0
+DEPEND=sys-process/numactl dev-libs/elfutils:= >=dev-libs/roct-thunk-interface-3.8.0 ~dev-libs/rocm-device-libs-3.8.0
 DESCRIPTION=Radeon Open Compute Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCR-Runtime
@@ -10,4 +10,4 @@ RDEPEND=sys-process/numactl dev-libs/elfutils:=
 SLOT=0/3.8
 SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-3.8.0.tar.gz -> rocr-runtime-3.8.0.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=48a106492a94ad193f0e0864bbc712b0
+_md5_=b657e1196b2b14373026181947b3fc53
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-3.9.0 b/metadata/md5-cache/dev-libs/rocr-runtime-3.9.0
new file mode 100644
index 000000000000..3613e0981a9a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-3.9.0
@@ -0,0 +1,13 @@
+BDEPEND=app-editors/vim-core dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-process/numactl dev-libs/elfutils:= >=dev-libs/roct-thunk-interface-3.9.0 >=dev-libs/rocm-device-libs-3.9.0
+DESCRIPTION=Radeon Open Compute Runtime
+EAPI=7
+HOMEPAGE=https://github.com/RadeonOpenCompute/ROCR-Runtime
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=sys-process/numactl dev-libs/elfutils:=
+SLOT=0/3.9
+SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-3.9.0.tar.gz -> rocr-runtime-3.9.0.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6019e18a1dd3158164024462e7c5d79e
diff --git a/metadata/md5-cache/dev-libs/serd-0.30.4 b/metadata/md5-cache/dev-libs/serd-0.30.4
deleted file mode 100644
index c4c1799ff502..000000000000
--- a/metadata/md5-cache/dev-libs/serd-0.30.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=|| ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) doc? ( app-doc/doxygen )
-DESCRIPTION=Library for RDF syntax which supports reading and writing Turtle and NTriples
-EAPI=6
-HOMEPAGE=http://drobilla.net/software/serd/
-IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86
-LICENSE=ISC
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://download.drobilla.net/serd-0.30.4.tar.bz2
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	waf-utils	cf9742c01975dc707eb982114a9d70fa
-_md5_=5dbc79aa2fb1c41afca7d0367fcc4f6d
diff --git a/metadata/md5-cache/dev-libs/starpu-1.2.6-r1 b/metadata/md5-cache/dev-libs/starpu-1.2.6-r1
index e8263cadf5ee..1dc6961e2e8a 100644
--- a/metadata/md5-cache/dev-libs/starpu-1.2.6-r1
+++ b/metadata/md5-cache/dev-libs/starpu-1.2.6-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Unified runtime system for heterogeneous multicore architectures
 EAPI=6
 HOMEPAGE=http://starpu.gforge.inria.fr/
 IUSE=blas cuda doc examples fftw fortran gcc-plugin mpi opencl opengl spinlock-check static-libs test valgrind
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=sci-mathematics/glpk:0= sys-apps/hwloc:0= blas? ( virtual/blas ) cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers ) fftw? ( sci-libs/fftw:3.0= ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) opengl? ( media-libs/freeglut:0= ) valgrind? ( dev-util/valgrind ) fortran? ( virtual/fortran )
 RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=https://gforge.inria.fr/frs/download.php/file/37744/starpu-1.2.6.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	cuda	c2f1b334711bbbf2130f339636dc7515	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b2f52701a1873629c1e5eb7cd5769a22
+_md5_=b0905ad01780542c7a18a29399d1914d
diff --git a/metadata/md5-cache/dev-libs/ustr-1.0.4-r5 b/metadata/md5-cache/dev-libs/ustr-1.0.4-r5
deleted file mode 100644
index e91039f4db2b..000000000000
--- a/metadata/md5-cache/dev-libs/ustr-1.0.4-r5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Low-overhead managed string library for C
-EAPI=5
-HOMEPAGE=http://www.and.org/ustr/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~mips x86
-LICENSE=|| ( BSD-2 MIT LGPL-2 )
-SLOT=0
-SRC_URI=ftp://ftp.and.org/pub/james/ustr/1.0.4/ustr-1.0.4.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9491ae57f5c808428353b8a0a048f4ca
diff --git a/metadata/md5-cache/dev-libs/ustr-1.0.4-r7 b/metadata/md5-cache/dev-libs/ustr-1.0.4-r7
deleted file mode 100644
index 47c0f48c997f..000000000000
--- a/metadata/md5-cache/dev-libs/ustr-1.0.4-r7
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Low-overhead managed string library for C
-EAPI=5
-HOMEPAGE=http://www.and.org/ustr/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~mips ~x86
-LICENSE=|| ( BSD-2 MIT LGPL-2 )
-SLOT=0
-SRC_URI=ftp://ftp.and.org/pub/james/ustr/1.0.4/ustr-1.0.4.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4ee06c72db6807a6a2fb8605748f94a8
diff --git a/metadata/md5-cache/dev-libs/ustr-1.0.4-r8 b/metadata/md5-cache/dev-libs/ustr-1.0.4-r8
index 2483296a2fb6..04893d4a61c6 100644
--- a/metadata/md5-cache/dev-libs/ustr-1.0.4-r8
+++ b/metadata/md5-cache/dev-libs/ustr-1.0.4-r8
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Low-overhead managed string library for C
 EAPI=5
 HOMEPAGE=http://www.and.org/ustr/
-IUSE=static-libs ustr-import abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=ustr-import abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 ~arm ~arm64 ~mips x86
 LICENSE=|| ( BSD-2 MIT LGPL-2 )
 SLOT=0
 SRC_URI=ftp://ftp.and.org/pub/james/ustr/1.0.4/ustr-1.0.4.tar.bz2
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=59894d5941ed2ac5f92e7d6b3e1ec171
+_md5_=b34d8065d97f7a9b8937076bb1ec8121
diff --git a/metadata/md5-cache/dev-libs/ustr-1.0.4-r9 b/metadata/md5-cache/dev-libs/ustr-1.0.4-r9
new file mode 100644
index 000000000000..4a77bfa68339
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/ustr-1.0.4-r9
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-overhead managed string library for C
+EAPI=7
+HOMEPAGE=http://www.and.org/ustr/
+IUSE=ustr-import abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
+LICENSE=|| ( BSD-2 MIT LGPL-2 )
+SLOT=0
+SRC_URI=ftp://ftp.and.org/pub/james/ustr/1.0.4/ustr-1.0.4.tar.bz2
+_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=196272ce599fcd72539ef4ea02cfc452
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.48.9 b/metadata/md5-cache/dev-libs/vala-common-0.48.9
index 1f0da97c789a..16e4dd4360e9 100644
--- a/metadata/md5-cache/dev-libs/vala-common-0.48.9
+++ b/metadata/md5-cache/dev-libs/vala-common-0.48.9
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install
 DESCRIPTION=Build infrastructure for packages that use Vala
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=mirror://gnome/sources/vala/0.48/vala-0.48.9.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a
-_md5_=61aa0f2ece614b14420d9f521f48171e
+_md5_=80ec047d000767b1553e9f7211be6d1c
diff --git a/metadata/md5-cache/dev-libs/xerces-c-3.2.2-r1 b/metadata/md5-cache/dev-libs/xerces-c-3.2.2-r1
index 10c23b686152..73e5ea2d6f88 100644
--- a/metadata/md5-cache/dev-libs/xerces-c-3.2.2-r1
+++ b/metadata/md5-cache/dev-libs/xerces-c-3.2.2-r1
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=icu? ( dev-libs/icu:0= ) curl? ( net-misc/curl ) virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://apache/xerces/c/3/sources/xerces-c-3.2.2.tar.gz
+SRC_URI=mirror://apache/xerces/c/3/sources/xerces-c-3.2.2.tar.gz https://dev.gentoo.org/~juippis/distfiles/tmp/xerces-c-3.2.2-fix-XERCESC-2161.patch
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e46a9aacb1952ae5358eb220f9796cb7
+_md5_=b445476d832357235d7815b55d5f7713
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index 43e4cd025cae..7c895ebde375 100644
Binary files a/metadata/md5-cache/dev-lua/Manifest.gz and b/metadata/md5-cache/dev-lua/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lua/lua-bit32-5.3.5-r100 b/metadata/md5-cache/dev-lua/lua-bit32-5.3.5-r100
new file mode 100644
index 000000000000..2763c09243e6
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/lua-bit32-5.3.5-r100
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install test
+DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 )
+DESCRIPTION=Backported Lua bit manipulation library
+EAPI=7
+HOMEPAGE=https://github.com/keplerproject/lua-compat-5.3
+IUSE=test lua_targets_luajit lua_targets_lua5-1
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/keplerproject/lua-compat-5.3/archive/v0.10.tar.gz -> lua-compat53-0.10.tar.gz
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6faeeee990ecf5be0797a1339f3faf98
diff --git a/metadata/md5-cache/dev-lua/lua-zlib-1.2-r100 b/metadata/md5-cache/dev-lua/lua-zlib-1.2-r100
new file mode 100644
index 000000000000..ba6b7cd2edea
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/lua-zlib-1.2-r100
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/zlib lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+DESCRIPTION=Simple streaming interface to zlib for Lua
+EAPI=7
+HOMEPAGE=https://github.com/brimworks/lua-zlib
+IUSE=lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=sys-libs/zlib lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
+SLOT=0
+SRC_URI=https://github.com/brimworks/lua-zlib/archive/v1.2.tar.gz -> lua-zlib-1.2.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=595f5d75107306bbb6b999821bdb64c1
diff --git a/metadata/md5-cache/dev-lua/luadbi-0.5-r6 b/metadata/md5-cache/dev-lua/luadbi-0.5-r6
deleted file mode 100644
index a929adbdc6ed..000000000000
--- a/metadata/md5-cache/dev-lua/luadbi-0.5-r6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-lang/lua-5.1 mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql ) sqlite? ( >=dev-db/sqlite-3 ) virtual/pkgconfig
-DESCRIPTION=DBI module for Lua
-EAPI=6
-HOMEPAGE=https://code.google.com/p/luadbi/
-IUSE=mysql postgres +sqlite
-KEYWORDS=amd64 arm arm64 x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1 mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql ) sqlite? ( >=dev-db/sqlite-3 )
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=0
-SRC_URI=https://luadbi.googlecode.com/files/luadbi.0.5.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=eebe74ffe5709436b82979e464634d6a
diff --git a/metadata/md5-cache/dev-lua/luadbi-0.7.2 b/metadata/md5-cache/dev-lua/luadbi-0.7.2
index 41fcc311902e..c54bd3d473dc 100644
--- a/metadata/md5-cache/dev-lua/luadbi-0.7.2
+++ b/metadata/md5-cache/dev-lua/luadbi-0.7.2
@@ -5,7 +5,7 @@ DESCRIPTION=A database interface library for Lua
 EAPI=7
 HOMEPAGE=https://github.com/mwild1/luadbi
 IUSE=mysql postgres +sqlite test
-KEYWORDS=~amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1:= mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite )
 REQUIRED_USE=|| ( mysql postgres sqlite )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mwild1/luadbi/archive/v0.7.2.tar.gz -> luadbi-0.7.2.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0865de853a7f5269fe2474abae84597a
+_md5_=aae1e4d57cfe50040b2ea49ba31df0f7
diff --git a/metadata/md5-cache/dev-lua/luaevent-0.4.6-r100 b/metadata/md5-cache/dev-lua/luaevent-0.4.6-r100
new file mode 100644
index 000000000000..adc3a123784f
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/luaevent-0.4.6-r100
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) dev-libs/libevent:0=
+DESCRIPTION=Binding of libevent for Lua
+EAPI=7
+HOMEPAGE=http://luaforge.net/projects/luaevent
+IUSE=lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) dev-libs/libevent:0=
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
+SLOT=0
+SRC_URI=https://github.com/harningt/luaevent/archive/v0.4.6.tar.gz -> luaevent-0.4.6.tar.gz
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=58235d33b3bc9454fd9bd3e24a5b5b73
diff --git a/metadata/md5-cache/dev-lua/luasocket-3.0_rc1-r4 b/metadata/md5-cache/dev-lua/luasocket-3.0_rc1-r4
deleted file mode 100644
index a8f93fb6d442..000000000000
--- a/metadata/md5-cache/dev-lua/luasocket-3.0_rc1-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-lang/lua-5.1.5-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Networking support library for the Lua language
-EAPI=7
-HOMEPAGE=http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/ https://github.com/diegonehab/luasocket
-IUSE=debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1.5-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/diegonehab/luasocket/archive/v3.0-rc1.tar.gz -> luasocket-3.0_rc1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8460278444706dce70d6219f06a87eba
diff --git a/metadata/md5-cache/dev-lua/luv-1.32.0.0-r100 b/metadata/md5-cache/dev-lua/luv-1.32.0.0-r100
deleted file mode 100644
index ada4ccc8bc97..000000000000
--- a/metadata/md5-cache/dev-lua/luv-1.32.0.0-r100
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) >=dev-libs/libuv-1.32.0:=
-DESCRIPTION=Bare libuv bindings for lua
-EAPI=7
-HOMEPAGE=https://github.com/luvit/luv
-IUSE=test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0 MIT
-RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) >=dev-libs/libuv-1.32.0:=
-REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/luvit/luv/archive/1.32.0-0.tar.gz -> luv-1.32.0.0.tar.gz https://github.com/keplerproject/lua-compat-5.3/archive/v0.7.tar.gz -> luv-lua-compat-0.7.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c9305c6c0e6b158735f2aa3dca96c9a5
diff --git a/metadata/md5-cache/dev-perl/DBD-SQLite-1.660.0 b/metadata/md5-cache/dev-perl/DBD-SQLite-1.660.0
index 3dca149e2549..d651977c18a0 100644
--- a/metadata/md5-cache/dev-perl/DBD-SQLite-1.660.0
+++ b/metadata/md5-cache/dev-perl/DBD-SQLite-1.660.0
@@ -5,11 +5,11 @@ DESCRIPTION=Self Contained RDBMS in a DBI Driver
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/DBD-SQLite
 IUSE=test system-sqlite
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=system-sqlite? ( >=dev-db/sqlite-3.32.3[extensions(+)] ) >=dev-perl/DBI-1.570.0 !<dev-perl/DBD-SQLite-1 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.66.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6327fd51027f1036b9070993186e768c
+_md5_=a88ee13ec9bec6b48cc66ece04f4d831
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index fed11d5cdefa..d5ad9c261b79 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-perl/X11-XCB-0.180.0 b/metadata/md5-cache/dev-perl/X11-XCB-0.180.0
index 9bd7d75898c4..7974f53fa9cd 100644
--- a/metadata/md5-cache/dev-perl/X11-XCB-0.180.0
+++ b/metadata/md5-cache/dev-perl/X11-XCB-0.180.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl bindings for libxcb
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/X11-XCB
 IUSE=test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Data-Dump dev-perl/Mouse dev-perl/MouseX-NativeTraits dev-perl/Try-Tiny dev-perl/XML-Descent dev-perl/XML-Simple >=virtual/perl-XSLoader-0.20.0 >=x11-libs/libxcb-1.2 x11-libs/xcb-util x11-libs/xcb-util-wm dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSTPLBG/X11-XCB-0.18.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=da85c7c7751e53f9e9496fe865c18e99
+_md5_=911ed3c94983385d8360d09355905321
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 6292dd63ea80..2a2bc1847254 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/jsonlint-1.8.2 b/metadata/md5-cache/dev-php/jsonlint-1.8.2
index 0687faf9b604..f153c80338e5 100644
--- a/metadata/md5-cache/dev-php/jsonlint-1.8.2
+++ b/metadata/md5-cache/dev-php/jsonlint-1.8.2
@@ -7,6 +7,7 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Seldaek/jsonlint/archive/1.8.2.tar.gz -> jsonlint-1.8.2.tar.gz
-_md5_=99cc68921a1a4d5dc63337a9f03fd6a6
+_md5_=755a4e3a85dd5b6977bf0531dc9053e6
diff --git a/metadata/md5-cache/dev-php/pecl-ssh2-1.1.2 b/metadata/md5-cache/dev-php/pecl-ssh2-1.1.2
index a06baea6d44c..17349661058d 100644
--- a/metadata/md5-cache/dev-php/pecl-ssh2-1.1.2
+++ b/metadata/md5-cache/dev-php/pecl-ssh2-1.1.2
@@ -10,6 +10,6 @@ LICENSE=PHP-3.01
 RDEPEND=>=net-libs/libssh2-1.2[-gcrypt] php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) 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 )
 REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 )
 SLOT=7
-SRC_URI=https://pecl.php.net/get/ssh2-1.1.2.tgz
+SRC_URI=https://pecl.php.net/get/ssh2-1.1.2.tgz https://dev.gentoo.org/~juippis/distfiles/tmp/pecl-ssh2-1.1.2-fix-php7-port.patch
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0d50a7a88665261358f47d5139f42e39
+_md5_=4f51119554046457fb2719cc0f8a236c
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 8e99d7bf1dcf..c5d3aeb59083 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/aiocontextvars-0.2.2 b/metadata/md5-cache/dev-python/aiocontextvars-0.2.2
index a7c8095b02fd..33003164719e 100644
--- a/metadata/md5-cache/dev-python/aiocontextvars-0.2.2
+++ b/metadata/md5-cache/dev-python/aiocontextvars-0.2.2
@@ -5,7 +5,7 @@ DESCRIPTION=Asyncio support for PEP-567 contextvars backport
 EAPI=7
 HOMEPAGE=https://github.com/fantix/aiocontextvars
 IUSE=doc test python_targets_python3_6
-KEYWORDS=~amd64 ~arm arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 arm arm64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/contextvars[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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fantix/aiocontextvars/archive/v0.2.2.tar.gz -> aiocontextvars-0.2.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bcc427590af230840675e83df132d3f4
+_md5_=26cdc8a7ebb422865ecc5b2e41edc00a
diff --git a/metadata/md5-cache/dev-python/aiohttp-socks-0.5.3 b/metadata/md5-cache/dev-python/aiohttp-socks-0.5.3
deleted file mode 100644
index a5d849ba826e..000000000000
--- a/metadata/md5-cache/dev-python/aiohttp-socks-0.5.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/aiohttp-2.3.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/attrs-19.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-proxy/3proxy )
-DESCRIPTION=SOCKS proxy connector for aiohttp
-EAPI=7
-HOMEPAGE=https://pypi.org/project/aiohttp-socks/
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/aiohttp-2.3.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/attrs-19.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/romis2012/aiohttp-socks/archive/v0.5.3.tar.gz -> aiohttp-socks-0.5.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8342a57a3f34036f26d2b868ded8bde9
diff --git a/metadata/md5-cache/dev-python/aiohttp-socks-0.5.4 b/metadata/md5-cache/dev-python/aiohttp-socks-0.5.4
deleted file mode 100644
index d77c014bb196..000000000000
--- a/metadata/md5-cache/dev-python/aiohttp-socks-0.5.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) 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=SOCKS proxy connector for aiohttp
-EAPI=7
-HOMEPAGE=https://pypi.org/project/aiohttp-socks/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/aiohttp-2.3.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/attrs-19.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-socks[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/romis2012/aiohttp-socks/archive/v0.5.4.tar.gz -> aiohttp-socks-0.5.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b12314e270f3333b702fe1ef32cb146c
diff --git a/metadata/md5-cache/dev-python/aiohttp-socks-0.5.5 b/metadata/md5-cache/dev-python/aiohttp-socks-0.5.5
index 610f37711562..ca678c2d7c2f 100644
--- a/metadata/md5-cache/dev-python/aiohttp-socks-0.5.5
+++ b/metadata/md5-cache/dev-python/aiohttp-socks-0.5.5
@@ -4,7 +4,7 @@ DESCRIPTION=SOCKS proxy connector for aiohttp
 EAPI=7
 HOMEPAGE=https://pypi.org/project/aiohttp-socks/
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/aiohttp-2.3.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/attrs-19.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-socks[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/romis2012/aiohttp-socks/archive/v0.5.5.tar.gz -> aiohttp-socks-0.5.5.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ec9931b58abd532fa5562a408c944f67
+_md5_=7672fca38fd20e484dd415cef01e54d5
diff --git a/metadata/md5-cache/dev-python/arrow-0.16.0 b/metadata/md5-cache/dev-python/arrow-0.16.0
deleted file mode 100644
index ef3d762337c6..000000000000
--- a/metadata/md5-cache/dev-python/arrow-0.16.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/simplejson[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/python-dateutil-2.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Better dates and times for Python
-EAPI=7
-HOMEPAGE=https://github.com/crsmithdev/arrow/
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/python-dateutil-2.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/arrow/arrow-0.16.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=66d7248c661448b369a76e00b1664688
diff --git a/metadata/md5-cache/dev-python/arrow-0.17.0 b/metadata/md5-cache/dev-python/arrow-0.17.0
index ce39078eaa5a..664b0af45a80 100644
--- a/metadata/md5-cache/dev-python/arrow-0.17.0
+++ b/metadata/md5-cache/dev-python/arrow-0.17.0
@@ -4,7 +4,7 @@ DESCRIPTION=Better dates and times for Python
 EAPI=7
 HOMEPAGE=https://github.com/crsmithdev/arrow/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/python-dateutil-2.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/arrow/arrow-0.17.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ca69ee5cf2195f6f32cc6d244b21bfb9
+_md5_=66d7248c661448b369a76e00b1664688
diff --git a/metadata/md5-cache/dev-python/asgiref-3.2.10 b/metadata/md5-cache/dev-python/asgiref-3.2.10
deleted file mode 100644
index 254827682eb9..000000000000
--- a/metadata/md5-cache/dev-python/asgiref-3.2.10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=ASGI utilities (successor to WSGI)
-EAPI=7
-HOMEPAGE=https://asgi.readthedocs.io/en/latest/ https://github.com/django/asgiref/ https://pypi.org/project/asgiref/
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
-LICENSE=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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/asgiref/asgiref-3.2.10.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bbd3c3cf049f96e8a02efe4a598624fd
diff --git a/metadata/md5-cache/dev-python/asgiref-3.3.0 b/metadata/md5-cache/dev-python/asgiref-3.3.0
index f78a6068f9a5..2f5b28810dbf 100644
--- a/metadata/md5-cache/dev-python/asgiref-3.3.0
+++ b/metadata/md5-cache/dev-python/asgiref-3.3.0
@@ -4,7 +4,7 @@ DESCRIPTION=ASGI utilities (successor to WSGI)
 EAPI=7
 HOMEPAGE=https://asgi.readthedocs.io/en/latest/ https://github.com/django/asgiref/ https://pypi.org/project/asgiref/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/asgiref/asgiref-3.3.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7f7eedf2ad627edd9d7af25cb3eb0c91
+_md5_=bbd3c3cf049f96e8a02efe4a598624fd
diff --git a/metadata/md5-cache/dev-python/asttokens-2.0.4 b/metadata/md5-cache/dev-python/asttokens-2.0.4
index 77d650e0252a..ebb05abafcad 100644
--- a/metadata/md5-cache/dev-python/asttokens-2.0.4
+++ b/metadata/md5-cache/dev-python/asttokens-2.0.4
@@ -4,7 +4,7 @@ DESCRIPTION=Annotate Python AST trees with source text and token information
 EAPI=7
 HOMEPAGE=https://github.com/gristlabs/asttokens/ https://pypi.org/project/asttokens/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 arm arm64 ~ppc ~ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gristlabs/asttokens/archive/v2.0.4.tar.gz -> asttokens-2.0.4.gh.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7e346227b8effa38863f9c45e301e680
+_md5_=01fdcd2c0cd300abca691024672628a2
diff --git a/metadata/md5-cache/dev-python/bandit-1.6.2-r1 b/metadata/md5-cache/dev-python/bandit-1.6.2-r1
index 3635f49a83dc..2aa8fd892bd8 100644
--- a/metadata/md5-cache/dev-python/bandit-1.6.2-r1
+++ b/metadata/md5-cache/dev-python/bandit-1.6.2-r1
@@ -5,7 +5,7 @@ DESCRIPTION=A security linter from OpenStack Security
 EAPI=7
 HOMEPAGE=https://github.com/PyCQA/bandit
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~s390 ~x86
+KEYWORDS=~amd64 ~arm64 ~s390 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/GitPython-1.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyyaml-5.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bandit/bandit-1.6.2.tar.gz https://github.com/PyCQA/bandit/commit/45494c94d59eea5ddbe0204f3781b90108cbde30.patch -> bandit-1.6.2_py38-1.patch https://github.com/PyCQA/bandit/commit/3d0824676974e7e2e9635c10bc4f12e261f1dbdf.patch -> bandit-1.6.2_py38-2.patch
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=97f2332c1482affca2f2e5323b1fde7d
+_md5_=e7c4720c8fe6851df44fede96ae8a31c
diff --git a/metadata/md5-cache/dev-python/bitarray-0.8.3 b/metadata/md5-cache/dev-python/bitarray-0.8.3
index 19aa3b883346..c75b6b2e557b 100644
--- a/metadata/md5-cache/dev-python/bitarray-0.8.3
+++ b/metadata/md5-cache/dev-python/bitarray-0.8.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=efficient arrays of booleans -- C extension
 EAPI=6
 HOMEPAGE=https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bitarray/bitarray-0.8.3.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=39926bce2a36e96c0a3a4f8ca7de8309
+_md5_=f3075a77bd43016048021e02046977b0
diff --git a/metadata/md5-cache/dev-python/bitarray-1.6.1 b/metadata/md5-cache/dev-python/bitarray-1.6.1
new file mode 100644
index 000000000000..fb3272812929
--- /dev/null
+++ b/metadata/md5-cache/dev-python/bitarray-1.6.1
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=efficient arrays of booleans -- C extension
+EAPI=7
+HOMEPAGE=https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/
+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=PSF-2
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/b/bitarray/bitarray-1.6.1.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=764f02a2294aef58856603aa084b7145
diff --git a/metadata/md5-cache/dev-python/boto3-1.16.18 b/metadata/md5-cache/dev-python/boto3-1.16.18
new file mode 100644
index 000000000000..b42369495a81
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.16.18
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( >=dev-python/botocore-1.19.18[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=7
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.19.18[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.16.18.tar.gz -> boto3-1.16.18.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=53909f2d22ada8f7f100ce8183ef9cfc
diff --git a/metadata/md5-cache/dev-python/botocore-1.19.18 b/metadata/md5-cache/dev-python/botocore-1.19.18
new file mode 100644
index 000000000000..9f429c2e3582
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.19.18
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonschema[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=7
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.19.18.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f5530f62319f8a88c8d1822506f374be
diff --git a/metadata/md5-cache/dev-python/bpython-0.19 b/metadata/md5-cache/dev-python/bpython-0.19
deleted file mode 100644
index b481be7a0bce..000000000000
--- a/metadata/md5-cache/dev-python/bpython-0.19
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( dev-python/sphinx ) test? ( >=dev-python/curtsies-0.2.11[python_targets_python3_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/greenlet[python_targets_python3_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/jedi[python_targets_python3_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/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/urwid[python_targets_python3_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/watchdog[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Syntax highlighting and autocompletion for the Python interpreter
-EAPI=7
-HOMEPAGE=https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython/
-IUSE=doc test doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=dev-python/curtsies-0.2.11[python_targets_python3_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/greenlet[python_targets_python3_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/jedi[python_targets_python3_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/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/urwid[python_targets_python3_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/watchdog[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/bpython/bpython-0.19.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=193d7a3b15cd32890971a1e9c68a9697
diff --git a/metadata/md5-cache/dev-python/bpython-0.20 b/metadata/md5-cache/dev-python/bpython-0.20
index a72d106df674..fce0a423a353 100644
--- a/metadata/md5-cache/dev-python/bpython-0.20
+++ b/metadata/md5-cache/dev-python/bpython-0.20
@@ -4,7 +4,7 @@ DESCRIPTION=Syntax highlighting and autocompletion for the Python interpreter
 EAPI=7
 HOMEPAGE=https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython/
 IUSE=doc test doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/curtsies-0.2.11[python_targets_python3_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/greenlet[python_targets_python3_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/jedi[python_targets_python3_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/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/urwid[python_targets_python3_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/watchdog[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bpython/bpython-0.20.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=38604be433acfd2fd7804ddcc7db292f
+_md5_=193d7a3b15cd32890971a1e9c68a9697
diff --git a/metadata/md5-cache/dev-python/cbor2-5.2.0 b/metadata/md5-cache/dev-python/cbor2-5.2.0
index 38bb0fb6779c..020d32e4cc08 100644
--- a/metadata/md5-cache/dev-python/cbor2-5.2.0
+++ b/metadata/md5-cache/dev-python/cbor2-5.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=Pure Python CBOR (de)serializer with extensive tag support
 EAPI=7
 HOMEPAGE=https://github.com/agronholm/cbor2 https://pypi.org/project/cbor2/
 IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cbor2/cbor2-5.2.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c4e7d817017a2a6b5b88c1801d7ab54b
+_md5_=2e80b021a0d3da617219450973e199ff
diff --git a/metadata/md5-cache/dev-python/cfn-python-lint-0.38.0 b/metadata/md5-cache/dev-python/cfn-python-lint-0.38.0
index 7ce3a5677969..27f9f2436533 100644
--- a/metadata/md5-cache/dev-python/cfn-python-lint-0.38.0
+++ b/metadata/md5-cache/dev-python/cfn-python-lint-0.38.0
@@ -1,14 +1,15 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=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/aws-sam-translator-1.25.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-python/importlib_resources[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-python/jsonpatch[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/junit-xml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/networkx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.15.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=CloudFormation Linter
 EAPI=7
 HOMEPAGE=https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/aws-sam-translator-1.25.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-python/importlib_resources[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-python/jsonpatch[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/junit-xml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/networkx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.15.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aws-cloudformation/cfn-python-lint/archive/v0.38.0.tar.gz -> cfn-python-lint-0.38.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bf48ff0aae5af9c0b15c0f36b059a2d5
+_md5_=b37b6a749cd81724bdf6f4d2fa4779e4
diff --git a/metadata/md5-cache/dev-python/cfn-python-lint-0.39.0 b/metadata/md5-cache/dev-python/cfn-python-lint-0.39.0
index 8d57a40cbae6..74deb7d98124 100644
--- a/metadata/md5-cache/dev-python/cfn-python-lint-0.39.0
+++ b/metadata/md5-cache/dev-python/cfn-python-lint-0.39.0
@@ -1,14 +1,15 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=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/aws-sam-translator-1.25.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-python/importlib_resources[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-python/jsonpatch[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/junit-xml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/networkx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.15.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=CloudFormation Linter
 EAPI=7
 HOMEPAGE=https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/aws-sam-translator-1.25.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-python/importlib_resources[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-python/jsonpatch[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/junit-xml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/networkx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.15.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aws-cloudformation/cfn-python-lint/archive/v0.39.0.tar.gz -> cfn-python-lint-0.39.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bf48ff0aae5af9c0b15c0f36b059a2d5
+_md5_=399c664fde2ee517fd6520dfcc990e0e
diff --git a/metadata/md5-cache/dev-python/cheroot-8.4.5 b/metadata/md5-cache/dev-python/cheroot-8.4.5
new file mode 100644
index 000000000000..5de5f9989485
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cheroot-8.4.5
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/six-1.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/more-itertools-2.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-functools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-context[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-text[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/portend[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-forked[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-mock-1.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests-toolbelt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests-unixsocket[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/trustme[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/six-1.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/more-itertools-2.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-functools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Cheroot is the high-performance, pure-Python HTTP server used by CherryPy.
+EAPI=7
+HOMEPAGE=https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/six-1.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/more-itertools-2.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-functools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/C/Cheroot/cheroot-8.4.5.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b3053ec89baca61581db1384a9c105c9
diff --git a/metadata/md5-cache/dev-python/collective-checkdocs-0.2 b/metadata/md5-cache/dev-python/collective-checkdocs-0.2
deleted file mode 100644
index 82c55af94399..000000000000
--- a/metadata/md5-cache/dev-python/collective-checkdocs-0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Distutils command to view/validate packages's rst text long_descriptions.
-EAPI=6
-HOMEPAGE=https://github.com/collective/collective.checkdocs
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/docutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/c/collective.checkdocs/collective.checkdocs-0.2.zip
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ef7fa342ec45f94e05dd65730359873f
diff --git a/metadata/md5-cache/dev-python/collective-checkdocs-0.2-r1 b/metadata/md5-cache/dev-python/collective-checkdocs-0.2-r1
index f18f53488398..937d832a3b62 100644
--- a/metadata/md5-cache/dev-python/collective-checkdocs-0.2-r1
+++ b/metadata/md5-cache/dev-python/collective-checkdocs-0.2-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Distutils command to view/validate packages's rst text long_descript
 EAPI=7
 HOMEPAGE=https://github.com/collective/collective.checkdocs
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/collective.checkdocs/collective.checkdocs-0.2.zip
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bba89d85877c309f81a338df48cd7d1d
+_md5_=b46b75c11e7b5374d5e045c477b0cabf
diff --git a/metadata/md5-cache/dev-python/colorama-0.4.4 b/metadata/md5-cache/dev-python/colorama-0.4.4
index eb42431bfc0f..b2469b1c5738 100644
--- a/metadata/md5-cache/dev-python/colorama-0.4.4
+++ b/metadata/md5-cache/dev-python/colorama-0.4.4
@@ -4,7 +4,7 @@ DESCRIPTION=ANSI escape character sequences for colored terminal text & cursor p
 EAPI=7
 HOMEPAGE=https://pypi.org/project/colorama/ https://github.com/tartley/colorama
 IUSE=examples test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tartley/colorama/archive/0.4.4.tar.gz -> colorama-0.4.4.github.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=915eba551c3a6788c7aa4a75ece8bfc9
+_md5_=8f297d95d851d3f5508559ebd4df2025
diff --git a/metadata/md5-cache/dev-python/construct-2.10.56 b/metadata/md5-cache/dev-python/construct-2.10.56
index 05ab2af9a3a6..dd5500d8eea3 100644
--- a/metadata/md5-cache/dev-python/construct-2.10.56
+++ b/metadata/md5-cache/dev-python/construct-2.10.56
@@ -4,7 +4,7 @@ DESCRIPTION=A powerful declarative parser for binary data
 EAPI=7
 HOMEPAGE=https://construct.readthedocs.io/en/latest/ https://pypi.org/project/construct/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/construct/construct/archive/v2.10.56.tar.gz -> construct-2.10.56.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=dd0c48e3199383bc5322163d02267707
+_md5_=df0adb438898ad73ebc5fcaa3c115efc
diff --git a/metadata/md5-cache/dev-python/contextvars-2.4 b/metadata/md5-cache/dev-python/contextvars-2.4
index 65fbd21c107c..b70fcb7252b8 100644
--- a/metadata/md5-cache/dev-python/contextvars-2.4
+++ b/metadata/md5-cache/dev-python/contextvars-2.4
@@ -4,7 +4,7 @@ DESCRIPTION=Backport of Python 3.7 contextvars module (PEP 567) for Python 3.6
 EAPI=7
 HOMEPAGE=https://github.com/MagicStack
 IUSE=test python_targets_python3_6
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/immutables[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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/MagicStack/contextvars/archive/v2.4.tar.gz -> contextvars-2.4.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0d72fe369636d3605049f27d8d6c139e
+_md5_=ed8b00c205c85f845938b41b13e8d60f
diff --git a/metadata/md5-cache/dev-python/dask-2.28.0 b/metadata/md5-cache/dev-python/dask-2.28.0
deleted file mode 100644
index 2ecd345d41dc..000000000000
--- a/metadata/md5-cache/dev-python/dask-2.28.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/toolz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/moto[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numexpr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-xdist[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/s3fs-0.0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/cloudpickle-0.2.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/fsspec-0.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.13.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pandas-0.23.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/partd-0.3.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/toolz-0.8.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/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Task scheduling and blocked algorithms for parallel processing
-EAPI=7
-HOMEPAGE=https://dask.org/
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/cloudpickle-0.2.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/fsspec-0.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.13.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pandas-0.23.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/partd-0.3.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/toolz-0.8.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(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/dask/dask-2.28.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b9dd22858ffc870ebe6590600381c10f
diff --git a/metadata/md5-cache/dev-python/dask-2.30.0 b/metadata/md5-cache/dev-python/dask-2.30.0
index bb74c82101b0..172be1906279 100644
--- a/metadata/md5-cache/dev-python/dask-2.30.0
+++ b/metadata/md5-cache/dev-python/dask-2.30.0
@@ -4,7 +4,7 @@ DESCRIPTION=Task scheduling and blocked algorithms for parallel processing
 EAPI=7
 HOMEPAGE=https://dask.org/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/cloudpickle-0.2.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/fsspec-0.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.13.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pandas-0.23.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/partd-0.3.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/toolz-0.8.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(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dask/dask-2.30.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1e3c32d3a5fd601ba93482261e3e2276
+_md5_=b9dd22858ffc870ebe6590600381c10f
diff --git a/metadata/md5-cache/dev-python/debtcollector-1.21.0 b/metadata/md5-cache/dev-python/debtcollector-1.21.0
deleted file mode 100644
index d239be242a19..000000000000
--- a/metadata/md5-cache/dev-python/debtcollector-1.21.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/coverage-4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/coverage-4.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/subunit-1.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stestr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/testtools-2.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/fixtures-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/doc8-0.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/reno-2.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=Python deprecation patterns and strategies that collect technical debt
-EAPI=7
-HOMEPAGE=https://www.openstack.org/
-IUSE=test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/wrapt-1.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/debtcollector/debtcollector-1.21.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7b3694fff20f0f49bd5c1b1dc4ce9e5b
diff --git a/metadata/md5-cache/dev-python/debtcollector-2.2.0 b/metadata/md5-cache/dev-python/debtcollector-2.2.0
index 891072f3791d..78251a3496f2 100644
--- a/metadata/md5-cache/dev-python/debtcollector-2.2.0
+++ b/metadata/md5-cache/dev-python/debtcollector-2.2.0
@@ -5,11 +5,11 @@ DESCRIPTION=Python deprecation patterns and strategies that collect technical de
 EAPI=7
 HOMEPAGE=https://www.openstack.org/
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/wrapt-1.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/d/debtcollector/debtcollector-2.2.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3cfee45e433c9503b1a240d32b1222ad
+_md5_=61c9d8fdcf1881e5d2c416880db1b879
diff --git a/metadata/md5-cache/dev-python/distlib-0.3.1-r1 b/metadata/md5-cache/dev-python/distlib-0.3.1-r1
index fa6a2ae9c6fb..bd641bf82466 100644
--- a/metadata/md5-cache/dev-python/distlib-0.3.1-r1
+++ b/metadata/md5-cache/dev-python/distlib-0.3.1-r1
@@ -8,8 +8,8 @@ KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=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? ( test )
+RESTRICT=test
 SLOT=0
 SRC_URI=https://bitbucket.org/pypa/distlib/get/0.3.1.tar.bz2 -> distlib-0.3.1.tar.bz2
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=a8f439aae95dd3122f8ca63cd95f73c6
+_md5_=069788dea0fffd30c4be4e4ac28173f1
diff --git a/metadata/md5-cache/dev-python/dogpile-cache-1.1.0 b/metadata/md5-cache/dev-python/dogpile-cache-1.1.0
new file mode 100644
index 000000000000..bfd6f35f1426
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dogpile-cache-1.1.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mako[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/decorator-4.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/stevedore-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A locking API for expiring values while a single thread generates a new value.
+EAPI=7
+HOMEPAGE=https://github.com/sqlalchemy/dogpile.cache
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/decorator-4.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/stevedore-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/d/dogpile.cache/dogpile.cache-1.1.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=05cc4b690f368b7d1fb602d19692c228
diff --git a/metadata/md5-cache/dev-python/easyprocess-0.3 b/metadata/md5-cache/dev-python/easyprocess-0.3
index 3fb130847e2a..6d1e910c1724 100644
--- a/metadata/md5-cache/dev-python/easyprocess-0.3
+++ b/metadata/md5-cache/dev-python/easyprocess-0.3
@@ -4,7 +4,7 @@ DESCRIPTION=Easy to use Python subprocess interface
 EAPI=7
 HOMEPAGE=https://github.com/ponty/EasyProcess
 IUSE=test python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ponty/EasyProcess/archive/0.3.tar.gz -> easyprocess-0.3.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=daabaf87cc65eb0be68f7a314cc826de
+_md5_=c518db070327e3f09c6a8e3753d34163
diff --git a/metadata/md5-cache/dev-python/empy-3.3.3 b/metadata/md5-cache/dev-python/empy-3.3.3
deleted file mode 100644
index 185f36f5ad42..000000000000
--- a/metadata/md5-cache/dev-python/empy-3.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DESCRIPTION=A powerful and robust templating system for Python
-EAPI=6
-HOMEPAGE=http://www.alcyone.com/software/empy/
-IUSE=doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm ~ia64 ppc x86
-LICENSE=LGPL-2.1
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=http://www.alcyone.com/software/empy/empy-3.3.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d8a855b2e515d7cedc3559753ae75cf4
diff --git a/metadata/md5-cache/dev-python/empy-3.3.4 b/metadata/md5-cache/dev-python/empy-3.3.4
index a52e9517b37b..2bf4afcde95a 100644
--- a/metadata/md5-cache/dev-python/empy-3.3.4
+++ b/metadata/md5-cache/dev-python/empy-3.3.4
@@ -4,11 +4,11 @@ DESCRIPTION=A powerful and robust templating system for Python
 EAPI=6
 HOMEPAGE=http://www.alcyone.com/software/empy/
 IUSE=doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ppc x86
 LICENSE=LGPL-2.1
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=http://www.alcyone.com/software/empy/empy-3.3.4.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=79844e902beb6fd43a9bd0322ab8ec8b
+_md5_=659eec68eefe8802002631bc1894b7d5
diff --git a/metadata/md5-cache/dev-python/entrypoint2-0.2.1 b/metadata/md5-cache/dev-python/entrypoint2-0.2.1
index b8444aa407ce..28760456ec24 100644
--- a/metadata/md5-cache/dev-python/entrypoint2-0.2.1
+++ b/metadata/md5-cache/dev-python/entrypoint2-0.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=Easy to use command-line interface for python modules
 EAPI=7
 HOMEPAGE=https://github.com/ponty/entrypoint2
 IUSE=test python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ponty/entrypoint2/archive/0.2.1.tar.gz -> entrypoint2-0.2.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f71c623cd6e01cd01ab272d46b75f144
+_md5_=b6c33877f76ab012d34a65090f971ee5
diff --git a/metadata/md5-cache/dev-python/executing-0.5.3 b/metadata/md5-cache/dev-python/executing-0.5.3
index 9d009a7905cb..923d053a864c 100644
--- a/metadata/md5-cache/dev-python/executing-0.5.3
+++ b/metadata/md5-cache/dev-python/executing-0.5.3
@@ -4,7 +4,7 @@ DESCRIPTION=Get information about what a Python frame is currently doing
 EAPI=7
 HOMEPAGE=https://github.com/alexmojaki/executing/ https://pypi.org/project/executing/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 arm arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alexmojaki/executing/archive/v0.5.3.tar.gz -> executing-0.5.3.gh.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a62292eea54e18c82f23cf5c657e7ec2
+_md5_=1319d8f292ff0cfb5af8ad0df5a33b8b
diff --git a/metadata/md5-cache/dev-python/fakeredis-1.4.3 b/metadata/md5-cache/dev-python/fakeredis-1.4.3
index 712e5632e07f..e50f1a00daff 100644
--- a/metadata/md5-cache/dev-python/fakeredis-1.4.3
+++ b/metadata/md5-cache/dev-python/fakeredis-1.4.3
@@ -4,7 +4,7 @@ DESCRIPTION=Fake implementation of redis API for testing purposes
 EAPI=7
 HOMEPAGE=https://github.com/jamesls/fakeredis/ https://pypi.org/project/fakeredis/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 arm arm64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/redis-py[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sortedcontainers[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jamesls/fakeredis/archive/1.4.3.tar.gz -> fakeredis-1.4.3.gh.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f1e251d2727d2bdd376b213e60d5e19f
+_md5_=7b7ba58ebb20b6472239b371e2776b08
diff --git a/metadata/md5-cache/dev-python/fastjsonschema-2.14.5 b/metadata/md5-cache/dev-python/fastjsonschema-2.14.5
index 5665881bda5b..fc36a9a85950 100644
--- a/metadata/md5-cache/dev-python/fastjsonschema-2.14.5
+++ b/metadata/md5-cache/dev-python/fastjsonschema-2.14.5
@@ -4,7 +4,7 @@ DESCRIPTION=Fast JSON schema validator for Python
 EAPI=7
 HOMEPAGE=https://github.com/horejsek/python-fastjsonschema/
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 arm64 ~x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/horejsek/python-fastjsonschema/archive/v2.14.5.tar.gz -> python-fastjsonschema-2.14.5.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=40eca01b7ff99e86a5305b019ca8a504
+_md5_=f5d5d26e428946aefebc0f5da6d2fb81
diff --git a/metadata/md5-cache/dev-python/flask-login-0.5.0 b/metadata/md5-cache/dev-python/flask-login-0.5.0
index d58ada75b4cf..5c61cd2d6200 100644
--- a/metadata/md5-cache/dev-python/flask-login-0.5.0
+++ b/metadata/md5-cache/dev-python/flask-login-0.5.0
@@ -5,7 +5,7 @@ DESCRIPTION=Login session support for Flask
 EAPI=7
 HOMEPAGE=https://pypi.org/project/Flask-Login/
 IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/flask-0.10[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/werkzeug[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/maxcountryman/flask-login/archive/0.5.0.tar.gz -> flask-login-0.5.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5f1aaf1ac71abdbdda3e49b7e1b6b453
+_md5_=b73576270056fbe392ed3ef7d34c4718
diff --git a/metadata/md5-cache/dev-python/graphviz-0.14.2 b/metadata/md5-cache/dev-python/graphviz-0.14.2
index 8954d17c1020..2192e2a8d5cb 100644
--- a/metadata/md5-cache/dev-python/graphviz-0.14.2
+++ b/metadata/md5-cache/dev-python/graphviz-0.14.2
@@ -4,7 +4,7 @@ DESCRIPTION=Simple Python interface for Graphviz
 EAPI=7
 HOMEPAGE=https://graphviz.readthedocs.io/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=media-gfx/graphviz python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/graphviz/graphviz-0.14.2.zip
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a854cbd6156fc99d4eb1b17c64c8f38d
+_md5_=ea1c1dbfe89ed3c1cd343a89220da961
diff --git a/metadata/md5-cache/dev-python/graphviz-0.14.1 b/metadata/md5-cache/dev-python/graphviz-0.15
similarity index 95%
rename from metadata/md5-cache/dev-python/graphviz-0.14.1
rename to metadata/md5-cache/dev-python/graphviz-0.15
index 3a8c771e03f6..66eda796f528 100644
--- a/metadata/md5-cache/dev-python/graphviz-0.14.1
+++ b/metadata/md5-cache/dev-python/graphviz-0.15
@@ -4,12 +4,12 @@ DESCRIPTION=Simple Python interface for Graphviz
 EAPI=7
 HOMEPAGE=https://graphviz.readthedocs.io/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=media-gfx/graphviz python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/g/graphviz/graphviz-0.14.1.zip
+SRC_URI=mirror://pypi/g/graphviz/graphviz-0.15.zip
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ea1c1dbfe89ed3c1cd343a89220da961
+_md5_=a854cbd6156fc99d4eb1b17c64c8f38d
diff --git a/metadata/md5-cache/dev-python/hiredis-1.0.1 b/metadata/md5-cache/dev-python/hiredis-1.0.1
index 2ff19dfe2d20..10d751bf590e 100644
--- a/metadata/md5-cache/dev-python/hiredis-1.0.1
+++ b/metadata/md5-cache/dev-python/hiredis-1.0.1
@@ -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-libs/hiredis-0.14:=
+DEPEND=dev-libs/hiredis:0/0.14
 DESCRIPTION=Python extension that wraps hiredis
 EAPI=7
 HOMEPAGE=https://github.com/pietern/hiredis-py
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm x86
 LICENSE=BSD
-RDEPEND=>=dev-libs/hiredis-0.14:= python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-libs/hiredis:0/0.14 python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hiredis/hiredis-1.0.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7ae4ecfd81b61c4e04bff260707b7cdb
+_md5_=63f343d56fe1d86784db5c6456178e49
diff --git a/metadata/md5-cache/dev-python/hiredis-1.0.1-r1 b/metadata/md5-cache/dev-python/hiredis-1.0.1-r1
new file mode 100644
index 000000000000..ae766ce47b68
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hiredis-1.0.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=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=system-libs? ( dev-libs/hiredis:0/0.14 )
+DESCRIPTION=Python extension that wraps hiredis
+EAPI=7
+HOMEPAGE=https://github.com/pietern/hiredis-py
+IUSE=system-libs python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=system-libs? ( dev-libs/hiredis:0/0.14 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/h/hiredis/hiredis-1.0.1.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3ae2ceec02006a8a8a46a5524e0b6685
diff --git a/metadata/md5-cache/dev-python/hiredis-1.1.0 b/metadata/md5-cache/dev-python/hiredis-1.1.0
new file mode 100644
index 000000000000..5b598e359996
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hiredis-1.1.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=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=system-libs? ( dev-libs/hiredis:0/0.14 )
+DESCRIPTION=Python extension that wraps hiredis
+EAPI=7
+HOMEPAGE=https://github.com/pietern/hiredis-py
+IUSE=system-libs python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=system-libs? ( dev-libs/hiredis:0/0.14 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/h/hiredis/hiredis-1.1.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4d6b32cdebc631213a4d156d99f2193a
diff --git a/metadata/md5-cache/dev-python/ujson-3.2.0 b/metadata/md5-cache/dev-python/imagesize-1.2.0
similarity index 68%
rename from metadata/md5-cache/dev-python/ujson-3.2.0
rename to metadata/md5-cache/dev-python/imagesize-1.2.0
index 9047d94b1006..46661a22c03e 100644
--- a/metadata/md5-cache/dev-python/ujson-3.2.0
+++ b/metadata/md5-cache/dev-python/imagesize-1.2.0
@@ -1,16 +1,15 @@
 BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
-DESCRIPTION=Ultra fast JSON encoder and decoder for Python
+DESCRIPTION=Pure Python module for getting image size from png/jpeg/jpeg2000/gif files
 EAPI=7
-HOMEPAGE=https://pypi.org/project/ujson/
-IUSE=test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
+HOMEPAGE=https://github.com/shibukawa/imagesize_py
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris
+LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
+RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/u/ujson/ujson-3.2.0.tar.gz
+SRC_URI=mirror://pypi/i/imagesize/imagesize-1.2.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1f640584f62dad4d5f93d58e10052b13
+_md5_=1096595e6b359f691d3f1ce9bdf32a48
diff --git a/metadata/md5-cache/dev-python/immutables-0.14 b/metadata/md5-cache/dev-python/immutables-0.14
index a4914841c561..07d0a80926a8 100644
--- a/metadata/md5-cache/dev-python/immutables-0.14
+++ b/metadata/md5-cache/dev-python/immutables-0.14
@@ -4,7 +4,7 @@ DESCRIPTION=A high-performance immutable mapping type for Python
 EAPI=7
 HOMEPAGE=https://github.com/MagicStack/immutables
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/MagicStack/immutables/archive/v0.14.tar.gz -> immutables-0.14.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=13fed0af14ca6b95287b5c41c0e0b259
+_md5_=4004eac1b6d14fc1373c28c2768ae525
diff --git a/metadata/md5-cache/dev-python/inflect-5.0.2 b/metadata/md5-cache/dev-python/inflect-5.0.2
new file mode 100644
index 000000000000..7e46861ed516
--- /dev/null
+++ b/metadata/md5-cache/dev-python/inflect-5.0.2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/setuptools_scm-3.4.1[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/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_9(-),python_single_target_python3_9(+)] >=dev-python/rst-linker-1.9[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/alabaster[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/rst-linker-1.9[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/alabaster[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/rst-linker-1.9[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/alabaster[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/rst-linker-1.9[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/alabaster[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] >=dev-python/jaraco-packaging-3.2[python_targets_pypy3(-),python_single_target_pypy3(+)] >=dev-python/rst-linker-1.9[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/alabaster[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Correctly inflect words and numbers
+EAPI=7
+HOMEPAGE=https://github.com/jaraco/inflect
+IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/inflect/inflect-5.0.2.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6c6d6876f05ebfc59bd34fb4854426fb
diff --git a/metadata/md5-cache/dev-python/keystoneauth-4.0.1 b/metadata/md5-cache/dev-python/keystoneauth-4.0.1
deleted file mode 100644
index a13e1a7bb5b2..000000000000
--- a/metadata/md5-cache/dev-python/keystoneauth-4.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0
-DESCRIPTION=This package contains tools for authenticating to an OpenStack-based cloud.
-EAPI=7
-HOMEPAGE=https://github.com/openstack/keystoneauth
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/iso8601-0.1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-service-types-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/k/keystoneauth1/keystoneauth1-4.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c33bc68c187ab45a27677a8fcf61fa9c
diff --git a/metadata/md5-cache/dev-python/keystoneauth-4.2.1 b/metadata/md5-cache/dev-python/keystoneauth-4.2.1
index 2b07c9cbac28..d2dfca0d4011 100644
--- a/metadata/md5-cache/dev-python/keystoneauth-4.2.1
+++ b/metadata/md5-cache/dev-python/keystoneauth-4.2.1
@@ -5,11 +5,11 @@ DESCRIPTION=This package contains tools for authenticating to an OpenStack-based
 EAPI=7
 HOMEPAGE=https://github.com/openstack/keystoneauth
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pbr-2.1.0 >=dev-python/iso8601-0.1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.14.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/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-service-types-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/k/keystoneauth1/keystoneauth1-4.2.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=58c60073351c37bafdb965868f2af7f4
+_md5_=7feffea6d36175c5154b8cc56972fcf3
diff --git a/metadata/md5-cache/dev-python/lmdb-1.0.0 b/metadata/md5-cache/dev-python/lmdb-1.0.0
index 2e8ac99e5386..f4169d92cb6f 100644
--- a/metadata/md5-cache/dev-python/lmdb-1.0.0
+++ b/metadata/md5-cache/dev-python/lmdb-1.0.0
@@ -5,7 +5,7 @@ DESCRIPTION=Python bindings for the Lightning Database
 EAPI=7
 HOMEPAGE=https://github.com/jnwatson/py-lmdb/
 IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=OPENLDAP
 RDEPEND=dev-db/lmdb:= python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lmdb/lmdb-1.0.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e4d7e69939f150b03ef2295e4ed14d8b
+_md5_=6a5bd2d36c5bb3c4a04f5b2053a8b472
diff --git a/metadata/md5-cache/dev-python/loky-2.9.0 b/metadata/md5-cache/dev-python/loky-2.9.0
index d1a52b3ebc70..c69349c9c94f 100644
--- a/metadata/md5-cache/dev-python/loky-2.9.0
+++ b/metadata/md5-cache/dev-python/loky-2.9.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/joblib/loky/archive/2.9.0.tar.gz -> loky-2.9.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ad072896a800191cc186f6c561792133
+_md5_=0da5bc19444d4acfbe910c3575ea8064
diff --git a/metadata/md5-cache/dev-python/markdown-3.1.1-r1 b/metadata/md5-cache/dev-python/markdown-3.1.1-r1
deleted file mode 100644
index 8e32f3a79645..000000000000
--- a/metadata/md5-cache/dev-python/markdown-3.1.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-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 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python implementation of the markdown markup language
-EAPI=7
-HOMEPAGE=https://python-markdown.github.io/ https://pypi.org/project/Markdown/ https://github.com/Python-Markdown/markdown
-IUSE=doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/M/Markdown/Markdown-3.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5452c03d4621cc936c9665353040a338
diff --git a/metadata/md5-cache/dev-python/markdown-3.2.2 b/metadata/md5-cache/dev-python/markdown-3.2.2
deleted file mode 100644
index fc2a1947e868..000000000000
--- a/metadata/md5-cache/dev-python/markdown-3.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pygments[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/pytidylib[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/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python implementation of the markdown markup language
-EAPI=7
-HOMEPAGE=https://python-markdown.github.io/ https://pypi.org/project/Markdown/ https://github.com/Python-Markdown/markdown
-IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/M/Markdown/Markdown-3.2.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5e615bf3f903ac713423d13269c0e986
diff --git a/metadata/md5-cache/dev-python/markdown-3.3 b/metadata/md5-cache/dev-python/markdown-3.3
deleted file mode 100644
index 2e6a02656a8d..000000000000
--- a/metadata/md5-cache/dev-python/markdown-3.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pygments[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/pytidylib[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/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python implementation of the markdown markup language
-EAPI=7
-HOMEPAGE=https://python-markdown.github.io/ https://pypi.org/project/Markdown/ https://github.com/Python-Markdown/markdown
-IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/M/Markdown/Markdown-3.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=41913c2dbb4c9f781f841c20f8ca5fda
diff --git a/metadata/md5-cache/dev-python/markdown-3.3.1 b/metadata/md5-cache/dev-python/markdown-3.3.1
index c5c05f2a8f73..83f2e020c58f 100644
--- a/metadata/md5-cache/dev-python/markdown-3.3.1
+++ b/metadata/md5-cache/dev-python/markdown-3.3.1
@@ -4,7 +4,7 @@ DESCRIPTION=Python implementation of the markdown markup language
 EAPI=7
 HOMEPAGE=https://python-markdown.github.io/ https://pypi.org/project/Markdown/ https://github.com/Python-Markdown/markdown
 IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Markdown/Markdown-3.3.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=879f7f738eeec09ff37c3df2e39320c7
+_md5_=45dc1b7d95fbba741e6e6921c05f8aa9
diff --git a/metadata/md5-cache/dev-python/markdown-3.3.2 b/metadata/md5-cache/dev-python/markdown-3.3.2
deleted file mode 100644
index 4a7e8e071ff6..000000000000
--- a/metadata/md5-cache/dev-python/markdown-3.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pygments[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/pytidylib[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/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python implementation of the markdown markup language
-EAPI=7
-HOMEPAGE=https://python-markdown.github.io/ https://pypi.org/project/Markdown/ https://github.com/Python-Markdown/markdown
-IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/M/Markdown/Markdown-3.3.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=879f7f738eeec09ff37c3df2e39320c7
diff --git a/metadata/md5-cache/dev-python/matplotlib-3.3.3 b/metadata/md5-cache/dev-python/matplotlib-3.3.3
index 80bf75ff4558..b7a919571081 100644
--- a/metadata/md5-cache/dev-python/matplotlib-3.3.3
+++ b/metadata/md5-cache/dev-python/matplotlib-3.3.3
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/certifi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cycler-0.10.0-r1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/kiwisolver-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.18.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/pillow-7.1.1[jpeg,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyparsing-1.5.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/python-dateutil:0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytz-2019.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.14.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/versioneer[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013 >=www-servers/tornado-6.0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] cairo? ( dev-python/cairocffi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) excel? ( dev-python/xlwt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) gtk3? ( dev-python/pygobject:3[cairo?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) wxwidgets? ( python_targets_python3_6? ( dev-python/wxpython:*[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/wxpython:*[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/wxpython:*[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) ) virtual/pkgconfig doc? ( >=app-text/dvipng-1.15-r1 >=dev-python/colorspacious-1.1.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/ipython-1.18.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/numpydoc-0.9.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/scipy-1.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sphinx-1.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sphinx-gallery-0.3.1-r1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/xlwt-1.3.0-r1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended >=media-gfx/graphviz-2.42.3[cairo] ) test? ( dev-python/flaky[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygobject:3[cairo?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/gtk+:3[introspection] ) test? ( dev-python/certifi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cycler-0.10.0-r1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/kiwisolver-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.18.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/pillow-7.1.1[jpeg,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyparsing-1.5.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/python-dateutil:0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytz-2019.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.14.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/versioneer[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013 >=www-servers/tornado-6.0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] cairo? ( dev-python/cairocffi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) excel? ( dev-python/xlwt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) gtk3? ( dev-python/pygobject:3[cairo?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) wxwidgets? ( python_targets_python3_6? ( dev-python/wxpython:*[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/wxpython:*[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/wxpython:*[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) ) >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[tk?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=dev-python/certifi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cycler-0.10.0-r1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/kiwisolver-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.18.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/pillow-7.1.1[jpeg,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyparsing-1.5.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/python-dateutil:0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytz-2019.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.14.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/versioneer[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013 cairo? ( dev-python/cairocffi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) excel? ( dev-python/xlwt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) gtk3? ( dev-python/pygobject:3[cairo?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) webagg? ( >=www-servers/tornado-6.0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) wxwidgets? ( python_targets_python3_6? ( dev-python/wxpython:*[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/wxpython:*[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/wxpython:*[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) ) virtual/pkgconfig doc? ( >=app-text/dvipng-1.15-r1 >=dev-python/colorspacious-1.1.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/ipython-1.18.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/numpydoc-0.9.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/scipy-1.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sphinx-1.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sphinx-gallery-0.3.1-r1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/xlwt-1.3.0-r1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended >=media-gfx/graphviz-2.42.3[cairo] ) test? ( dev-python/flaky[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygobject:3[cairo?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=www-servers/tornado-6.0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/gtk+:3[introspection] ) test? ( dev-python/certifi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cycler-0.10.0-r1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/kiwisolver-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.18.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/pillow-7.1.1[jpeg,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyparsing-1.5.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/python-dateutil:0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytz-2019.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.14.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/versioneer[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013 cairo? ( dev-python/cairocffi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) excel? ( dev-python/xlwt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) gtk3? ( dev-python/pygobject:3[cairo?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) webagg? ( >=www-servers/tornado-6.0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) wxwidgets? ( python_targets_python3_6? ( dev-python/wxpython:*[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/wxpython:*[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/wxpython:*[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) ) >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[tk?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=Pure python plotting library with matlab like syntax
 EAPI=7
 HOMEPAGE=https://matplotlib.org/
-IUSE=cairo doc excel examples gtk3 latex qt5 tk wxwidgets test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
+IUSE=cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
-RDEPEND=dev-python/certifi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cycler-0.10.0-r1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/kiwisolver-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.18.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/pillow-7.1.1[jpeg,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyparsing-1.5.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/python-dateutil:0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytz-2019.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.14.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/versioneer[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013 >=www-servers/tornado-6.0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] cairo? ( dev-python/cairocffi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) excel? ( dev-python/xlwt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) gtk3? ( dev-python/pygobject:3[cairo?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) wxwidgets? ( python_targets_python3_6? ( dev-python/wxpython:*[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/wxpython:*[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/wxpython:*[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[tk?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+RDEPEND=dev-python/certifi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cycler-0.10.0-r1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/kiwisolver-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.18.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/pillow-7.1.1[jpeg,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyparsing-1.5.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/python-dateutil:0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytz-2019.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.14.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/versioneer[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013 cairo? ( dev-python/cairocffi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) excel? ( dev-python/xlwt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) gtk3? ( dev-python/pygobject:3[cairo?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) webagg? ( >=www-servers/tornado-6.0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) wxwidgets? ( python_targets_python3_6? ( dev-python/wxpython:*[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/wxpython:*[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/wxpython:*[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[tk?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/matplotlib/matplotlib-3.3.3.tar.gz test? ( https://downloads.sourceforge.net/project/freetype/freetype2/2.6.1/freetype-2.6.1.tar.gz )
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=68a70046bbc82ea50f82a56d21d3db08
+_md5_=af659dac4d8cd66ab6b776f8930517be
diff --git a/metadata/md5-cache/dev-python/multidict-5.0.0 b/metadata/md5-cache/dev-python/multidict-5.0.0
index 871a479af646..ec1a0f99cc89 100644
--- a/metadata/md5-cache/dev-python/multidict-5.0.0
+++ b/metadata/md5-cache/dev-python/multidict-5.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=multidict implementation
 EAPI=7
 HOMEPAGE=https://github.com/aio-libs/multidict/
 IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/multidict/archive/v5.0.0.tar.gz -> multidict-5.0.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0b09b2f86c5ee50aaf10b4eeb3b4ea03
+_md5_=582ef10ed73ea68f446d63ef8f3c331f
diff --git a/metadata/md5-cache/dev-python/nbformat-5.0.8 b/metadata/md5-cache/dev-python/nbformat-5.0.8
index 4124d83f3e13..baa83488b32d 100644
--- a/metadata/md5-cache/dev-python/nbformat-5.0.8
+++ b/metadata/md5-cache/dev-python/nbformat-5.0.8
@@ -5,7 +5,7 @@ DESCRIPTION=Reference implementation of the Jupyter Notebook format
 EAPI=7
 HOMEPAGE=https://jupyter.org
 IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 arm64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/jsonschema-2.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipython_genutils[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/traitlets-4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jupyter_core[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jupyter/nbformat/archive/5.0.8.tar.gz -> nbformat-5.0.8.gh.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d3e8a55e8f3c0c589284eaea277edb95
+_md5_=7f50514da65d2f16ab226c7df003c8fb
diff --git a/metadata/md5-cache/dev-python/nltk-3.5 b/metadata/md5-cache/dev-python/nltk-3.5
index 222df0102041..4ed18b4a85f5 100644
--- a/metadata/md5-cache/dev-python/nltk-3.5
+++ b/metadata/md5-cache/dev-python/nltk-3.5
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/joblib[python_targets_python3_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/nltk-data-20200312-r1 dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyparsing[python_targets_python3_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/twython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sci-libs/scikits_learn[python_targets_python3_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/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/click[python_targets_python3_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/joblib[python_targets_python3_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/regex[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/tqdm[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite,tk?,xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite,tk?,xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite,tk?,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=test? ( dev-python/joblib[python_targets_python3_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/nltk-data-20200312-r1 dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyparsing[python_targets_python3_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/twython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sci-libs/scikit-learn[python_targets_python3_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/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/click[python_targets_python3_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/joblib[python_targets_python3_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/regex[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/tqdm[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite,tk?,xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite,tk?,xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite,tk?,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(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Natural Language Toolkit
 EAPI=7
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nltk/nltk/archive/3.5.tar.gz -> nltk-3.5.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4495e90eb0bcf4e4e16c17850a161d0a
+_md5_=074b3fa221c811dc5e48c15ef3a08f39
diff --git a/metadata/md5-cache/dev-python/objgraph-3.4.1 b/metadata/md5-cache/dev-python/objgraph-3.4.1
deleted file mode 100644
index 717c8b71d33e..000000000000
--- a/metadata/md5-cache/dev-python/objgraph-3.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( media-gfx/xdot ) test? ( media-gfx/graphviz ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=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=Draws Python object reference graphs with graphviz
-EAPI=7
-HOMEPAGE=https://mg.pov.lt/objgraph/
-IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=media-gfx/graphviz python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/o/objgraph/objgraph-3.4.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=68d82c635d3a798d24b3beba4a8133e6
diff --git a/metadata/md5-cache/dev-python/objgraph-3.5.0 b/metadata/md5-cache/dev-python/objgraph-3.5.0
index 821c5505cd56..f79ca8b29b45 100644
--- a/metadata/md5-cache/dev-python/objgraph-3.5.0
+++ b/metadata/md5-cache/dev-python/objgraph-3.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=Draws Python object reference graphs with graphviz
 EAPI=7
 HOMEPAGE=https://mg.pov.lt/objgraph/
 IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=media-gfx/graphviz python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/objgraph/objgraph-3.5.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=146f03e918cb10f43f2190db5305df2f
+_md5_=68d82c635d3a798d24b3beba4a8133e6
diff --git a/metadata/md5-cache/dev-python/oslo-i18n-3.23.1 b/metadata/md5-cache/dev-python/oslo-i18n-3.23.1
deleted file mode 100644
index 3e0b9822c87a..000000000000
--- a/metadata/md5-cache/dev-python/oslo-i18n-3.23.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/stestr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslotest-3.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/coverage-4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/coverage-4.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testscenarios-0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( >=dev-python/oslotest-3.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/openstackdocstheme-1.18.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sphinx-1.6.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sphinx-1.6.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sphinx-1.6.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/reno-2.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Oslo i18n library
-EAPI=6
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/Babel-2.3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/Babel-2.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.i18n/oslo.i18n-3.23.1.tar.gz -> oslo-i18n-3.23.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=131b7cc0fb22b7d204b9c851fb798109
diff --git a/metadata/md5-cache/dev-python/oslo-i18n-5.0.1 b/metadata/md5-cache/dev-python/oslo-i18n-5.0.1
index 551eecf05a2b..918073ac7eb9 100644
--- a/metadata/md5-cache/dev-python/oslo-i18n-5.0.1
+++ b/metadata/md5-cache/dev-python/oslo-i18n-5.0.1
@@ -5,11 +5,11 @@ DESCRIPTION=Oslo i18n library
 EAPI=7
 HOMEPAGE=https://launchpad.net/oslo
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.i18n/oslo.i18n-5.0.1.tar.gz -> oslo-i18n-5.0.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=91c8cd7141251570a5e94919a88f17b7
+_md5_=f1755b21b96e25b76897da2bca90c29d
diff --git a/metadata/md5-cache/dev-python/oslotest-3.7.1 b/metadata/md5-cache/dev-python/oslotest-3.7.1
deleted file mode 100644
index a848c35fa580..000000000000
--- a/metadata/md5-cache/dev-python/oslotest-3.7.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-1.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/oslo-config-5.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stestr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( >=dev-python/openstackdocstheme-1.18.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sphinx-1.6.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sphinx-1.6.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sphinx-1.6.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/reno-2.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=Oslo test framework
-EAPI=7
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/fixtures-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/subunit-1.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stestr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testtools-2.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mox3-0.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-client-config-1.28.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslotest/oslotest-3.7.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=31a57b903ea7f1446ba7af76168d2425
diff --git a/metadata/md5-cache/dev-python/oslotest-4.4.1 b/metadata/md5-cache/dev-python/oslotest-4.4.1
index 2d011c9d60cd..15962c6ea74b 100644
--- a/metadata/md5-cache/dev-python/oslotest-4.4.1
+++ b/metadata/md5-cache/dev-python/oslotest-4.4.1
@@ -5,11 +5,11 @@ DESCRIPTION=Oslo test framework
 EAPI=7
 HOMEPAGE=https://launchpad.net/oslo
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/fixtures-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/subunit-1.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/testtools-2.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslotest/oslotest-4.4.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=90621a04f2c826ed917f6a751e668363
+_md5_=ae59806990489997c008b648e60f6bdc
diff --git a/metadata/md5-cache/dev-python/passlib-1.7.4 b/metadata/md5-cache/dev-python/passlib-1.7.4
index 461eef38daed..c56a6bc830dc 100644
--- a/metadata/md5-cache/dev-python/passlib-1.7.4
+++ b/metadata/md5-cache/dev-python/passlib-1.7.4
@@ -4,7 +4,7 @@ DESCRIPTION=Password hashing framework supporting over 20 schemes
 EAPI=7
 HOMEPAGE=https://foss.heptapod.net/python-libs/passlib/wikis/home
 IUSE=+bcrypt doc +scrypt +totp test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD-2
 RDEPEND=bcrypt? ( dev-python/bcrypt[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(-)] ) totp? ( dev-python/cryptography[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(-)] ) scrypt? ( dev-python/scrypt[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/passlib/passlib-1.7.4.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=25fb0d5c1d101e1d36ec71e5cc510e6a
+_md5_=a16ee654d7098568301643d7a0c237f2
diff --git a/metadata/md5-cache/dev-python/paste-3.4.6 b/metadata/md5-cache/dev-python/paste-3.4.6
deleted file mode 100644
index 50ffcfc11e96..000000000000
--- a/metadata/md5-cache/dev-python/paste-3.4.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/namespace-paste[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Tools for using a Web Server Gateway Interface stack
-EAPI=7
-HOMEPAGE=https://pypi.org/project/Paste/
-IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris
-LICENSE=MIT
-RDEPEND=dev-python/namespace-paste[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/P/Paste/Paste-3.4.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bee46775156b02ed7ac1059553757ce5
diff --git a/metadata/md5-cache/dev-python/paste-3.5.0 b/metadata/md5-cache/dev-python/paste-3.5.0
index d87199293a1d..53947ef64c15 100644
--- a/metadata/md5-cache/dev-python/paste-3.5.0
+++ b/metadata/md5-cache/dev-python/paste-3.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=Tools for using a Web Server Gateway Interface stack
 EAPI=7
 HOMEPAGE=https://pypi.org/project/Paste/
 IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=MIT
 RDEPEND=dev-python/namespace-paste[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Paste/Paste-3.5.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7c4db71085ca083427bddd0b01960fa8
+_md5_=bee46775156b02ed7ac1059553757ce5
diff --git a/metadata/md5-cache/dev-python/pastedeploy-2.1.0 b/metadata/md5-cache/dev-python/pastedeploy-2.1.0
deleted file mode 100644
index a50303138df7..000000000000
--- a/metadata/md5-cache/dev-python/pastedeploy-2.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/namespace-paste[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/namespace-paste[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Load, configure, and compose WSGI applications and servers
-EAPI=7
-HOMEPAGE=https://pypi.org/project/PasteDeploy/
-IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=MIT
-RDEPEND=dev-python/namespace-paste[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Pylons/pastedeploy/archive/2.1.0.tar.gz -> pastedeploy-2.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ca6f12a141b21eecabff62f8101e629f
diff --git a/metadata/md5-cache/dev-python/pastedeploy-2.1.1 b/metadata/md5-cache/dev-python/pastedeploy-2.1.1
index 8bdf610efbf2..08846d085715 100644
--- a/metadata/md5-cache/dev-python/pastedeploy-2.1.1
+++ b/metadata/md5-cache/dev-python/pastedeploy-2.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Load, configure, and compose WSGI applications and servers
 EAPI=7
 HOMEPAGE=https://pypi.org/project/PasteDeploy/
 IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-python/namespace-paste[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Pylons/pastedeploy/archive/2.1.1.tar.gz -> pastedeploy-2.1.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=19e932a1c7c1107524fe54d664481105
+_md5_=ca6f12a141b21eecabff62f8101e629f
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.12.13 b/metadata/md5-cache/dev-python/phonenumbers-8.12.13
new file mode 100644
index 000000000000..a435696560d0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/phonenumbers-8.12.13
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python port of Google's libphonenumber
+EAPI=7
+HOMEPAGE=https://github.com/daviddrysdale/python-phonenumbers
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/p/phonenumbers/phonenumbers-8.12.13.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=82a94cf3e0ff7cc68cb4b10dcbda2dd0
diff --git a/metadata/md5-cache/dev-python/xlsxwriter-1.3.6 b/metadata/md5-cache/dev-python/pid-3.0.4
similarity index 88%
rename from metadata/md5-cache/dev-python/xlsxwriter-1.3.6
rename to metadata/md5-cache/dev-python/pid-3.0.4
index 3484ebdc78b5..1643306d775d 100644
--- a/metadata/md5-cache/dev-python/xlsxwriter-1.3.6
+++ b/metadata/md5-cache/dev-python/pid-3.0.4
@@ -1,15 +1,15 @@
 BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python module for creating Excel XLSX files
+DESCRIPTION=Pidfile featuring stale detection and file-locking
 EAPI=7
-HOMEPAGE=https://github.com/jmcnamara/XlsxWriter
+HOMEPAGE=https://pypi.org/project/pid/ https://github.com/trbs/pid/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_1.3.6.tar.gz -> xlsxwriter-1.3.6-tests.tar.gz
+SRC_URI=mirror://pypi/p/pid/pid-3.0.4.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=65d9726c7ba0696e4c7d197d3ea6da85
+_md5_=f51ad5040a46dd9cbf59752045561814
diff --git a/metadata/md5-cache/dev-python/progress-1.3 b/metadata/md5-cache/dev-python/progress-1.3
deleted file mode 100644
index 9b1ded8d6612..000000000000
--- a/metadata/md5-cache/dev-python/progress-1.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DESCRIPTION=Easy to use progress bars
-EAPI=6
-HOMEPAGE=https://pypi.org/project/progress/ https://github.com/verigak/progress/
-IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=ISC
-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 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/progress/progress-1.3.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9732f61ed86d95b692e790d109cc6728
diff --git a/metadata/md5-cache/dev-python/progress-1.5 b/metadata/md5-cache/dev-python/progress-1.5
index fa036ed9d833..382647eb770f 100644
--- a/metadata/md5-cache/dev-python/progress-1.5
+++ b/metadata/md5-cache/dev-python/progress-1.5
@@ -4,11 +4,11 @@ DESCRIPTION=Easy to use progress bars
 EAPI=7
 HOMEPAGE=https://pypi.org/project/progress/ https://github.com/verigak/progress/
 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 ~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=ISC
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/progress/progress-1.5.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2e37af22a032be5bf4a803ad05ecb62e
+_md5_=604e4bf3e866e31ce58159296f9dd220
diff --git a/metadata/md5-cache/dev-python/pycairo-1.20.0 b/metadata/md5-cache/dev-python/pycairo-1.20.0
index 8c3feaa6554e..535f1d984c8a 100644
--- a/metadata/md5-cache/dev-python/pycairo-1.20.0
+++ b/metadata/md5-cache/dev-python/pycairo-1.20.0
@@ -5,7 +5,7 @@ DESCRIPTION=Python bindings for the cairo library
 EAPI=7
 HOMEPAGE=https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo
 IUSE=examples doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=>=x11-libs/cairo-1.13.1[svg] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pygobject/pycairo/releases/download/v1.20.0/pycairo-1.20.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=41dfa99315145034c9f0d92360ec190c
+_md5_=714fc349bbe00c5a670b0bceb3b9b9c2
diff --git a/metadata/md5-cache/dev-python/pygobject-3.36.1-r1 b/metadata/md5-cache/dev-python/pygobject-3.36.1-r1
index 9f9c5ca63032..86aaf59e03a5 100644
--- a/metadata/md5-cache/dev-python/pygobject-3.36.1-r1
+++ b/metadata/md5-cache/dev-python/pygobject-3.36.1-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Python bindings for GObject Introspection
 EAPI=7
 HOMEPAGE=https://pygobject.readthedocs.io/
 IUSE=+cairo examples test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-libs/glib-2.48:2 >=dev-libs/gobject-introspection-1.54:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.11.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/cairo[glib] )
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=mirror://gnome/sources/pygobject/3.36/pygobject-3.36.1.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bce30ce153cb04fb393f29d72c42b554
+_md5_=83cddf94574484ccab4437998a246a5b
diff --git a/metadata/md5-cache/dev-python/pylast-3.3.0 b/metadata/md5-cache/dev-python/pylast-3.3.0
deleted file mode 100644
index ab122fe057c0..000000000000
--- a/metadata/md5-cache/dev-python/pylast-3.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/flaky[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python interface to last.fm and other api-compatible websites
-EAPI=7
-HOMEPAGE=https://github.com/pylast/pylast
-IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pylast/pylast/archive/3.3.0.tar.gz -> pylast-3.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=20caf7a669ae4f8952a2932592888362
diff --git a/metadata/md5-cache/dev-python/pylast-4.0.0 b/metadata/md5-cache/dev-python/pylast-4.0.0
index b57b6ee636ed..32a61472feb8 100644
--- a/metadata/md5-cache/dev-python/pylast-4.0.0
+++ b/metadata/md5-cache/dev-python/pylast-4.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Python interface to last.fm and other api-compatible websites
 EAPI=7
 HOMEPAGE=https://github.com/pylast/pylast
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pylast/pylast/archive/4.0.0.tar.gz -> pylast-4.0.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=05ee9f09bc48f0660fbc675494eb4ebd
+_md5_=20caf7a669ae4f8952a2932592888362
diff --git a/metadata/md5-cache/dev-python/pylint-2.5.3 b/metadata/md5-cache/dev-python/pylint-2.5.3
deleted file mode 100644
index dc018604c9d7..000000000000
--- a/metadata/md5-cache/dev-python/pylint-2.5.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/astroid-2.3.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/isort-4.2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mccabe[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[threads(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[threads(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( >=dev-python/astroid-2.3.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/isort-4.2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mccabe[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python code static checker
-EAPI=7
-HOMEPAGE=https://www.logilab.org/project/pylint https://pypi.org/project/pylint/ https://github.com/pycqa/pylint
-IUSE=examples test doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/astroid-2.3.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/isort-4.2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mccabe[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pylint/pylint-2.5.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=69cf54d43c0265d9b000bac34c221259
diff --git a/metadata/md5-cache/dev-python/pylint-2.6.0 b/metadata/md5-cache/dev-python/pylint-2.6.0
index b01aaeeee15a..29fbf5399f72 100644
--- a/metadata/md5-cache/dev-python/pylint-2.6.0
+++ b/metadata/md5-cache/dev-python/pylint-2.6.0
@@ -1,10 +1,10 @@
 BDEPEND=test? ( dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( dev-python/sphinx ) test? ( >=dev-python/astroid-2.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <=dev-python/astroid-2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/isort-4.2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/isort-6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/mccabe-0.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/mccabe-0.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/toml-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python code static checker
 EAPI=7
 HOMEPAGE=https://www.logilab.org/project/pylint https://pypi.org/project/pylint/ https://github.com/pycqa/pylint
 IUSE=examples doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-python/astroid-2.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <=dev-python/astroid-2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/isort-4.2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/isort-6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/mccabe-0.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/mccabe-0.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/toml-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pylint/pylint-2.6.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=61b65006bb29149c32ca41a82a30e196
+_md5_=38b526e2c34f90eb4a58fff74e89ac84
diff --git a/metadata/md5-cache/dev-python/pypiserver-1.3.2 b/metadata/md5-cache/dev-python/pypiserver-1.3.2
deleted file mode 100644
index 0f4800b0f93f..000000000000
--- a/metadata/md5-cache/dev-python/pypiserver-1.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools-git[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/pip[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/wheel-0.25.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/passlib[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-2.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/twine[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/webtest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/pip[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/wheel-0.25.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Minimal PyPI server
-EAPI=7
-HOMEPAGE=https://github.com/pypiserver/pypiserver
-IUSE=test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86
-LICENSE=ZLIB MIT
-RDEPEND=dev-python/pip[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/wheel-0.25.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pypiserver/pypiserver/archive/v1.3.2.tar.gz -> pypiserver-1.3.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=929c5b297c2c502a5602518e32d00a85
diff --git a/metadata/md5-cache/dev-python/pypiserver-1.4.2 b/metadata/md5-cache/dev-python/pypiserver-1.4.2
index b0f3ad46081d..acc6b1c42d06 100644
--- a/metadata/md5-cache/dev-python/pypiserver-1.4.2
+++ b/metadata/md5-cache/dev-python/pypiserver-1.4.2
@@ -4,7 +4,7 @@ DESCRIPTION=Minimal PyPI server
 EAPI=7
 HOMEPAGE=https://github.com/pypiserver/pypiserver
 IUSE=test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=ZLIB MIT
 RDEPEND=dev-python/pip[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/wheel-0.25.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypiserver/pypiserver/archive/v1.4.2.tar.gz -> pypiserver-1.4.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=460fdf1854809dab3b69111652326b04
+_md5_=929c5b297c2c502a5602518e32d00a85
diff --git a/metadata/md5-cache/dev-python/pypy-7.3.3_rc1 b/metadata/md5-cache/dev-python/pypy-7.3.3_rc1
new file mode 100644
index 000000000000..7edada29526e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy-7.3.3_rc1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=|| ( dev-python/pypy-exe:7.3.3_rc1[bzip2?,ncurses?] dev-python/pypy-exe-bin:7.3.3_rc1 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy-bin-7.3.0:0
+DESCRIPTION=A fast, compliant alternative implementation of the Python language
+EAPI=7
+HOMEPAGE=https://pypy.org/
+IUSE=bzip2 gdbm +jit libressl ncurses sqlite tk
+LICENSE=MIT
+RDEPEND=|| ( dev-python/pypy-exe:7.3.3_rc1[bzip2?,ncurses?] dev-python/pypy-exe-bin:7.3.3_rc1 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy-bin-7.3.0:0
+SLOT=0/73
+SRC_URI=https://buildbot.pypy.org/pypy/pypy2.7-v7.3.3rc1-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-2.7.18-r1.tar.xz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=10886f95893ca44e27f0b373358f9ea0
diff --git a/metadata/md5-cache/dev-python/pypy-exe-7.3.3_rc1 b/metadata/md5-cache/dev-python/pypy-exe-7.3.3_rc1
new file mode 100644
index 000000000000..3f4cc22f3e23
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy-exe-7.3.3_rc1
@@ -0,0 +1,13 @@
+BDEPEND=!low-memory? ( || ( dev-python/pypy dev-lang/python:2.7 ) )
+DEFINED_PHASES=compile configure install pretend setup
+DEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy-exe-bin:7.3.3_rc1
+DESCRIPTION=PyPy executable (build from source)
+EAPI=7
+HOMEPAGE=https://pypy.org/
+IUSE=bzip2 +jit low-memory ncurses cpu_flags_x86_sse2
+LICENSE=MIT
+RDEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy-exe-bin:7.3.3_rc1
+SLOT=7.3.3_rc1
+SRC_URI=https://buildbot.pypy.org/pypy/pypy2.7-v7.3.3rc1-src.tar.bz2
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e8c2c6a75d1c7804c4556eb7c2da2890
diff --git a/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.3_rc1 b/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.3_rc1
new file mode 100644
index 000000000000..a823986166a3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.3_rc1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=PyPy executable (pre-built version)
+EAPI=7
+HOMEPAGE=https://pypy.org/
+LICENSE=MIT
+RDEPEND=>=sys-libs/zlib-1.1.3:0/1 dev-libs/libffi:0/7 virtual/libintl:0/0 dev-libs/expat:0/0 app-arch/bzip2:0/1 sys-libs/ncurses:0/6 !dev-python/pypy-exe:7.3.3_rc1
+SLOT=7.3.3_rc1
+SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/pypy-exe-7.3.3_rc1-1.xpak -> pypy-exe-7.3.3_rc1-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/pypy-exe-7.3.3_rc1-1.xpak -> pypy-exe-7.3.3_rc1-1.x86.xpak )
+_eclasses_=pax-utils	a41d1fd1c111289ffa04490de6ee79d7
+_md5_=37db398a0eb6e45457a25529f08e8b93
diff --git a/metadata/md5-cache/dev-python/pypy3-7.3.3_rc1 b/metadata/md5-cache/dev-python/pypy3-7.3.3_rc1
new file mode 100644
index 000000000000..404ca936b259
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3-7.3.3_rc1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=|| ( dev-python/pypy3-exe:7.3.3_rc1[bzip2?,ncurses?] dev-python/pypy3-exe-bin:7.3.3_rc1 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy3-bin-7.3.0:0 test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) !!dev-python/pytest-forked )
+DESCRIPTION=A fast, compliant alternative implementation of the Python (3.6) language
+EAPI=7
+HOMEPAGE=https://pypy.org/
+IUSE=bzip2 gdbm +jit libressl ncurses sqlite test tk
+LICENSE=MIT
+RDEPEND=|| ( dev-python/pypy3-exe:7.3.3_rc1[bzip2?,ncurses?] dev-python/pypy3-exe-bin:7.3.3_rc1 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy3-bin-7.3.0:0
+RESTRICT=!test? ( test )
+SLOT=0/pypy36-pp73
+SRC_URI=https://buildbot.pypy.org/pypy/pypy3.6-v7.3.3rc1-src.tar.bz2
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5f31d1d885f172d4602a7e1e048d162d
diff --git a/metadata/md5-cache/dev-python/pypy3-7.3.3_rc1_p37 b/metadata/md5-cache/dev-python/pypy3-7.3.3_rc1_p37
new file mode 100644
index 000000000000..04ba722588b7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3-7.3.3_rc1_p37
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=|| ( dev-python/pypy3-exe:7.3.3_rc1_p37[bzip2?,ncurses?] dev-python/pypy3-exe-bin:7.3.3_rc1_p37 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy3-bin-7.3.0:0 test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) !!dev-python/pytest-forked )
+DESCRIPTION=A fast, compliant alternative implementation of the Python (3.7) language
+EAPI=7
+HOMEPAGE=https://pypy.org/
+IUSE=bzip2 gdbm +jit libressl ncurses sqlite test tk
+LICENSE=MIT
+RDEPEND=|| ( dev-python/pypy3-exe:7.3.3_rc1_p37[bzip2?,ncurses?] dev-python/pypy3-exe-bin:7.3.3_rc1_p37 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy3-bin-7.3.0:0
+RESTRICT=test
+SLOT=0/pypy37-pp73
+SRC_URI=https://buildbot.pypy.org/pypy/pypy3.7-v7.3.3rc1-src.tar.bz2
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5f589c6f81cb4aa3dea1691bf4f89378
diff --git a/metadata/md5-cache/dev-python/pypy3-exe-7.3.3_rc1 b/metadata/md5-cache/dev-python/pypy3-exe-7.3.3_rc1
new file mode 100644
index 000000000000..161fd5ede538
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3-exe-7.3.3_rc1
@@ -0,0 +1,13 @@
+BDEPEND=low-memory? ( dev-python/pypy ) !low-memory? ( || ( dev-python/pypy dev-lang/python:2.7 ) )
+DEFINED_PHASES=compile configure install pretend setup
+DEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy3-exe-bin:7.3.3_rc1
+DESCRIPTION=PyPy3 executable (build from source)
+EAPI=7
+HOMEPAGE=https://pypy.org/
+IUSE=bzip2 +jit low-memory ncurses cpu_flags_x86_sse2
+LICENSE=MIT
+RDEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy3-exe-bin:7.3.3_rc1
+SLOT=7.3.3_rc1
+SRC_URI=https://buildbot.pypy.org/pypy/pypy3.6-v7.3.3rc1-src.tar.bz2
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f9131be85ba9801fefefaeb3fa387ca2
diff --git a/metadata/md5-cache/dev-python/pypy3-exe-7.3.3_rc1_p37 b/metadata/md5-cache/dev-python/pypy3-exe-7.3.3_rc1_p37
new file mode 100644
index 000000000000..289ac62fcc72
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3-exe-7.3.3_rc1_p37
@@ -0,0 +1,13 @@
+BDEPEND=low-memory? ( dev-python/pypy ) !low-memory? ( || ( dev-python/pypy dev-lang/python:2.7 ) )
+DEFINED_PHASES=compile configure install pretend setup
+DEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy3-exe-bin:7.3.3_rc1_p37
+DESCRIPTION=PyPy3 executable (build from source)
+EAPI=7
+HOMEPAGE=https://pypy.org/
+IUSE=bzip2 +jit low-memory ncurses cpu_flags_x86_sse2
+LICENSE=MIT
+RDEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy3-exe-bin:7.3.3_rc1_p37
+SLOT=7.3.3_rc1_p37
+SRC_URI=https://buildbot.pypy.org/pypy/pypy3.7-v7.3.3rc1-src.tar.bz2
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c83f3c51ff35b8c460884da9c1aa21a0
diff --git a/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.3_rc1 b/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.3_rc1
new file mode 100644
index 000000000000..c148a412f60c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.3_rc1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=PyPy3 executable (pre-built version)
+EAPI=7
+HOMEPAGE=https://pypy.org/
+LICENSE=MIT
+RDEPEND=>=sys-libs/zlib-1.1.3:0/1 dev-libs/libffi:0/7 virtual/libintl:0/0 dev-libs/expat:0/0 app-arch/bzip2:0/1 sys-libs/ncurses:0/6 !dev-python/pypy-exe:7.3.3_rc1
+SLOT=7.3.3_rc1
+SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.3_rc1-1.xpak -> pypy3-exe-7.3.3_rc1-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.3_rc1-1.xpak -> pypy3-exe-7.3.3_rc1-1.x86.xpak )
+_eclasses_=pax-utils	a41d1fd1c111289ffa04490de6ee79d7
+_md5_=8d73ab106f5b9c66cd13c6e5951fbfdd
diff --git a/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.3_rc1_p37 b/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.3_rc1_p37
new file mode 100644
index 000000000000..df589fc211f7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.3_rc1_p37
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=PyPy3 executable (pre-built version)
+EAPI=7
+HOMEPAGE=https://pypy.org/
+LICENSE=MIT
+RDEPEND=>=sys-libs/zlib-1.1.3:0/1 dev-libs/libffi:0/7 virtual/libintl:0/0 dev-libs/expat:0/0 app-arch/bzip2:0/1 sys-libs/ncurses:0/6 !dev-python/pypy-exe:7.3.3_rc1_p37
+SLOT=7.3.3_rc1_p37
+SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.3_rc1_p37-1.xpak -> pypy3-exe-7.3.3_rc1_p37-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.3_rc1_p37-1.xpak -> pypy3-exe-7.3.3_rc1_p37-1.x86.xpak )
+_eclasses_=pax-utils	a41d1fd1c111289ffa04490de6ee79d7
+_md5_=12f3d42c82ad3883ef1ae306ea4bf364
diff --git a/metadata/md5-cache/dev-python/pyroute2-0.5.12-r1 b/metadata/md5-cache/dev-python/pyroute2-0.5.12-r1
deleted file mode 100644
index c94ec323fab0..000000000000
--- a/metadata/md5-cache/dev-python/pyroute2-0.5.12-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A pure Python netlink and Linux network configuration library.
-EAPI=7
-HOMEPAGE=https://github.com/svinota/pyroute2
-IUSE=test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test ) test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/svinota/pyroute2/archive/0.5.12.tar.gz -> pyroute2-0.5.12.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=106e5256c68acd3a2f8198068bd7a3d1
diff --git a/metadata/md5-cache/dev-python/pyroute2-0.5.14 b/metadata/md5-cache/dev-python/pyroute2-0.5.14
index 43a9da9d3f60..b7f0bce48087 100644
--- a/metadata/md5-cache/dev-python/pyroute2-0.5.14
+++ b/metadata/md5-cache/dev-python/pyroute2-0.5.14
@@ -4,7 +4,7 @@ DESCRIPTION=A pure Python netlink and Linux network configuration library.
 EAPI=7
 HOMEPAGE=https://github.com/svinota/pyroute2
 IUSE=test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/svinota/pyroute2/archive/0.5.14.tar.gz -> pyroute2-0.5.14.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f83fc9526096ad653124f3660e52f324
+_md5_=b137af3f1960df7912f2dfda2f6cf989
diff --git a/metadata/md5-cache/dev-python/pyscreenshot-2.2 b/metadata/md5-cache/dev-python/pyscreenshot-2.2
index 24be38d84e5e..5dc9650c6a2e 100644
--- a/metadata/md5-cache/dev-python/pyscreenshot-2.2
+++ b/metadata/md5-cache/dev-python/pyscreenshot-2.2
@@ -5,7 +5,7 @@ DESCRIPTION=Python screenshot library
 EAPI=7
 HOMEPAGE=https://github.com/ponty/pyscreenshot
 IUSE=test python_targets_python3_7 python_targets_python3_8 test
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ponty/pyscreenshot/archive/2.2.tar.gz -> pyscreenshot-2.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=cef9bef365363abc227b69791826c6cc
+_md5_=aed918b9b80d9ae8b7aafeaf56244a0e
diff --git a/metadata/md5-cache/dev-python/pytest-xprocess-0.13.1-r1 b/metadata/md5-cache/dev-python/pytest-xprocess-0.13.1-r1
deleted file mode 100644
index dd987742ea1d..000000000000
--- a/metadata/md5-cache/dev-python/pytest-xprocess-0.13.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Manage external processes across test runs
-EAPI=7
-HOMEPAGE=https://pypi.org/project/pytest-xprocess/ https://github.com/pytest-dev/pytest-xprocess
-IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest-xprocess/pytest-xprocess-0.13.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=20fd36bbe5c6775f289f92fbbb3e9a3c
diff --git a/metadata/md5-cache/dev-python/pytest-xprocess-0.15.0 b/metadata/md5-cache/dev-python/pytest-xprocess-0.15.0
index b645762dd2ce..e6fe3a71da32 100644
--- a/metadata/md5-cache/dev-python/pytest-xprocess-0.15.0
+++ b/metadata/md5-cache/dev-python/pytest-xprocess-0.15.0
@@ -4,7 +4,7 @@ DESCRIPTION=Manage external processes across test runs
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pytest-xprocess/ https://github.com/pytest-dev/pytest-xprocess
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-xprocess/pytest-xprocess-0.15.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3ab93424b700e9c35f2af31ee6e0c26a
+_md5_=20fd36bbe5c6775f289f92fbbb3e9a3c
diff --git a/metadata/md5-cache/dev-python/python-bugzilla-3.0.0 b/metadata/md5-cache/dev-python/python-bugzilla-3.0.0
index a167b69c156e..fb9e4f1f42c5 100644
--- a/metadata/md5-cache/dev-python/python-bugzilla-3.0.0
+++ b/metadata/md5-cache/dev-python/python-bugzilla-3.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=A python module for interacting with Bugzilla over XMLRPC
 EAPI=7
 HOMEPAGE=https://github.com/python-bugzilla/python-bugzilla
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=|| ( dev-python/python-magic[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-apps/file[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-bugzilla/python-bugzilla-3.0.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=12363ec899f0b64cf7e66dfe53679919
+_md5_=453b78fe7721abc6927a8ad06cc718cd
diff --git a/metadata/md5-cache/dev-python/python-bugzilla-2.5.0 b/metadata/md5-cache/dev-python/python-bugzilla-3.0.2
similarity index 96%
rename from metadata/md5-cache/dev-python/python-bugzilla-2.5.0
rename to metadata/md5-cache/dev-python/python-bugzilla-3.0.2
index 858aea864ce6..eface0b706e4 100644
--- a/metadata/md5-cache/dev-python/python-bugzilla-2.5.0
+++ b/metadata/md5-cache/dev-python/python-bugzilla-3.0.2
@@ -4,12 +4,12 @@ DESCRIPTION=A python module for interacting with Bugzilla over XMLRPC
 EAPI=7
 HOMEPAGE=https://github.com/python-bugzilla/python-bugzilla
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2+
 RDEPEND=|| ( dev-python/python-magic[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-apps/file[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/python-bugzilla/python-bugzilla-2.5.0.tar.gz
+SRC_URI=mirror://pypi/p/python-bugzilla/python-bugzilla-3.0.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=453b78fe7721abc6927a8ad06cc718cd
+_md5_=12363ec899f0b64cf7e66dfe53679919
diff --git a/metadata/md5-cache/dev-python/python-daemon-2.2.4 b/metadata/md5-cache/dev-python/python-daemon-2.2.4
index 85a166fb35a9..beb5e95d7e28 100644
--- a/metadata/md5-cache/dev-python/python-daemon-2.2.4
+++ b/metadata/md5-cache/dev-python/python-daemon-2.2.4
@@ -4,7 +4,7 @@ DESCRIPTION=Library to implement a well-behaved Unix daemon process
 EAPI=7
 HOMEPAGE=https://pypi.org/project/python-daemon/
 IUSE=test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 arm x86
 LICENSE=PSF-2
 RDEPEND=dev-python/lockfile[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-daemon/python-daemon-2.2.4.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=df27fbeba3cfb639f297afa4c338cace
+_md5_=0bdb37946b8ef2e34cb13bdfb10ac086
diff --git a/metadata/md5-cache/dev-python/python-jsonrpc-server-0.4.0-r1 b/metadata/md5-cache/dev-python/python-jsonrpc-server-0.4.0-r1
index 0f9b16901e1c..dd030c382197 100644
--- a/metadata/md5-cache/dev-python/python-jsonrpc-server-0.4.0-r1
+++ b/metadata/md5-cache/dev-python/python-jsonrpc-server-0.4.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A Python 2 and 3 asynchronous JSON RPC server
 EAPI=7
 HOMEPAGE=https://github.com/palantir/python-jsonrpc-server
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/ujson-3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-jsonrpc-server/python-jsonrpc-server-0.4.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=524a5e348312b54aebb4af230ba66a2d
+_md5_=2db22ec49ef6ae9fc84b747e75681917
diff --git a/metadata/md5-cache/dev-python/python-language-server-0.35.1-r1 b/metadata/md5-cache/dev-python/python-language-server-0.35.1-r1
index 3f3bce9a9b10..a85fe2ca8c84 100644
--- a/metadata/md5-cache/dev-python/python-language-server-0.35.1-r1
+++ b/metadata/md5-cache/dev-python/python-language-server-0.35.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=An implementation of the Language Server Protocol for Python
 EAPI=7
 HOMEPAGE=https://github.com/palantir/python-language-server
 IUSE=test python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/jedi-0.17.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/jedi-0.18.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pluggy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-jsonrpc-server-0.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ujson-3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-language-server/python-language-server-0.35.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bf349e51520ec8c8113a6f79699366bc
+_md5_=1470c83c8383687ffe14ef3d9b69990a
diff --git a/metadata/md5-cache/dev-python/python-ldap-3.3.1 b/metadata/md5-cache/dev-python/python-ldap-3.3.1
index ec487051b6fa..09a828577927 100644
--- a/metadata/md5-cache/dev-python/python-ldap-3.3.1
+++ b/metadata/md5-cache/dev-python/python-ldap-3.3.1
@@ -4,7 +4,7 @@ DESCRIPTION=Various LDAP-related Python modules
 EAPI=7
 HOMEPAGE=https://www.python-ldap.org/en/latest/ https://pypi.org/project/python-ldap/ https://github.com/python-ldap/python-ldap
 IUSE=examples sasl ssl test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris
 LICENSE=PSF-2
 RDEPEND=!dev-python/pyldap >=dev-python/pyasn1-0.3.7[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/pyasn1-modules-0.1.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >net-nds/openldap-2.4.11:=[sasl?,ssl?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ldap/python-ldap-3.3.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d4aff74f867c2409b3c72b936acf7c36
+_md5_=ba5396c726504e00a73529b450af3649
diff --git a/metadata/md5-cache/dev-python/pyvirtualdisplay-1.3.2 b/metadata/md5-cache/dev-python/pyvirtualdisplay-1.3.2
index 8823072ca913..6dce7f88d645 100644
--- a/metadata/md5-cache/dev-python/pyvirtualdisplay-1.3.2
+++ b/metadata/md5-cache/dev-python/pyvirtualdisplay-1.3.2
@@ -5,7 +5,7 @@ DESCRIPTION=Python wrapper for Xvfb, Xephyr and Xvnc
 EAPI=7
 HOMEPAGE=https://github.com/ponty/PyVirtualDisplay
 IUSE=test python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ponty/PyVirtualDisplay/archive/1.3.2.tar.gz -> pyvirtualdisplay-1.3.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=38dfb9da0009894c25083d406057a2bd
+_md5_=06caea6a77e1c040fb63d56fae26177b
diff --git a/metadata/md5-cache/dev-python/pyzmq-20.0.0 b/metadata/md5-cache/dev-python/pyzmq-20.0.0
new file mode 100644
index 000000000000..b9e74188d215
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyzmq-20.0.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_6? ( dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) test? ( >=www-servers/tornado-5.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=net-libs/zeromq-4.2.2-r2:=[drafts] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9[threads(+)] dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/numpydoc[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/numpydoc[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[threads(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/numpydoc[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[threads(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/numpydoc[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=net-libs/zeromq-4.2.2-r2:=[drafts]
+DESCRIPTION=Lightweight and super-fast messaging library built on top of the ZeroMQ library
+EAPI=7
+HOMEPAGE=https://www.zeromq.org/bindings:python https://pypi.org/project/pyzmq/ https://github.com/zeromq/pyzmq/
+IUSE=+draft test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=LGPL-3
+RDEPEND=>=net-libs/zeromq-4.2.2-r2:=[drafts] python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/zeromq/pyzmq/archive/v20.0.0.tar.gz -> pyzmq-20.0.0.gh.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=016c4c3cbfe1678e447f9026b3312837
diff --git a/metadata/md5-cache/dev-python/readme_renderer-27.0 b/metadata/md5-cache/dev-python/readme_renderer-27.0
index 30eb76b86bc7..52d03001756c 100644
--- a/metadata/md5-cache/dev-python/readme_renderer-27.0
+++ b/metadata/md5-cache/dev-python/readme_renderer-27.0
@@ -4,7 +4,7 @@ DESCRIPTION=a library for rendering "readme" descriptions for Warehouse
 EAPI=7
 HOMEPAGE=https://github.com/pypa/readme_renderer https://pypi.org/project/readme_renderer/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/bleach-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/docutils-0.13.1[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/pygments-2.5.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/readme_renderer/readme_renderer-27.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a19639585dfb1557aa15e8cf32fe531b
+_md5_=ff51c9d09070401113404f729727182f
diff --git a/metadata/md5-cache/dev-python/reno-2.11.3 b/metadata/md5-cache/dev-python/reno-2.11.3
deleted file mode 100644
index e3e957329892..000000000000
--- a/metadata/md5-cache/dev-python/reno-2.11.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-python/pbr-1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Release notes manager, storing release notes in a git repo and building docs
-EAPI=7
-HOMEPAGE=https://pypi.org/project/reno/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyyaml-3.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/dulwich-0.15.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://pypi/r/reno/reno-2.11.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0f116d03b9640ca55f7535b2bd36c53a
diff --git a/metadata/md5-cache/dev-python/reno-3.2.0 b/metadata/md5-cache/dev-python/reno-3.2.0
index 6fe00b7c2546..82fa7a6c9642 100644
--- a/metadata/md5-cache/dev-python/reno-3.2.0
+++ b/metadata/md5-cache/dev-python/reno-3.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=Release notes manager, storing release notes in a git repo and build
 EAPI=7
 HOMEPAGE=https://pypi.org/project/reno/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/pbr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyyaml-5.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/dulwich-0.15.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/packaging-20.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/reno/reno-3.2.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e00bbd34af922260b0d3cbdd844daab7
+_md5_=7fca55e0464349c8e23fab2899d3f999
diff --git a/metadata/md5-cache/dev-python/routes-2.4.1-r1 b/metadata/md5-cache/dev-python/routes-2.4.1-r1
deleted file mode 100644
index b2265b449f6d..000000000000
--- a/metadata/md5-cache/dev-python/routes-2.4.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/webob[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/repoze-lru-0.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A re-implementation of Rails routes system, mapping URLs to Controllers/Actions
-EAPI=7
-HOMEPAGE=https://routes.readthedocs.io/en/latest/ https://pypi.org/project/Routes/
-IUSE=doc test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=>=dev-python/repoze-lru-0.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/R/Routes/Routes-2.4.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=31add86b296368de821e7347ff2c5bd6
diff --git a/metadata/md5-cache/dev-python/routes-2.5.1 b/metadata/md5-cache/dev-python/routes-2.5.1
index 48c05f6fb2c1..2861ee735c5e 100644
--- a/metadata/md5-cache/dev-python/routes-2.5.1
+++ b/metadata/md5-cache/dev-python/routes-2.5.1
@@ -4,7 +4,7 @@ DESCRIPTION=A re-implementation of Rails routes system, mapping URLs to Controll
 EAPI=7
 HOMEPAGE=https://routes.readthedocs.io/en/latest/ https://pypi.org/project/Routes/
 IUSE=doc test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/repoze-lru-0.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/R/Routes/Routes-2.5.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e595efae5729b3fe6b6f9ed7d2b0d128
+_md5_=bc1699684d188c8f502a3b6caa5af008
diff --git a/metadata/md5-cache/dev-python/rtslib-fb-2.1.73 b/metadata/md5-cache/dev-python/rtslib-fb-2.1.73
deleted file mode 100644
index 8a25a8912591..000000000000
--- a/metadata/md5-cache/dev-python/rtslib-fb-2.1.73
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python object API for managing the Linux LIO kernel target
-EAPI=7
-HOMEPAGE=https://github.com/open-iscsi/rtslib-fb
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm ~arm64 ~mips x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/pyudev[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://pypi/r/rtslib-fb/rtslib-fb-2.1.73.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9edf27cdb5dbaa22a1c9cdfc0b0189c7
diff --git a/metadata/md5-cache/dev-python/rtslib-fb-2.1.74 b/metadata/md5-cache/dev-python/rtslib-fb-2.1.74
index 2f6277340e37..e469fb69cd3a 100644
--- a/metadata/md5-cache/dev-python/rtslib-fb-2.1.74
+++ b/metadata/md5-cache/dev-python/rtslib-fb-2.1.74
@@ -4,11 +4,11 @@ DESCRIPTION=A Python object API for managing the Linux LIO kernel target
 EAPI=7
 HOMEPAGE=https://github.com/open-iscsi/rtslib-fb
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~mips x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/pyudev[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rtslib-fb/rtslib-fb-2.1.74.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e43a07a888e32409a973589bf69fad4f
+_md5_=9edf27cdb5dbaa22a1c9cdfc0b0189c7
diff --git a/metadata/md5-cache/dev-python/ryu-4.26-r1 b/metadata/md5-cache/dev-python/ryu-4.26-r1
deleted file mode 100644
index 4f5a96c86ca2..000000000000
--- a/metadata/md5-cache/dev-python/ryu-4.26-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pbr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Component-based Software-defined Networking Framework
-EAPI=6
-HOMEPAGE=https://ryu-sdn.org/
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/r/ryu/ryu-4.26.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0ad50288b1d33acbab488c3ce7e7a8c8
diff --git a/metadata/md5-cache/dev-python/ryu-4.34 b/metadata/md5-cache/dev-python/ryu-4.34
index f54985289930..606d3d6b91c2 100644
--- a/metadata/md5-cache/dev-python/ryu-4.34
+++ b/metadata/md5-cache/dev-python/ryu-4.34
@@ -5,11 +5,11 @@ DESCRIPTION=Component-based Software-defined Networking Framework
 EAPI=7
 HOMEPAGE=https://ryu-sdn.org/
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=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 )
 SLOT=0
 SRC_URI=mirror://pypi/r/ryu/ryu-4.34.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=39088810aeb8977cc1582e9b61d18e6f
+_md5_=14327e08fcaadbc0c708da8a77866f5f
diff --git a/metadata/md5-cache/dev-python/semantic_version-2.8.5 b/metadata/md5-cache/dev-python/semantic_version-2.8.5
index 5808f376176b..aa5717083c9e 100644
--- a/metadata/md5-cache/dev-python/semantic_version-2.8.5
+++ b/metadata/md5-cache/dev-python/semantic_version-2.8.5
@@ -4,7 +4,7 @@ DESCRIPTION=Python library providing a few tools handling SemVer in Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/semantic_version/
 IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/semantic_version/semantic_version-2.8.5.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=462297c194281b88531def335670e79a
+_md5_=93e2acf06f4e614ed25b00de0059f6ff
diff --git a/metadata/md5-cache/dev-python/sentry-sdk-0.18.0 b/metadata/md5-cache/dev-python/sentry-sdk-0.18.0
index 5bccebbeef9a..42fa4c20e0e2 100644
--- a/metadata/md5-cache/dev-python/sentry-sdk-0.18.0
+++ b/metadata/md5-cache/dev-python/sentry-sdk-0.18.0
@@ -4,7 +4,7 @@ DESCRIPTION=Python client for Sentry
 EAPI=7
 HOMEPAGE=https://getsentry.com https://pypi.org/project/sentry-sdk/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 arm arm64 ~ppc ~ppc64 ~x86
 LICENSE=PSF-2
 RDEPEND=dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/getsentry/sentry-python/archive/0.18.0.tar.gz -> sentry-sdk-0.18.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=73674ae08f300e479d9fcd49d510f299
+_md5_=33ba6c025d52bf84ee48f8333cc5b2eb
diff --git a/metadata/md5-cache/dev-python/spur-0.3.21 b/metadata/md5-cache/dev-python/spur-0.3.21
deleted file mode 100644
index 8aab7ffd5029..000000000000
--- a/metadata/md5-cache/dev-python/spur-0.3.21
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Run commands locally or over SSH using the same interface
-EAPI=7
-HOMEPAGE=https://github.com/mwilliamson/spur.py
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=BSD-2
-RDEPEND=dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mwilliamson/spur.py/archive/0.3.21.tar.gz -> spur.py-0.3.21.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=35e62c17d94ffb04a3c60fbd8e3875b1
diff --git a/metadata/md5-cache/dev-python/spur-0.3.22 b/metadata/md5-cache/dev-python/spur-0.3.22
index 4972ddb5d697..57a8a9a9b293 100644
--- a/metadata/md5-cache/dev-python/spur-0.3.22
+++ b/metadata/md5-cache/dev-python/spur-0.3.22
@@ -4,7 +4,7 @@ DESCRIPTION=Run commands locally or over SSH using the same interface
 EAPI=7
 HOMEPAGE=https://github.com/mwilliamson/spur.py
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD-2
 RDEPEND=dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mwilliamson/spur.py/archive/0.3.22.tar.gz -> spur.py-0.3.22.gh.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6ddb72a2a72a25bd39b91ca482d0f3f0
+_md5_=35e62c17d94ffb04a3c60fbd8e3875b1
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.3.11 b/metadata/md5-cache/dev-python/sqlalchemy-1.3.11
deleted file mode 100644
index 5b41a70a8ee3..000000000000
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.3.11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python SQL toolkit and Object Relational Mapper
-EAPI=7
-HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/
-IUSE=doc examples +sqlite test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=test? ( sqlite ) || ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.3.11.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e55ed78f642d65281b5b477cbb53916f
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.3.20 b/metadata/md5-cache/dev-python/sqlalchemy-1.3.20
index 4f210c9c4867..819661ed26c6 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.3.20
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.3.20
@@ -4,7 +4,7 @@ DESCRIPTION=Python SQL toolkit and Object Relational Mapper
 EAPI=7
 HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/
 IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=test? ( sqlite ) || ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.3.20.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b57b1439b11554eec4506ec48fa0df27
+_md5_=2647005e061e5317055e4bdb81529f7d
diff --git a/metadata/md5-cache/dev-python/sqlparse-0.4.1 b/metadata/md5-cache/dev-python/sqlparse-0.4.1
index 5015ba6a9c5e..4f2ce6e905d7 100644
--- a/metadata/md5-cache/dev-python/sqlparse-0.4.1
+++ b/metadata/md5-cache/dev-python/sqlparse-0.4.1
@@ -4,7 +4,7 @@ DESCRIPTION=A non-validating SQL parser module for Python
 EAPI=7
 HOMEPAGE=https://github.com/andialbrecht/sqlparse
 IUSE=doc test 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
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sqlparse/sqlparse-0.4.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=40c2f605c478d55d1b1a8cf7700b9bd1
+_md5_=adac221ab3979285dafaf9d655f07729
diff --git a/metadata/md5-cache/dev-python/tox-3.19.0 b/metadata/md5-cache/dev-python/tox-3.19.0
deleted file mode 100644
index e18e4adf7144..000000000000
--- a/metadata/md5-cache/dev-python/tox-3.19.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/filelock[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/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/packaging[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/pluggy-0.12[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/pip[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/py[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.14[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/toml[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/virtualenv-16.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/flaky-3.4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/freezegun-0.3.11[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/pathlib2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] =dev-python/tox-3.19.0-r0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=virtualenv-based automation of test activities
-EAPI=7
-HOMEPAGE=https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/
-IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=dev-python/filelock[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/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/packaging[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/pluggy-0.12[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/pip[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/py[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.14[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/toml[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/virtualenv-16.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tox-dev/tox/archive/3.19.0.tar.gz -> tox-3.19.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9d875a6ed3040a93296382e763543fe6
diff --git a/metadata/md5-cache/dev-python/tox-3.20.1 b/metadata/md5-cache/dev-python/tox-3.20.1
index 9433d134d5ea..d9ce49c5e501 100644
--- a/metadata/md5-cache/dev-python/tox-3.20.1
+++ b/metadata/md5-cache/dev-python/tox-3.20.1
@@ -4,7 +4,7 @@ DESCRIPTION=virtualenv-based automation of test activities
 EAPI=7
 HOMEPAGE=https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/filelock[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/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/packaging[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/pluggy-0.12[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/pip[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/py[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.14[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/toml[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/virtualenv-16.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tox-dev/tox/archive/3.20.1.tar.gz -> tox-3.20.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1e9d30fbfd2a6816acfd77ee06897649
+_md5_=9d875a6ed3040a93296382e763543fe6
diff --git a/metadata/md5-cache/dev-python/ujson-4.0.1 b/metadata/md5-cache/dev-python/ujson-4.0.1
index 1376354992d9..abf546694dac 100644
--- a/metadata/md5-cache/dev-python/ujson-4.0.1
+++ b/metadata/md5-cache/dev-python/ujson-4.0.1
@@ -5,7 +5,7 @@ DESCRIPTION=Ultra fast JSON encoder and decoder for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/ujson/
 IUSE=test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/ujson/ujson-4.0.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7fae640d1d3f43dc98dec044efdf4fdc
+_md5_=1f640584f62dad4d5f93d58e10052b13
diff --git a/metadata/md5-cache/dev-python/urllib3-1.26.2 b/metadata/md5-cache/dev-python/urllib3-1.26.2
new file mode 100644
index 000000000000..9b56875fcb37
--- /dev/null
+++ b/metadata/md5-cache/dev-python/urllib3-1.26.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_targets_python3_6? ( >=dev-python/PySocks-1.5.8[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/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[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/cryptography-1.3.4[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/pyopenssl-0.14[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/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlipy[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/brotlipy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest-freezegun[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/trustme-0.5.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=www-servers/tornado-4.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( >=dev-python/PySocks-1.5.8[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/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[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/cryptography-1.3.4[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/pyopenssl-0.14[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/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlipy[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/brotlipy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest-freezegun[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/trustme-0.5.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=www-servers/tornado-4.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( >=dev-python/PySocks-1.5.8[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/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[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/cryptography-1.3.4[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/pyopenssl-0.14[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/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlipy[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/brotlipy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest-freezegun[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/trustme-0.5.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=www-servers/tornado-4.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( >=dev-python/PySocks-1.5.8[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/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[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/cryptography-1.3.4[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/pyopenssl-0.14[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/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlipy[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/brotlipy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest-freezegun[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/trustme-0.5.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=www-servers/tornado-4.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) doc? ( || ( ( dev-lang/python:3.9[ssl(+)] dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/alabaster[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/mock[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8[ssl(+)] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/alabaster[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/mock[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[ssl(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/alabaster[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/mock[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[ssl(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/alabaster[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/mock[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0[ssl(+)] dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/alabaster[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/mock[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) >=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=HTTP library with thread-safe connection pooling, file post, and more
+EAPI=7
+HOMEPAGE=https://github.com/urllib3/urllib3
+IUSE=brotli test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/PySocks-1.5.8[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/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[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/cryptography-1.3.4[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/pyopenssl-0.14[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/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlipy[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=[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/u/urllib3/urllib3-1.26.2.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d6f056dcb4d100952f88de6bdd2f8cf1
diff --git a/metadata/md5-cache/dev-python/vcrpy-4.1.0 b/metadata/md5-cache/dev-python/vcrpy-4.1.0
deleted file mode 100644
index 4c00e32f60cb..000000000000
--- a/metadata/md5-cache/dev-python/vcrpy-4.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-httpbin[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/httplib2-0.9.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wrapt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/yarl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Automatically mock your HTTP interactions to simplify and speed up testing
-EAPI=7
-HOMEPAGE=https://github.com/kevin1024/vcrpy
-IUSE=test 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
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/httplib2-0.9.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wrapt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/yarl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/kevin1024/vcrpy/archive/v4.1.0.tar.gz -> vcrpy-4.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ae533261a1f74944d7923c5280e7d99f
diff --git a/metadata/md5-cache/dev-python/vcrpy-4.1.1 b/metadata/md5-cache/dev-python/vcrpy-4.1.1
index bb7fa0b83968..189604867637 100644
--- a/metadata/md5-cache/dev-python/vcrpy-4.1.1
+++ b/metadata/md5-cache/dev-python/vcrpy-4.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Automatically mock your HTTP interactions to simplify and speed up t
 EAPI=7
 HOMEPAGE=https://github.com/kevin1024/vcrpy
 IUSE=test 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/httplib2-0.9.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wrapt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/yarl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kevin1024/vcrpy/archive/v4.1.1.tar.gz -> vcrpy-4.1.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c21187d4c1e10019724da808f090ce62
+_md5_=9126b45a5f7bee1b05a113f9a66f0917
diff --git a/metadata/md5-cache/dev-python/xlsxwriter-1.3.7 b/metadata/md5-cache/dev-python/xlsxwriter-1.3.7
index 446a024b5d1f..7157847f182f 100644
--- a/metadata/md5-cache/dev-python/xlsxwriter-1.3.7
+++ b/metadata/md5-cache/dev-python/xlsxwriter-1.3.7
@@ -4,7 +4,7 @@ DESCRIPTION=Python module for creating Excel XLSX files
 EAPI=7
 HOMEPAGE=https://github.com/jmcnamara/XlsxWriter
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_1.3.7.tar.gz -> xlsxwriter-1.3.7-tests.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3e851768c2abe357fd4b394d02351455
+_md5_=65d9726c7ba0696e4c7d197d3ea6da85
diff --git a/metadata/md5-cache/dev-python/yarl-1.6.2 b/metadata/md5-cache/dev-python/yarl-1.6.2
index ef3a9916fd97..23b09e7e77e5 100644
--- a/metadata/md5-cache/dev-python/yarl-1.6.2
+++ b/metadata/md5-cache/dev-python/yarl-1.6.2
@@ -4,7 +4,7 @@ DESCRIPTION=Yet another URL library
 EAPI=7
 HOMEPAGE=https://github.com/aio-libs/yarl/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/multidict-4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/typing-extensions-3.7.4[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/typing-extensions-3.7.4[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/typing-extensions-3.7.4[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yarl/yarl-1.6.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8b7de813315153a8580e73170977b559
+_md5_=df6b826409f1abd6923d52c5e078244d
diff --git a/metadata/md5-cache/dev-python/yarl-1.6.3 b/metadata/md5-cache/dev-python/yarl-1.6.3
new file mode 100644
index 000000000000..8540c91620d6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/yarl-1.6.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/multidict-4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/typing-extensions-3.7.4[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/typing-extensions-3.7.4[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/typing-extensions-3.7.4[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Yet another URL library
+EAPI=7
+HOMEPAGE=https://github.com/aio-libs/yarl/
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/multidict-4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/typing-extensions-3.7.4[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/typing-extensions-3.7.4[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/typing-extensions-3.7.4[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/y/yarl/yarl-1.6.3.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8b7de813315153a8580e73170977b559
diff --git a/metadata/md5-cache/dev-python/zope-event-4.5.0-r1 b/metadata/md5-cache/dev-python/zope-event-4.5.0-r1
index e6266b54edd6..6fc3fb50e263 100644
--- a/metadata/md5-cache/dev-python/zope-event-4.5.0-r1
+++ b/metadata/md5-cache/dev-python/zope-event-4.5.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Event publishing / dispatch, used by Zope Component Architecture
 EAPI=7
 HOMEPAGE=https://github.com/zopefoundation/zope.event https://docs.zope.org/zope.event/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ZPL
 RDEPEND=dev-python/namespace-zope[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.event/zope.event-4.5.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3e4db2d2698dae9f96842191e24b0706
+_md5_=8c05ecb99b90ed41f67314d6a442dbd2
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 5d217f7e14d7..18415248e6e8 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/ascii85-1.1.0 b/metadata/md5-cache/dev-ruby/ascii85-1.1.0
new file mode 100644
index 000000000000..ef35ff634b02
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ascii85-1.1.0
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/minitest[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest[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? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=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 encoding/decoding Adobe's binary-to-text encoding of the same name
+EAPI=7
+HOMEPAGE=https://github.com/datawraith/ascii85gem
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/Ascii85-1.1.0.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4e8cd3e2ff340e577fc33749b0c07fa5
diff --git a/metadata/md5-cache/dev-ruby/duktape-rb-2.3.0.0-r2 b/metadata/md5-cache/dev-ruby/duktape-rb-2.3.0.0-r2
new file mode 100644
index 000000000000..b573b00b0145
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/duktape-rb-2.3.0.0-r2
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] dev-ruby/rake-compiler[ruby_targets_ruby25(-)] dev-ruby/sdoc[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] dev-ruby/rake-compiler[ruby_targets_ruby26(-)] dev-ruby/sdoc[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/pkg-config[ruby_targets_ruby27(-)] dev-ruby/rake-compiler[ruby_targets_ruby27(-)] dev-ruby/sdoc[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/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-lang/duktape 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=Ruby bindings to the Duktape JavaScript interpeter
+EAPI=7
+HOMEPAGE=https://github.com/judofyr/duktape.rb
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-lang/duktape 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 )
+SLOT=0
+SRC_URI=https://github.com/judofyr/duktape.rb/archive/v2.3.0.0.tar.gz -> duktape-rb-2.3.0.0.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=13823fd29dad6be80f81673a840bbd9d
diff --git a/metadata/md5-cache/dev-ruby/erubi-1.10.0 b/metadata/md5-cache/dev-ruby/erubi-1.10.0
new file mode 100644
index 000000000000..d67b87b52174
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/erubi-1.10.0
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/minitest[ruby_targets_ruby25(-)] dev-ruby/minitest-global_expectations[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] dev-ruby/minitest-global_expectations[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] dev-ruby/minitest-global_expectations[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/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=a ERB template engine for ruby; a simplified fork of Erubis
+EAPI=7
+HOMEPAGE=https://github.com/jeremyevans/erubi
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jeremyevans/erubi/archive/1.10.0.tar.gz -> erubi-1.10.0.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e4e3d8382277243c78b6b36034673704
diff --git a/metadata/md5-cache/dev-ruby/listen-3.3.1 b/metadata/md5-cache/dev-ruby/listen-3.3.1
new file mode 100644
index 000000000000..d1b332e4f053
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/listen-3.3.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/thor[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/thor[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/thor[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? ( 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=Listens to file modifications and notifies you about the changes
+EAPI=7
+HOMEPAGE=https://github.com/guard/listen
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=!!media-radio/ax25-apps !!<dev-ruby/listen-2.8.6-r1:2 ruby_targets_ruby25? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rb-inotify-0.9.10[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 )
+SLOT=3
+SRC_URI=https://github.com/guard/listen/archive/v3.3.1.tar.gz -> listen-3.3.1.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ed925bca184fb6ce4daed350cbfcf439
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.10.0 b/metadata/md5-cache/dev-ruby/rspec-3.10.0
new file mode 100644
index 000000000000..70393ace9fab
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rspec-3.10.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( =dev-ruby/rspec-core-3.10*[ruby_targets_ruby25(-)] =dev-ruby/rspec-expectations-3.10*[ruby_targets_ruby25(-)] =dev-ruby/rspec-mocks-3.10*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/rspec-core-3.10*[ruby_targets_ruby26(-)] =dev-ruby/rspec-expectations-3.10*[ruby_targets_ruby26(-)] =dev-ruby/rspec-mocks-3.10*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/rspec-core-3.10*[ruby_targets_ruby27(-)] =dev-ruby/rspec-expectations-3.10*[ruby_targets_ruby27(-)] =dev-ruby/rspec-mocks-3.10*[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? ( 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=A Behaviour Driven Development (BDD) framework for Ruby
+EAPI=7
+HOMEPAGE=https://github.com/rspec/rspec
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( =dev-ruby/rspec-core-3.10*[ruby_targets_ruby25(-)] =dev-ruby/rspec-expectations-3.10*[ruby_targets_ruby25(-)] =dev-ruby/rspec-mocks-3.10*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/rspec-core-3.10*[ruby_targets_ruby26(-)] =dev-ruby/rspec-expectations-3.10*[ruby_targets_ruby26(-)] =dev-ruby/rspec-mocks-3.10*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/rspec-core-3.10*[ruby_targets_ruby27(-)] =dev-ruby/rspec-expectations-3.10*[ruby_targets_ruby27(-)] =dev-ruby/rspec-mocks-3.10*[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 )
+SLOT=3
+SRC_URI=https://rubygems.org/gems/rspec-3.10.0.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d13103609e4bd0fe5ec592b73f96cc25
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.10.0 b/metadata/md5-cache/dev-ruby/rspec-core-3.10.0
new file mode 100644
index 000000000000..a949bb9007bc
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.10.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( =dev-ruby/rspec-support-3.10*[ruby_targets_ruby25(-)] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( =dev-ruby/rspec-support-3.10*[ruby_targets_ruby26(-)] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( =dev-ruby/rspec-support-3.10*[ruby_targets_ruby27(-)] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby27(-)] ) ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby25(-)] >=dev-ruby/coderay-1.1.1[ruby_targets_ruby25(-)] dev-ruby/syntax[ruby_targets_ruby25(-)] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby25(-)] >=dev-ruby/rspec-expectations-3.8.0:3[ruby_targets_ruby25(-)] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby25(-)] >=dev-ruby/rspec-support-3.9.1:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby26(-)] >=dev-ruby/coderay-1.1.1[ruby_targets_ruby26(-)] dev-ruby/syntax[ruby_targets_ruby26(-)] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby26(-)] >=dev-ruby/rspec-expectations-3.8.0:3[ruby_targets_ruby26(-)] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby26(-)] >=dev-ruby/rspec-support-3.9.1:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby27(-)] >=dev-ruby/coderay-1.1.1[ruby_targets_ruby27(-)] dev-ruby/syntax[ruby_targets_ruby27(-)] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby27(-)] >=dev-ruby/rspec-expectations-3.8.0:3[ruby_targets_ruby27(-)] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby27(-)] >=dev-ruby/rspec-support-3.9.1:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( 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/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
+EAPI=7
+HOMEPAGE=https://github.com/rspec/rspec-core
+IUSE=highlight test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( =dev-ruby/rspec-support-3.10*[ruby_targets_ruby25(-)] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( =dev-ruby/rspec-support-3.10*[ruby_targets_ruby26(-)] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( =dev-ruby/rspec-support-3.10*[ruby_targets_ruby27(-)] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=3
+SRC_URI=https://github.com/rspec/rspec-core/archive/v3.10.0.tar.gz -> rspec-core-3.10.0-git.tgz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=22751a3b37f62c5421df1e85d1275b07
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.0 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.0
new file mode 100644
index 000000000000..2a2a2f6a9ae4
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby25(-)] =dev-ruby/rspec-support-3.10*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby26(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby26(-)] =dev-ruby/rspec-support-3.10*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby27(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby27(-)] =dev-ruby/rspec-support-3.10*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby25(-)] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby26(-)] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby27(-)] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( 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=A Behaviour Driven Development (BDD) framework for Ruby
+EAPI=7
+HOMEPAGE=https://github.com/rspec/rspec-expectations
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby25(-)] =dev-ruby/rspec-support-3.10*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby26(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby26(-)] =dev-ruby/rspec-support-3.10*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby27(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby27(-)] =dev-ruby/rspec-support-3.10*[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=3
+SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.10.0.tar.gz -> rspec-expectations-3.10.0-git.tgz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d590c37d9ddfe705e16c1c63ea51d3a2
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.0 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.0
new file mode 100644
index 000000000000..d0df6dcaca3c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( =dev-ruby/rspec-support-3.10*[ruby_targets_ruby25(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/rspec-support-3.10*[ruby_targets_ruby26(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby26(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/rspec-support-3.10*[ruby_targets_ruby27(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby27(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby25(-)] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby26(-)] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby27(-)] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( 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=A Behaviour Driven Development (BDD) framework for Ruby
+EAPI=7
+HOMEPAGE=https://github.com/rspec/rspec-mocks
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( =dev-ruby/rspec-support-3.10*[ruby_targets_ruby25(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/rspec-support-3.10*[ruby_targets_ruby26(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby26(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/rspec-support-3.10*[ruby_targets_ruby27(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby27(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=3
+SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.10.0.tar.gz -> rspec-mocks-3.10.0-git.tgz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=da810f8efefefe1df2b1a251b9b7908c
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.10.0 b/metadata/md5-cache/dev-ruby/rspec-support-3.10.0
new file mode 100644
index 000000000000..592a656d0993
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.10.0
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-3.9.0:3[ruby_targets_ruby25(-)] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rspec-3.9.0:3[ruby_targets_ruby26(-)] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/rspec-3.9.0:3[ruby_targets_ruby27(-)] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( 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=A Behaviour Driven Development (BDD) framework for Ruby
+EAPI=7
+HOMEPAGE=https://github.com/rspec/rspec-support
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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 ) !test? ( test )
+SLOT=3
+SRC_URI=https://github.com/rspec/rspec-support/archive/v3.10.0.tar.gz -> rspec-support-3.10.0-git.tgz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=bfd71bc1992d1ae6d395649801fdfb18
diff --git a/metadata/md5-cache/dev-tcltk/Manifest.gz b/metadata/md5-cache/dev-tcltk/Manifest.gz
index dc61ad823c3c..9915a16378bb 100644
Binary files a/metadata/md5-cache/dev-tcltk/Manifest.gz and b/metadata/md5-cache/dev-tcltk/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-tcltk/tcllib-1.20 b/metadata/md5-cache/dev-tcltk/tcllib-1.20
index 67238e510c44..4a8bafe1db22 100644
--- a/metadata/md5-cache/dev-tcltk/tcllib-1.20
+++ b/metadata/md5-cache/dev-tcltk/tcllib-1.20
@@ -5,11 +5,11 @@ DESCRIPTION=Tcl Standard Library
 EAPI=7
 HOMEPAGE=http://www.tcl.tk/software/tcllib/
 IUSE=examples test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-lang/tcl:0= dev-tcltk/tdom
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/tcllib/tcllib/1.20/tcllib-1.20.tar.xz
 _eclasses_=virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=6f9d8c3fc48a45af77ea52e3d41e6682
+_md5_=489e8de56834e120516d24b6951b8375
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 93a0a8d0251f..2562285dd604 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/bpftrace-0.10.0-r1 b/metadata/md5-cache/dev-util/bpftrace-0.10.0-r1
deleted file mode 100644
index ff1e8a18246d..000000000000
--- a/metadata/md5-cache/dev-util/bpftrace-0.10.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/xz-utils dev-util/cmake sys-devel/flex sys-devel/bison dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=dev-util/systemtap sys-devel/clang:= dev-libs/libbpf:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] <sys-devel/clang-10:= <sys-devel/llvm-10:=[llvm_targets_BPF(+)] >=dev-util/bcc-0.12.0:= virtual/libelf test? ( dev-cpp/gtest )
-DESCRIPTION=High-level tracing language for eBPF
-EAPI=7
-HOMEPAGE=https://github.com/iovisor/bpftrace
-IUSE=test kernel_linux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-util/systemtap sys-devel/clang:= dev-libs/libbpf:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] <sys-devel/clang-10:= <sys-devel/llvm-10:=[llvm_targets_BPF(+)] >=dev-util/bcc-0.12.0:= virtual/libelf
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/iovisor/bpftrace/archive/v0.10.0.tar.gz -> bpftrace-0.10.0.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=51c275e8ac6d5f5d9da6acb6685567b3
diff --git a/metadata/md5-cache/dev-util/bpftrace-0.11.0-r1 b/metadata/md5-cache/dev-util/bpftrace-0.11.0-r1
deleted file mode 100644
index d148bda40d67..000000000000
--- a/metadata/md5-cache/dev-util/bpftrace-0.11.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/xz-utils >=dev-util/cmake-3.8 sys-devel/flex sys-devel/bison dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=dev-util/systemtap sys-devel/clang:= dev-libs/libbpf:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] sys-devel/clang:= >=dev-util/bcc-0.13.0:= virtual/libelf test? ( dev-cpp/gtest ) !!sys-devel/llvm:0
-DESCRIPTION=High-level tracing language for eBPF
-EAPI=7
-HOMEPAGE=https://github.com/iovisor/bpftrace
-IUSE=test kernel_linux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-util/systemtap sys-devel/clang:= dev-libs/libbpf:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] sys-devel/clang:= >=dev-util/bcc-0.13.0:= virtual/libelf
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/iovisor/bpftrace/archive/v0.11.0.tar.gz -> bpftrace-0.11.0.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b8ba9db0542a789ef8b320e0c23e5790
diff --git a/metadata/md5-cache/dev-util/bpftrace-0.11.2 b/metadata/md5-cache/dev-util/bpftrace-0.11.2
deleted file mode 100644
index a0bc74606b5e..000000000000
--- a/metadata/md5-cache/dev-util/bpftrace-0.11.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/xz-utils >=dev-util/cmake-3.8 sys-devel/flex sys-devel/bison dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=dev-util/systemtap <dev-libs/libbpf-0.2:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] <=sys-devel/llvm-12:=[llvm_targets_BPF(+)] <=sys-devel/clang-12:= >=dev-util/bcc-0.13.0:= <dev-util/bcc-0.17.0:= virtual/libelf test? ( dev-cpp/gtest ) !!sys-devel/llvm:0
-DESCRIPTION=High-level tracing language for eBPF
-EAPI=7
-HOMEPAGE=https://github.com/iovisor/bpftrace
-IUSE=test kernel_linux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-util/systemtap <dev-libs/libbpf-0.2:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] <=sys-devel/llvm-12:=[llvm_targets_BPF(+)] <=sys-devel/clang-12:= >=dev-util/bcc-0.13.0:= <dev-util/bcc-0.17.0:= virtual/libelf
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/iovisor/bpftrace/archive/v0.11.2.tar.gz -> bpftrace-0.11.2.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=57f70342c39583f816817f0bb4bb7032
diff --git a/metadata/md5-cache/dev-util/bpftrace-0.11.1 b/metadata/md5-cache/dev-util/bpftrace-0.11.3-r1
similarity index 62%
rename from metadata/md5-cache/dev-util/bpftrace-0.11.1
rename to metadata/md5-cache/dev-util/bpftrace-0.11.3-r1
index 824ae01b31aa..37c25fb34223 100644
--- a/metadata/md5-cache/dev-util/bpftrace-0.11.1
+++ b/metadata/md5-cache/dev-util/bpftrace-0.11.3-r1
@@ -1,15 +1,15 @@
 BDEPEND=app-arch/xz-utils >=dev-util/cmake-3.8 sys-devel/flex sys-devel/bison dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=dev-util/systemtap sys-devel/clang:= dev-libs/libbpf:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] sys-devel/clang:= >=dev-util/bcc-0.13.0:= virtual/libelf test? ( dev-cpp/gtest ) !!sys-devel/llvm:0
+DEPEND=dev-util/systemtap dev-libs/libbpf:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] <=sys-devel/llvm-12:=[llvm_targets_BPF(+)] <=sys-devel/clang-12:= >=dev-util/bcc-0.13.0:= virtual/libelf test? ( dev-cpp/gtest ) !!sys-devel/llvm:0
 DESCRIPTION=High-level tracing language for eBPF
 EAPI=7
 HOMEPAGE=https://github.com/iovisor/bpftrace
 IUSE=test kernel_linux
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-util/systemtap sys-devel/clang:= dev-libs/libbpf:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] sys-devel/clang:= >=dev-util/bcc-0.13.0:= virtual/libelf
+RDEPEND=dev-util/systemtap dev-libs/libbpf:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] <=sys-devel/llvm-12:=[llvm_targets_BPF(+)] <=sys-devel/clang-12:= >=dev-util/bcc-0.13.0:= virtual/libelf
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/iovisor/bpftrace/archive/v0.11.1.tar.gz -> bpftrace-0.11.1.tar.gz
+SRC_URI=https://github.com/iovisor/bpftrace/archive/v0.11.3.tar.gz -> bpftrace-0.11.3.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b8ba9db0542a789ef8b320e0c23e5790
+_md5_=27cdf756e16bebb778bd70ca5a1a5fef
diff --git a/metadata/md5-cache/dev-util/bpftrace-9999 b/metadata/md5-cache/dev-util/bpftrace-9999
index cd9e8235336b..fb6c87b955ea 100644
--- a/metadata/md5-cache/dev-util/bpftrace-9999
+++ b/metadata/md5-cache/dev-util/bpftrace-9999
@@ -1,14 +1,14 @@
 BDEPEND=>=dev-util/cmake-3.8 sys-devel/flex sys-devel/bison dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=dev-util/systemtap sys-devel/clang:= dev-libs/libbpf:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] sys-devel/clang:= >=dev-util/bcc-0.13.0:= virtual/libelf test? ( dev-cpp/gtest ) !!sys-devel/llvm:0
+DEPEND=dev-util/systemtap <dev-libs/libbpf-0.2:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] <=sys-devel/llvm-12:=[llvm_targets_BPF(+)] <=sys-devel/clang-12:= >=dev-util/bcc-0.13.0:= virtual/libelf test? ( dev-cpp/gtest ) !!sys-devel/llvm:0
 DESCRIPTION=High-level tracing language for eBPF
 EAPI=7
 HOMEPAGE=https://github.com/iovisor/bpftrace
 IUSE=test kernel_linux
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-util/systemtap sys-devel/clang:= dev-libs/libbpf:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] sys-devel/clang:= >=dev-util/bcc-0.13.0:= virtual/libelf
+RDEPEND=dev-util/systemtap <dev-libs/libbpf-0.2:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] <=sys-devel/llvm-12:=[llvm_targets_BPF(+)] <=sys-devel/clang-12:= >=dev-util/bcc-0.13.0:= virtual/libelf
 RESTRICT=test
 SLOT=0
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b8ba9db0542a789ef8b320e0c23e5790
+_md5_=399bdc3ddf28c333c6239d337a907168
diff --git a/metadata/md5-cache/dev-util/ccache-3.7.11 b/metadata/md5-cache/dev-util/ccache-3.7.11
deleted file mode 100644
index cccd010cc4e1..000000000000
--- a/metadata/md5-cache/dev-util/ccache-3.7.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm test
-DEPEND=app-arch/xz-utils sys-libs/zlib test? ( dev-libs/elfutils )
-DESCRIPTION=fast compiler cache
-EAPI=7
-HOMEPAGE=https://ccache.dev/
-IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
-LICENSE=GPL-3
-RDEPEND=app-arch/xz-utils sys-libs/zlib dev-util/shadowman sys-apps/gentoo-functions
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ccache/ccache/releases/download/v3.7.11/ccache-3.7.11.tar.xz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d09ea29d64feaf231fe8b60405019cda
diff --git a/metadata/md5-cache/dev-util/ccache-3.7.12 b/metadata/md5-cache/dev-util/ccache-3.7.12
index 570d19472e83..e00f70f560cb 100644
--- a/metadata/md5-cache/dev-util/ccache-3.7.12
+++ b/metadata/md5-cache/dev-util/ccache-3.7.12
@@ -4,11 +4,11 @@ DESCRIPTION=fast compiler cache
 EAPI=7
 HOMEPAGE=https://ccache.dev/
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-3
 RDEPEND=app-arch/xz-utils sys-libs/zlib dev-util/shadowman sys-apps/gentoo-functions
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ccache/ccache/releases/download/v3.7.12/ccache-3.7.12.tar.xz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f2d3367b7c1e043027ff761d946c6105
+_md5_=a456c78159e128a41b062c4472e519cf
diff --git a/metadata/md5-cache/dev-util/colm-0.13.0.5 b/metadata/md5-cache/dev-util/colm-0.13.0.5
index 3ad0ded0f1a9..37fba7514dfa 100644
--- a/metadata/md5-cache/dev-util/colm-0.13.0.5
+++ b/metadata/md5-cache/dev-util/colm-0.13.0.5
@@ -1,4 +1,4 @@
-DEFINED_PHASES=-
+DEFINED_PHASES=configure install
 DEPEND=app-text/asciidoc
 DESCRIPTION=COmputer Language Manipulation
 EAPI=6
@@ -7,4 +7,4 @@ KEYWORDS=amd64 arm arm64 ~ia64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.colm.net/files/colm/colm-0.13.0.5.tar.gz
-_md5_=db2364c5dfc7320c59bdfc42943d0733
+_md5_=8c7237d326b962c2ea231eb4ba41ca2f
diff --git a/metadata/md5-cache/dev-util/cpputest-3.8 b/metadata/md5-cache/dev-util/cpputest-3.8
deleted file mode 100644
index 955e11455bdb..000000000000
--- a/metadata/md5-cache/dev-util/cpputest-3.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=test? ( >=dev-cpp/gtest-1.8.0 )
-DESCRIPTION=unit testing and mocking framework for C/C++
-EAPI=6
-HOMEPAGE=https://cpputest.github.io/ https://github.com/cpputest/cpputest
-IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86
-LICENSE=BSD
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/cpputest/cpputest/releases/download/v3.8/cpputest-3.8.tar.gz
-_md5_=efb24e7b592c8a53f7604aaf971457ee
diff --git a/metadata/md5-cache/dev-util/cucumber-messages-13.2.0 b/metadata/md5-cache/dev-util/cucumber-messages-13.2.0
new file mode 100644
index 000000000000..55d0babe30dc
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-messages-13.2.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-util/protobuf-cucumber-3.10.8:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-util/protobuf-cucumber-3.10.8:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/protobuf-cucumber-3.10.8:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( 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=Protocol Buffer messages for Cucumber's inter-process communication
+EAPI=7
+HOMEPAGE=https://github.com/cucumber/cucumber-messages-ruby#readme
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( >=dev-util/protobuf-cucumber-3.10.8:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-util/protobuf-cucumber-3.10.8:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/protobuf-cucumber-3.10.8:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=13
+SRC_URI=https://rubygems.org/gems/cucumber-messages-13.2.0.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=da2288094b511d0ebd73d072060fa99f
diff --git a/metadata/md5-cache/dev-util/diffball-1.0.1-r2 b/metadata/md5-cache/dev-util/diffball-1.0.1-r2
index 73797b286b86..c9d38a259d6d 100644
--- a/metadata/md5-cache/dev-util/diffball-1.0.1-r2
+++ b/metadata/md5-cache/dev-util/diffball-1.0.1-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure prepare
-DEPEND=>=sys-libs/zlib-1.1.4 >=app-arch/bzip2-1.0.2 app-arch/xz-utils virtual/pkgconfig
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=>=sys-libs/zlib-1.1.4 >=app-arch/bzip2-1.0.2 app-arch/xz-utils
 DESCRIPTION=Delta compression suite for using/generating binary patches
 EAPI=7
 HOMEPAGE=https://github.com/zmedico/diffball
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/zmedico/diffball/archive/v1.0.1.tar.gz -> diffball-1.0.1.tar.gz https://github.com/zmedico/diffball/pull/1.patch -> diffball-1.0.1-bug_543310_stack_buffer_overflows.patch https://github.com/zmedico/diffball/pull/2.patch -> diffball-1.0.1-bug_708736_cseek_xz_reset_avail_in_out.patch
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3e32bdf58dfee58b5bed309566bb32f7
+_md5_=4c661830d7e5c126d54fd2d1f8038e4f
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.64.5 b/metadata/md5-cache/dev-util/gdbus-codegen-2.64.5
index 3c50e190dbb6..0a5df47db394 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.64.5
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.64.5
@@ -5,11 +5,11 @@ DESCRIPTION=GDBus code and documentation generator
 EAPI=7
 HOMEPAGE=https://www.gtk.org/
 IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2+
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.64/glib-2.64.5.tar.xz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	gnome.org	532d56d07b9eace4831aaa817d2b756a	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=65278d0993e0ac491d08c151f6c2a4b1
+_md5_=362dc56d6a8f9faea1125037abcefdfa
diff --git a/metadata/md5-cache/dev-util/glib-utils-2.64.5 b/metadata/md5-cache/dev-util/glib-utils-2.64.5
index 94fb1a1733d0..aa886fd7fbab 100644
--- a/metadata/md5-cache/dev-util/glib-utils-2.64.5
+++ b/metadata/md5-cache/dev-util/glib-utils-2.64.5
@@ -5,11 +5,11 @@ DESCRIPTION=Build utilities for GLib using projects
 EAPI=7
 HOMEPAGE=https://www.gtk.org/
 IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=LGPL-2.1+
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !<dev-libs/glib-2.56.2:2
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.64/glib-2.64.5.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7bd54fa8ff9075ea6238c65a5a702d1e
+_md5_=cd14cb903ab83b6b756d6181614e3cb5
diff --git a/metadata/md5-cache/dev-util/gtk-doc-1.32-r2 b/metadata/md5-cache/dev-util/gtk-doc-1.32-r2
index 2673b87aa32f..18ec076a1ac0 100644
--- a/metadata/md5-cache/dev-util/gtk-doc-1.32-r2
+++ b/metadata/md5-cache/dev-util/gtk-doc-1.32-r2
@@ -4,7 +4,7 @@ DESCRIPTION=GTK+ Documentation Generator
 EAPI=6
 HOMEPAGE=https://www.gtk.org/gtk-doc/
 IUSE=debug doc emacs python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=GPL-2 FDL-1.1
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-libs/glib-2.6:2 dev-libs/libxslt >=dev-libs/libxml2-2.3.6:2 ~app-text/docbook-xml-dtd-4.3 app-text/docbook-xsl-stylesheets ~app-text/docbook-sgml-dtd-3.0 >=app-text/docbook-dsssl-stylesheets-1.40 emacs? ( >=app-editors/emacs-23.1:* ) python_single_target_python3_6? ( dev-python/pygments[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygments[python_targets_python3_7(-)] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-doc/1.32/gtk-doc-1.32.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fc9f01066f48a2fad26475f592b87a44
+_md5_=eebc8628dd7d7f9dfc1557108deab836
diff --git a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.21 b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.21
index 061638dcd0f7..3ecdf73dc2b9 100644
--- a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.21
+++ b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.21
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.53.4:2 >=x11-libs/gdk-pixbuf-2.30:2 !<x11-libs/gtk+-2.2
 DESCRIPTION=GTK update icon cache
 EAPI=6
 HOMEPAGE=https://www.gtk.org/ https://gitlab.gnome.org/Community/gentoo/gtk-update-icon-cache
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.53.4:2 >=x11-libs/gdk-pixbuf-2.30:2 !<x11-libs/gtk+-2.24.28-r1:2 !<x11-libs/gtk+-3.22.2:3
 SLOT=0
 SRC_URI=https://gitlab.gnome.org/Community/gentoo/gtk-update-icon-cache/-/archive/3.24.21/gtk-update-icon-cache-3.24.21.tar.bz2
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1ab41307bb13a6baa04f4c2b811cb553
+_md5_=5908fbbb2d97262ea37b0a0f34749c68
diff --git a/metadata/md5-cache/dev-util/hfstospell-0.5.1 b/metadata/md5-cache/dev-util/hfstospell-0.5.1
deleted file mode 100644
index 74929857143f..000000000000
--- a/metadata/md5-cache/dev-util/hfstospell-0.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=install prepare
-DEPEND=app-arch/libarchive dev-cpp/libxmlpp:2.6 dev-libs/icu:= dev-libs/tinyxml2
-DESCRIPTION=HFST spell checker library and command line tool
-EAPI=7
-HOMEPAGE=https://github.com/hfst/hfst-ospell
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=app-arch/libarchive dev-cpp/libxmlpp:2.6 dev-libs/icu:= dev-libs/tinyxml2
-SLOT=0
-SRC_URI=https://github.com/hfst/hfst-ospell/archive/v0.5.1.tar.gz -> hfstospell-0.5.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d6aa1d18b107bb3e7a1a1a8f9a79c0e5
diff --git a/metadata/md5-cache/dev-util/hfstospell-0.5.2 b/metadata/md5-cache/dev-util/hfstospell-0.5.2
index 320166bebb7c..f686ff154edf 100644
--- a/metadata/md5-cache/dev-util/hfstospell-0.5.2
+++ b/metadata/md5-cache/dev-util/hfstospell-0.5.2
@@ -4,10 +4,10 @@ DEPEND=app-arch/libarchive dev-cpp/libxmlpp:2.6 dev-libs/icu:= dev-libs/tinyxml2
 DESCRIPTION=HFST spell checker library and command line tool
 EAPI=7
 HOMEPAGE=https://github.com/hfst/hfst-ospell
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=app-arch/libarchive dev-cpp/libxmlpp:2.6 dev-libs/icu:= dev-libs/tinyxml2
 SLOT=0
 SRC_URI=https://github.com/hfst/hfst-ospell/archive/v0.5.2.tar.gz -> hfstospell-0.5.2.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a82baf862390831178407137748f5f4a
+_md5_=5da8f8897502defe6289dd6324827915
diff --git a/metadata/md5-cache/dev-util/pkgconf-1.6.3 b/metadata/md5-cache/dev-util/pkgconf-1.6.3
index 79a1fcd5b966..d6e6e9f30c3e 100644
--- a/metadata/md5-cache/dev-util/pkgconf-1.6.3
+++ b/metadata/md5-cache/dev-util/pkgconf-1.6.3
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=http://distfiles.dereferenced.org/pkgconf/pkgconf-1.6.3.tar.xz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8c88ad6949b4a7001e663709fcadaff4
+_md5_=1505c19187481451c696441c2d45740c
diff --git a/metadata/md5-cache/dev-util/promu-0.5.0 b/metadata/md5-cache/dev-util/promu-0.5.0
index 32a4f055e22d..8cfea2352ac4 100644
--- a/metadata/md5-cache/dev-util/promu-0.5.0
+++ b/metadata/md5-cache/dev-util/promu-0.5.0
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile install postinst prepare unpack
 DESCRIPTION=Prometheus Utility Tool
 EAPI=7
 HOMEPAGE=https://github.com/prometheus/promu
-KEYWORDS=amd64 ~arm
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0 BSD BSD-2 MIT
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/prometheus/promu/archive/v0.5.0.tar.gz -> promu-0.5.0.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=0f8bd5bac5311f0465f624b7fdb4ca3b
+_md5_=7e3dfc153cc99b95d07882c73d72f412
diff --git a/metadata/md5-cache/dev-util/promu-0.6.1 b/metadata/md5-cache/dev-util/promu-0.6.1
index 46261cfc7f00..91b560419fc4 100644
--- a/metadata/md5-cache/dev-util/promu-0.6.1
+++ b/metadata/md5-cache/dev-util/promu-0.6.1
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile install postinst prepare unpack
 DESCRIPTION=Prometheus Utility Tool
 EAPI=7
 HOMEPAGE=https://github.com/prometheus/promu
-KEYWORDS=~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0 BSD BSD-2 MIT
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/prometheus/promu/archive/v0.6.1.tar.gz -> promu-0.6.1.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=925ac66af7d5c1b6e6c6980ce832b490
+_md5_=4ee3fc8594e995afa13b5384f15fe142
diff --git a/metadata/md5-cache/x11-misc/j4-dmenu-desktop-2.17-r1 b/metadata/md5-cache/dev-util/rocm-cmake-3.9.0
similarity index 53%
rename from metadata/md5-cache/x11-misc/j4-dmenu-desktop-2.17-r1
rename to metadata/md5-cache/dev-util/rocm-cmake-3.9.0
index a1a68415dcb4..4689ca677136 100644
--- a/metadata/md5-cache/x11-misc/j4-dmenu-desktop-2.17-r1
+++ b/metadata/md5-cache/dev-util/rocm-cmake-3.9.0
@@ -1,15 +1,12 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=test? ( dev-cpp/catch:1 )
-DESCRIPTION=A fast desktop replacement for i3-dmenu-desktop
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Radeon Open Compute CMake Modules
 EAPI=7
-HOMEPAGE=https://github.com/enkore/j4-dmenu-desktop
-IUSE=+dmenu test
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=dmenu? ( x11-misc/dmenu )
-RESTRICT=!test? ( test )
+HOMEPAGE=https://github.com/RadeonOpenCompute/rocm-cmake
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/enkore/j4-dmenu-desktop/archive/r2.17.tar.gz -> j4-dmenu-desktop-2.17.tar.gz
+SRC_URI=https://github.com/RadeonOpenCompute/rocm-cmake/archive/rocm-3.9.0.tar.gz -> rocm-cmake-3.9.0.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7610187724a875aca935889b2af30f59
+_md5_=c4afe92216ba4629086d6ee99cba7822
diff --git a/metadata/md5-cache/dev-util/rocminfo-3.9.0 b/metadata/md5-cache/dev-util/rocminfo-3.9.0
new file mode 100644
index 000000000000..ebbd81d2f42d
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rocminfo-3.9.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/rocr-runtime-3.9.0
+DESCRIPTION=ROCm Application for Reporting System Info
+EAPI=7
+HOMEPAGE=https://github.com/RadeonOpenCompute/rocminfo
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-libs/rocr-runtime-3.9.0
+SLOT=0/3.9
+SRC_URI=https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-3.9.0.tar.gz -> rocminfo-3.9.0.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9d0d8c64fa517c59629ad465d5371579
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 4223436721d4..445c91cee6d2 100644
Binary files a/metadata/md5-cache/games-arcade/Manifest.gz and b/metadata/md5-cache/games-arcade/Manifest.gz differ
diff --git a/metadata/md5-cache/games-arcade/moleinvasion-0.4-r2 b/metadata/md5-cache/games-arcade/moleinvasion-0.4-r2
index a62608fc61f2..1bd7108e26b6 100644
--- a/metadata/md5-cache/games-arcade/moleinvasion-0.4-r2
+++ b/metadata/md5-cache/games-arcade/moleinvasion-0.4-r2
@@ -1,13 +1,13 @@
-DEFINED_PHASES=install prepare
-DEPEND=media-libs/libsdl[opengl,video] virtual/opengl media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf
+DEFINED_PHASES=configure install prepare
+DEPEND=media-libs/libsdl[opengl,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf virtual/opengl
 DESCRIPTION=Mole infested 2D platform game
-EAPI=6
+EAPI=7
 HOMEPAGE=http://moleinvasion.tuxfamily.org/
 IUSE=music
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[opengl,video] virtual/opengl media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf
+RDEPEND=media-libs/libsdl[opengl,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf virtual/opengl
 SLOT=0
 SRC_URI=ftp://download.tuxfamily.org/minvasion/packages/MoleInvasion-0.4.tar.bz2 music? ( mirror://gentoo/moleinvasion-music-20090731.tar.gz )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8
-_md5_=003ef87e5d8b5968949d50fc5e1bf514
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6418c436f6b20c0145d378fd0e097613
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index af495bc32c33..1c4ef0dc4a41 100644
Binary files a/metadata/md5-cache/games-emulation/Manifest.gz and b/metadata/md5-cache/games-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/games-emulation/advancescan-1.16-r1 b/metadata/md5-cache/games-emulation/advancescan-1.16-r1
index 54ddddaf3326..07b403afa130 100644
--- a/metadata/md5-cache/games-emulation/advancescan-1.16-r1
+++ b/metadata/md5-cache/games-emulation/advancescan-1.16-r1
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/expat sys-libs/zlib
 SLOT=0
-SRC_URI=mirror://sourceforge/advancemame/advancescan-1.16.tar.gz
+SRC_URI=mirror://sourceforge/advancemame/advancescan-1.16.tar.gz https://dev.gentoo.org/~juippis/distfiles/tmp/advancescan-1.16-gcc6.patch
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4b0aabdd30827471ee333ad279753be3
+_md5_=7357a8c4960b9b31a62745b5db80c33d
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index 3e05da8becf5..caae2e92872e 100644
Binary files a/metadata/md5-cache/games-fps/Manifest.gz and b/metadata/md5-cache/games-fps/Manifest.gz differ
diff --git a/metadata/md5-cache/games-fps/alienarena-20130827-r1 b/metadata/md5-cache/games-fps/alienarena-20130827-r1
deleted file mode 100644
index a425f4fd770e..000000000000
--- a/metadata/md5-cache/games-fps/alienarena-20130827-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst
-DEPEND=!dedicated? ( virtual/jpeg:0 media-libs/openal media-libs/libvorbis media-libs/freetype:2 virtual/glu virtual/opengl dga? ( x11-libs/libXxf86dga ) vidmode? ( x11-libs/libXxf86vm ) zlib? ( sys-libs/zlib ) net-misc/curl ) !dedicated? ( dga? ( x11-base/xorg-proto ) vidmode? ( x11-base/xorg-proto ) ) virtual/pkgconfig
-DESCRIPTION=Fast-paced multiplayer deathmatch game
-EAPI=6
-HOMEPAGE=http://red.planetarena.org/
-IUSE=dedicated +dga +vidmode +zlib
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 free-noncomm
-RDEPEND=!dedicated? ( virtual/jpeg:0 media-libs/openal media-libs/libvorbis media-libs/freetype:2 virtual/glu virtual/opengl dga? ( x11-libs/libXxf86dga ) vidmode? ( x11-libs/libXxf86vm ) zlib? ( sys-libs/zlib ) net-misc/curl )
-SLOT=0
-SRC_URI=http://icculus.org/alienarena/Files/alienarena-7.66-linux20130827.tar.gz http://red.planetarena.org/files/alienarena-7.66-linux20130827.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9a541ccaf898de2419cd57f5be69609f
diff --git a/metadata/md5-cache/games-fps/alienarena-7.66 b/metadata/md5-cache/games-fps/alienarena-7.66
new file mode 100644
index 000000000000..5f567ab085e1
--- /dev/null
+++ b/metadata/md5-cache/games-fps/alienarena-7.66
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=!dedicated? ( media-libs/freetype:2 media-libs/libvorbis media-libs/openal net-misc/curl virtual/glu virtual/jpeg:0 virtual/opengl dga? ( x11-libs/libXxf86dga ) vidmode? ( x11-libs/libXxf86vm ) zlib? ( sys-libs/zlib ) ) !dedicated? ( dga? ( x11-base/xorg-proto ) vidmode? ( x11-base/xorg-proto ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Fast-paced multiplayer deathmatch game
+EAPI=7
+HOMEPAGE=http://red.planetarena.org/
+IUSE=dedicated +dga +vidmode +zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 free-noncomm
+RDEPEND=!dedicated? ( media-libs/freetype:2 media-libs/libvorbis media-libs/openal net-misc/curl virtual/glu virtual/jpeg:0 virtual/opengl dga? ( x11-libs/libXxf86dga ) vidmode? ( x11-libs/libXxf86vm ) zlib? ( sys-libs/zlib ) )
+SLOT=0
+SRC_URI=http://icculus.org/alienarena/Files/alienarena-7.66-linux20130827.tar.gz http://red.planetarena.org/files/alienarena-7.66-linux20130827.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=15ab0c811fb8397ec8fc055b22038fdb
diff --git a/metadata/md5-cache/games-fps/avp-20150214-r1 b/metadata/md5-cache/games-fps/avp-20150214-r1
index c82dab13c5c5..7a925ed26338 100644
--- a/metadata/md5-cache/games-fps/avp-20150214-r1
+++ b/metadata/md5-cache/games-fps/avp-20150214-r1
@@ -1,12 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=media-libs/libsdl[video,joystick,opengl] media-libs/openal virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=media-libs/libsdl[video,joystick,opengl] media-libs/openal
 DESCRIPTION=Linux port of Aliens vs Predator
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.icculus.org/avp/
 KEYWORDS=~amd64 ~x86
 LICENSE=AvP
 RDEPEND=media-libs/libsdl[video,joystick,opengl] media-libs/openal
+RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=http://www.icculus.org/avp/files/avp-20150214.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=09dc8dca95411e5619676ddf6d92b3bb
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=96ddbf757f10cb697955ba9795215a31
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index f35844aed985..8cbfbf0f0788 100644
Binary files a/metadata/md5-cache/games-misc/Manifest.gz and b/metadata/md5-cache/games-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/games-misc/typespeed-0.6.5-r1 b/metadata/md5-cache/games-misc/typespeed-0.6.5-r2
similarity index 62%
rename from metadata/md5-cache/games-misc/typespeed-0.6.5-r1
rename to metadata/md5-cache/games-misc/typespeed-0.6.5-r2
index dc429ae73c50..c7acd32ba57b 100644
--- a/metadata/md5-cache/games-misc/typespeed-0.6.5-r1
+++ b/metadata/md5-cache/games-misc/typespeed-0.6.5-r2
@@ -1,7 +1,8 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses:0= nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=sys-libs/ncurses:0= nls? ( virtual/libintl )
 DESCRIPTION=Test your typing speed, and get your fingers CPS
-EAPI=6
+EAPI=7
 HOMEPAGE=http://typespeed.sourceforge.net/
 IUSE=nls
 KEYWORDS=~alpha ~amd64 ~ppc64 ~x86
@@ -10,4 +11,4 @@ RDEPEND=sys-libs/ncurses:0= nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/typespeed/typespeed-0.6.5.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=db5722231fbfcd1a9360c72da99ed9bc
+_md5_=6dee0fd03a25072c192866264373e1ec
diff --git a/metadata/md5-cache/games-misc/xcowsay-1.5 b/metadata/md5-cache/games-misc/xcowsay-1.5
deleted file mode 100644
index 8a42c2a7e761..000000000000
--- a/metadata/md5-cache/games-misc/xcowsay-1.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gtk+:3 x11-libs/pango dbus? ( dev-libs/dbus-glib ) fortune? ( games-misc/fortune-mod )
-DESCRIPTION=Displays a cute cow and message on your desktop
-EAPI=7
-HOMEPAGE=https://github.com/nickg/xcowsay https://www.doof.me.uk/xcowsay/
-IUSE=dbus fortune nls
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gtk+:3 x11-libs/pango dbus? ( dev-libs/dbus-glib ) fortune? ( games-misc/fortune-mod )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/nickg/xcowsay/archive/v1.5.tar.gz -> xcowsay-1.5.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=20998b0072a6609e76fd003580deb046
diff --git a/metadata/md5-cache/games-mud/Manifest.gz b/metadata/md5-cache/games-mud/Manifest.gz
index 69eaac17cc93..5083ef9c12e9 100644
Binary files a/metadata/md5-cache/games-mud/Manifest.gz and b/metadata/md5-cache/games-mud/Manifest.gz differ
diff --git a/metadata/md5-cache/games-mud/tf-5.0_beta8_p8 b/metadata/md5-cache/games-mud/tf-5.0_beta8_p8
new file mode 100644
index 000000000000..266364fe572d
--- /dev/null
+++ b/metadata/md5-cache/games-mud/tf-5.0_beta8_p8
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst
+DEPEND=dev-libs/libpcre sys-libs/ncurses:= ssl? ( dev-libs/openssl:0= )
+DESCRIPTION=A small, flexible, screen-oriented MUD client (aka TinyFugue)
+EAPI=7
+HOMEPAGE=http://tinyfugue.sourceforge.net/
+IUSE=+atcp doc +gmcp ipv6 +option102 ssl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libpcre sys-libs/ncurses:= ssl? ( dev-libs/openssl:0= )
+SLOT=0
+SRC_URI=mirror://sourceforge/tinyfugue/tf-50b8.tar.gz mirror://debian/pool/main/t/tf5/tf5_5.0beta8-8.debian.tar.xz http://homepage.mac.com/mikeride/abelinc/scripts/allrootpatch.txt -> tf-allrootpatch.txt http://homepage.mac.com/mikeride/abelinc/scripts/allsrcpatch.txt -> tf-allsrcpatch.txt doc? ( mirror://sourceforge/tinyfugue/tf-50b8-help.tar.gz )
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1932ca71508c3a45f21be819e7e83b25
diff --git a/metadata/md5-cache/games-mud/tf-50_beta8-r2 b/metadata/md5-cache/games-mud/tf-50_beta8-r2
deleted file mode 100644
index e6d66633dffa..000000000000
--- a/metadata/md5-cache/games-mud/tf-50_beta8-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=ssl? ( dev-libs/openssl:0= ) dev-libs/libpcre
-DESCRIPTION=A small, flexible, screen-oriented MUD client (aka TinyFugue)
-EAPI=6
-HOMEPAGE=http://tinyfugue.sourceforge.net/
-IUSE=+atcp debug doc +gmcp ipv6 +option102 ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=ssl? ( dev-libs/openssl:0= ) dev-libs/libpcre
-SLOT=0
-SRC_URI=mirror://sourceforge/tinyfugue/tf-50b8.tar.gz http://homepage.mac.com/mikeride/abelinc/scripts/allrootpatch.txt -> tf-allrootpatch.txt http://homepage.mac.com/mikeride/abelinc/scripts/allsrcpatch.txt -> tf-allsrcpatch.txt doc? ( mirror://sourceforge/tinyfugue/tf-50b8-help.tar.gz )
-_md5_=923cfc004b3e6db69a9439a9a0342e44
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index b930ed966b12..e0c697a75459 100644
Binary files a/metadata/md5-cache/games-puzzle/Manifest.gz and b/metadata/md5-cache/games-puzzle/Manifest.gz differ
diff --git a/metadata/md5-cache/games-puzzle/rezerwar-0.4.2-r1 b/metadata/md5-cache/games-puzzle/rezerwar-0.4.2-r1
deleted file mode 100644
index d8eb938a2aea..000000000000
--- a/metadata/md5-cache/games-puzzle/rezerwar-0.4.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-mixer[vorbis]
-DESCRIPTION=Puzzle game like the known tetromino and the average pipe games
-EAPI=6
-HOMEPAGE=http://tamentis.com/projects/rezerwar/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-mixer[vorbis]
-SLOT=0
-SRC_URI=http://tamentis.com/projects/rezerwar/files/rezerwar-0.4.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8
-_md5_=e3167945521888ff630b1232d03b7d82
diff --git a/metadata/md5-cache/games-puzzle/rezerwar-0.4.2-r2 b/metadata/md5-cache/games-puzzle/rezerwar-0.4.2-r2
new file mode 100644
index 000000000000..bd83a2a20136
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/rezerwar-0.4.2-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-mixer[vorbis]
+DESCRIPTION=Puzzle game like the known tetromino and the average pipe games
+EAPI=7
+HOMEPAGE=https://tamentis.com/projects/rezerwar/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-mixer[vorbis]
+SLOT=0
+SRC_URI=https://tamentis.com/projects/rezerwar/files/rezerwar-0.4.2.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=67bde81bddf5ec1f76b4892e607efb25
diff --git a/metadata/md5-cache/games-puzzle/zaz-1.0.0-r1 b/metadata/md5-cache/games-puzzle/zaz-1.0.0-r1
index 9774f6c0de68..39d92c02e501 100644
--- a/metadata/md5-cache/games-puzzle/zaz-1.0.0-r1
+++ b/metadata/md5-cache/games-puzzle/zaz-1.0.0-r1
@@ -1,5 +1,5 @@
-DEFINED_PHASES=configure prepare
-DEPEND=virtual/opengl virtual/glu media-libs/libsdl[X,sound,video] media-libs/sdl-image[jpeg,png] media-libs/libvorbis media-libs/libtheora media-libs/ftgl virtual/libintl virtual/pkgconfig nls? ( sys-devel/gettext ) >=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 postinst postrm preinst prepare
+DEPEND=virtual/opengl virtual/glu media-libs/libsdl[X,sound,video] media-libs/sdl-image[jpeg,png] media-libs/libvorbis media-libs/libtheora media-libs/ftgl virtual/libintl virtual/pkgconfig nls? ( sys-devel/gettext ) >=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-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A puzzle game where the player has to arrange balls in triplets
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/zaz/
@@ -9,5 +9,5 @@ LICENSE=GPL-3 GPL-3+ CC-BY-SA-3.0 OFL
 RDEPEND=virtual/opengl virtual/glu media-libs/libsdl[X,sound,video] media-libs/sdl-image[jpeg,png] media-libs/libvorbis media-libs/libtheora media-libs/ftgl virtual/libintl
 SLOT=0
 SRC_URI=mirror://sourceforge/zaz/zaz-1.0.0.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=94619645d32bc3a694562f2fde294d4b
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=57669272ecffed770419055b505537a3
diff --git a/metadata/md5-cache/games-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index 0f190c47d7a3..010128b28f77 100644
Binary files a/metadata/md5-cache/games-roguelike/Manifest.gz and b/metadata/md5-cache/games-roguelike/Manifest.gz differ
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r100 b/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r100
new file mode 100644
index 000000000000..d3539a83f36e
--- /dev/null
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r100
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm setup
+DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) dev-db/sqlite:3 sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl ) dev-lang/perl dev-python/pyyaml sys-devel/flex tiles? ( sys-libs/ncurses:0 ) virtual/pkgconfig virtual/yacc
+DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in dungeons
+EAPI=7
+HOMEPAGE=http://crawl.develz.org/wordpress/
+IUSE=debug ncurses sound test +tiles lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 BSD BSD-2 public-domain CC0-1.0 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 ) dev-db/sqlite:3 sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl )
+REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/crawl/crawl/releases/download/0.25.1/stone_soup-0.25.1.zip https://dev.gentoo.org/~hasufell/distfiles/stone-soup.png https://dev.gentoo.org/~hasufell/distfiles/stone-soup.svg
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b9abe49dcf003215db2e06ec7273277b
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index fc9ea58f7f9b..c9a5f5b969ba 100644
Binary files a/metadata/md5-cache/games-server/Manifest.gz and b/metadata/md5-cache/games-server/Manifest.gz differ
diff --git a/metadata/md5-cache/games-server/mtavc-0.5-r2 b/metadata/md5-cache/games-server/mtavc-0.5-r2
index 2e0e1bc227aa..ca43b5912801 100644
--- a/metadata/md5-cache/games-server/mtavc-0.5-r2
+++ b/metadata/md5-cache/games-server/mtavc-0.5-r2
@@ -8,4 +8,4 @@ RDEPEND=sys-libs/libstdc++-v3:5
 SLOT=0
 SRC_URI=http://files.gonnaplay.com/201/MTAServer0_5-linux.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=107884b0d4bda93086e2b52cbea93cef
+_md5_=3ea9a9387b2d09f27070cde8d94886fb
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index 7b68a2c7b4a2..4e134e7666fc 100644
Binary files a/metadata/md5-cache/games-simulation/Manifest.gz and b/metadata/md5-cache/games-simulation/Manifest.gz differ
diff --git a/metadata/md5-cache/games-simulation/openrct2-0.3.0 b/metadata/md5-cache/games-simulation/openrct2-0.3.0-r1
similarity index 85%
rename from metadata/md5-cache/games-simulation/openrct2-0.3.0
rename to metadata/md5-cache/games-simulation/openrct2-0.3.0-r1
index d1b728b427d6..79fb151e7380 100644
--- a/metadata/md5-cache/games-simulation/openrct2-0.3.0
+++ b/metadata/md5-cache/games-simulation/openrct2-0.3.0-r1
@@ -1,15 +1,15 @@
 BDEPEND=app-arch/unzip virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) scripting? ( dev-lang/duktape ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) test? ( dev-cpp/gtest )
+DEPEND=dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) test? ( dev-cpp/gtest )
 DESCRIPTION=An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2
 EAPI=7
 HOMEPAGE=https://openrct2.org/
 IUSE=dedicated libressl +lightfx +opengl scripting test +truetype
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-3
-RDEPEND=dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) scripting? ( dev-lang/duktape ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dedicated? ( acct-group/openrct2 acct-user/openrct2 )
+RDEPEND=dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dedicated? ( acct-group/openrct2 acct-user/openrct2 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenRCT2/OpenRCT2/archive/v0.3.0.tar.gz -> openrct2-0.3.0.tar.gz https://github.com/OpenRCT2/objects/releases/download/v1.0.16/objects.zip -> openrct2-objects-1.0.16.zip https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.2c/title-sequences.zip -> openrct2-title-sequences-0.1.2c.zip test? ( https://github.com/OpenRCT2/replays/releases/download/v0.0.17/replays.zip -> openrct2-replays-0.0.17.zip )
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c91c9defa58ffafd749b9aace588a925
+_md5_=7dadc4c21760359282ab74e7b2a14f2f
diff --git a/metadata/md5-cache/games-simulation/openrct2-0.3.2 b/metadata/md5-cache/games-simulation/openrct2-0.3.2-r1
similarity index 84%
rename from metadata/md5-cache/games-simulation/openrct2-0.3.2
rename to metadata/md5-cache/games-simulation/openrct2-0.3.2-r1
index e899baa05284..4a5219f55b68 100644
--- a/metadata/md5-cache/games-simulation/openrct2-0.3.2
+++ b/metadata/md5-cache/games-simulation/openrct2-0.3.2-r1
@@ -1,15 +1,15 @@
 BDEPEND=app-arch/unzip virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) scripting? ( dev-lang/duktape ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dev-cpp/nlohmann_json test? ( dev-cpp/gtest )
+DEPEND=dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dev-cpp/nlohmann_json test? ( dev-cpp/gtest )
 DESCRIPTION=An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2
 EAPI=7
 HOMEPAGE=https://openrct2.org/
 IUSE=dedicated libressl +lightfx +opengl scripting test +truetype
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) scripting? ( dev-lang/duktape ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dedicated? ( acct-group/openrct2 acct-user/openrct2 )
+RDEPEND=dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dedicated? ( acct-group/openrct2 acct-user/openrct2 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenRCT2/OpenRCT2/archive/v0.3.2.tar.gz -> openrct2-0.3.2.tar.gz https://github.com/OpenRCT2/objects/releases/download/v1.0.18/objects.zip -> openrct2-objects-1.0.18.zip https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.2c/title-sequences.zip -> openrct2-title-sequences-0.1.2c.zip test? ( https://github.com/OpenRCT2/replays/releases/download/v0.0.19/replays.zip -> openrct2-replays-0.0.19.zip )
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=36dd7bb9e2b6615d46800e1b940993af
+_md5_=cd2b5d06d89f7d866fb2961c9fecafff
diff --git a/metadata/md5-cache/games-simulation/openrct2-9999 b/metadata/md5-cache/games-simulation/openrct2-9999
index 99d356e20e06..1bab30c8a1e0 100644
--- a/metadata/md5-cache/games-simulation/openrct2-9999
+++ b/metadata/md5-cache/games-simulation/openrct2-9999
@@ -1,15 +1,15 @@
 BDEPEND=app-arch/unzip virtual/pkgconfig dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) scripting? ( dev-lang/duktape ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dev-cpp/nlohmann_json test? ( dev-cpp/gtest )
+DEPEND=dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dev-cpp/nlohmann_json test? ( dev-cpp/gtest )
 DESCRIPTION=An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2
 EAPI=7
 HOMEPAGE=https://openrct2.org/
 IUSE=dedicated libressl +lightfx +opengl scripting test +truetype
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) scripting? ( dev-lang/duktape ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dedicated? ( acct-group/openrct2 acct-user/openrct2 )
+RDEPEND=dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dedicated? ( acct-group/openrct2 acct-user/openrct2 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenRCT2/objects/releases/download/v1.0.18/objects.zip -> openrct2-objects-1.0.18.zip https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.2c/title-sequences.zip -> openrct2-title-sequences-0.1.2c.zip test? ( https://github.com/OpenRCT2/replays/releases/download/v0.0.19/replays.zip -> openrct2-replays-0.0.19.zip )
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6bd9b8bef4b0a7d2ec3e7db2b9f61135
+_md5_=77d9619a7de5a01870b25773640aafbb
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 4315dbced015..a2e87f1d8da8 100644
Binary files a/metadata/md5-cache/games-strategy/Manifest.gz and b/metadata/md5-cache/games-strategy/Manifest.gz differ
diff --git a/metadata/md5-cache/games-strategy/seven-kingdoms-2.14.7 b/metadata/md5-cache/games-strategy/seven-kingdoms-2.14.7
index c52fab4de931..b2b12b88dfd1 100644
--- a/metadata/md5-cache/games-strategy/seven-kingdoms-2.14.7
+++ b/metadata/md5-cache/games-strategy/seven-kingdoms-2.14.7
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install unpack
+DEFINED_PHASES=compile install unpack
 DEPEND=net-libs/enet:1.3= media-libs/libsdl2[X,video] media-libs/openal net-misc/curl
 DESCRIPTION=Seven Kingdoms: Ancient Adversaries
 EAPI=6
@@ -9,4 +9,4 @@ RDEPEND=net-libs/enet:1.3= media-libs/libsdl2[X,video] media-libs/openal net-mis
 SLOT=0
 SRC_URI=https://github.com/the3dfxdude/7kaa/releases/download/v2.14.7/7kaa-2.14.7.tar.xz https://dev.gentoo.org/~pinkbyte/distfiles/7kaa.png
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cb836dd5eaf549f85884bbcd341141f8
+_md5_=bed33153d1b0ec08325f0aadefcc901b
diff --git a/metadata/md5-cache/games-strategy/seven-kingdoms-2.15.2 b/metadata/md5-cache/games-strategy/seven-kingdoms-2.15.4_p1
similarity index 55%
rename from metadata/md5-cache/games-strategy/seven-kingdoms-2.15.2
rename to metadata/md5-cache/games-strategy/seven-kingdoms-2.15.4_p1
index e4fba001cc7d..696a51e09335 100644
--- a/metadata/md5-cache/games-strategy/seven-kingdoms-2.15.2
+++ b/metadata/md5-cache/games-strategy/seven-kingdoms-2.15.4_p1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install unpack
+DEFINED_PHASES=compile install unpack
 DEPEND=net-libs/enet:1.3= media-libs/libsdl2[X,video] media-libs/openal net-misc/curl
 DESCRIPTION=Seven Kingdoms: Ancient Adversaries
 EAPI=7
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=net-libs/enet:1.3= media-libs/libsdl2[X,video] media-libs/openal net-misc/curl
 SLOT=0
-SRC_URI=https://github.com/the3dfxdude/7kaa/releases/download/v2.15.2/7kaa-2.15.2.tar.xz https://dev.gentoo.org/~pinkbyte/distfiles/7kaa.png
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8
-_md5_=543b068df490229e29cf81d724fe5562
+SRC_URI=https://github.com/the3dfxdude/7kaa/releases/download/v2.15.4p1/7kaa-2.15.4p1.tar.xz https://dev.gentoo.org/~pinkbyte/distfiles/7kaa.png
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7cf9f6e2d924fab0d4e591d8fb749662
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.14.13 b/metadata/md5-cache/games-strategy/wesnoth-1.14.13
deleted file mode 100644
index 44331ed455f3..000000000000
--- a/metadata/md5-cache/games-strategy/wesnoth-1.14.13
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=acct-group/wesnoth acct-user/wesnoth >=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) ) x11-libs/libX11 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Battle for Wesnoth - A fantasy turn-based strategy game
-EAPI=7
-HOMEPAGE=http://www.wesnoth.org https://github.com/wesnoth/wesnoth
-IUSE=dbus dedicated doc fribidi libressl nls server
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=acct-group/wesnoth acct-user/wesnoth >=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) )
-SLOT=0
-SRC_URI=https://github.com/wesnoth/wesnoth/archive/1.14.13.tar.gz -> wesnoth-1.14.13.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4cd4e05fb9ef5710345de62cb779af8a
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.14.14 b/metadata/md5-cache/games-strategy/wesnoth-1.14.14
index eb6f5fd4ac99..daa6052be443 100644
--- a/metadata/md5-cache/games-strategy/wesnoth-1.14.14
+++ b/metadata/md5-cache/games-strategy/wesnoth-1.14.14
@@ -11,4 +11,4 @@ RDEPEND=acct-group/wesnoth acct-user/wesnoth >=dev-libs/boost-1.50:=[nls,threads
 SLOT=0
 SRC_URI=https://github.com/wesnoth/wesnoth/archive/1.14.14.tar.gz -> wesnoth-1.14.14.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4cd4e05fb9ef5710345de62cb779af8a
+_md5_=c2f4298638653aea71c96e72a638cbd6
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.15.4 b/metadata/md5-cache/games-strategy/wesnoth-1.15.4
index b83f1318ec76..2712ede862ed 100644
--- a/metadata/md5-cache/games-strategy/wesnoth-1.15.4
+++ b/metadata/md5-cache/games-strategy/wesnoth-1.15.4
@@ -10,4 +10,4 @@ RDEPEND=acct-group/wesnoth acct-user/wesnoth >=dev-libs/boost-1.50:=[nls,threads
 SLOT=0
 SRC_URI=https://github.com/wesnoth/wesnoth/archive/1.15.4.tar.gz -> wesnoth-1.15.4.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4cd4e05fb9ef5710345de62cb779af8a
+_md5_=c2f4298638653aea71c96e72a638cbd6
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index 0c3e54bbe744..568646a77145 100644
Binary files a/metadata/md5-cache/games-util/Manifest.gz and b/metadata/md5-cache/games-util/Manifest.gz differ
diff --git a/metadata/md5-cache/games-util/lutris-0.5.7 b/metadata/md5-cache/games-util/lutris-0.5.7
deleted file mode 100644
index 9b834c0e3f10..000000000000
--- a/metadata/md5-cache/games-util/lutris-0.5.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=An open source gaming platform for GNU/Linux
-EAPI=7
-HOMEPAGE=https://lutris.net/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-arch/cabextract app-arch/p7zip app-arch/unrar app-arch/unzip dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-evdev[python_targets_python3_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/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] gnome-base/gnome-desktop:3[introspection] media-sound/fluid-soundfont net-libs/libsoup net-libs/webkit-gtk:4[introspection] x11-apps/mesa-progs x11-apps/xgamma x11-apps/xrandr x11-libs/gtk+:3[introspection] x11-libs/libnotify python_targets_python3_6? ( dev-lang/python:3.6[sqlite,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://lutris.net/releases/lutris_0.5.7.tar.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8d5fff0f186837728b134683ed27c081
diff --git a/metadata/md5-cache/games-util/lutris-0.5.8 b/metadata/md5-cache/games-util/lutris-0.5.8
new file mode 100644
index 000000000000..a909b7135b50
--- /dev/null
+++ b/metadata/md5-cache/games-util/lutris-0.5.8
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_single_target_python3_6? ( dev-python/nose[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=An open source gaming platform for GNU/Linux
+EAPI=7
+HOMEPAGE=https://lutris.net/
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-arch/cabextract app-arch/p7zip app-arch/unrar app-arch/unzip python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/python-evdev[python_targets_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] dev-python/pillow[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/python-evdev[python_targets_python3_7(-)] dev-python/pyyaml[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/python-evdev[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) gnome-base/gnome-desktop:3[introspection] media-sound/fluid-soundfont net-libs/libsoup net-libs/webkit-gtk:4[introspection] x11-apps/mesa-progs x11-apps/xgamma x11-apps/xrandr x11-libs/gtk+:3[introspection] x11-libs/libnotify python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://lutris.net/releases/lutris_0.5.8.tar.xz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=726a0e3445eb1840d4a280c5477c6047
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 87e8c2be7cab..80d5ecb40d62 100644
Binary files a/metadata/md5-cache/gnome-base/Manifest.gz and b/metadata/md5-cache/gnome-base/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-base/dconf-0.36.0 b/metadata/md5-cache/gnome-base/dconf-0.36.0
index 140cdb749e89..54f12a15d4b5 100644
--- a/metadata/md5-cache/gnome-base/dconf-0.36.0
+++ b/metadata/md5-cache/gnome-base/dconf-0.36.0
@@ -5,11 +5,11 @@ DESCRIPTION=Simple low-level configuration system
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/dconf
 IUSE=gtk-doc test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44.0:2 sys-apps/dbus
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/dconf/0.36/dconf-0.36.0.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dcd96a2746484ce5b6252f2269cb60d6
+_md5_=7f9471c7d1e2a801716157246a49eed1
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-3.36.7 b/metadata/md5-cache/gnome-base/gnome-shell-3.36.7
new file mode 100644
index 000000000000..b76328d8845a
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gnome-shell-3.36.7
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/sassc dev-libs/libxslt app-text/asciidoc >=dev-util/gdbus-codegen-2.45.3 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.17 app-text/docbook-xml-dtd:4.3 ) >=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=>=gnome-extra/evolution-data-server-3.33.1:= >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.57.2:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.63.2 >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-3.36.0:0/6[introspection] >=sys-auth/polkit-0.100[introspection] >=gnome-base/gsettings-desktop-schemas-3.33.1 >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.2 >=gnome-base/gnome-desktop-3.35.90:3=[introspection] bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 media-libs/gst-plugins-base:1.0 networkmanager? ( >=net-misc/networkmanager-1.10.4:=[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-31 >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-atk-2.5.3 x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-sound/pulseaudio-12.99.3[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) media-libs/mesa[X(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Provides core UI functions for the GNOME 3 desktop
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell
+IUSE=+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+ LGPL-2+
+PDEPEND=>=gnome-base/gdm-3.5[introspection] >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] browser-extension? ( gnome-extra/chrome-gnome-shell )
+RDEPEND=>=gnome-extra/evolution-data-server-3.33.1:= >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.57.2:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.63.2 >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-3.36.0:0/6[introspection] >=sys-auth/polkit-0.100[introspection] >=gnome-base/gsettings-desktop-schemas-3.33.1 >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.2 >=gnome-base/gnome-desktop-3.35.90:3=[introspection] bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 media-libs/gst-plugins-base:1.0 networkmanager? ( >=net-misc/networkmanager-1.10.4:=[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-31 >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-atk-2.5.3 x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-sound/pulseaudio-12.99.3[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) media-libs/mesa[X(+)] >=sys-apps/accountsservice-0.6.14[introspection] app-accessibility/at-spi2-core:2[introspection] app-misc/geoclue[introspection] >=dev-libs/libgweather-3.26:2[introspection] >=sys-power/upower-0.99:=[introspection] x11-libs/pango[introspection] gnome-base/librsvg:2[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 x11-misc/xdg-utils >=x11-themes/adwaita-icon-theme-3.26 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] ) telepathy? ( >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] ) media-fonts/cantarell
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ?? ( elogind systemd )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-shell/3.36/gnome-shell-3.36.7.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-shell-3.36.7-patchset.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	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_=1b698fc402c939f6a3440082f825ae02
diff --git a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.36.1 b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.36.1
index df1002bd0e11..fe8a4e06a307 100644
--- a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.36.1
+++ b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.36.1
@@ -5,9 +5,9 @@ DESCRIPTION=Collection of GSettings schemas for GNOME desktop
 EAPI=7
 HOMEPAGE=https://git.gnome.org/browse/gsettings-desktop-schemas
 IUSE=+introspection
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=mirror://gnome/sources/gsettings-desktop-schemas/3.36/gsettings-desktop-schemas-3.36.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6cdaa5c2974c9b1d3b8be5102f61cf92
+_md5_=2da07b8d33582753f21a09a67919c8ae
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 051d3a921deb..df068869da79 100644
Binary files a/metadata/md5-cache/gnome-extra/Manifest.gz and b/metadata/md5-cache/gnome-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.36.7 b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.36.7
new file mode 100644
index 000000000000..877dbd17e1d0
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.36.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211 dev-lang/sassc >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( dev-lang/spidermonkey:68 ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=JavaScript extensions for GNOME Shell
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell/Extensions
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211 >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= dev-libs/atk[introspection] gnome-base/gnome-menus:3[introspection] =gnome-base/gnome-shell-3.36* media-libs/clutter:1.0[introspection] net-libs/telepathy-glib[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-themes/adwaita-icon-theme >=x11-wm/mutter-3.32[introspection]
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-shell-extensions/3.36/gnome-shell-extensions-3.36.7.tar.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bc322ff2c48bf84e9246283b4ec4719d
diff --git a/metadata/md5-cache/gnome-extra/yelp-xsl-3.36.0 b/metadata/md5-cache/gnome-extra/yelp-xsl-3.36.0
index cbf264c36bdb..4bf365d4ced1 100644
--- a/metadata/md5-cache/gnome-extra/yelp-xsl-3.36.0
+++ b/metadata/md5-cache/gnome-extra/yelp-xsl-3.36.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:= >=dev-util/itstool
 DESCRIPTION=XSL stylesheets for yelp
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/yelp-xsl
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~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+ LGPL-2.1+ MIT FDL-1.1+
 RDEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/yelp-xsl/3.36/yelp-xsl-3.36.0.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a6f3b6520e8f0b7e10b0b9c725331f05
+_md5_=67c844c1bc8ff2bd9be495db843d5080
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index e1a98d7032e6..099517f9c918 100644
Binary files a/metadata/md5-cache/gui-apps/Manifest.gz and b/metadata/md5-cache/gui-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-apps/gtkgreet-0.6-r1 b/metadata/md5-cache/gui-apps/gtkgreet-0.6-r1
index c8294305dfc6..7b7b9c8142f5 100644
--- a/metadata/md5-cache/gui-apps/gtkgreet-0.6-r1
+++ b/metadata/md5-cache/gui-apps/gtkgreet-0.6-r1
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig man? ( app-text/scdoc ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
 DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/json-c:= x11-libs/gtk+:3 layershell? ( gui-libs/gtk-layer-shell )
+DEPEND=dev-libs/json-c:= layershell? ( gui-libs/gtk-layer-shell ) x11-libs/gtk+:3
 DESCRIPTION=gtk based greeter for greetd
 EAPI=7
 HOMEPAGE=https://git.sr.ht/~kennylevinsen/gtkgreet
 IUSE=+layershell +man
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-libs/json-c:= x11-libs/gtk+:3 layershell? ( gui-libs/gtk-layer-shell ) gui-libs/greetd
+RDEPEND=dev-libs/json-c:= layershell? ( gui-libs/gtk-layer-shell ) x11-libs/gtk+:3 gui-libs/greetd
 SLOT=0
 SRC_URI=https://git.sr.ht/~kennylevinsen/gtkgreet/archive/0.6.tar.gz -> gtkgreet-0.6.tar.gz
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=10efc1cc4a50f541829465c215842fc6
+_md5_=dfcc1360fc7dea97d2f98205a8c45037
diff --git a/metadata/md5-cache/gui-apps/gtkgreet-9999 b/metadata/md5-cache/gui-apps/gtkgreet-9999
index cf914e453ee9..4b954570b86b 100644
--- a/metadata/md5-cache/gui-apps/gtkgreet-9999
+++ b/metadata/md5-cache/gui-apps/gtkgreet-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=dev-libs/json-c:= layershell? ( gui-libs/gtk-layer-shell ) x11-libs/gtk+:3 gui-libs/greetd
 SLOT=0
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fe49afd9b3d98726dff3369fd1ed4804
+_md5_=dfcc1360fc7dea97d2f98205a8c45037
diff --git a/metadata/md5-cache/gui-apps/wayland-logout-1.0 b/metadata/md5-cache/gui-apps/wayland-logout-1.0
new file mode 100644
index 000000000000..0ebf287651fd
--- /dev/null
+++ b/metadata/md5-cache/gui-apps/wayland-logout-1.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=general logout scripts for wayland compositors
+EAPI=7
+HOMEPAGE=https://github.com/soreau/wayland-logout
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=sys-process/lsof
+SLOT=0
+SRC_URI=https://github.com/soreau/wayland-logout/archive/v1.0.tar.gz -> wayland-logout-1.0.tar.gz
+_md5_=e6dcb8ffa05f2a739250cf98d8204bae
diff --git a/metadata/md5-cache/gui-apps/wayland-logout-9999 b/metadata/md5-cache/gui-apps/wayland-logout-9999
new file mode 100644
index 000000000000..7a192e640d16
--- /dev/null
+++ b/metadata/md5-cache/gui-apps/wayland-logout-9999
@@ -0,0 +1,11 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=install unpack
+DESCRIPTION=general logout scripts for wayland compositors
+EAPI=7
+HOMEPAGE=https://github.com/soreau/wayland-logout
+LICENSE=MIT
+PROPERTIES=live
+RDEPEND=sys-process/lsof
+SLOT=0
+_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441
+_md5_=e6dcb8ffa05f2a739250cf98d8204bae
diff --git a/metadata/md5-cache/gui-apps/wcm-0.6.0 b/metadata/md5-cache/gui-apps/wcm-0.6.0
new file mode 100644
index 000000000000..e500fc720214
--- /dev/null
+++ b/metadata/md5-cache/gui-apps/wcm-0.6.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-libs/wayland-protocols virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install test
+DEPEND=dev-libs/libevdev dev-libs/libxml2 dev-cpp/gtkmm:3.0[wayland] >=gui-wm/wayfire-0.6
+DESCRIPTION=Wayfire Config Manager
+EAPI=7
+HOMEPAGE=https://github.com/WayfireWM/wcm
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/libevdev dev-libs/libxml2 dev-cpp/gtkmm:3.0[wayland] >=gui-wm/wayfire-0.6
+SLOT=0
+SRC_URI=https://github.com/WayfireWM/wcm/archive/v0.6.0.tar.gz -> wcm-0.6.0.tar.gz
+_eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7c42d252399692e130dd77b20694ed11
diff --git a/metadata/md5-cache/gui-apps/wcm-9999 b/metadata/md5-cache/gui-apps/wcm-9999
index 53cadf1aa6b6..9b463aaaf0d5 100644
--- a/metadata/md5-cache/gui-apps/wcm-9999
+++ b/metadata/md5-cache/gui-apps/wcm-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=dev-libs/libevdev dev-libs/libxml2 dev-cpp/gtkmm:3.0[wayland] >=gui-wm/wayfire-9999
 SLOT=0
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b04536492658a888267ec698ad062d95
+_md5_=7c42d252399692e130dd77b20694ed11
diff --git a/metadata/md5-cache/gui-apps/wf-shell-0.6.1 b/metadata/md5-cache/gui-apps/wf-shell-0.6.1
new file mode 100644
index 000000000000..595326a2d919
--- /dev/null
+++ b/metadata/md5-cache/gui-apps/wf-shell-0.6.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-libs/wayland-protocols virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install test
+DEPEND=dev-cpp/gtkmm:3.0=[wayland] dev-libs/gobject-introspection gui-libs/gtk-layer-shell >=gui-wm/wayfire-0.6 pulseaudio? ( media-sound/pulseaudio )
+DESCRIPTION=A compiz like 3D wayland compositor
+EAPI=7
+HOMEPAGE=https://github.com/WayfireWM/wf-shell
+IUSE=+pulseaudio
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-cpp/gtkmm:3.0=[wayland] dev-libs/gobject-introspection gui-libs/gtk-layer-shell >=gui-wm/wayfire-0.6 pulseaudio? ( media-sound/pulseaudio ) gui-apps/wayland-logout
+SLOT=0
+SRC_URI=https://github.com/WayfireWM/wf-shell/releases/download/v0.6.1/wf-shell-0.6.1.tar.xz
+_eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=460b3363016f9089bb001deb6dcd8fb9
diff --git a/metadata/md5-cache/gui-apps/wf-shell-9999 b/metadata/md5-cache/gui-apps/wf-shell-9999
index ba908d29c4e7..6fed917bc07e 100644
--- a/metadata/md5-cache/gui-apps/wf-shell-9999
+++ b/metadata/md5-cache/gui-apps/wf-shell-9999
@@ -1,13 +1,13 @@
 BDEPEND=dev-libs/wayland-protocols virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install test unpack
-DEPEND=dev-cpp/gtkmm:3.0=[wayland] dev-libs/gobject-introspection >=gui-libs/gtk-layer-shell-0.1 >=gui-wm/wayfire-9999 pulseaudio? ( media-sound/pulseaudio )
+DEPEND=dev-cpp/gtkmm:3.0=[wayland] dev-libs/gobject-introspection gui-libs/gtk-layer-shell >=gui-wm/wayfire-9999 pulseaudio? ( media-sound/pulseaudio )
 DESCRIPTION=A compiz like 3D wayland compositor
 EAPI=7
 HOMEPAGE=https://github.com/WayfireWM/wf-shell
 IUSE=+pulseaudio
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=dev-cpp/gtkmm:3.0=[wayland] dev-libs/gobject-introspection >=gui-libs/gtk-layer-shell-0.1 >=gui-wm/wayfire-9999 pulseaudio? ( media-sound/pulseaudio )
+RDEPEND=dev-cpp/gtkmm:3.0=[wayland] dev-libs/gobject-introspection gui-libs/gtk-layer-shell >=gui-wm/wayfire-9999 pulseaudio? ( media-sound/pulseaudio ) gui-apps/wayland-logout
 SLOT=0
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cfcf8d96ede8a00eab457fc224d3ffce
+_md5_=460b3363016f9089bb001deb6dcd8fb9
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 2f1698ad525c..3219d1d740f4 100644
Binary files a/metadata/md5-cache/gui-libs/Manifest.gz and b/metadata/md5-cache/gui-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-libs/wf-config-0.6.0 b/metadata/md5-cache/gui-libs/wf-config-0.6.0
new file mode 100644
index 000000000000..3ac446f4b32f
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/wf-config-0.6.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-libs/wayland-protocols virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install test
+DEPEND=dev-libs/libevdev dev-libs/libxml2 >=gui-libs/wlroots-0.12.0 media-libs/glm
+DESCRIPTION=library for managing wayfire configuration files
+EAPI=7
+HOMEPAGE=https://github.com/WayfireWM/wf-config
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/libevdev dev-libs/libxml2 >=gui-libs/wlroots-0.12.0 media-libs/glm
+SLOT=0
+SRC_URI=https://github.com/WayfireWM/wf-config/releases/download/0.6.0/wf-config-0.6.0.tar.xz
+_eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b9a061d2c51629c1cbf5aeeec15ffcae
diff --git a/metadata/md5-cache/gui-libs/wf-config-9999 b/metadata/md5-cache/gui-libs/wf-config-9999
index 2352abe22ec3..0c6a44c4bea3 100644
--- a/metadata/md5-cache/gui-libs/wf-config-9999
+++ b/metadata/md5-cache/gui-libs/wf-config-9999
@@ -1,12 +1,12 @@
 BDEPEND=dev-libs/wayland-protocols virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install test unpack
-DEPEND=dev-libs/libevdev dev-libs/libxml2 >=gui-libs/wlroots-0.11.0 media-libs/glm
+DEPEND=dev-libs/libevdev dev-libs/libxml2 >=gui-libs/wlroots-0.12.0 media-libs/glm
 DESCRIPTION=library for managing wayfire configuration files
 EAPI=7
 HOMEPAGE=https://github.com/WayfireWM/wf-config
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=dev-libs/libevdev dev-libs/libxml2 >=gui-libs/wlroots-0.11.0 media-libs/glm
+RDEPEND=dev-libs/libevdev dev-libs/libxml2 >=gui-libs/wlroots-0.12.0 media-libs/glm
 SLOT=0
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2e830307b5367cabd5b5ff976fb33396
+_md5_=b9a061d2c51629c1cbf5aeeec15ffcae
diff --git a/metadata/md5-cache/gui-wm/Manifest.gz b/metadata/md5-cache/gui-wm/Manifest.gz
index 3367926a3611..88b7478e8f9b 100644
Binary files a/metadata/md5-cache/gui-wm/Manifest.gz and b/metadata/md5-cache/gui-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-wm/wayfire-0.6.0 b/metadata/md5-cache/gui-wm/wayfire-0.6.0
new file mode 100644
index 000000000000..b6c88a63390d
--- /dev/null
+++ b/metadata/md5-cache/gui-wm/wayfire-0.6.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/wayland-protocols virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install postinst test
+DEPEND=dev-libs/libevdev dev-libs/libinput gui-libs/gtk-layer-shell media-libs/glm media-libs/mesa:=[gles2,wayland,X?] media-libs/libjpeg-turbo media-libs/libpng media-libs/freetype:=[X?] x11-libs/libdrm x11-libs/gtk+:3=[wayland,X?] x11-libs/cairo:=[X?,svg] X? ( x11-libs/libxkbcommon:=[X] ) x11-libs/pixman gles? ( media-libs/libglvnd[X?] ) system-wfconfig? ( >=gui-libs/wf-config-0.6 ) !system-wfconfig? ( !gui-libs/wf-config ) system-wlroots? ( >=gui-libs/wlroots-0.12.0[elogind=,systemd=,X?] ) !system-wlroots? ( !gui-libs/wlroots )
+DESCRIPTION=compiz like 3D wayland compositor
+EAPI=7
+HOMEPAGE=https://github.com/WayfireWM/wayfire
+IUSE=+gles +system-wfconfig +system-wlroots elogind systemd X
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/libevdev dev-libs/libinput gui-libs/gtk-layer-shell media-libs/glm media-libs/mesa:=[gles2,wayland,X?] media-libs/libjpeg-turbo media-libs/libpng media-libs/freetype:=[X?] x11-libs/libdrm x11-libs/gtk+:3=[wayland,X?] x11-libs/cairo:=[X?,svg] X? ( x11-libs/libxkbcommon:=[X] ) x11-libs/pixman gles? ( media-libs/libglvnd[X?] ) system-wfconfig? ( >=gui-libs/wf-config-0.6 ) !system-wfconfig? ( !gui-libs/wf-config ) system-wlroots? ( >=gui-libs/wlroots-0.12.0[elogind=,systemd=,X?] ) !system-wlroots? ( !gui-libs/wlroots ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) x11-misc/xkeyboard-config
+REQUIRED_USE=?? ( elogind systemd )
+SLOT=0
+SRC_URI=https://github.com/WayfireWM/wayfire/releases/download/0.6.0/wayfire-0.6.0.tar.xz
+_eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=669ea7b3b1873ca3deb5ae8f8789f4cf
diff --git a/metadata/md5-cache/gui-wm/wayfire-9999 b/metadata/md5-cache/gui-wm/wayfire-9999
index 26a2cfeeca8f..2999cf9ee463 100644
--- a/metadata/md5-cache/gui-wm/wayfire-9999
+++ b/metadata/md5-cache/gui-wm/wayfire-9999
@@ -1,14 +1,14 @@
 BDEPEND=dev-libs/wayland-protocols virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst test unpack
-DEPEND=dev-libs/libevdev dev-libs/libinput gui-libs/gtk-layer-shell media-libs/glm media-libs/mesa:=[gles2,wayland,X?] media-libs/libjpeg-turbo media-libs/libpng media-libs/freetype:=[X?] x11-libs/libdrm x11-libs/gtk+:3=[wayland,X?] x11-libs/cairo:=[X?,svg] X? ( x11-libs/libxkbcommon:=[X] ) x11-libs/pixman gles? ( media-libs/libglvnd[X?] ) system-wfconfig? ( >=gui-libs/wf-config-9999 ) !system-wfconfig? ( !gui-libs/wf-config ) system-wlroots? ( >=gui-libs/wlroots-0.11.0[elogind=,systemd=,X?] ) !system-wlroots? ( !gui-libs/wlroots )
+DEPEND=dev-libs/libevdev dev-libs/libinput gui-libs/gtk-layer-shell media-libs/glm media-libs/mesa:=[gles2,wayland,X?] media-libs/libjpeg-turbo media-libs/libpng media-libs/freetype:=[X?] x11-libs/libdrm x11-libs/gtk+:3=[wayland,X?] x11-libs/cairo:=[X?,svg] X? ( x11-libs/libxkbcommon:=[X] ) x11-libs/pixman gles? ( media-libs/libglvnd[X?] ) system-wfconfig? ( >=gui-libs/wf-config-9999 ) !system-wfconfig? ( !gui-libs/wf-config ) system-wlroots? ( >=gui-libs/wlroots-0.12.0[elogind=,systemd=,X?] ) !system-wlroots? ( !gui-libs/wlroots )
 DESCRIPTION=compiz like 3D wayland compositor
 EAPI=7
 HOMEPAGE=https://github.com/WayfireWM/wayfire
 IUSE=+gles +system-wfconfig +system-wlroots elogind systemd X
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=dev-libs/libevdev dev-libs/libinput gui-libs/gtk-layer-shell media-libs/glm media-libs/mesa:=[gles2,wayland,X?] media-libs/libjpeg-turbo media-libs/libpng media-libs/freetype:=[X?] x11-libs/libdrm x11-libs/gtk+:3=[wayland,X?] x11-libs/cairo:=[X?,svg] X? ( x11-libs/libxkbcommon:=[X] ) x11-libs/pixman gles? ( media-libs/libglvnd[X?] ) system-wfconfig? ( >=gui-libs/wf-config-9999 ) !system-wfconfig? ( !gui-libs/wf-config ) system-wlroots? ( >=gui-libs/wlroots-0.11.0[elogind=,systemd=,X?] ) !system-wlroots? ( !gui-libs/wlroots ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) x11-misc/xkeyboard-config
+RDEPEND=dev-libs/libevdev dev-libs/libinput gui-libs/gtk-layer-shell media-libs/glm media-libs/mesa:=[gles2,wayland,X?] media-libs/libjpeg-turbo media-libs/libpng media-libs/freetype:=[X?] x11-libs/libdrm x11-libs/gtk+:3=[wayland,X?] x11-libs/cairo:=[X?,svg] X? ( x11-libs/libxkbcommon:=[X] ) x11-libs/pixman gles? ( media-libs/libglvnd[X?] ) system-wfconfig? ( >=gui-libs/wf-config-9999 ) !system-wfconfig? ( !gui-libs/wf-config ) system-wlroots? ( >=gui-libs/wlroots-0.12.0[elogind=,systemd=,X?] ) !system-wlroots? ( !gui-libs/wlroots ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) x11-misc/xkeyboard-config
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c63c32bb239d95f9827058793380bc23
+_md5_=669ea7b3b1873ca3deb5ae8f8789f4cf
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 21f46a017a48..178febd0ba04 100644
Binary files a/metadata/md5-cache/kde-frameworks/Manifest.gz and b/metadata/md5-cache/kde-frameworks/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.76.0 b/metadata/md5-cache/kde-frameworks/attica-5.76.0
new file mode 100644
index 000000000000..9e278ba2e42e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/attica-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtnetwork-5.15.1:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing access to Open Collaboration Services
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtnetwork-5.15.1:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/attica-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=58146c7f2800f2c29d9ce225a1791099
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.76.0 b/metadata/md5-cache/kde-frameworks/baloo-5.76.0
new file mode 100644
index 000000000000..487b66f8881e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-db/lmdb-0.9.17 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kcrash-5.76*:5 =kde-frameworks/kdbusaddons-5.76*:5 =kde-frameworks/kfilemetadata-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kidletime-5.76*:5 =kde-frameworks/kio-5.76*:5 =kde-frameworks/solid-5.76*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for searching and managing metadata
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-db/lmdb-0.9.17 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kcrash-5.76*:5 =kde-frameworks/kdbusaddons-5.76*:5 =kde-frameworks/kfilemetadata-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kidletime-5.76*:5 =kde-frameworks/kio-5.76*:5 =kde-frameworks/solid-5.76*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/baloo-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c9ed098bc16b4ae79aeb5bbc9f928ddd
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.76.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.76.0
new file mode 100644
index 000000000000..15168a0fa3b7
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Qt wrapper for Bluez 5 DBus API
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/bluez-qt-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=28e4def595dab58baa5e33f3055353bb
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.76.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.76.0
new file mode 100644
index 000000000000..01124923e382
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.76.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/qtcore:5 >=kde-frameworks/extra-cmake-modules-5.76:5 test? ( app-misc/fdupes ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
+DEPEND=test? ( dev-qt/qttest:5 )
+DESCRIPTION=Breeze SVG icon theme
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-3
+RESTRICT=!test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/breeze-icons-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9305738f65625e6d4c6e40f506c83e11
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.76.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.76.0
new file mode 100644
index 000000000000..0e49ac0d09bc
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.76.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/qtcore:5 >=kde-frameworks/extra-cmake-modules-5.76:5 test? ( app-misc/fdupes ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install nofetch prepare test unpack
+DEPEND=test? ( dev-qt/qttest:5 )
+DESCRIPTION=Breeze SVG icon theme binary resource
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-3
+RESTRICT=!test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/breeze-icons-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dd6bab7a81ba331a6dff02c93d137906
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.76.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.76.0
new file mode 100644
index 000000000000..77b17cc77c8b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.76.0
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ) >=dev-qt/qthelp-5.15.1:5 ) test? ( >=dev-qt/linguist-tools-5.15.1:5 >=dev-qt/qtcore-5.15.1:5 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
+DESCRIPTION=Extra modules and scripts for CMake
+EAPI=7
+HOMEPAGE=https://invent.kde.org/frameworks/extra-cmake-modules
+IUSE=doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/libarchive[bzip2]
+RESTRICT=!test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/extra-cmake-modules-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1c94223df0de38861eced6e3c659d845
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.76.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.76.0
new file mode 100644
index 000000000000..ca3fbd3d2803
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kconfigwidgets-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kiconthemes-5.76*:5 =kde-frameworks/knewstuff-5.76*:5 =kde-frameworks/knotifications-5.76*:5 =kde-frameworks/kpackage-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for integrating Qt applications with KDE Plasma workspaces
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kconfigwidgets-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kiconthemes-5.76*:5 =kde-frameworks/knewstuff-5.76*:5 =kde-frameworks/knotifications-5.76*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/frameworkintegration-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=84a5ce46afded6811f867bf37596187d
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.76.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.76.0
new file mode 100644
index 000000000000..1104a9d48b44
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtsql-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 >=dev-libs/boost-1.54 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for working with KDE activities
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtsql-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 >=kde-plasma/kactivitymanagerd-5.16.5:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kactivities-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=560786304dea104ce9cba58388762f0d
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.76.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.76.0
new file mode 100644
index 000000000000..f5b9cd556018
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtsql-5.15.1:5 =kde-frameworks/kactivities-5.76*:5 =kde-frameworks/kconfig-5.76*:5 >=dev-libs/boost-1.54 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for getting the usage statistics collected by the activities service
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtsql-5.15.1:5 =kde-frameworks/kactivities-5.76*:5 =kde-frameworks/kconfig-5.76*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kactivities-stats-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=13f719fc20a76c560166eeebebbe2b13
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.76.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.76.0
new file mode 100644
index 000000000000..93a17f3beca5
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.76.0
@@ -0,0 +1,14 @@
+BDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
+DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
+DESCRIPTION=Framework for building KDE API documentation in a standard format and style
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=app-doc/doxygen python_single_target_python3_7? ( dev-python/jinja[python_targets_python3_7(-)] dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/jinja[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/jinja[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) media-gfx/graphviz[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kapidox-5.76.0.tar.xz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	kde.org	16ab706e1b049cfaa65425a0c0e28cac	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=966cb57d0951c8acb5fb35ff01e42062
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.76.0 b/metadata/md5-cache/kde-frameworks/karchive-5.76.0
new file mode 100644
index 000000000000..e36027ebbf53
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for reading, creation, and manipulation of various archive formats
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/karchive-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2923aca4053d35b408c23cd0afb801b1
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.76.0 b/metadata/md5-cache/kde-frameworks/kauth-5.76.0
new file mode 100644
index 000000000000..295ca07a5a21
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.76.0
@@ -0,0 +1,16 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.1:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kcoreaddons-5.76*:5 policykit? ( >=sys-auth/polkit-qt-0.113.0 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework to let applications perform actions as a privileged user
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls +policykit test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kcoreaddons-5.76*:5 policykit? ( >=sys-auth/polkit-qt-0.113.0 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kauth-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a1f21f33b4f7b08fa8ed91ff5425c75e
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.76.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.76.0
new file mode 100644
index 000000000000..bf427e5520b1
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.1:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 =kde-frameworks/kcodecs-5.76*:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kiconthemes-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 =kde-frameworks/kxmlgui-5.76*:5 >=kde-frameworks/kconfigwidgets-5.76:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for managing bookmarks stored in XBEL format
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 =kde-frameworks/kcodecs-5.76*:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kiconthemes-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 =kde-frameworks/kxmlgui-5.76*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kbookmarks-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=56cde6fcdd4fc2299d4d1ecc2bfdb392
diff --git a/metadata/md5-cache/kde-frameworks/kcalendarcore-5.76.0 b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.76.0
new file mode 100644
index 000000000000..344abb817268
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/libical-3.0.5:= >=dev-qt/qtgui-5.15.1:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for interfacing with calendars
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+ test? ( LGPL-3+ )
+RDEPEND=>=dev-libs/libical-3.0.5:= >=dev-qt/qtgui-5.15.1:5 !kde-apps/kcalcore:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kcalendarcore-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dc6ad0eab47eade07b4bb6b0fbce9a3c
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.76.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.76.0
new file mode 100644
index 000000000000..ddc9da8d266d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kauth-5.76*:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kconfigwidgets-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kdeclarative-5.76*:5 =kde-frameworks/kguiaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kitemviews-5.76*:5 =kde-frameworks/kservice-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 =kde-frameworks/kxmlgui-5.76*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework to work with KDE System Settings modules
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kauth-5.76*:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kconfigwidgets-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kdeclarative-5.76*:5 =kde-frameworks/kguiaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kitemviews-5.76*:5 =kde-frameworks/kservice-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 =kde-frameworks/kxmlgui-5.76*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kcmutils-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=445321112994a94be269c3052aafc354
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.76.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.76.0
new file mode 100644
index 000000000000..a74d9cb044d7
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/gperf nls? ( >=dev-qt/linguist-tools-5.15.1:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for manipulating strings using various encodings
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kcodecs-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6563da76347df95c45d3894737d8c6d0
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.76.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.76.0
new file mode 100644
index 000000000000..c6efe92618e3
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.1:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for common completion tasks such as filename or URL completion
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kcompletion-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7d8fcf3e1e93bd45c2808fda6b51cf5c
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.76.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.76.0
new file mode 100644
index 000000000000..53dffc176eb4
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.1:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 dbus? ( >=dev-qt/qtdbus-5.15.1:5 ) test? ( >=dev-qt/qtconcurrent-5.15.1:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for reading and writing configuration
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=dbus nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 dbus? ( >=dev-qt/qtdbus-5.15.1:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kconfig-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=baf5ebbb88690ca4af0cbd82813fc029
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.76.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.76.0
new file mode 100644
index 000000000000..5c47daa27119
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.76:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kauth-5.76*:5 =kde-frameworks/kcodecs-5.76*:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kguiaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing an assortment of configuration-related widgets
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=+man test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kauth-5.76*:5 =kde-frameworks/kcodecs-5.76*:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kguiaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kconfigwidgets-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6fc2bb430af2a236197e6bb6312b893c
diff --git a/metadata/md5-cache/kde-frameworks/kcontacts-5.76.0 b/metadata/md5-cache/kde-frameworks/kcontacts-5.76.0
new file mode 100644
index 000000000000..af50a62bbc57
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcontacts-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.1:5 =kde-frameworks/kcodecs-5.76*:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Address book API based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.1:5 =kde-frameworks/kcodecs-5.76*:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 !kde-apps/kcontacts:5 app-text/iso-codes >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kcontacts-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=938380744af9cb2f9cdd004517467e1d
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.76.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.76.0
new file mode 100644
index 000000000000..5a9dbc0cd9db
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.1:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtcore-5.15.1:5[icu] fam? ( virtual/fam ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for solving common problems such as caching, randomisation, and more
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=fam nls debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtcore-5.15.1:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kcoreaddons-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7a83003405d5c055f446078d304948c6
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.76.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.76.0
new file mode 100644
index 000000000000..1d18634a23c5
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.1:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kwindowsystem-5.76*:5 x11-libs/libX11 x11-base/xorg-proto test? ( >=dev-qt/qtwidgets-5.15.1:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for intercepting and handling application crashes
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kwindowsystem-5.76*:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kcrash-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=294fd64f1d3b1b1373f4f047d0a6ab8e
diff --git a/metadata/md5-cache/kde-frameworks/kdav-5.76.0 b/metadata/md5-cache/kde-frameworks/kdav-5.76.0
new file mode 100644
index 000000000000..2343bed40025
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdav-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=dev-qt/qtxmlpatterns-5.15.1:5 >=kde-frameworks/kcoreaddons-5.76:5 >=kde-frameworks/ki18n-5.76:5 >=kde-frameworks/kio-5.76:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=DAV protocol implemention with KJobs
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=dev-qt/qtxmlpatterns-5.15.1:5 >=kde-frameworks/kcoreaddons-5.76:5 >=kde-frameworks/ki18n-5.76:5 >=kde-frameworks/kio-5.76:5 !kde-apps/kdav:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/frameworks/5.76/kdav-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c29ef033516afa59a08e34d95322d296
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.76.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.76.0
new file mode 100644
index 000000000000..5a8d7eceb9a5
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.1:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 X? ( >=dev-qt/qtx11extras-5.15.1:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for registering services and applications per freedesktop standards
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls X debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 X? ( >=dev-qt/qtx11extras-5.15.1:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kdbusaddons-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ad691e5479a8926642ee99f87191aaee
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.76.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.76.0
new file mode 100644
index 000000000000..362e3f5bf4a0
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.76.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kglobalaccel-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kiconthemes-5.76*:5 =kde-frameworks/kio-5.76*:5 =kde-frameworks/knotifications-5.76*:5 =kde-frameworks/kpackage-5.76*:5 =kde-frameworks/kservice-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 =kde-frameworks/kwindowsystem-5.76*:5 media-libs/libepoxy doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing integration of QML and KDE work spaces
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kglobalaccel-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kiconthemes-5.76*:5 =kde-frameworks/kio-5.76*:5 =kde-frameworks/knotifications-5.76*:5 =kde-frameworks/kpackage-5.76*:5 =kde-frameworks/kservice-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 =kde-frameworks/kwindowsystem-5.76*:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kdeclarative-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=521bfc2191b8bda585c228c5b0633813
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.76.0 b/metadata/md5-cache/kde-frameworks/kded-5.76.0
new file mode 100644
index 000000000000..00dc9336b908
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kded-5.76.0
@@ -0,0 +1,14 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.76:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kcrash-5.76*:5 =kde-frameworks/kdbusaddons-5.76*:5 =kde-frameworks/kinit-5.76*:5 =kde-frameworks/kservice-5.76*:5 dev-qt/qtcore:5
+DESCRIPTION=Central daemon of KDE workspaces
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=+man debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kcrash-5.76*:5 =kde-frameworks/kdbusaddons-5.76*:5 =kde-frameworks/kinit-5.76*:5 =kde-frameworks/kservice-5.76*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kded-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=469a36d90b4075b2010fb39d7b53639b
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.76.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.76.0
new file mode 100644
index 000000000000..2b2fcec0674e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-perl/URI dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.76:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5[ssl] >=dev-qt/qtprintsupport-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qttest-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kauth-5.76*:5 =kde-frameworks/kcodecs-5.76*:5 =kde-frameworks/kcompletion-5.76*:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kconfigwidgets-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kcrash-5.76*:5 =kde-frameworks/kdbusaddons-5.76*:5 >=kde-frameworks/kded-5.76:5 =kde-frameworks/kdesignerplugin-5.76*:5 =kde-frameworks/kdoctools-5.76*:5 =kde-frameworks/kemoticons-5.76*:5 =kde-frameworks/kglobalaccel-5.76*:5 =kde-frameworks/kguiaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kiconthemes-5.76*:5 =kde-frameworks/kio-5.76*:5 =kde-frameworks/kitemviews-5.76*:5 =kde-frameworks/kjobwidgets-5.76*:5 =kde-frameworks/knotifications-5.76*:5 =kde-frameworks/kparts-5.76*:5 =kde-frameworks/kservice-5.76*:5 =kde-frameworks/ktextwidgets-5.76*:5 =kde-frameworks/kunitconversion-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 =kde-frameworks/kwindowsystem-5.76*:5 =kde-frameworks/kxmlgui-5.76*:5 =kde-frameworks/solid-5.76*:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb ) >=dev-qt/designer-5.15.1:5 test? ( >=dev-qt/qtconcurrent-5.15.1:5 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework easing the development transition from KDELibs 4 to KF 5
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=libressl X test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5[ssl] >=dev-qt/qtprintsupport-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qttest-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kauth-5.76*:5 =kde-frameworks/kcodecs-5.76*:5 =kde-frameworks/kcompletion-5.76*:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kconfigwidgets-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kcrash-5.76*:5 =kde-frameworks/kdbusaddons-5.76*:5 >=kde-frameworks/kded-5.76:5 =kde-frameworks/kdesignerplugin-5.76*:5 =kde-frameworks/kdoctools-5.76*:5 =kde-frameworks/kemoticons-5.76*:5 =kde-frameworks/kglobalaccel-5.76*:5 =kde-frameworks/kguiaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kiconthemes-5.76*:5 =kde-frameworks/kio-5.76*:5 =kde-frameworks/kitemviews-5.76*:5 =kde-frameworks/kjobwidgets-5.76*:5 =kde-frameworks/knotifications-5.76*:5 =kde-frameworks/kparts-5.76*:5 =kde-frameworks/kservice-5.76*:5 =kde-frameworks/ktextwidgets-5.76*:5 =kde-frameworks/kunitconversion-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 =kde-frameworks/kwindowsystem-5.76*:5 =kde-frameworks/kxmlgui-5.76*:5 =kde-frameworks/solid-5.76*:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb ) =kde-frameworks/kinit-5.76*:5 =kde-frameworks/kitemmodels-5.76*:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/portingAids/kdelibs4support-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8e4fa363ec37e57536f78bf8800a70f2
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.76.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.76.0
new file mode 100644
index 000000000000..936030ec2814
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.76.0
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.1:5 ) dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.76:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 dev-qt/qtcore:5
+DESCRIPTION=Framework providing plugins to use KDE frameworks widgets in QtDesigner
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND==kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/portingAids/kdesignerplugin-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bb8a798b570b6338ee2c6025a23e1e63
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.76.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.76.0
new file mode 100644
index 000000000000..4368d959c56e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kpty-5.76*:5 =kde-frameworks/kservice-5.76*:5 X? ( x11-libs/libX11 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework to handle super user actions
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=X debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND==kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kpty-5.76*:5 =kde-frameworks/kservice-5.76*:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kdesu-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=16a5d3fb8479c5e61ad00452446733c2
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.76.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.76.0
new file mode 100644
index 000000000000..e9fd0f874227
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.76.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kio-5.76*:5 =kde-frameworks/kjobwidgets-5.76*:5 =kde-frameworks/kparts-5.76*:5 =kde-frameworks/kservice-5.76*:5 =kde-frameworks/kwallet-5.76*:5 designer? ( =kde-frameworks/kdesignerplugin-5.76*:5 ) >=dev-qt/qtnetwork-5.15.1:5 dev-qt/qtcore:5
+DESCRIPTION=Framework providing KDE integration of QtWebKit
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=designer debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kio-5.76*:5 =kde-frameworks/kjobwidgets-5.76*:5 =kde-frameworks/kparts-5.76*:5 =kde-frameworks/kservice-5.76*:5 =kde-frameworks/kwallet-5.76*:5 designer? ( =kde-frameworks/kdesignerplugin-5.76*:5 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/portingAids/kdewebkit-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=77c1ba6e61a1831ae076c7066d63379d
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.76.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.76.0
new file mode 100644
index 000000000000..56c7ada6e910
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.1:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtnetwork-5.15.1:5 zeroconf? ( >=dev-qt/qtdbus-5.15.1:5 net-dns/avahi[mdnsresponder-compat] ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for network service discovery using Zeroconf
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls zeroconf debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtnetwork-5.15.1:5 zeroconf? ( >=dev-qt/qtdbus-5.15.1:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kdnssd-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=988d5b8a45f78890eb2c071fc108d869
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.76.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.76.0
new file mode 100644
index 000000000000..0010ea72f8b1
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-perl/URI nls? ( >=kde-frameworks/ki18n-5.76:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt =kde-frameworks/karchive-5.76*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Tools to generate documentation in various formats from DocBook files
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt =kde-frameworks/karchive-5.76*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kdoctools-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0cfb5daf7cea5bf029d934ae540536d6
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.76.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.76.0
new file mode 100644
index 000000000000..5f374da1559e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 =kde-frameworks/karchive-5.76*:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kservice-5.76*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for converting text emoticons to graphical representations
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 =kde-frameworks/karchive-5.76*:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kservice-5.76*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kemoticons-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b1e82c4a685e1b3ebd3cec0299c6b32e
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.76.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.76.0
new file mode 100644
index 000000000000..de819f05d6e6
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtxml-5.15.1:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( media-video/ffmpeg:0= ) office? ( =kde-frameworks/karchive-5.76*:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) kernel_linux? ( sys-apps/attr ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for extracting file metadata
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=epub exif ffmpeg kernel_linux office pdf taglib debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtxml-5.15.1:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( media-video/ffmpeg:0= ) office? ( =kde-frameworks/karchive-5.76*:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kfilemetadata-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c47e5356b21c5e5208774dc2a728d21d
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.76.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.76.0
new file mode 100644
index 000000000000..71b75b0b4d3c
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.1:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kcrash-5.76*:5 =kde-frameworks/kdbusaddons-5.76*:5 =kde-frameworks/kwindowsystem-5.76*:5[X] x11-libs/libxcb x11-libs/xcb-util-keysyms test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework to handle global shortcuts
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kcrash-5.76*:5 =kde-frameworks/kdbusaddons-5.76*:5 =kde-frameworks/kwindowsystem-5.76*:5[X] x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kglobalaccel-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=50c72e469429a1b2682a4236507703d6
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.76.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.76.0
new file mode 100644
index 000000000000..03095e7518ea
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libX11 x11-base/xorg-proto x11-libs/libxcb test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing assorted high-level user interface components
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kguiaddons-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2ad52e7dbcba7c9fd048b61e07a6f9a8
diff --git a/metadata/md5-cache/kde-frameworks/kholidays-5.76.0 b/metadata/md5-cache/kde-frameworks/kholidays-5.76.0
new file mode 100644
index 000000000000..40cd69da39a6
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kholidays-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.1:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.1:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library to determine holidays and other special events for a geographical region
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.1:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kholidays-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b71a189df98f33dbbd6aba2730d48b02
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.76.0 b/metadata/md5-cache/kde-frameworks/khtml-5.76.0
new file mode 100644
index 000000000000..8a32a6b11de5
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-util/gperf dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5[ssl] >=dev-qt/qtprintsupport-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 =kde-frameworks/karchive-5.76*:5 =kde-frameworks/kcodecs-5.76*:5 =kde-frameworks/kcompletion-5.76*:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kconfigwidgets-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kglobalaccel-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kiconthemes-5.76*:5 =kde-frameworks/kio-5.76*:5 =kde-frameworks/kjobwidgets-5.76*:5 =kde-frameworks/kjs-5.76*:5 =kde-frameworks/knotifications-5.76*:5 =kde-frameworks/kparts-5.76*:5 =kde-frameworks/kservice-5.76*:5 =kde-frameworks/ktextwidgets-5.76*:5 =kde-frameworks/kwallet-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 =kde-frameworks/kwindowsystem-5.76*:5 =kde-frameworks/kxmlgui-5.76*:5 =kde-frameworks/sonnet-5.76*:5 media-libs/giflib:= media-libs/libpng:0= >=media-libs/phonon-4.11.0 sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libX11 ) test? ( >=dev-qt/qtx11extras-5.15.1:5 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KHTML web rendering engine
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=libressl X test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5[ssl] >=dev-qt/qtprintsupport-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 =kde-frameworks/karchive-5.76*:5 =kde-frameworks/kcodecs-5.76*:5 =kde-frameworks/kcompletion-5.76*:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kconfigwidgets-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kglobalaccel-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kiconthemes-5.76*:5 =kde-frameworks/kio-5.76*:5 =kde-frameworks/kjobwidgets-5.76*:5 =kde-frameworks/kjs-5.76*:5 =kde-frameworks/knotifications-5.76*:5 =kde-frameworks/kparts-5.76*:5 =kde-frameworks/kservice-5.76*:5 =kde-frameworks/ktextwidgets-5.76*:5 =kde-frameworks/kwallet-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 =kde-frameworks/kwindowsystem-5.76*:5 =kde-frameworks/kxmlgui-5.76*:5 =kde-frameworks/sonnet-5.76*:5 media-libs/giflib:= media-libs/libpng:0= >=media-libs/phonon-4.11.0 sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/portingAids/khtml-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b8ffc0e81170376015a5026a40f4b847
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.76.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.76.0
new file mode 100644
index 000000000000..dbfde615a8b1
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.76.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76: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/qtdeclarative-5.15.1:5 sys-devel/gettext virtual/libintl test? ( >=dev-qt/qtconcurrent-5.15.1:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework based on Gettext for internationalizing user interface text
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-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/qtdeclarative-5.15.1:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/ki18n-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e0582be1722a869d374aaa78c68dd13d
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.76.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.76.0
new file mode 100644
index 000000000000..daf5be5d52da
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/karchive-5.76*:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kconfigwidgets-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kitemviews-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for icon theming and configuration
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/karchive-5.76*:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kconfigwidgets-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kitemviews-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kiconthemes-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a8f4104c048c13c2d2e06d6d2673edee
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.76.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.76.0
new file mode 100644
index 000000000000..abf1d9f57cf3
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76: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 X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.15.1:5 x11-libs/libXScrnSaver ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for detection and notification of device idle time
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=X xscreensaver debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.15.1:5 x11-libs/libXScrnSaver ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+REQUIRED_USE=xscreensaver? ( X )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kidletime-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e10ce0883ff66694d5af12bd178b495b
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.76.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.76.0
new file mode 100644
index 000000000000..cb3437e98156
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.1:5 =kde-frameworks/karchive-5.76*:5 eps? ( >=dev-qt/qtprintsupport-5.15.1:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing additional format plugins for Qt's image I/O system
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=eps openexr test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.1:5 =kde-frameworks/karchive-5.76*:5 eps? ( >=dev-qt/qtprintsupport-5.15.1:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kimageformats-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7f21b5ed00e52ad77ec51cffa27a99ef
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.76.0 b/metadata/md5-cache/kde-frameworks/kinit-5.76.0
new file mode 100644
index 000000000000..5f2d593aeb5a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.76.0
@@ -0,0 +1,14 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.76:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kcrash-5.76*:5 =kde-frameworks/kdbusaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kio-5.76*:5 =kde-frameworks/kservice-5.76*:5 =kde-frameworks/kwindowsystem-5.76*:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) X? ( x11-base/xorg-proto ) dev-qt/qtcore:5
+DESCRIPTION=Helper library to speed up start of applications on KDE work spaces
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=+caps +man X debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kcrash-5.76*:5 =kde-frameworks/kdbusaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kio-5.76*:5 =kde-frameworks/kservice-5.76*:5 =kde-frameworks/kwindowsystem-5.76*:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kinit-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5d708ac5378827ee84696e542e73c88e
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.76.0 b/metadata/md5-cache/kde-frameworks/kio-5.76.0
new file mode 100644
index 000000000000..2b7d57814758
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kio-5.76.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5[ssl] >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 =kde-frameworks/kauth-5.76*:5 =kde-frameworks/karchive-5.76*:5 =kde-frameworks/kbookmarks-5.76*:5 =kde-frameworks/kcodecs-5.76*:5 =kde-frameworks/kcompletion-5.76*:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kconfigwidgets-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kcrash-5.76*:5 =kde-frameworks/kdbusaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kiconthemes-5.76*:5 =kde-frameworks/kitemviews-5.76*:5 =kde-frameworks/kjobwidgets-5.76*:5 =kde-frameworks/knotifications-5.76*:5 =kde-frameworks/kservice-5.76*:5 =kde-frameworks/ktextwidgets-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 =kde-frameworks/kwindowsystem-5.76*:5 =kde-frameworks/kxmlgui-5.76*:5 =kde-frameworks/solid-5.76*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.76*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.76*:5 ) X? ( >=dev-qt/qtx11extras-5.15.1:5 ) >=dev-qt/qtconcurrent-5.15.1:5 test? ( sys-libs/zlib ) X? ( x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing transparent file and data management
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=acl +handbook kerberos +kwallet X test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+PDEPEND=>=kde-frameworks/kded-5.76:5
+RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5[ssl] >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 =kde-frameworks/kauth-5.76*:5 =kde-frameworks/karchive-5.76*:5 =kde-frameworks/kbookmarks-5.76*:5 =kde-frameworks/kcodecs-5.76*:5 =kde-frameworks/kcompletion-5.76*:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kconfigwidgets-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kcrash-5.76*:5 =kde-frameworks/kdbusaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kiconthemes-5.76*:5 =kde-frameworks/kitemviews-5.76*:5 =kde-frameworks/kjobwidgets-5.76*:5 =kde-frameworks/knotifications-5.76*:5 =kde-frameworks/kservice-5.76*:5 =kde-frameworks/ktextwidgets-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 =kde-frameworks/kwindowsystem-5.76*:5 =kde-frameworks/kxmlgui-5.76*:5 =kde-frameworks/solid-5.76*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.76*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.76*:5 ) X? ( >=dev-qt/qtx11extras-5.15.1:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kio-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bb3ca76b95dfa15bff45065cb7dddf81
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.76.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.76.0
new file mode 100644
index 000000000000..06d6b46fdd39
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kirigami-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-qt/linguist-tools-5.15.1:5 dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtconcurrent-5.15.1:5 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtquickcontrols2-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Lightweight user interface framework for mobile and convergent applications
+EAPI=7
+HOMEPAGE=https://techbase.kde.org/Kirigami
+IUSE=debug examples test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtconcurrent-5.15.1:5 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtquickcontrols2-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtgraphicaleffects-5.15.1:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kirigami2-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c6f508acda06a9c20db4155021f8d6a0
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.76.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.76.0
new file mode 100644
index 000000000000..748866eff721
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=qml? ( >=dev-qt/qtdeclarative-5.15.1:5 ) test? ( >=dev-qt/qtwidgets-5.15.1:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing data models to help with tasks such as sorting and filtering
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=qml test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=qml? ( >=dev-qt/qtdeclarative-5.15.1:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kitemmodels-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f5e37639c0240e5dbe4a0002a86837f7
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.76.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.76.0
new file mode 100644
index 000000000000..6462abbe7266
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.1:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76: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 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing additional widgets for item models
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kitemviews-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cfd984bc963850fda7dc233b6114fa22
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.76.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.76.0
new file mode 100644
index 000000000000..6e1cc0569859
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.1:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 X? ( >=dev-qt/qtx11extras-5.15.1:5 ) X? ( x11-base/xorg-proto x11-libs/libX11 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing assorted widgets for showing the progress of jobs
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls X debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 X? ( >=dev-qt/qtx11extras-5.15.1:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kjobwidgets-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b2613bc3b4d745dae12ef24cee99040c
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.76.0 b/metadata/md5-cache/kde-frameworks/kjs-5.76.0
new file mode 100644
index 000000000000..bbef5e126438
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.76:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libpcre test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=ECMAScipt compatible parser and engine
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=BSD-2 LGPL-2+
+RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/portingAids/kjs-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0467c69afa4b5c03f525a5412bbe0a0c
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.76.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.76.0
new file mode 100644
index 000000000000..c629d84feacf
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.76.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.76:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kjs-5.76*:5 >=dev-qt/designer-5.15.1:5 dev-qt/qtcore:5
+DESCRIPTION=Framework binding JavaScript objects to QObjects
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kjs-5.76*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/portingAids/kjsembed-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=05a8b44e9a69023b6d0ded27956036df
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.76.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.76.0
new file mode 100644
index 000000000000..e890c0c07257
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kparts-5.76*:5 =kde-frameworks/kxmlgui-5.76*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing a common interface for KParts that can play media files
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kparts-5.76*:5 =kde-frameworks/kxmlgui-5.76*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/portingAids/kmediaplayer-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=48ad6a0993ad335386189651b2ace758
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.76.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.76.0
new file mode 100644
index 000000000000..acdd9e1e4980
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.76.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 =kde-frameworks/attica-5.76*:5 =kde-frameworks/karchive-5.76*:5 =kde-frameworks/kcompletion-5.76*:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kiconthemes-5.76*:5 =kde-frameworks/kio-5.76*:5 =kde-frameworks/kitemviews-5.76*:5 =kde-frameworks/kpackage-5.76*:5 =kde-frameworks/kservice-5.76*:5 =kde-frameworks/ktextwidgets-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 =kde-frameworks/kxmlgui-5.76*:5 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for downloading and sharing additional application data
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 =kde-frameworks/attica-5.76*:5 =kde-frameworks/karchive-5.76*:5 =kde-frameworks/kcompletion-5.76*:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kiconthemes-5.76*:5 =kde-frameworks/kio-5.76*:5 =kde-frameworks/kitemviews-5.76*:5 =kde-frameworks/kpackage-5.76*:5 =kde-frameworks/kservice-5.76*:5 =kde-frameworks/ktextwidgets-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 =kde-frameworks/kxmlgui-5.76*:5 >=kde-frameworks/kirigami-5.76:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/knewstuff-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c69f0fe4e15445e107fcdc635b8d2299
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.76.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.76.0
new file mode 100644
index 000000000000..99daccebdb16
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.76.0
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.1:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kwindowsystem-5.76*:5 dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) speech? ( >=dev-qt/qtspeech-5.15.1:5 ) X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libX11 x11-libs/libXtst ) X? ( x11-base/xorg-proto ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for notifying the user of an event
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=dbus nls phonon speech X debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kwindowsystem-5.76*:5 dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) speech? ( >=dev-qt/qtspeech-5.15.1:5 ) X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/knotifications-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9468a7a555043c0eb8e7a4a7073c03a6
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.76.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.76.0
new file mode 100644
index 000000000000..d46eb787135d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.76.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kcompletion-5.76*:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kio-5.76*:5 !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for configuring desktop notifications
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=phonon debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kcompletion-5.76*:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kio-5.76*:5 !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/knotifyconfig-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a3a968e18c9c717f77cb81a76d28e472
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.76.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.76.0
new file mode 100644
index 000000000000..e15b4fb7b888
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.76:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 =kde-frameworks/karchive-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework to install and load packages of non binary content
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 =kde-frameworks/karchive-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kpackage-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=21881769a79e863f5bb7ed1c130a440b
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.76.0 b/metadata/md5-cache/kde-frameworks/kparts-5.76.0
new file mode 100644
index 000000000000..11c480f0a593
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76: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-qt/qtxml-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kiconthemes-5.76*:5 =kde-frameworks/kio-5.76*:5 =kde-frameworks/kjobwidgets-5.76*:5 =kde-frameworks/kservice-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 =kde-frameworks/kxmlgui-5.76*:5 >=kde-frameworks/ktextwidgets-5.76:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing elaborate user-interface components
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kiconthemes-5.76*:5 =kde-frameworks/kio-5.76*:5 =kde-frameworks/kjobwidgets-5.76*:5 =kde-frameworks/kservice-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 =kde-frameworks/kxmlgui-5.76*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kparts-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8346c3ea4f2ca53afde89f17368aec2a
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.76.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.76.0
new file mode 100644
index 000000000000..349cddc56835
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtsql-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kitemviews-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE contact person abstraction library
+EAPI=7
+HOMEPAGE=https://invent.kde.org/frameworks/kpeople
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtsql-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kitemviews-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kpeople-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ea34c2451bab48976957b080ed21498d
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.76.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.76.0
new file mode 100644
index 000000000000..2f2f5cfc1897
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76: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 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing easy data-plotting functions
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kplotting-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=44ce6756c89682362e27029b3854521d
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.76.0 b/metadata/md5-cache/kde-frameworks/kpty-5.76.0
new file mode 100644
index 000000000000..ca8f04ef0da7
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 sys-libs/libutempter test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for pseudo terminal devices and running child processes
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND==kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kpty-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4e14301dcad55434b5757aea21c4a2d2
diff --git a/metadata/md5-cache/kde-frameworks/kquickcharts-5.76.0 b/metadata/md5-cache/kde-frameworks/kquickcharts-5.76.0
new file mode 100644
index 000000000000..6b63174da3c2
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kquickcharts-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtquickcontrols2-5.15.1:5 examples? ( >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kdeclarative-5.76*:5 =kde-frameworks/kirigami-5.76*:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=QtQuick plugin providing high-performance charts
+EAPI=7
+HOMEPAGE=https://invent.kde.org/frameworks/kquickcharts
+IUSE=test debug examples test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtquickcontrols2-5.15.1:5 examples? ( >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kdeclarative-5.76*:5 =kde-frameworks/kirigami-5.76*:5 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kquickcharts-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fcd8f246d1dee2846efde7455db96772
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.76.0 b/metadata/md5-cache/kde-frameworks/kross-5.76.0
new file mode 100644
index 000000000000..c0a6030c8360
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kross-5.76.0
@@ -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.76:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtscript-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 =kde-frameworks/kcompletion-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kiconthemes-5.76*:5 =kde-frameworks/kio-5.76*:5 =kde-frameworks/kparts-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 =kde-frameworks/kxmlgui-5.76*:5 >=dev-qt/designer-5.15.1:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for embedding scripting into applications
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtscript-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 =kde-frameworks/kcompletion-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kiconthemes-5.76*:5 =kde-frameworks/kio-5.76*:5 =kde-frameworks/kparts-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 =kde-frameworks/kxmlgui-5.76*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/portingAids/kross-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=af1d1863ff04cc2999f54182517b3c83
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.76.0 b/metadata/md5-cache/kde-frameworks/krunner-5.76.0
new file mode 100644
index 000000000000..03254086d72c
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kio-5.76*:5 =kde-frameworks/kservice-5.76*:5 =kde-frameworks/plasma-5.76*:5 =kde-frameworks/solid-5.76*:5 =kde-frameworks/threadweaver-5.76*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for providing different actions given a string query
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kio-5.76*:5 =kde-frameworks/kservice-5.76*:5 =kde-frameworks/plasma-5.76*:5 =kde-frameworks/solid-5.76*:5 =kde-frameworks/threadweaver-5.76*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/krunner-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0919da8f0f51d642ac1ffc01244b985b
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.76.0 b/metadata/md5-cache/kde-frameworks/kservice-5.76.0
new file mode 100644
index 000000000000..0244bf188569
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison sys-devel/flex man? ( >=kde-frameworks/kdoctools-5.76:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kcrash-5.76*:5 =kde-frameworks/kdbusaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 test? ( >=dev-qt/qtconcurrent-5.15.1:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Advanced plugin and service introspection
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=+man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2 LGPL-2.1+
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kcrash-5.76*:5 =kde-frameworks/kdbusaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kservice-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b7768febefbce0513af93f31ee47cf33
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.76.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.76.0
new file mode 100644
index 000000000000..498ae1f374e5
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=kde-frameworks/kservice-5.76:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtprintsupport-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 =kde-frameworks/karchive-5.76*:5 =kde-frameworks/kauth-5.76*:5 =kde-frameworks/kcodecs-5.76*:5 =kde-frameworks/kcompletion-5.76*:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kconfigwidgets-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kguiaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kiconthemes-5.76*:5 =kde-frameworks/kio-5.76*:5 =kde-frameworks/kitemviews-5.76*:5 =kde-frameworks/kjobwidgets-5.76*:5 =kde-frameworks/kparts-5.76*:5 =kde-frameworks/ktextwidgets-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 =kde-frameworks/kxmlgui-5.76*:5 =kde-frameworks/sonnet-5.76*:5 =kde-frameworks/syntax-highlighting-5.76*:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing a full text editor component
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=+editorconfig git test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtprintsupport-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 =kde-frameworks/karchive-5.76*:5 =kde-frameworks/kauth-5.76*:5 =kde-frameworks/kcodecs-5.76*:5 =kde-frameworks/kcompletion-5.76*:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kconfigwidgets-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kguiaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kiconthemes-5.76*:5 =kde-frameworks/kio-5.76*:5 =kde-frameworks/kitemviews-5.76*:5 =kde-frameworks/kjobwidgets-5.76*:5 =kde-frameworks/kparts-5.76*:5 =kde-frameworks/ktextwidgets-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 =kde-frameworks/kxmlgui-5.76*:5 =kde-frameworks/sonnet-5.76*:5 =kde-frameworks/syntax-highlighting-5.76*:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/ktexteditor-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5a856cc4af92ca63e5c3a1dad46d1d68
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.76.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.76.0
new file mode 100644
index 000000000000..70ed2792b63d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kcompletion-5.76*:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kconfigwidgets-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kservice-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 =kde-frameworks/sonnet-5.76*:5 speech? ( >=dev-qt/qtspeech-5.15.1:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing an assortment of widgets for displaying and editing text
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=speech test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+ LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kcompletion-5.76*:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kconfigwidgets-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kservice-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 =kde-frameworks/sonnet-5.76*:5 speech? ( >=dev-qt/qtspeech-5.15.1:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/ktextwidgets-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=28f4d20920f4917124126b05f435dd88
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.76.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.76.0
new file mode 100644
index 000000000000..a4ca0fbddf19
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtnetwork-5.15.1:5 =kde-frameworks/ki18n-5.76*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for converting units
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtnetwork-5.15.1:5 =kde-frameworks/ki18n-5.76*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kunitconversion-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f9fe7250352ba48766feac12e225520b
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.76.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.76.0
new file mode 100644
index 000000000000..baa98cfbb015
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.76:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libgcrypt:0= >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kconfigwidgets-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kdbusaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/knotifications-5.76*:5 =kde-frameworks/kservice-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 =kde-frameworks/kwindowsystem-5.76*:5 gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing desktop-wide storage for passwords
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=gpg +man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=dev-libs/libgcrypt:0= >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kconfigwidgets-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kdbusaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/knotifications-5.76*:5 =kde-frameworks/kservice-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 =kde-frameworks/kwindowsystem-5.76*:5 gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kwallet-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=591c24985eab87c3fee82dd22c6b6d49
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.76.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.76.0
new file mode 100644
index 000000000000..819e3df7484d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwayland-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/wayland-1.15.0 >=dev-qt/qtconcurrent-5.15.1:5 >=dev-qt/qtgui-5.15.1:5[egl] >=dev-qt/qtwayland-5.15.1:5 media-libs/mesa[egl] >=dev-libs/plasma-wayland-protocols-1.1.1 >=dev-libs/wayland-protocols-1.15 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
+EAPI=7
+HOMEPAGE=https://invent.kde.org/frameworks/kwayland
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/wayland-1.15.0 >=dev-qt/qtconcurrent-5.15.1:5 >=dev-qt/qtgui-5.15.1:5[egl] >=dev-qt/qtwayland-5.15.1:5 media-libs/mesa[egl] >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kwayland-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ab7d8790f229d0fb7f8cc25a7cce49d5
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.76.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.76.0
new file mode 100644
index 000000000000..e8f854a8a9a5
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.1:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76: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 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=An assortment of high-level widgets for common tasks
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kwidgetsaddons-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5f29849915ebe96ffa53ef4b3ba77738
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.76.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.76.0
new file mode 100644
index 000000000000..2cd34a167434
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.1:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76: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 X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing access to properties and features of the window manager
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) MIT
+RDEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kwindowsystem-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=398e1e56201fc3b193e975a6326b9ace
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.76.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.76.0
new file mode 100644
index 000000000000..cba44c917dbd
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtcore-5.15.1:5= >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5[ssl] >=dev-qt/qtprintsupport-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kconfigwidgets-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kglobalaccel-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kiconthemes-5.76*:5 =kde-frameworks/kitemviews-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 =kde-frameworks/kwindowsystem-5.76*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for managing menu and toolbar actions in an abstract way
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtcore-5.15.1:5= >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5[ssl] >=dev-qt/qtprintsupport-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kconfigwidgets-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kglobalaccel-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kiconthemes-5.76*:5 =kde-frameworks/kitemviews-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 =kde-frameworks/kwindowsystem-5.76*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/kxmlgui-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6e20a988863bf5fbbc8709736c9653f1
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.76.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.76.0
new file mode 100644
index 000000000000..cdb35fedb472
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtxml-5.15.1:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kio-5.76*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing client-side support for the XML-RPC protocol
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-qt/qtxml-5.15.1:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kio-5.76*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/portingAids/kxmlrpcclient-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=36c5408f5bb7bcfe4f4d1c325ec35d14
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.76.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.76.0
new file mode 100644
index 000000000000..9a2d1cb79990
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 net-misc/modemmanager test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=ModemManager bindings for Qt
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 net-misc/modemmanager >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/modemmanager-qt-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b56a3b9c7bb173cd2ddfe7c982213c76
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.76.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.76.0
new file mode 100644
index 000000000000..a597c99f807d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=NetworkManager bindings for Qt
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=teamd debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] || ( >=net-misc/networkmanager-1.4.0-r1[elogind] >=net-misc/networkmanager-1.4.0-r1[systemd] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/networkmanager-qt-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6dd10e9570a06b6c4b4b39303fbc495b
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.76.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.76.0
new file mode 100644
index 000000000000..41837fbc65a0
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.76.0
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-qt/qtcore-5.15.1:5 >=kde-frameworks/extra-cmake-modules-5.76:5 test? ( app-misc/fdupes ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
+DEPEND=test? ( >=dev-qt/qttest-5.15.1:5 )
+DESCRIPTION=Oxygen SVG icon theme
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-3
+RESTRICT=!test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/oxygen-icons5-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=74e1fb1ca0f474bc4e04cd223f261a8a
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.76.0 b/metadata/md5-cache/kde-frameworks/plasma-5.76.0
new file mode 100644
index 000000000000..7e71b47ebe7d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=>=kde-frameworks/kdoctools-5.76:5 dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5[gles2-only=] >=dev-qt/qtquickcontrols-5.15.1:5 >=dev-qt/qtsql-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kactivities-5.76*:5 =kde-frameworks/karchive-5.76*:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kconfigwidgets-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kdeclarative-5.76*:5 =kde-frameworks/kglobalaccel-5.76*:5 =kde-frameworks/kguiaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kiconthemes-5.76*:5 =kde-frameworks/kio-5.76*:5 =kde-frameworks/kirigami-5.76*:5 =kde-frameworks/knotifications-5.76*:5 =kde-frameworks/kpackage-5.76*:5 =kde-frameworks/kservice-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 =kde-frameworks/kwindowsystem-5.76*:5 =kde-frameworks/kxmlgui-5.76*:5 !gles2-only? ( virtual/opengl ) wayland? ( =kde-frameworks/kwayland-5.76*:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libX11 x11-libs/libxcb ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plasma framework
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=gles2-only wayland X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5[gles2-only=] >=dev-qt/qtquickcontrols-5.15.1:5 >=dev-qt/qtsql-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kactivities-5.76*:5 =kde-frameworks/karchive-5.76*:5 =kde-frameworks/kconfig-5.76*:5 =kde-frameworks/kconfigwidgets-5.76*:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/kdeclarative-5.76*:5 =kde-frameworks/kglobalaccel-5.76*:5 =kde-frameworks/kguiaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kiconthemes-5.76*:5 =kde-frameworks/kio-5.76*:5 =kde-frameworks/kirigami-5.76*:5 =kde-frameworks/knotifications-5.76*:5 =kde-frameworks/kpackage-5.76*:5 =kde-frameworks/kservice-5.76*:5 =kde-frameworks/kwidgetsaddons-5.76*:5 =kde-frameworks/kwindowsystem-5.76*:5 =kde-frameworks/kxmlgui-5.76*:5 !gles2-only? ( virtual/opengl ) wayland? ( =kde-frameworks/kwayland-5.76*:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/plasma-framework-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=427b75be9055fbc8db548adef58f8d44
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.76.0 b/metadata/md5-cache/kde-frameworks/prison-5.76.0
new file mode 100644
index 000000000000..7b5a4ac0df6f
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/prison-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.1:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.15.1:5 ) test? ( >=dev-qt/qtwidgets-5.15.1:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=QRCode and data matrix barcode library
+EAPI=7
+HOMEPAGE=https://invent.kde.org/frameworks/prison
+IUSE=qml debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.15.1:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.15.1:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/prison-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ae80ac62d90e2a92c2335b237b6b9e83
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.76.0 b/metadata/md5-cache/kde-frameworks/purpose-5.76.0
new file mode 100644
index 000000000000..d05b3eb6dcba
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/purpose-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kio-5.76*:5 =kde-frameworks/kirigami-5.76*:5 dolphin? ( =kde-frameworks/knotifications-5.76*:5 ) kaccounts? ( >=kde-apps/kaccounts-integration-19.04.3:5 net-libs/accounts-qt ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for providing abstractions to get the developer's purposes fulfilled
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=bluetooth +dolphin +kaccounts debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kcoreaddons-5.76*:5 =kde-frameworks/ki18n-5.76*:5 =kde-frameworks/kio-5.76*:5 =kde-frameworks/kirigami-5.76*:5 dolphin? ( =kde-frameworks/knotifications-5.76*:5 ) kaccounts? ( >=kde-apps/kaccounts-integration-19.04.3:5 net-libs/accounts-qt ) >=dev-qt/qtquickcontrols-5.15.1:5 >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-frameworks/kdeclarative-5.76:5 bluetooth? ( =kde-frameworks/bluez-qt-5.76*:5 ) kaccounts? ( net-libs/accounts-qml ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/purpose-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=06e742d0a0213451f84812dae4ef1d69
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.76.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.76.0
new file mode 100644
index 000000000000..136d44ff1f4a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.1:5= >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kconfigwidgets-5.76*:5 =kde-frameworks/kiconthemes-5.76*:5 =kde-frameworks/kirigami-5.76*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Style for QtQuickControls 2 that uses QWidget's QStyle for painting
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( GPL-2+ LGPL-3+ )
+RDEPEND=>=dev-qt/qtdeclarative-5.15.1:5= >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kconfigwidgets-5.76*:5 =kde-frameworks/kiconthemes-5.76*:5 =kde-frameworks/kirigami-5.76*:5 >=dev-qt/qtgraphicaleffects-5.15.1:5 >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/qqc2-desktop-style-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a28e2e084b7ef21f4cea66416a4619e7
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.76.0 b/metadata/md5-cache/kde-frameworks/solid-5.76.0
new file mode 100644
index 000000000000..4eeafd5fbdb0
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/solid-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison sys-devel/flex nls? ( >=dev-qt/linguist-tools-5.15.1:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 sys-fs/udisks:2 virtual/libudev:= ios? ( app-pda/libimobiledevice:= app-pda/libplist:= ) test? ( >=dev-qt/qtconcurrent-5.15.1:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Provider for platform independent hardware discovery, abstraction and management
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=ios nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 sys-fs/udisks:2 virtual/libudev:= ios? ( app-pda/libimobiledevice:= app-pda/libplist:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/solid-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e77141fe3977219792b64b320243c798
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.76.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.76.0
new file mode 100644
index 000000000000..2d067070af40
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.1:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76: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 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for providing spell-checking through abstraction of popular backends
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=aspell +hunspell nls test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2+ LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/sonnet-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1dd851edc582ee7e673588de7dc0f8d7
diff --git a/metadata/md5-cache/kde-frameworks/syndication-5.76.0 b/metadata/md5-cache/kde-frameworks/syndication-5.76.0
new file mode 100644
index 000000000000..0037d4afe53b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/syndication-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtxml-5.15.1:5 =kde-frameworks/kcodecs-5.76*:5 test? ( >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for parsing RSS and Atom feeds
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtxml-5.15.1:5 =kde-frameworks/kcodecs-5.76*:5 !kde-apps/syndication >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/syndication-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cd24c06f6c17bf1a921229d88659a64a
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.76.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.76.0
new file mode 100644
index 000000000000..b4da87badea5
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl nls? ( >=dev-qt/linguist-tools-5.15.1:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtxmlpatterns-5.15.1:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for syntax highlighting
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtxmlpatterns-5.15.1:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/syntax-highlighting-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9c05b9b41714c7ccdc8a3b86ef061658
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.76.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.76.0
new file mode 100644
index 000000000000..b54ade48db2d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.76.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.76:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for managing threads using job and queue-based interfaces
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.76
+SRC_URI=mirror://kde/stable/frameworks/5.76/threadweaver-5.76.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fa770c88e844f70617ab2e9463ea3b68
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index 5c7cda594f7b..79c0d3916a19 100644
Binary files a/metadata/md5-cache/kde-misc/Manifest.gz and b/metadata/md5-cache/kde-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-misc/markdownpart-0.1.1 b/metadata/md5-cache/kde-misc/markdownpart-0.1.1
index 6dbd5540f5f1..ef6995e963ff 100644
--- a/metadata/md5-cache/kde-misc/markdownpart-0.1.1
+++ b/metadata/md5-cache/kde-misc/markdownpart-0.1.1
@@ -5,10 +5,10 @@ DESCRIPTION=Markdown viewer KParts plugin based on QTextDocument
 EAPI=7
 HOMEPAGE=https://apps.kde.org/en/markdownpart
 IUSE=debug
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kparts-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/markdownpart/0.1.1/src/markdownpart-0.1.1.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9762d48fb360a1cae894939bb5ae1bc0
+_md5_=d894a16ff95b4b427d876fb590c9ce63
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 8d9d3bea2ef7..ccc22f9c53d4 100644
Binary files a/metadata/md5-cache/mail-filter/Manifest.gz and b/metadata/md5-cache/mail-filter/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-filter/libsieve-2.2.7 b/metadata/md5-cache/mail-filter/libsieve-2.2.7
index eb82cb382113..a48812219e2f 100644
--- a/metadata/md5-cache/mail-filter/libsieve-2.2.7
+++ b/metadata/md5-cache/mail-filter/libsieve-2.2.7
@@ -1,4 +1,5 @@
-DEFINED_PHASES=-
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
 DESCRIPTION=A library for parsing, sorting and filtering your mail
 EAPI=7
 HOMEPAGE=http://libsieve.sourceforge.net/
@@ -7,4 +8,5 @@ LICENSE=MIT LGPL-2.1
 RDEPEND=!<net-mail/mailutils-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/libsieve/libsieve-2.2.7.tar.gz
-_md5_=07cade972315e2a07415a39fc9a151d9
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a421903290906d0d594940d64b4f5459
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 4b775afb97b6..e325b186049c 100644
Binary files a/metadata/md5-cache/mail-mta/Manifest.gz and b/metadata/md5-cache/mail-mta/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-mta/msmtp-1.8.10 b/metadata/md5-cache/mail-mta/msmtp-1.8.10
deleted file mode 100644
index 7d1b31a417fa..000000000000
--- a/metadata/md5-cache/mail-mta/msmtp-1.8.10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( virtual/texi2dvi ) nls? ( sys-devel/gettext ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=gnome-keyring? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls[idn?] ) !ssl? ( idn? ( net-dns/libidn2:= ) )
-DESCRIPTION=An SMTP client and SMTP plugin for mail user agents such as Mutt
-EAPI=7
-HOMEPAGE=https://marlam.de/msmtp/
-IUSE=daemon doc gnome-keyring idn +mta nls sasl ssl vim-syntax +filecaps
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=gnome-keyring? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls[idn?] ) !ssl? ( idn? ( net-dns/libidn2:= ) ) net-mail/mailbase daemon? ( acct-group/msmtpd acct-user/msmtpd ) mta? ( !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] ) filecaps? ( sys-libs/libcap )
-REQUIRED_USE=daemon? ( filecaps )
-SLOT=0
-SRC_URI=https://marlam.de/msmtp/releases/msmtp-1.8.10.tar.xz
-_eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cb690a8e507fdd9583f6058e2494aa6c
diff --git a/metadata/md5-cache/mail-mta/msmtp-1.8.11 b/metadata/md5-cache/mail-mta/msmtp-1.8.11
deleted file mode 100644
index 5e05dc6fad90..000000000000
--- a/metadata/md5-cache/mail-mta/msmtp-1.8.11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( virtual/texi2dvi ) nls? ( sys-devel/gettext ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=gnome-keyring? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls[idn?] ) !ssl? ( idn? ( net-dns/libidn2:= ) )
-DESCRIPTION=An SMTP client and SMTP plugin for mail user agents such as Mutt
-EAPI=7
-HOMEPAGE=https://marlam.de/msmtp/
-IUSE=daemon doc gnome-keyring idn +mta nls sasl ssl vim-syntax +filecaps
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=gnome-keyring? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls[idn?] ) !ssl? ( idn? ( net-dns/libidn2:= ) ) net-mail/mailbase daemon? ( acct-group/msmtpd acct-user/msmtpd ) mta? ( !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] ) filecaps? ( sys-libs/libcap )
-REQUIRED_USE=daemon? ( filecaps )
-SLOT=0
-SRC_URI=https://marlam.de/msmtp/releases/msmtp-1.8.11.tar.xz
-_eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cb690a8e507fdd9583f6058e2494aa6c
diff --git a/metadata/md5-cache/mail-mta/msmtp-1.8.12 b/metadata/md5-cache/mail-mta/msmtp-1.8.12
index d25ab2f12e35..127d8dcaf2ac 100644
--- a/metadata/md5-cache/mail-mta/msmtp-1.8.12
+++ b/metadata/md5-cache/mail-mta/msmtp-1.8.12
@@ -1,15 +1,15 @@
 BDEPEND=doc? ( virtual/texi2dvi ) nls? ( sys-devel/gettext ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=gnome-keyring? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls[idn?] ) !ssl? ( idn? ( net-dns/libidn2:= ) )
+DEPEND=gnome-keyring? ( app-crypt/libsecret ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls[idn?] )
 DESCRIPTION=An SMTP client and SMTP plugin for mail user agents such as Mutt
 EAPI=7
 HOMEPAGE=https://marlam.de/msmtp/
 IUSE=daemon doc gnome-keyring idn +mta nls sasl ssl vim-syntax +filecaps
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-3
-RDEPEND=gnome-keyring? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls[idn?] ) !ssl? ( idn? ( net-dns/libidn2:= ) ) net-mail/mailbase daemon? ( acct-group/msmtpd acct-user/msmtpd ) mta? ( !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] ) filecaps? ( sys-libs/libcap )
+RDEPEND=gnome-keyring? ( app-crypt/libsecret ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls[idn?] ) net-mail/mailbase daemon? ( acct-group/msmtpd acct-user/msmtpd ) mta? ( !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] ) filecaps? ( sys-libs/libcap )
 REQUIRED_USE=daemon? ( filecaps )
 SLOT=0
 SRC_URI=https://marlam.de/msmtp/releases/msmtp-1.8.12.tar.xz
 _eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cb690a8e507fdd9583f6058e2494aa6c
+_md5_=025326ed23ba94a7d43458f99aced5cf
diff --git a/metadata/md5-cache/mail-mta/msmtp-1.8.13 b/metadata/md5-cache/mail-mta/msmtp-1.8.13
new file mode 100644
index 000000000000..73a32cc4bdd9
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/msmtp-1.8.13
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( virtual/texi2dvi ) nls? ( sys-devel/gettext ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=gnome-keyring? ( app-crypt/libsecret ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls[idn?] )
+DESCRIPTION=An SMTP client and SMTP plugin for mail user agents such as Mutt
+EAPI=7
+HOMEPAGE=https://marlam.de/msmtp/
+IUSE=daemon doc gnome-keyring idn +mta nls sasl ssl vim-syntax +filecaps
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-3
+RDEPEND=gnome-keyring? ( app-crypt/libsecret ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls[idn?] ) net-mail/mailbase daemon? ( acct-group/msmtpd acct-user/msmtpd ) mta? ( !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] ) filecaps? ( sys-libs/libcap )
+REQUIRED_USE=daemon? ( filecaps )
+SLOT=0
+SRC_URI=https://marlam.de/msmtp/releases/msmtp-1.8.13.tar.xz
+_eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=025326ed23ba94a7d43458f99aced5cf
diff --git a/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.4.4 b/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.5.0
similarity index 93%
rename from metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.4.4
rename to metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.5.0
index 1421f8dbfce7..4078bc0b689a 100644
--- a/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.4.4
+++ b/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.5.0
@@ -8,6 +8,6 @@ LICENSE=MIT protonmail-bridge-EULA
 RDEPEND=app-crypt/libsecret dev-libs/glib:2 media-sound/pulseaudio[glib] sys-apps/dbus virtual/opengl media-libs/fontconfig media-libs/freetype x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/libXi
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=https://protonmail.com/download/protonmail-bridge-1.4.4-1.x86_64.rpm
+SRC_URI=https://protonmail.com/download/protonmail-bridge-1.5.0-1.x86_64.rpm
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	rpm	760ff223c2c4299b68ea901e24c4cabd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5af82226962d888060209366b640847b
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index f58a3516af29..e66c85f9ef2b 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/cantarell-0.201 b/metadata/md5-cache/media-fonts/cantarell-0.201
index ff734248fd23..7a13f784a5a0 100644
--- a/metadata/md5-cache/media-fonts/cantarell-0.201
+++ b/metadata/md5-cache/media-fonts/cantarell-0.201
@@ -5,10 +5,10 @@ DESCRIPTION=Default fontset for GNOME Shell
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/CantarellFonts
 IUSE=X
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=OFL-1.1
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/cantarell-fonts/0.201/cantarell-fonts-0.201.tar.xz
 _eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=31f07fdd38016dbce9e5e83ff2f8194d
+_md5_=d339a0bd3d66004cd6d3e78754f64634
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 32a20ba360be..2a3175b3b26b 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/darktable-3.2.1-r1 b/metadata/md5-cache/media-gfx/darktable-3.2.1-r1
index 2797cdb0c816..1a663d16f995 100644
--- a/metadata/md5-cache/media-gfx/darktable-3.2.1-r1
+++ b/metadata/md5-cache/media-gfx/darktable-3.2.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=A virtual lighttable and darkroom for photographers
 EAPI=7
 HOMEPAGE=https://www.darktable.org/
 IUSE=colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet lto lua nls opencl openmp openexr system-lua tools webp l10n_de l10n_es l10n_fr l10n_he l10n_it l10n_pl l10n_pt-BR l10n_ru l10n_sl +lua_single_target_lua5-3
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=GPL-3 CC-BY-3.0
 RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 >=dev-libs/pugixml-1.8:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl sys-libs/zlib:= virtual/jpeg:0 x11-libs/cairo >=x11-libs/gtk+-3.22:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:2= ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) system-lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) webp? ( media-libs/libwebp:0= ) kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
 REQUIRED_USE=system-lua? ( lua ^^ ( lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-3.2.1/darktable-3.2.1.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-3.0.0/darktable-usermanual.pdf -> darktable-usermanual-3.0.0.pdf )
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=24be11d7584b65da8116b15e05c641c7
+_md5_=59e56bc00df5225fcc11521b08c6b2aa
diff --git a/metadata/md5-cache/media-gfx/fontforge-20200314 b/metadata/md5-cache/media-gfx/fontforge-20200314
index 8fcd73cb9dc6..064f0627e514 100644
--- a/metadata/md5-cache/media-gfx/fontforge-20200314
+++ b/metadata/md5-cache/media-gfx/fontforge-20200314
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fontforge/fontforge/releases/download/20200314/fontforge-20200314.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5df34cff3e8d543233f6bb9781e99583
+_md5_=2506ef104905c15c1e10a8e2705966c6
diff --git a/metadata/md5-cache/media-gfx/fontforge-20201107 b/metadata/md5-cache/media-gfx/fontforge-20201107
new file mode 100644
index 000000000000..ebdfa34e08c5
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/fontforge-20201107
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gettext doc? ( >=dev-python/sphinx-2 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) test? ( dev-libs/glib:2 dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( >=x11-libs/gtk+-3.10:3 ) !gtk? ( X? ( >=x11-libs/cairo-1.6:0= >=x11-libs/pango-1.10:0=[X] x11-libs/libX11:0= x11-libs/libXi:0= ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) unicode? ( media-libs/libuninameslist:0= ) woff2? ( media-libs/woff2:0= ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-libs/glib:2 dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( >=x11-libs/gtk+-3.10:3 ) !gtk? ( X? ( >=x11-libs/cairo-1.6:0= >=x11-libs/pango-1.10:0=[X] x11-libs/libX11:0= x11-libs/libXi:0= ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) unicode? ( media-libs/libuninameslist:0= ) woff2? ( media-libs/woff2:0= ) !gtk? ( X? ( x11-base/xorg-proto ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=postscript font editor and converter
+EAPI=7
+HOMEPAGE=https://fontforge.org/
+IUSE=doc truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode woff2 X python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=BSD GPL-3+
+RDEPEND=dev-libs/glib:2 dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( >=x11-libs/gtk+-3.10:3 ) !gtk? ( X? ( >=x11-libs/cairo-1.6:0= >=x11-libs/pango-1.10:0=[X] x11-libs/libX11:0= x11-libs/libXi:0= ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) unicode? ( media-libs/libuninameslist:0= ) woff2? ( media-libs/woff2:0= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/fontforge/fontforge/releases/download/20201107/fontforge-20201107.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5b3285a1d4946a9a05e00e82df1f0f2d
diff --git a/metadata/md5-cache/media-gfx/xsane-0.999-r3 b/metadata/md5-cache/media-gfx/xsane-0.999-r3
index a53ba1f90a4c..2b3d2754f9ff 100644
--- a/metadata/md5-cache/media-gfx/xsane-0.999-r3
+++ b/metadata/md5-cache/media-gfx/xsane-0.999-r3
@@ -11,4 +11,4 @@ RDEPEND=media-gfx/sane-backends x11-libs/gtk+:2 x11-misc/xdg-utils jpeg? ( virtu
 SLOT=0
 SRC_URI=http://www.xsane.org/download/xsane-0.999.tar.gz https://dev.gentoo.org/~dilfridge/distfiles/xsane-0.998-patches-2.tar.xz https://dev.gentoo.org/~pacho/xsane/xsane-256x256.png
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a79a05cb189fbab4c08431a6c07b55b9
+_md5_=40a21042e7bc518842f3d0c18311a501
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 7f387eb4eaf9..dd422d214b7e 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/ampache_browser-1.0.3 b/metadata/md5-cache/media-libs/ampache_browser-1.0.3
index 2f09c0eb2572..a9738003411e 100644
--- a/metadata/md5-cache/media-libs/ampache_browser-1.0.3
+++ b/metadata/md5-cache/media-libs/ampache_browser-1.0.3
@@ -5,10 +5,10 @@ DESCRIPTION=Ampache desktop client library
 EAPI=7
 HOMEPAGE=http://ampache-browser.org https://github.com/ampache-browser/ampache_browser
 IUSE=debug nls
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/ampache-browser/ampache_browser/archive/v1.0.3.tar.gz -> ampache_browser-1.0.3.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4a4e5261a0831a7064028b64037f277f
+_md5_=e57b0d95ebaac8726037adbef662c383
diff --git a/metadata/md5-cache/media-libs/bio2jack-0.9-r2 b/metadata/md5-cache/media-libs/bio2jack-0.9-r2
index 84d1ab95c209..0a43b3b1d014 100644
--- a/metadata/md5-cache/media-libs/bio2jack-0.9-r2
+++ b/metadata/md5-cache/media-libs/bio2jack-0.9-r2
@@ -5,10 +5,10 @@ DESCRIPTION=A library for porting blocked I/O OSS/ALSA audio applications to JAC
 EAPI=7
 HOMEPAGE=http://bio2jack.sourceforge.net/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=media-libs/libsamplerate virtual/jack
 SLOT=0
 SRC_URI=mirror://sourceforge/bio2jack/bio2jack-0.9.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e2c570d598336dc599397a2c00443b2e
+_md5_=4fd6d86c8f942c3a7e9d1b770147dc8d
diff --git a/metadata/md5-cache/media-libs/freeimage-3.18.0-r1 b/metadata/md5-cache/media-libs/freeimage-3.18.0-r1
index 135e2de0243f..09c5e2a4a512 100644
--- a/metadata/md5-cache/media-libs/freeimage-3.18.0-r1
+++ b/metadata/md5-cache/media-libs/freeimage-3.18.0-r1
@@ -9,6 +9,6 @@ KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2 FIPL-1.0 )
 RDEPEND=sys-libs/zlib jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) mng? ( media-libs/libmng:= ) openexr? ( media-libs/openexr:= ) png? ( media-libs/libpng:0= ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/ilmbase:= media-libs/tiff:0 ) webp? ( media-libs/libwebp:= )
 SLOT=0
-SRC_URI=mirror://sourceforge/freeimage/FreeImage3180.zip mirror://sourceforge/freeimage/FreeImage3180.pdf
+SRC_URI=mirror://sourceforge/freeimage/FreeImage3180.zip mirror://sourceforge/freeimage/FreeImage3180.pdf https://dev.gentoo.org/~juippis/distfiles/tmp/freeimage-3.18.0-unbundling.patch
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=99d56e751b141dca90414f42bb17b71b
+_md5_=7fd80feedf054a48839de097b3835ac5
diff --git a/metadata/md5-cache/media-libs/freeimage-3.18.0-r2 b/metadata/md5-cache/media-libs/freeimage-3.18.0-r2
index 4d318c2c0a1a..b38b27e74fcc 100644
--- a/metadata/md5-cache/media-libs/freeimage-3.18.0-r2
+++ b/metadata/md5-cache/media-libs/freeimage-3.18.0-r2
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2 FIPL-1.0 )
 RDEPEND=sys-libs/zlib jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) mng? ( media-libs/libmng:= ) openexr? ( media-libs/openexr:= ) png? ( media-libs/libpng:0= ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/ilmbase:= media-libs/tiff:0 ) webp? ( media-libs/libwebp:= )
 SLOT=0
-SRC_URI=mirror://sourceforge/freeimage/FreeImage3180.zip mirror://sourceforge/freeimage/FreeImage3180.pdf
+SRC_URI=mirror://sourceforge/freeimage/FreeImage3180.zip mirror://sourceforge/freeimage/FreeImage3180.pdf https://dev.gentoo.org/~juippis/distfiles/tmp/freeimage-3.18.0-unbundling.patch
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ac500bf28b406e311d91f4a8d9602abe
+_md5_=ebca8f807d2b369779cca2e2d6618616
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-1.16.2 b/metadata/md5-cache/media-libs/gst-plugins-base-1.16.2
index 4e7513468ffb..5fe4c6917a7f 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-base-1.16.2
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-1.16.2
@@ -11,4 +11,4 @@ REQUIRED_USE=ivorbis? ( ogg ) theora? ( ogg ) vorbis? ( ogg ) opengl? ( || ( egl
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c18e44fbc861d0331a8735babcdcaa9c
+_md5_=cf601c0b2db03da281d8ca1ac02e5b31
diff --git a/metadata/md5-cache/media-libs/libbs2b-3.1.0-r2 b/metadata/md5-cache/media-libs/libbs2b-3.1.0-r2
index 019a28b9ef5c..c16de5d8dd78 100644
--- a/metadata/md5-cache/media-libs/libbs2b-3.1.0-r2
+++ b/metadata/md5-cache/media-libs/libbs2b-3.1.0-r2
@@ -11,4 +11,4 @@ RDEPEND=>=media-libs/libsndfile-1.0.25-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 SLOT=0
 SRC_URI=mirror://sourceforge/bs2b/libbs2b-3.1.0.tar.bz2
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e916a17981a33498ba1538d732705b29
+_md5_=42a3e11647f77a4e38ec67c47226771a
diff --git a/metadata/md5-cache/media-libs/libcdaudio-0.99.12-r2 b/metadata/md5-cache/media-libs/libcdaudio-0.99.12-r2
index 950a91b946a8..a83ee9cf76fd 100644
--- a/metadata/md5-cache/media-libs/libcdaudio-0.99.12-r2
+++ b/metadata/md5-cache/media-libs/libcdaudio-0.99.12-r2
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure
+DEFINED_PHASES=configure install
 DESCRIPTION=Library of cd audio related routines
 EAPI=7
 HOMEPAGE=http://libcdaudio.sourceforge.net/
@@ -6,4 +6,4 @@ KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/libcdaudio/libcdaudio-0.99.12.tar.gz
-_md5_=e2c900fc0857ac2ae9d559b5521241c5
+_md5_=b983cdd278dd3a4f4dd7d8816aada582
diff --git a/metadata/md5-cache/media-libs/libcuefile-477-r1 b/metadata/md5-cache/media-libs/libcuefile-477-r1
index 70cb0f3fb0a3..f9381a466ff9 100644
--- a/metadata/md5-cache/media-libs/libcuefile-477-r1
+++ b/metadata/md5-cache/media-libs/libcuefile-477-r1
@@ -9,4 +9,4 @@ LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ssuominen/libcuefile-477.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dcda24676c8fed34f69a15088da3418a
+_md5_=c539eac6cfdf7ccaf834366223bf82dd
diff --git a/metadata/md5-cache/media-libs/libexif-0.6.22_p20201105 b/metadata/md5-cache/media-libs/libexif-0.6.22_p20201105
new file mode 100644
index 000000000000..e60d3309d8c2
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libexif-0.6.22_p20201105
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=nls? ( virtual/libintl )
+DESCRIPTION=Library for parsing, editing, and saving EXIF data
+EAPI=7
+HOMEPAGE=https://libexif.github.io/ https://github.com/libexif/libexif
+IUSE=doc nls 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
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2+
+RDEPEND=nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=https://github.com/libexif/libexif/archive/9266d14b5ca4e29b970fa03272318e5f99386e06.tar.gz -> libexif-0.6.22_p20201105.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a67318efbce750dd8bc9057450806e95
diff --git a/metadata/md5-cache/media-libs/libfishsound-1.0.0 b/metadata/md5-cache/media-libs/libfishsound-1.0.0
index dce07c57f5fe..72f5a3941196 100644
--- a/metadata/md5-cache/media-libs/libfishsound-1.0.0
+++ b/metadata/md5-cache/media-libs/libfishsound-1.0.0
@@ -10,4 +10,4 @@ RDEPEND=media-libs/libogg media-libs/libvorbis flac? ( media-libs/flac ) speex?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://downloads.xiph.org/releases/libfishsound/libfishsound-1.0.0.tar.gz
-_md5_=1f6f9f8884f4f583f41ef23fe34d47f0
+_md5_=4decbdb5ede68d0e26fd0a0204d111ef
diff --git a/metadata/md5-cache/media-libs/libheif-1.7.0-r1 b/metadata/md5-cache/media-libs/libheif-1.7.0-r1
deleted file mode 100644
index d131c7836a69..000000000000
--- a/metadata/md5-cache/media-libs/libheif-1.7.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-lang/go ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=media-libs/libde265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/x265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg: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(-)?] gdk-pixbuf? ( x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) go? ( dev-lang/go ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=ISO/IEC 23008-12:2017 HEIF file format decoder and encoder
-EAPI=7
-HOMEPAGE=https://github.com/strukturag/libheif
-IUSE=gdk-pixbuf go static-libs test +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=GPL-3
-RDEPEND=media-libs/libde265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/x265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg: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(-)?] gdk-pixbuf? ( x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) go? ( dev-lang/go )
-REQUIRED_USE=test? ( go )
-RESTRICT=!test? ( test )
-SLOT=0/1.7
-SRC_URI=https://github.com/strukturag/libheif/releases/download/v1.7.0/libheif-1.7.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=feafb11728241552e0f93ad7593e9716
diff --git a/metadata/md5-cache/media-libs/libheif-1.7.0-r2 b/metadata/md5-cache/media-libs/libheif-1.7.0-r2
deleted file mode 100644
index 46731e62add3..000000000000
--- a/metadata/md5-cache/media-libs/libheif-1.7.0-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-lang/go ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=media-libs/libaom-2.0.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(-)?] media-libs/libde265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/x265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg: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(-)?] gdk-pixbuf? ( x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) go? ( dev-lang/go ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=ISO/IEC 23008-12:2017 HEIF file format decoder and encoder
-EAPI=7
-HOMEPAGE=https://github.com/strukturag/libheif
-IUSE=gdk-pixbuf go static-libs test +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=media-libs/libaom-2.0.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(-)?] media-libs/libde265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/x265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg: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(-)?] gdk-pixbuf? ( x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) go? ( dev-lang/go )
-REQUIRED_USE=test? ( go )
-RESTRICT=!test? ( test )
-SLOT=0/1.7
-SRC_URI=https://github.com/strukturag/libheif/releases/download/v1.7.0/libheif-1.7.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cf3103b2e3e612d747e8a06fb481ca3b
diff --git a/metadata/md5-cache/media-libs/liblingoteach-0.2.3 b/metadata/md5-cache/media-libs/liblingoteach-0.2.3
index 21c1169bd830..b13beb4b8b2f 100644
--- a/metadata/md5-cache/media-libs/liblingoteach-0.2.3
+++ b/metadata/md5-cache/media-libs/liblingoteach-0.2.3
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure
+DEFINED_PHASES=configure install
 DEPEND=zlib? ( sys-libs/zlib ) dev-libs/libxml2 virtual/pkgconfig
 DESCRIPTION=A library to support lingoteach-ui and for generic lesson development
 EAPI=6
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 RDEPEND=zlib? ( sys-libs/zlib ) dev-libs/libxml2
 SLOT=0
 SRC_URI=mirror://sourceforge/lingoteach/liblingoteach-0.2.3.tar.gz
-_md5_=c042d3e8cfaf92fc3dc396362c4df6ef
+_md5_=98d1212d999ec4fa1f1c08acf41d9643
diff --git a/metadata/md5-cache/media-libs/libmpris2client-0.1.0-r1 b/metadata/md5-cache/media-libs/libmpris2client-0.1.0-r1
index 07db60f86507..a7f8d5e462c8 100644
--- a/metadata/md5-cache/media-libs/libmpris2client-0.1.0-r1
+++ b/metadata/md5-cache/media-libs/libmpris2client-0.1.0-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install postinst postrm
+DEFINED_PHASES=configure install postinst postrm
 DEPEND=>=dev-libs/glib-2 x11-libs/gtk+:2 virtual/pkgconfig
 DESCRIPTION=A library to control MPRIS2 compatible players
 EAPI=6
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/glib-2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=https://github.com/matiasdelellis/libmpris2client/releases/download/V0.1.0/libmpris2client-0.1.0.tar.bz2
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=55ba623c613adf3339e0de34a8a49c37
+_md5_=60ddcba98e0fe947615172964dcdc40b
diff --git a/metadata/md5-cache/media-libs/libofa-0.9.3-r2 b/metadata/md5-cache/media-libs/libofa-0.9.3-r2
index 1c7d79c43230..8e441c6da2a3 100644
--- a/metadata/md5-cache/media-libs/libofa-0.9.3-r2
+++ b/metadata/md5-cache/media-libs/libofa-0.9.3-r2
@@ -11,4 +11,4 @@ RDEPEND=>=sci-libs/fftw-3.3.3-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 SLOT=0
 SRC_URI=https://musicip-libofa.googlecode.com/files/libofa-0.9.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=30dc530a5ced287be375072af94ff468
+_md5_=a0f6d384b67f04aa77b84d2a241c64a4
diff --git a/metadata/md5-cache/media-libs/libpng-1.6.37-r2 b/metadata/md5-cache/media-libs/libpng-1.6.37-r2
index 8654d9da2f73..e1d10e12b285 100644
--- a/metadata/md5-cache/media-libs/libpng-1.6.37-r2
+++ b/metadata/md5-cache/media-libs/libpng-1.6.37-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Portable Network Graphics library
 EAPI=7
 HOMEPAGE=http://www.libpng.org/
 IUSE=apng cpu_flags_arm_neon cpu_flags_x86_sse 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
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=libpng2
 RDEPEND=>=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(-)?]
 SLOT=0/16
 SRC_URI=mirror://sourceforge/libpng/libpng-1.6.37.tar.xz apng? ( mirror://sourceforge/apng/libpng-1.6.37-apng.patch.gz )
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e612cddaba8ee4cd3fba715c74af519a
+_md5_=e25489c4529dbb038f197096b59b1192
diff --git a/metadata/md5-cache/media-libs/libreplaygain-477-r1 b/metadata/md5-cache/media-libs/libreplaygain-477-r1
index 3b90bc34a8a6..76651d22f94c 100644
--- a/metadata/md5-cache/media-libs/libreplaygain-477-r1
+++ b/metadata/md5-cache/media-libs/libreplaygain-477-r1
@@ -9,4 +9,4 @@ LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ssuominen/libreplaygain-477.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=246291b4a15a4e3e9ec2de32ea0fa39a
+_md5_=96cbfc64a8aee5ef4264234a0cb35bea
diff --git a/metadata/md5-cache/media-libs/openimageio-1.8.17-r2 b/metadata/md5-cache/media-libs/openimageio-1.8.17-r2
deleted file mode 100644
index 144e3d3f3fc0..000000000000
--- a/metadata/md5-cache/media-libs/openimageio-1.8.17-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/boost-1.62:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 color-management? ( media-libs/opencolorio:= ) dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-libs/boost:=[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) truetype? ( media-libs/freetype:2= )
-DESCRIPTION=A library for reading and writing images
-EAPI=7
-HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
-IUSE=color-management dicom doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python qt5 raw ssl +truetype cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/boost-1.62:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 color-management? ( media-libs/opencolorio:= ) dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-libs/boost:=[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) truetype? ( media-libs/freetype:2= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/OpenImageIO/oiio/archive/Release-1.8.17.tar.gz -> openimageio-1.8.17.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d3d672cd01b6d4d15b59ed80839e9818
diff --git a/metadata/md5-cache/media-libs/openimageio-2.2.7.0 b/metadata/md5-cache/media-libs/openimageio-2.2.7.0
deleted file mode 100644
index a5a027ada0c6..000000000000
--- a/metadata/md5-cache/media-libs/openimageio-2.2.7.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/boost-1.62:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= >=media-libs/libheif-1.7.0:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= media-libs/opencolorio:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sci-libs/dcmtk sys-libs/zlib:= virtual/jpeg:0 ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( dev-libs/boost:=[python,python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] dev-python/pybind11[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] dev-python/pybind11[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
-DESCRIPTION=A library for reading and writing images
-EAPI=7
-HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
-IUSE=doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype cpu_flags_x86_aes cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/boost-1.62:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= >=media-libs/libheif-1.7.0:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= media-libs/opencolorio:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sci-libs/dcmtk sys-libs/zlib:= virtual/jpeg:0 ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( dev-libs/boost:=[python,python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] dev-python/pybind11[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] dev-python/pybind11[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
-RESTRICT=test
-SLOT=0/2.2
-SRC_URI=https://github.com/OpenImageIO/oiio/archive/Release-2.2.7.0.tar.gz -> openimageio-2.2.7.0.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ecb985efc7a7fc61a13a6c378e01cf2d
diff --git a/metadata/md5-cache/media-libs/openimageio-2.2.8.0 b/metadata/md5-cache/media-libs/openimageio-2.2.8.0
index 5162c75c5c7b..1eee88a92179 100644
--- a/metadata/md5-cache/media-libs/openimageio-2.2.8.0
+++ b/metadata/md5-cache/media-libs/openimageio-2.2.8.0
@@ -1,16 +1,16 @@
 BDEPEND=doc? ( app-doc/doxygen dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/boost-1.62:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= >=media-libs/libheif-1.7.0:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= media-libs/opencolorio:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sci-libs/dcmtk sys-libs/zlib:= virtual/jpeg:0 ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( dev-libs/boost:=[python,python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] dev-python/pybind11[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] dev-python/pybind11[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
+DEPEND=>=dev-libs/boost-1.62:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= >=media-libs/libheif-1.7.0:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= media-libs/opencolorio:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( dev-libs/boost:=[python,python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] dev-python/pybind11[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] dev-python/pybind11[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
 DESCRIPTION=A library for reading and writing images
 EAPI=7
 HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
-IUSE=doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype cpu_flags_x86_aes cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+IUSE=dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype cpu_flags_x86_aes cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=amd64 ~ppc64 x86
 LICENSE=BSD
-RDEPEND=>=dev-libs/boost-1.62:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= >=media-libs/libheif-1.7.0:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= media-libs/opencolorio:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sci-libs/dcmtk sys-libs/zlib:= virtual/jpeg:0 ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( dev-libs/boost:=[python,python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] dev-python/pybind11[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] dev-python/pybind11[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
+RDEPEND=>=dev-libs/boost-1.62:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= >=media-libs/libheif-1.7.0:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= media-libs/opencolorio:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( dev-libs/boost:=[python,python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] dev-python/pybind11[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] dev-python/pybind11[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 RESTRICT=test
 SLOT=0/2.2
 SRC_URI=https://github.com/OpenImageIO/oiio/archive/Release-2.2.8.0.tar.gz -> openimageio-2.2.8.0.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=083819152a6c29a2edd2660a54209afe
+_md5_=354c47d99141ca42b32981ae8ab780e5
diff --git a/metadata/md5-cache/media-libs/sratom-0.6.4 b/metadata/md5-cache/media-libs/sratom-0.6.4
deleted file mode 100644
index 4d91a0540688..000000000000
--- a/metadata/md5-cache/media-libs/sratom-0.6.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=media-libs/lv2-1.16.0 >=dev-libs/serd-0.30.0 >=dev-libs/sord-0.14.0 || ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) doc? ( app-doc/doxygen ) virtual/pkgconfig
-DESCRIPTION=Library for serialising LV2 atoms to/from RDF, particularly the Turtle syntax
-EAPI=6
-HOMEPAGE=http://drobilla.net/software/sratom/
-IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86
-LICENSE=ISC
-RDEPEND=>=media-libs/lv2-1.16.0 >=dev-libs/serd-0.30.0 >=dev-libs/sord-0.14.0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://download.drobilla.net/sratom-0.6.4.tar.bz2
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	waf-utils	cf9742c01975dc707eb982114a9d70fa
-_md5_=82f0bb39f4927099cc4acb39b71dcedf
diff --git a/metadata/md5-cache/media-libs/suil-0.10.6 b/metadata/md5-cache/media-libs/suil-0.10.6
deleted file mode 100644
index 286798eba342..000000000000
--- a/metadata/md5-cache/media-libs/suil-0.10.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=>=media-libs/lv2-1.16.0 gtk? ( x11-libs/gtk+:2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) || ( dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] )
-DESCRIPTION=Lightweight C library for loading and wrapping LV2 plugin UIs
-EAPI=6
-HOMEPAGE=http://drobilla.net/software/suil/
-IUSE=doc gtk qt5
-KEYWORDS=amd64 ~arm64 ppc ppc64 x86
-LICENSE=ISC
-RDEPEND=>=media-libs/lv2-1.16.0 gtk? ( x11-libs/gtk+:2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 )
-SLOT=0
-SRC_URI=http://download.drobilla.net/suil-0.10.6.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	cf9742c01975dc707eb982114a9d70fa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7fae691c33035c81ac1d18617ec7f77a
diff --git a/metadata/md5-cache/media-libs/vitamtp-2.5.9_pre20160829 b/metadata/md5-cache/media-libs/vitamtp-2.5.9_pre20160829
index 3687038558fc..eb94535dfd36 100644
--- a/metadata/md5-cache/media-libs/vitamtp-2.5.9_pre20160829
+++ b/metadata/md5-cache/media-libs/vitamtp-2.5.9_pre20160829
@@ -1,5 +1,5 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=install prepare unpack
+DEFINED_PHASES=configure install prepare unpack
 DEPEND=virtual/libusb:1 dev-libs/libxml2
 DESCRIPTION=Library to interact with PS Vita's USB MTP protocol
 EAPI=7
@@ -10,4 +10,4 @@ RDEPEND=virtual/libusb:1 dev-libs/libxml2
 SLOT=0
 SRC_URI=https://github.com/codestation/vitamtp/archive/7ab537a4f45e34984cbeb9cf1b1af543a75a3dc0.tar.gz -> vitamtp-2.5.9_pre20160829.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=c8e10ad35ccef741ce628dce589ae919
+_md5_=975055e50feade2d02e86116afb71288
diff --git a/metadata/md5-cache/media-libs/vitamtp-9999 b/metadata/md5-cache/media-libs/vitamtp-9999
index b0d5334f9c62..5b8a0d598b0a 100644
--- a/metadata/md5-cache/media-libs/vitamtp-9999
+++ b/metadata/md5-cache/media-libs/vitamtp-9999
@@ -1,5 +1,5 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=install prepare unpack
+DEFINED_PHASES=configure install prepare unpack
 DEPEND=virtual/libusb:1 dev-libs/libxml2:2
 DESCRIPTION=Library to interact with PS Vita's USB MTP protocol
 EAPI=7
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=virtual/libusb:1 dev-libs/libxml2:2
 SLOT=0
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5adad45627d1ebe6b361227dad0c1b05
+_md5_=153495bbed364933405478710980ab19
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index f7a592d59569..3dd826bab913 100644
Binary files a/metadata/md5-cache/media-plugins/Manifest.gz and b/metadata/md5-cache/media-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.14.5
index c6e99622b16d..e741e72ea2e5 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.14.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.14.5
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.5.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=418af683fe5bd8c0f12b4b30dbd4ac39
+_md5_=645c324e1004c83ad420a8ba33c69d5e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.16.2
index 511848e87a32..7f95182120aa 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.16.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=418af683fe5bd8c0f12b4b30dbd4ac39
+_md5_=645c324e1004c83ad420a8ba33c69d5e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.16.2-r1 b/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.16.2-r1
index b817bc11a73c..84fc4817f31d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.16.2-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.16.2-r1
@@ -9,6 +9,6 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/lv2-1.14.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lilv-0.24.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
-SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz https://dev.gentoo.org/~juippis/distfiles/tmp/gst-plugins-lv2-1.16.2-r1-gcc10.patch
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5096de9b605ffa44cbf6c57db7fdd7bd
+_md5_=127724f5144602e1d1b791f1b7f8ae8f
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 71b3abe87336..78bbecdd11de 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/ardour-6.2-r1 b/metadata/md5-cache/media-sound/ardour-6.2-r1
deleted file mode 100644
index a858d4ed11d8..000000000000
--- a/metadata/md5-cache/media-sound/ardour-6.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup
-DEPEND=>=dev-cpp/glibmm-2.32.0 >=dev-cpp/gtkmm-2.16:2.4 >=dev-cpp/libgnomecanvasmm-2.26:2.6 dev-libs/boost:= >=dev-libs/glib-2.10.1:2 dev-libs/libsigc++:2 >=dev-libs/libxml2-2.6:2 dev-libs/libxslt >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib media-libs/aubio media-libs/flac media-libs/freetype:2 media-libs/libart_lgpl media-libs/liblo >=media-libs/liblrdf-0.4.0-r20 >=media-libs/libsamplerate-0.1 >=media-libs/libsndfile-1.0.18 >=media-libs/libsoundtouch-1.6.0 media-libs/raptor:2 >=media-libs/rubberband-1.6.0 >=media-libs/taglib-1.7 media-libs/vamp-plugin-sdk net-misc/curl sys-libs/readline:0= sci-libs/fftw:3.0[threads] virtual/libusb:1 x11-libs/cairo >=x11-libs/gtk+-2.8.1:2 x11-libs/pango jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) media-libs/lilv media-libs/sratom dev-libs/sord >=media-libs/suil-0.6.10 >=media-libs/lv2-1.4.0 || ( dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) jack? ( virtual/jack ) sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen[dot] )
-DESCRIPTION=Digital Audio Workstation
-EAPI=6
-HOMEPAGE=https://ardour.org/
-IUSE=altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-cpp/glibmm-2.32.0 >=dev-cpp/gtkmm-2.16:2.4 >=dev-cpp/libgnomecanvasmm-2.26:2.6 dev-libs/boost:= >=dev-libs/glib-2.10.1:2 dev-libs/libsigc++:2 >=dev-libs/libxml2-2.6:2 dev-libs/libxslt >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib media-libs/aubio media-libs/flac media-libs/freetype:2 media-libs/libart_lgpl media-libs/liblo >=media-libs/liblrdf-0.4.0-r20 >=media-libs/libsamplerate-0.1 >=media-libs/libsndfile-1.0.18 >=media-libs/libsoundtouch-1.6.0 media-libs/raptor:2 >=media-libs/rubberband-1.6.0 >=media-libs/taglib-1.7 media-libs/vamp-plugin-sdk net-misc/curl sys-libs/readline:0= sci-libs/fftw:3.0[threads] virtual/libusb:1 x11-libs/cairo >=x11-libs/gtk+-2.8.1:2 x11-libs/pango jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) media-libs/lilv media-libs/sratom dev-libs/sord >=media-libs/suil-0.6.10 >=media-libs/lv2-1.4.0
-SLOT=6
-SRC_URI=https://dev.gentoo.org/~fordfrog/distfiles/Ardour-6.2.0.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	cf9742c01975dc707eb982114a9d70fa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6010e4487d762b66e983409a6ca75211
diff --git a/metadata/md5-cache/media-sound/aucdtect-0.8.2-r1 b/metadata/md5-cache/media-sound/aucdtect-0.8.2-r1
index ddac6284768f..08359f060b70 100644
--- a/metadata/md5-cache/media-sound/aucdtect-0.8.2-r1
+++ b/metadata/md5-cache/media-sound/aucdtect-0.8.2-r1
@@ -1,11 +1,11 @@
+BDEPEND=>=app-arch/rpm2targz-9.0.0.3g
 DEFINED_PHASES=install unpack
-DEPEND=>=app-arch/rpm2targz-9.0.0.3g
 DESCRIPTION=Commandline FLAC CDDA authenticity verifier
-EAPI=5
+EAPI=7
 HOMEPAGE=http://en.true-audio.com
 KEYWORDS=~amd64 ~x86
 LICENSE=freedist
 SLOT=0
 SRC_URI=http://en.true-audio.com/ftp/aucdtect-0.8-2.i586.rpm -> aucdtect-0.8.2.rpm
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6afa5caaead50d406eca712f42da3acc
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	rpm	760ff223c2c4299b68ea901e24c4cabd	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=def29790d2f489b9e9ecbb8200bebce8
diff --git a/metadata/md5-cache/media-sound/aylet-0.5 b/metadata/md5-cache/media-sound/aylet-0.5
index 62ae30be5ad2..28b1824df372 100644
--- a/metadata/md5-cache/media-sound/aylet-0.5
+++ b/metadata/md5-cache/media-sound/aylet-0.5
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/ncurses gtk? ( x11-libs/gtk+:2 ) virtual/pkgconfig
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=sys-libs/ncurses:= gtk? ( x11-libs/gtk+:2 )
 DESCRIPTION=Aylet plays music files in the .ay format
-EAPI=5
+EAPI=7
 HOMEPAGE=http://rus.members.beeb.net/aylet.html
 IUSE=gtk
 KEYWORDS=amd64 ~ppc sparc x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses gtk? ( x11-libs/gtk+:2 )
+RDEPEND=sys-libs/ncurses:= gtk? ( x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=http://ftp.ibiblio.org/pub/Linux/apps/sound/players/aylet-0.5.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d9289073531a81986c54b4c23ec1ea23
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b4b349ab9aec90ccc1bbccb38a353949
diff --git a/metadata/md5-cache/media-sound/cmusfm-0.2.5 b/metadata/md5-cache/media-sound/cmusfm-0.2.5
deleted file mode 100644
index c9f9db50b6b8..000000000000
--- a/metadata/md5-cache/media-sound/cmusfm-0.2.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=net-misc/curl dev-libs/openssl:0= libnotify? ( x11-libs/libnotify ) >=app-portage/elt-patches-20170815
-DESCRIPTION=Last.fm scrobbler for cmus music player
-EAPI=5
-HOMEPAGE=https://github.com/Arkq/cmusfm
-IUSE=libnotify
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=net-misc/curl dev-libs/openssl:0= libnotify? ( x11-libs/libnotify ) media-sound/cmus
-SLOT=0
-SRC_URI=https://github.com/Arkq/cmusfm/archive/v0.2.5.tar.gz -> cmusfm-0.2.5.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	273fa5d1a8ed000a29d79323e2ed0dc1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2ba03946ffc477744d34754bf4053f86
diff --git a/metadata/md5-cache/media-sound/cmusfm-0.3.1 b/metadata/md5-cache/media-sound/cmusfm-0.3.1
deleted file mode 100644
index be8b798cf6fc..000000000000
--- a/metadata/md5-cache/media-sound/cmusfm-0.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=net-misc/curl dev-libs/openssl:0= libnotify? ( >=x11-libs/libnotify-0.7 ) 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
-DESCRIPTION=Last.fm scrobbler for cmus music player
-EAPI=6
-HOMEPAGE=https://github.com/Arkq/cmusfm
-IUSE=libnotify
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=net-misc/curl dev-libs/openssl:0= libnotify? ( >=x11-libs/libnotify-0.7 ) media-sound/cmus
-SLOT=0
-SRC_URI=https://github.com/Arkq/cmusfm/archive/v0.3.1.tar.gz -> cmusfm-0.3.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2db3d13609d730138e60ca3e567e8e11
diff --git a/metadata/md5-cache/media-sound/dbmeasure-0.0.20100217 b/metadata/md5-cache/media-sound/dbmeasure-0.0.20100217
index 953d7b255116..896ee087605b 100644
--- a/metadata/md5-cache/media-sound/dbmeasure-0.0.20100217
+++ b/metadata/md5-cache/media-sound/dbmeasure-0.0.20100217
@@ -1,12 +1,13 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=media-libs/alsa-lib-1.0.26 virtual/pkgconfig
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=>=media-libs/alsa-lib-1.0.26
 DESCRIPTION=ALSA Volume Control Attenuation Measurement Tool
-EAPI=5
+EAPI=7
 HOMEPAGE=http://pulseaudio.org/wiki/BadDecibel
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=media-libs/alsa-lib-1.0.26
 SLOT=0
 SRC_URI=http://git.0pointer.de/?p=dbmeasure.git;a=snapshot;h=ed8105083ab72f9afac9d18b7563fbc3d6c1c925;sf=tgz -> dbmeasure-0.0.20100217-ed8105083ab72f9afac9d18b7563fbc3d6c1c925.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=10f3d9b34aebe8301515bc1488064ea2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=9c4d18639796dd47cd9aa89170d66f13
diff --git a/metadata/md5-cache/media-sound/dcadec-0.2.0 b/metadata/md5-cache/media-sound/dcadec-0.2.0
index ad46096b8843..879942f7ac5e 100644
--- a/metadata/md5-cache/media-sound/dcadec-0.2.0
+++ b/metadata/md5-cache/media-sound/dcadec-0.2.0
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile configure install prepare test
+DEFINED_PHASES=compile configure install test
 DESCRIPTION=DTS Coherent Acoustics decoder with support for HD extensions
-EAPI=5
+EAPI=7
 HOMEPAGE=https://github.com/foo86/dcadec
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 ~arm ~arm64 ~mips x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://github.com/foo86/dcadec/archive/v0.2.0.tar.gz -> dcadec-0.2.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0a7eab517812c2f5b040769e380e1170
+_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=68af746f0e24f60ca327247a7a343162
diff --git a/metadata/md5-cache/media-sound/fmtools-2.0.7 b/metadata/md5-cache/media-sound/fmtools-2.0.7
index a9270474525b..ef1439d6aa7f 100644
--- a/metadata/md5-cache/media-sound/fmtools-2.0.7
+++ b/metadata/md5-cache/media-sound/fmtools-2.0.7
@@ -1,9 +1,9 @@
 DEFINED_PHASES=-
 DESCRIPTION=A collection of programs for controlling v4l radio card drivers
-EAPI=5
+EAPI=7
 HOMEPAGE=https://benpfaff.org/fmtools/
 KEYWORDS=amd64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://benpfaff.org/fmtools/fmtools-2.0.7.tar.gz
-_md5_=79599dc290ccc85876ba888e64ce96dd
+_md5_=f260c97ad157feba8e04da26c9e2d226
diff --git a/metadata/md5-cache/media-sound/gqradio-1.9.2 b/metadata/md5-cache/media-sound/gqradio-1.9.2
index 73a49970c8c9..9a52dae6d4f9 100644
--- a/metadata/md5-cache/media-sound/gqradio-1.9.2
+++ b/metadata/md5-cache/media-sound/gqradio-1.9.2
@@ -1,12 +1,13 @@
+BDEPEND=sys-devel/gettext 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=prepare
-DEPEND=>=x11-libs/gtk+-2.4:2 sys-devel/gettext 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
+DEPEND=>=x11-libs/gtk+-2.4:2
 DESCRIPTION=An FM radio tuner app from the people who brought you GQmpeg
-EAPI=5
+EAPI=7
 HOMEPAGE=http://gqmpeg.sourceforge.net/radio.html
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.4:2
 SLOT=0
 SRC_URI=mirror://sourceforge/gqmpeg/gqradio-1.9.2.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4d748ff606301a5af23528a2e2cfd7ce
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9365b352a3c2b9ddcfebcbac083c52e6
diff --git a/metadata/md5-cache/media-sound/gramofile-1.6_p9 b/metadata/md5-cache/media-sound/gramofile-1.6_p9
index 9f15bec04861..a5a53c1174fe 100644
--- a/metadata/md5-cache/media-sound/gramofile-1.6_p9
+++ b/metadata/md5-cache/media-sound/gramofile-1.6_p9
@@ -1,12 +1,13 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses sci-libs/fftw:2.1 virtual/pkgconfig
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=sys-libs/ncurses:= sci-libs/fftw:2.1
 DESCRIPTION=Transfer sound from gramophone records to CD
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.opensourcepartners.nl/~costar/gramofile
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses sci-libs/fftw:2.1
+RDEPEND=sys-libs/ncurses:= sci-libs/fftw:2.1
 SLOT=0
 SRC_URI=mirror://debian/pool/main/g/gramofile/gramofile_1.6.orig.tar.gz mirror://debian/pool/main/g/gramofile/gramofile_1.6-9.diff.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0e8a543ade99e946ff444245d490a908
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f754b5948f148c11926139be5adcba39
diff --git a/metadata/md5-cache/media-sound/gtkguitune-0.8 b/metadata/md5-cache/media-sound/gtkguitune-0.8
index 940fd159ed8b..9565ddda191d 100644
--- a/metadata/md5-cache/media-sound/gtkguitune-0.8
+++ b/metadata/md5-cache/media-sound/gtkguitune-0.8
@@ -1,12 +1,13 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/libsigc++:2 virtual/pkgconfig
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/libsigc++:2 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A guitar tuning program that uses Schmitt-triggering for quick feedback
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/libsigc++:2
 SLOT=0
 SRC_URI=mirror://gentoo/gtkguitune-gtk2-0.8.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6ae34e873d16af3d505b32bbdd33a36c
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2bc4ef78d577db51f3f37d7c240b7282
diff --git a/metadata/md5-cache/media-sound/guitarix-0.39.0 b/metadata/md5-cache/media-sound/guitarix-0.39.0
deleted file mode 100644
index 3f7af9c021e0..000000000000
--- a/metadata/md5-cache/media-sound/guitarix-0.39.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=dev-cpp/eigen:3 dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/glib:2 >=media-libs/libsndfile-1.0.17 >=media-libs/zita-convolver-3:= media-libs/zita-resampler >=net-misc/curl-7.26.0 >=sci-libs/fftw-3.1.2:3.0= x11-libs/gtk+:2 lv2? ( media-libs/lv2 ) standalone? ( dev-libs/boost:= media-libs/liblrdf media-libs/lilv virtual/jack bluetooth? ( net-wireless/bluez ) zeroconf? ( net-dns/avahi ) ) || ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) virtual/pkgconfig nls? ( dev-util/intltool ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Virtual guitar amplifier for Linux
-EAPI=6
-HOMEPAGE=https://guitarix.org/
-IUSE=bluetooth debug lv2 nls +standalone zeroconf
-KEYWORDS=amd64
-LICENSE=GPL-2
-RDEPEND=dev-cpp/eigen:3 dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/glib:2 >=media-libs/libsndfile-1.0.17 >=media-libs/zita-convolver-3:= media-libs/zita-resampler >=net-misc/curl-7.26.0 >=sci-libs/fftw-3.1.2:3.0= x11-libs/gtk+:2 lv2? ( media-libs/lv2 ) standalone? ( dev-libs/boost:= media-libs/liblrdf media-libs/lilv virtual/jack bluetooth? ( net-wireless/bluez ) zeroconf? ( net-dns/avahi ) ) x11-themes/gtk-engines standalone? ( media-fonts/roboto )
-REQUIRED_USE=|| ( lv2 standalone )
-SLOT=0
-SRC_URI=mirror://sourceforge/guitarix/guitarix/guitarix2-0.39.0.tar.xz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	waf-utils	cf9742c01975dc707eb982114a9d70fa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9f2d4ecf9e1d6502ae1493522156bf24
diff --git a/metadata/md5-cache/media-sound/guitarix-0.40.0 b/metadata/md5-cache/media-sound/guitarix-0.40.0
deleted file mode 100644
index 441a353d4484..000000000000
--- a/metadata/md5-cache/media-sound/guitarix-0.40.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=dev-cpp/eigen:3 dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0 dev-libs/glib:2 >=media-libs/libsndfile-1.0.17 >=media-libs/zita-convolver-3:= media-libs/zita-resampler >=net-misc/curl-7.26.0 >=sci-libs/fftw-3.1.2:3.0= x11-libs/gtk+:3 lv2? ( media-libs/lv2 ) standalone? ( dev-libs/boost:= media-libs/liblrdf media-libs/lilv virtual/jack bluetooth? ( net-wireless/bluez ) zeroconf? ( net-dns/avahi ) ) || ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) dev-lang/sassc virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Virtual guitar amplifier for Linux
-EAPI=6
-HOMEPAGE=https://guitarix.org/
-IUSE=bluetooth debug lv2 nls +standalone zeroconf
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-cpp/eigen:3 dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0 dev-libs/glib:2 >=media-libs/libsndfile-1.0.17 >=media-libs/zita-convolver-3:= media-libs/zita-resampler >=net-misc/curl-7.26.0 >=sci-libs/fftw-3.1.2:3.0= x11-libs/gtk+:3 lv2? ( media-libs/lv2 ) standalone? ( dev-libs/boost:= media-libs/liblrdf media-libs/lilv virtual/jack bluetooth? ( net-wireless/bluez ) zeroconf? ( net-dns/avahi ) ) standalone? ( media-fonts/roboto )
-REQUIRED_USE=|| ( lv2 standalone )
-SLOT=0
-SRC_URI=mirror://sourceforge/guitarix/guitarix/guitarix2-0.40.0.tar.xz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	waf-utils	cf9742c01975dc707eb982114a9d70fa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3cec8e1be43a45367671686b9b7e63f2
diff --git a/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.125.0 b/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.125.0
deleted file mode 100644
index eece278efa3a..000000000000
--- a/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.125.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
-DEFINED_PHASES=compile configure install test
-DEPEND=sys-libs/db:=[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/readline:0= >=media-libs/libsndfile-1.0.0 alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/libsamplerate-0.1.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(-)?]
-DESCRIPTION=A low-latency audio server
-EAPI=7
-HOMEPAGE=http://www.jackaudio.org
-IUSE=cpu_flags_x86_3dnow altivec alsa coreaudio doc debug examples oss cpu_flags_x86_sse pam 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=GPL-2 LGPL-2.1
-RDEPEND=sys-libs/db:=[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/readline:0= >=media-libs/libsndfile-1.0.0 alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/libsamplerate-0.1.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(-)?] alsa? ( sys-process/lsof ) pam? ( sys-auth/realtime-base )
-SLOT=0
-SRC_URI=https://github.com/jackaudio/jack1/archive/0.125.0.tar.gz -> jack-audio-connection-kit-0.125.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b779a129241676fd325d3b336542e380
diff --git a/metadata/md5-cache/media-sound/lash-0.5.4-r4 b/metadata/md5-cache/media-sound/lash-0.5.4-r4
index 8361aa5fb425..55a4dab21ec6 100644
--- a/metadata/md5-cache/media-sound/lash-0.5.4-r4
+++ b/metadata/md5-cache/media-sound/lash-0.5.4-r4
@@ -5,11 +5,11 @@ DESCRIPTION=LASH Audio Session Handler
 EAPI=7
 HOMEPAGE=http://www.nongnu.org/lash/
 IUSE=alsa debug gtk python 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 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 sys-apps/util-linux[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/jack alsa? ( media-libs/alsa-lib ) gtk? ( x11-libs/gtk+:2 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) || ( sys-libs/readline dev-libs/libedit )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0
 SRC_URI=mirror://nongnu/lash/lash-0.5.4.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c97592459fedd0a6398dd2d981a01d4c
+_md5_=deddc68e014b8d39bf2ba90ec507f40e
diff --git a/metadata/md5-cache/media-sound/mangler-1.2.5-r1 b/metadata/md5-cache/media-sound/mangler-1.2.5-r1
index 5c8ae1410914..33378ff99b7c 100644
--- a/metadata/md5-cache/media-sound/mangler-1.2.5-r1
+++ b/metadata/md5-cache/media-sound/mangler-1.2.5-r1
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install
-DEPEND=dev-cpp/gtkmm:2.4 gnome-base/librsvg >=dev-libs/dbus-glib-0.80 >=dev-libs/glib-2.20.1:2 >=x11-libs/gtk+-2.16:2 x11-libs/libX11 x11-libs/libXi alsa? ( media-libs/alsa-lib ) opus? ( media-libs/opus ) espeak? ( app-accessibility/espeak ) g15? ( app-misc/g15daemon ) gsm? ( media-sound/gsm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.14 ) speex? ( >=media-libs/speex-1.2_rc1 ) xosd? ( x11-libs/xosd ) virtual/pkgconfig
+DEPEND=dev-cpp/gtkmm:2.4 gnome-base/librsvg >=dev-libs/dbus-glib-0.80 >=dev-libs/glib-2.20.1:2 >=x11-libs/gtk+-2.16:2 x11-libs/libX11 x11-libs/libXi alsa? ( media-libs/alsa-lib ) opus? ( media-libs/opus ) espeak? ( app-accessibility/espeak ) g15? ( app-misc/g15daemon ) gsm? ( media-sound/gsm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.14 ) speex? ( >=media-libs/speex-1.2_rc1 ) xosd? ( x11-libs/xosd )
 DESCRIPTION=Open source VOIP client capable of connecting to Ventrilo 3.x servers
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.mangler.org/
-IUSE=+alsa opus espeak g15 +gsm oss pulseaudio static-libs +speex +xosd
+IUSE=+alsa opus espeak g15 +gsm oss pulseaudio +speex +xosd
 KEYWORDS=amd64 x86
 LICENSE=GPL-3 LGPL-2.1 ZLIB
 RDEPEND=dev-cpp/gtkmm:2.4 gnome-base/librsvg >=dev-libs/dbus-glib-0.80 >=dev-libs/glib-2.20.1:2 >=x11-libs/gtk+-2.16:2 x11-libs/libX11 x11-libs/libXi alsa? ( media-libs/alsa-lib ) opus? ( media-libs/opus ) espeak? ( app-accessibility/espeak ) g15? ( app-misc/g15daemon ) gsm? ( media-sound/gsm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.14 ) speex? ( >=media-libs/speex-1.2_rc1 ) xosd? ( x11-libs/xosd )
 SLOT=0
 SRC_URI=http://www.mangler.org/downloads/mangler-1.2.5.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c802c87f2bcde5c342d50efc482e02c7
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0ac339131ec2158ec6056bfd85e9862c
diff --git a/metadata/md5-cache/media-sound/mpd-0.22.3 b/metadata/md5-cache/media-sound/mpd-0.22.3
new file mode 100644
index 000000000000..ce121faf3043
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mpd-0.22.3
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/meson-0.49.2 virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=acct-user/mpd sys-libs/liburing:= alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile:= ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) chromaprint? ( media-libs/chromaprint ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) doc? ( dev-python/sphinx ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) network? ( media-libs/libshout ) nfs? ( net-fs/libnfs ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qobuz? ( dev-libs/libgcrypt:0 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mpd ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tidal? ( dev-libs/yajl net-misc/curl ) twolame? ( media-sound/twolame ) udisks? ( sys-fs/udisks:2 ) upnp? ( net-libs/libupnp:0 ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) zlib? ( sys-libs/zlib:= ) >=dev-libs/boost-1.58:= test? ( dev-cpp/gtest )
+DESCRIPTION=The Music Player Daemon (mpd)
+EAPI=7
+HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD
+IUSE=+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp zeroconf zip zlib kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-user/mpd sys-libs/liburing:= alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile:= ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) chromaprint? ( media-libs/chromaprint ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) doc? ( dev-python/sphinx ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) network? ( media-libs/libshout ) nfs? ( net-fs/libnfs ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qobuz? ( dev-libs/libgcrypt:0 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mpd ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tidal? ( dev-libs/yajl net-misc/curl ) twolame? ( media-sound/twolame ) udisks? ( sys-fs/udisks:2 ) upnp? ( net-libs/libupnp:0 ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder ) || ( audiofile faad ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) recorder? ( || ( audiofile flac lame twolame vorbis ) ) upnp? ( expat ) webdav? ( curl expat )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.musicpd.org/download/mpd/0.22/mpd-0.22.3.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9bad55ce46cd40437a82b3bcde657953
diff --git a/metadata/md5-cache/media-sound/musepack-tools-465-r1 b/metadata/md5-cache/media-sound/musepack-tools-465-r1
index 6c7e683c9eee..a0d40fd57cd4 100644
--- a/metadata/md5-cache/media-sound/musepack-tools-465-r1
+++ b/metadata/md5-cache/media-sound/musepack-tools-465-r1
@@ -11,4 +11,4 @@ RDEPEND=>=media-libs/libcuefile-465[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 SLOT=0
 SRC_URI=mirror://gentoo/musepack-tools-465.tar.bz2
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a009b8318843f5f5909566a2295d90d1
+_md5_=04e5b25a4e6f6ff5cd4f3ebd188dba57
diff --git a/metadata/md5-cache/media-sound/musescore-3.5 b/metadata/md5-cache/media-sound/musescore-3.5
deleted file mode 100644
index b7d229a1c0e8..000000000000
--- a/metadata/md5-cache/media-sound/musescore-3.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols2:5 >=dev-qt/qtsingleapplication-2.6.1_p20171024[X] dev-qt/qtsvg:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/freetype-2.5.2 media-libs/libsndfile sys-libs/zlib:= alsa? ( >=media-libs/alsa-lib-1.0.0 ) jack? ( virtual/jack ) mp3? ( media-sound/lame ) omr? ( app-text/poppler ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) sf3? ( media-libs/libvorbis ) webengine? ( dev-qt/qtwebengine:5[widgets] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=WYSIWYG Music Score Typesetter
-EAPI=7
-HOMEPAGE=https://musescore.org/
-IUSE=alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols2:5 >=dev-qt/qtsingleapplication-2.6.1_p20171024[X] dev-qt/qtsvg:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/freetype-2.5.2 media-libs/libsndfile sys-libs/zlib:= alsa? ( >=media-libs/alsa-lib-1.0.0 ) jack? ( virtual/jack ) mp3? ( media-sound/lame ) omr? ( app-text/poppler ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) sf3? ( media-libs/libvorbis ) webengine? ( dev-qt/qtwebengine:5[widgets] )
-REQUIRED_USE=portmidi? ( portaudio )
-SLOT=0
-SRC_URI=https://github.com/musescore/MuseScore/archive/v3.5.tar.gz -> musescore-3.5.tar.gz https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fb3dcd4bd71bad0d914365bda3af7ee2
diff --git a/metadata/md5-cache/media-sound/musescore-3.5.1 b/metadata/md5-cache/media-sound/musescore-3.5.1
index 39917fdd92a8..6108ac8c14ef 100644
--- a/metadata/md5-cache/media-sound/musescore-3.5.1
+++ b/metadata/md5-cache/media-sound/musescore-3.5.1
@@ -5,11 +5,11 @@ DESCRIPTION=WYSIWYG Music Score Typesetter
 EAPI=7
 HOMEPAGE=https://musescore.org/
 IUSE=alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine
-KEYWORDS=~amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols2:5 >=dev-qt/qtsingleapplication-2.6.1_p20171024[X] dev-qt/qtsvg:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/freetype-2.5.2 media-libs/libsndfile sys-libs/zlib:= alsa? ( >=media-libs/alsa-lib-1.0.0 ) jack? ( virtual/jack ) mp3? ( media-sound/lame ) omr? ( app-text/poppler ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) sf3? ( media-libs/libvorbis ) webengine? ( dev-qt/qtwebengine:5[widgets] )
 REQUIRED_USE=portmidi? ( portaudio )
 SLOT=0
 SRC_URI=https://github.com/musescore/MuseScore/archive/v3.5.1.tar.gz -> musescore-3.5.1.tar.gz https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=09b7bb1e5fc3d0d2907b6955c81a495b
+_md5_=4a4904156d6c4fba9db2f8280cb84f15
diff --git a/metadata/md5-cache/media-sound/pavucontrol-3.0 b/metadata/md5-cache/media-sound/pavucontrol-3.0
deleted file mode 100644
index 412373ef8a61..000000000000
--- a/metadata/md5-cache/media-sound/pavucontrol-3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=>=dev-cpp/gtkmm-3.0:3.0 >=dev-libs/libsigc++-2.2:2 >=media-libs/libcanberra-0.16[gtk3] >=media-sound/pulseaudio-3[glib] virtual/freedesktop-icon-theme virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext )
-DESCRIPTION=Pulseaudio Volume Control, GTK based mixer for Pulseaudio
-EAPI=5
-HOMEPAGE=https://freedesktop.org/software/pulseaudio/pavucontrol/
-IUSE=nls
-KEYWORDS=amd64 ~arm64 ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-cpp/gtkmm-3.0:3.0 >=dev-libs/libsigc++-2.2:2 >=media-libs/libcanberra-0.16[gtk3] >=media-sound/pulseaudio-3[glib] virtual/freedesktop-icon-theme
-SLOT=0
-SRC_URI=https://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-3.0.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=59e7ed15c8bf6205a7f9b6bc564a1ed2
diff --git a/metadata/md5-cache/media-sound/pavumeter-0.9.3-r1 b/metadata/md5-cache/media-sound/pavumeter-0.9.3-r1
index b4e079602f9e..80a0cdd02fcc 100644
--- a/metadata/md5-cache/media-sound/pavumeter-0.9.3-r1
+++ b/metadata/md5-cache/media-sound/pavumeter-0.9.3-r1
@@ -1,12 +1,12 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-cpp/gtkmm:2.4 dev-libs/libsigc++:2 >=media-sound/pulseaudio-0.9.7[glib] x11-themes/tango-icon-theme virtual/pkgconfig
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure
+DEPEND=dev-cpp/gtkmm:2.4 dev-libs/libsigc++:2 >=media-sound/pulseaudio-0.9.7[glib] x11-themes/tango-icon-theme
 DESCRIPTION=PulseAudio Volume Meter, simple GTK volume meter for PulseAudio
-EAPI=5
+EAPI=7
 HOMEPAGE=http://0pointer.de/lennart/projects/pavumeter/
 KEYWORDS=amd64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-cpp/gtkmm:2.4 dev-libs/libsigc++:2 >=media-sound/pulseaudio-0.9.7[glib] x11-themes/tango-icon-theme
 SLOT=0
 SRC_URI=http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a60ecc3148c5f21dcc1fb5d38028f203
+_md5_=34bb29c1c5d0e023ae26ca03696404d3
diff --git a/metadata/md5-cache/media-sound/qtractor-0.9.16 b/metadata/md5-cache/media-sound/qtractor-0.9.16
deleted file mode 100644
index d34187c335ea..000000000000
--- a/metadata/md5-cache/media-sound/qtractor-0.9.16
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig
-DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/ladspa-sdk media-libs/libsndfile >=media-libs/lilv-0.16.0 media-libs/lv2 media-libs/suil virtual/jack aubio? ( media-libs/aubio ) dssi? ( media-libs/dssi ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libvorbis ) zlib? ( sys-libs/zlib ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Audio/MIDI multi-track sequencer written in C++ with the Qt framework
-EAPI=7
-HOMEPAGE=https://qtractor.sourceforge.io
-IUSE=aubio cpu_flags_x86_sse debug dssi libsamplerate mad osc rubberband vorbis zlib
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/ladspa-sdk media-libs/libsndfile >=media-libs/lilv-0.16.0 media-libs/lv2 media-libs/suil virtual/jack aubio? ( media-libs/aubio ) dssi? ( media-libs/dssi ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libvorbis ) zlib? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=mirror://sourceforge/qtractor/qtractor-0.9.16.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ff11c0332e5a6eef2bbe83dc44b53221
diff --git a/metadata/md5-cache/media-sound/redoflacs-0.30 b/metadata/md5-cache/media-sound/redoflacs-0.30
index fb4c5f079ad5..950cf3c0982c 100644
--- a/metadata/md5-cache/media-sound/redoflacs-0.30
+++ b/metadata/md5-cache/media-sound/redoflacs-0.30
@@ -1,11 +1,11 @@
-DEFINED_PHASES=install postinst unpack
+DEFINED_PHASES=install unpack
 DESCRIPTION=Bash commandline flac compressor, verifier, organizer, analyzer, retagger
-EAPI=5
+EAPI=7
 HOMEPAGE=https://github.com/sirjaren/redoflacs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-shells/bash-4 media-libs/flac sys-apps/coreutils
 SLOT=0
 SRC_URI=https://github.com/sirjaren/redoflacs/tarball/v0.30 -> redoflacs-0.30.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	273fa5d1a8ed000a29d79323e2ed0dc1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fcfb196198b96c2d14c94908170f839c
+_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_md5_=227e0cc78ada2d4bb4dc2c499dc600d3
diff --git a/metadata/md5-cache/media-sound/ripperx-2.7.3 b/metadata/md5-cache/media-sound/ripperx-2.7.3
index 4af8c3946e37..463ae0d5e5e1 100644
--- a/metadata/md5-cache/media-sound/ripperx-2.7.3
+++ b/metadata/md5-cache/media-sound/ripperx-2.7.3
@@ -1,7 +1,8 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/id3lib media-sound/cdparanoia media-sound/lame x11-libs/gtk+:2 virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=a GTK program to rip CD audio tracks and encode them to the Ogg, MP3, or FLAC formats
-EAPI=5
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure install
+DEPEND=media-libs/id3lib media-sound/cdparanoia media-sound/lame x11-libs/gtk+:2
+DESCRIPTION=GTK program to rip CD audio tracks to Ogg, MP3 or FLAC
+EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/ripperx
 IUSE=nls
 KEYWORDS=amd64 ppc x86
@@ -9,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/id3lib media-sound/cdparanoia media-sound/lame x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/ripperx/ripperX-2.7.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8c84ff5d8d5a20a7a6764b6f4fa14dc8
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8
+_md5_=2c43a38833b7c2c1461fea6ffc0ada4b
diff --git a/metadata/md5-cache/media-sound/rplay-3.3.2-r3 b/metadata/md5-cache/media-sound/rplay-3.3.2-r3
index 4b3adc4a8380..ebb68c01dcdf 100644
--- a/metadata/md5-cache/media-sound/rplay-3.3.2-r3
+++ b/metadata/md5-cache/media-sound/rplay-3.3.2-r3
@@ -10,4 +10,4 @@ RDEPEND=media-sound/gsm
 SLOT=0
 SRC_URI=http://rplay.doit.org/dist/rplay-3.3.2.tar.gz mirror://debian/pool/main/r/rplay/rplay_3.3.2-16.debian.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=7833d8c66ac25a79da7a373297c30c35
+_md5_=9764177182b56254c26737962fe2680f
diff --git a/metadata/md5-cache/media-sound/spek-0.8.3-r1 b/metadata/md5-cache/media-sound/spek-0.8.3-r1
index 28add6c8fbcf..6adb9e0c3074 100644
--- a/metadata/md5-cache/media-sound/spek-0.8.3-r1
+++ b/metadata/md5-cache/media-sound/spek-0.8.3-r1
@@ -1,12 +1,13 @@
-DEFINED_PHASES=prepare
-DEPEND=media-video/ffmpeg:0= x11-libs/wxGTK:3.0[X] dev-util/intltool virtual/pkgconfig >=sys-devel/gcc-4.7 sys-devel/gettext >=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
+BDEPEND=dev-util/intltool sys-devel/gettext 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 postinst postrm preinst prepare
+DEPEND=media-video/ffmpeg:0= x11-libs/wxGTK:3.0[X] dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Analyse your audio files by showing their spectrogram
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.spek-project.org/
 KEYWORDS=~amd64
 LICENSE=GPL-3
 RDEPEND=media-video/ffmpeg:0= x11-libs/wxGTK:3.0[X]
 SLOT=0
 SRC_URI=https://github.com/alexkay/spek/archive/0.8.3.tar.gz -> spek-0.8.3.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=487aa847a6091988028f598c7a500d2d
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=778384b5af7b93b86890c76f5fc9de0b
diff --git a/metadata/md5-cache/media-sound/strawberry-0.8.3 b/metadata/md5-cache/media-sound/strawberry-0.8.3
index 5274c5b230f8..61d3e67d8095 100644
--- a/metadata/md5-cache/media-sound/strawberry-0.8.3
+++ b/metadata/md5-cache/media-sound/strawberry-0.8.3
@@ -5,7 +5,7 @@ DESCRIPTION=Modern music player and library organizer based on Clementine and Qt
 EAPI=7
 HOMEPAGE=https://www.strawbs.org/
 IUSE=cdda +dbus debug ipod mms mtp pulseaudio +udisks test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/alsa-lib media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 media-video/vlc sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) pulseaudio? ( media-sound/pulseaudio ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=udisks? ( dbus )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jonaski/strawberry/releases/download/0.8.3/strawberry-0.8.3.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cfefdf8772d3267c7de68f2cfaab4f50
+_md5_=58f87e7f3f3d6012535aea0976954a6e
diff --git a/metadata/md5-cache/media-sound/strawberry-0.8.2 b/metadata/md5-cache/media-sound/strawberry-0.8.4
similarity index 97%
rename from metadata/md5-cache/media-sound/strawberry-0.8.2
rename to metadata/md5-cache/media-sound/strawberry-0.8.4
index 6ad8f87505d4..adeb1b0e8dd3 100644
--- a/metadata/md5-cache/media-sound/strawberry-0.8.2
+++ b/metadata/md5-cache/media-sound/strawberry-0.8.4
@@ -11,6 +11,6 @@ RDEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/glib:2 dev-libs/libxml2
 REQUIRED_USE=udisks? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/jonaski/strawberry/releases/download/0.8.2/strawberry-0.8.2.tar.xz
+SRC_URI=https://github.com/jonaski/strawberry/releases/download/0.8.4/strawberry-0.8.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cfefdf8772d3267c7de68f2cfaab4f50
+_md5_=f77d290cf89cfdbab85726d7c21bfa83
diff --git a/metadata/md5-cache/media-sound/strawberry-9999 b/metadata/md5-cache/media-sound/strawberry-9999
index 5f687d75e159..a96056e6aaf0 100644
--- a/metadata/md5-cache/media-sound/strawberry-9999
+++ b/metadata/md5-cache/media-sound/strawberry-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=udisks? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cfefdf8772d3267c7de68f2cfaab4f50
+_md5_=f77d290cf89cfdbab85726d7c21bfa83
diff --git a/metadata/md5-cache/media-sound/subsonic-bin-5.2.1-r2 b/metadata/md5-cache/media-sound/subsonic-bin-5.2.1-r2
index fae12326e99a..d38aad4a5650 100644
--- a/metadata/md5-cache/media-sound/subsonic-bin-5.2.1-r2
+++ b/metadata/md5-cache/media-sound/subsonic-bin-5.2.1-r2
@@ -9,4 +9,4 @@ RDEPEND=virtual/jre lame? ( media-sound/lame ) ffmpeg? ( media-video/ffmpeg ) se
 SLOT=0
 SRC_URI=mirror://sourceforge/subsonic/5.2.1/subsonic-5.2.1-standalone.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5a0504e9c580e43503dd670fd1469b21
+_md5_=5d764eae99abc347ab8af08b246ceda6
diff --git a/metadata/md5-cache/media-sound/teamspeak-client-5.0.0_beta27 b/metadata/md5-cache/media-sound/teamspeak-client-5.0.0_beta32
similarity index 90%
rename from metadata/md5-cache/media-sound/teamspeak-client-5.0.0_beta27
rename to metadata/md5-cache/media-sound/teamspeak-client-5.0.0_beta32
index 325ca7f92f27..1f278f91e2e6 100644
--- a/metadata/md5-cache/media-sound/teamspeak-client-5.0.0_beta27
+++ b/metadata/md5-cache/media-sound/teamspeak-client-5.0.0_beta32
@@ -6,6 +6,6 @@ LICENSE=teamspeak5 || ( GPL-2 GPL-3 LGPL-3 )
 RDEPEND=app-accessibility/at-spi2-atk:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig:1.0 media-sound/pulseaudio net-print/cups sys-power/upower sys-apps/dbus x11-libs/cairo[glib] x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango
 RESTRICT=bindist mirror
 SLOT=5
-SRC_URI=https://files.teamspeak-services.com/teamspeak/teamspeak-client.tar.gz -> teamspeak-client-5.0.0_beta27.tar.gz
+SRC_URI=https://files.teamspeak-services.com/teamspeak/teamspeak-client.tar.gz -> teamspeak-client-5.0.0_beta32.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7861aa9ff822810f02924db8e9fc5c96
+_md5_=b1cffc0d22ac688e8eef5d48828db824
diff --git a/metadata/md5-cache/media-sound/teamspeak-server-3.13.1 b/metadata/md5-cache/media-sound/teamspeak-server-3.13.1
new file mode 100644
index 000000000000..24f832e6a797
--- /dev/null
+++ b/metadata/md5-cache/media-sound/teamspeak-server-3.13.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst unpack
+DESCRIPTION=A server software for hosting quality voice communication via the internet
+EAPI=7
+HOMEPAGE=https://www.teamspeak.com/
+IUSE=doc mysql postgres tsdns
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=Apache-2.0 Boost-1.0 BSD LGPL-2.1 LGPL-3 MIT teamspeak3
+RDEPEND=acct-group/teamspeak acct-user/teamspeak postgres? ( dev-db/postgresql )
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://files.teamspeak-services.com/releases/server/3.13.1/teamspeak3-server_linux_amd64-3.13.1.tar.bz2 ) x86? ( https://files.teamspeak-services.com/releases/server/3.13.1/teamspeak3-server_linux_x86-3.13.1.tar.bz2 )
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d60765d23a2f94ccb68af91b09752312
diff --git a/metadata/md5-cache/media-sound/terminatorx-4.0.1-r2 b/metadata/md5-cache/media-sound/terminatorx-4.0.1-r2
index 6adbc34a2854..8522d881c8ce 100644
--- a/metadata/md5-cache/media-sound/terminatorx-4.0.1-r2
+++ b/metadata/md5-cache/media-sound/terminatorx-4.0.1-r2
@@ -10,4 +10,4 @@ RDEPEND=alsa? ( media-libs/alsa-lib ) mad? ( media-sound/madplay ) pulseaudio? (
 SLOT=0
 SRC_URI=http://www.terminatorx.org/dist/terminatorX-4.0.1.tar.bz2
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8e82d53fabeffd5291aebcb5dd785551
+_md5_=a9d971008b27c579451089adfdf8cfcb
diff --git a/metadata/md5-cache/media-sound/timidity-freepats-20060219-r1 b/metadata/md5-cache/media-sound/timidity-freepats-20060219-r1
index f45a63fffd74..6d120182d17f 100644
--- a/metadata/md5-cache/media-sound/timidity-freepats-20060219-r1
+++ b/metadata/md5-cache/media-sound/timidity-freepats-20060219-r1
@@ -1,11 +1,11 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=>=app-eselect/eselect-timidity-20061203
+DEFINED_PHASES=configure install postinst
 DESCRIPTION=Free and open set of instrument patches
-EAPI=5
+EAPI=7
 HOMEPAGE=http://freepats.opensrc.org/
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
+RDEPEND=app-eselect/eselect-timidity
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://freepats.opensrc.org/freepats-20060219.tar.bz2
-_md5_=4136c96c703b5ff612deafb6742c97a7
+_md5_=bd004690dfc7b1f713e4c2a0b444b5a8
diff --git a/metadata/md5-cache/media-sound/volwheel-0.2.8-r1 b/metadata/md5-cache/media-sound/volwheel-0.2.8-r1
index 284650d3d3ae..c4958b99f9e0 100644
--- a/metadata/md5-cache/media-sound/volwheel-0.2.8-r1
+++ b/metadata/md5-cache/media-sound/volwheel-0.2.8-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-lang/perl
+DEPEND=dev-lang/perl dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A volume control trayicon with mouse wheel support
-EAPI=5
+EAPI=7
 HOMEPAGE=https://oliwer.net/b/volwheel.html
 IUSE=alsa
 KEYWORDS=amd64 ~mips x86
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-lang/perl dev-perl/Gtk2 alsa? ( media-sound/alsa-utils )
 SLOT=0
 SRC_URI=https://olwtools.googlecode.com/files/volwheel-0.2.8.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bc0cb5453eeb4cf2de1d8359ee270b87
+_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=05b0fec35a5d45cb957ec76a2e35f469
diff --git a/metadata/md5-cache/media-sound/wavbreaker-0.11 b/metadata/md5-cache/media-sound/wavbreaker-0.11
index c8ce287858b5..7f43fe3bed32 100644
--- a/metadata/md5-cache/media-sound/wavbreaker-0.11
+++ b/metadata/md5-cache/media-sound/wavbreaker-0.11
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/libxml2:= x11-libs/gtk+:2 alsa? ( media-libs/alsa-lib:= ) pulseaudio? ( media-sound/pulseaudio:= )
+DEFINED_PHASES=configure postinst postrm preinst prepare
+DEPEND=dev-libs/libxml2:= x11-libs/gtk+:2 alsa? ( media-libs/alsa-lib:= ) pulseaudio? ( media-sound/pulseaudio:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=wavbreaker/wavmerge GTK+ utility to break or merge WAV files
 EAPI=7
 HOMEPAGE=http://wavbreaker.sourceforge.net
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2:= x11-libs/gtk+:2 alsa? ( media-libs/alsa-lib:= ) pulseaudio? ( media-sound/pulseaudio:= )
 SLOT=0
 SRC_URI=mirror://sourceforge/wavbreaker/wavbreaker-0.11.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f67354edcae693b85e7451a0650bd984
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bbd3d820d19a08545ecb49a761bd14ec
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 95c9a3284b2a..df34fc4e563c 100644
Binary files a/metadata/md5-cache/media-tv/Manifest.gz and b/metadata/md5-cache/media-tv/Manifest.gz differ
diff --git a/metadata/md5-cache/media-tv/mythtv-30.0_p20190808-r3 b/metadata/md5-cache/media-tv/mythtv-30.0_p20190808-r3
index 131328d0313f..dee89bfbd410 100644
--- a/metadata/md5-cache/media-tv/mythtv-30.0_p20190808-r3
+++ b/metadata/md5-cache/media-tv/mythtv-30.0_p20190808-r3
@@ -10,6 +10,6 @@ LICENSE=GPL-2+
 RDEPEND=acct-user/mythtv dev-libs/glib:2 dev-libs/lzo dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 opengl? ( dev-qt/qtopengl:5 ) dev-qt/qtscript:5 dev-qt/qtsql:5[mysql] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= media-libs/freetype:2 media-libs/libsamplerate media-libs/taglib lame? ( >=media-sound/lame-3.93.1 ) sys-libs/zlib opengl? ( virtual/opengl ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXv:= x11-libs/libXxf86vm:= x11-misc/wmctrl:= ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) bluray? ( media-libs/libbluray:=[java?] dev-libs/libcdio:= sys-fs/udisks:2 ) cec? ( dev-libs/libcec ) dvd? ( dev-libs/libcdio:= sys-fs/udisks:2 ) egl? ( media-libs/mesa[egl] ) fftw? ( sci-libs/fftw:3.0=[threads] ) hdhomerun? ( media-libs/libhdhomerun ) ieee1394? ( >=media-libs/libiec61883-1.0.0 >=sys-libs/libavc1394-0.5.3 >=sys-libs/libraw1394-1.2.0 ) jack? ( media-sound/jack-audio-connection-kit ) java? ( dev-java/ant-core ) lcd? ( app-misc/lcdproc ) libass? ( >=media-libs/libass-0.9.11:= ) lirc? ( app-misc/lirc ) perl? ( >=dev-perl/libwww-perl-5 dev-perl/DBD-mysql dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 dev-perl/LWP-Protocol-https dev-perl/Net-UPnP ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd:= ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( x11-libs/libvdpau ) vpx? ( <media-libs/libvpx-1.8.0:= ) xnvctrl? ( x11-drivers/nvidia-drivers:=[tools,static-libs] ) x264? ( >=media-libs/x264-0.0.20111220:= ) x265? ( media-libs/x265 ) xml? ( >=dev-libs/libxml2-2.6.0 ) xvid? ( >=media-libs/xvid-1.1.0 ) zeroconf? ( dev-libs/openssl:0= net-dns/avahi[mdnsresponder-compat] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( dev-python/lxml[python_targets_python2_7(-)] dev-python/mysqlclient[python_targets_python2_7(-)] dev-python/urlgrabber[python_targets_python2_7(-)] dev-python/future[python_targets_python2_7(-)] dev-python/requests-cache[python_targets_python2_7(-)] ) ) media-fonts/corefonts media-fonts/dejavu media-fonts/liberation-fonts x11-apps/xinit autostart? ( net-dialup/mingetty x11-apps/xset x11-wm/evilwm ) dvd? ( media-libs/libdvdcss ) xmltv? ( >=media-tv/xmltv-0.5.43 )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) ) bluray? ( xml ) cdr? ( cdda )
 SLOT=0/30.0_p20190808
-SRC_URI=https://github.com/MythTV/mythtv/archive/5cde0578d84926171b20c8f7e95a101e9b0b9457.tar.gz -> mythtv-30.0_p20190808.tar.gz
+SRC_URI=https://github.com/MythTV/mythtv/archive/5cde0578d84926171b20c8f7e95a101e9b0b9457.tar.gz -> mythtv-30.0_p20190808.tar.gz https://dev.gentoo.org/~juippis/distfiles/tmp/mythtv-30.0_p20190808-cast_constants_to_short.patch
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f05746afd094ffd5a92a00eeedd51903
+_md5_=c56ea6270e8bb5d86227a7b322cd26e8
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index decbba598e81..bd93f1879994 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/jubler-5.1 b/metadata/md5-cache/media-video/jubler-5.1
index 62b3423192a9..190b64e3249e 100644
--- a/metadata/md5-cache/media-video/jubler-5.1
+++ b/metadata/md5-cache/media-video/jubler-5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Java subtitle editor
 EAPI=6
 HOMEPAGE=https://www.jubler.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mplayer? ( media-video/mplayer[libass] ) spell? ( app-text/aspell ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/jubler/Jubler-source-5.1.tar.bz2 -> jubler-5.1.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=248b4bdd833152a3acc64d6fa9ce1b19
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5b6449634c6d4f0a5e52fdabbe2f6e1c
diff --git a/metadata/md5-cache/media-video/kino-1.3.4-r1 b/metadata/md5-cache/media-video/kino-1.3.4-r1
index 7bf1bba313d8..70cb8c202a82 100644
--- a/metadata/md5-cache/media-video/kino-1.3.4-r1
+++ b/metadata/md5-cache/media-video/kino-1.3.4-r1
@@ -1,5 +1,5 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/gtk+-2.6.0:2 >=gnome-base/libglade-2.5.0 >=dev-libs/glib-2:2 x11-libs/libXv dev-libs/libxml2:2 media-libs/audiofile >=sys-libs/libraw1394-1.0.0 >=sys-libs/libavc1394-0.4.1 >=media-libs/libdv-0.103 media-libs/libsamplerate media-libs/libiec61883 media-libs/libv4l:0= alsa? ( >=media-libs/alsa-lib-1.0.9 ) >=media-video/ffmpeg-3:0= quicktime? ( >=media-libs/libquicktime-0.9.5 ) dev-util/intltool >=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 postrm preinst prepare
+DEPEND=>=x11-libs/gtk+-2.6.0:2 >=gnome-base/libglade-2.5.0 >=dev-libs/glib-2:2 x11-libs/libXv dev-libs/libxml2:2 media-libs/audiofile >=sys-libs/libraw1394-1.0.0 >=sys-libs/libavc1394-0.4.1 >=media-libs/libdv-0.103 media-libs/libsamplerate media-libs/libiec61883 media-libs/libv4l:0= alsa? ( >=media-libs/alsa-lib-1.0.9 ) >=media-video/ffmpeg-3:0= quicktime? ( >=media-libs/libquicktime-0.9.5 ) dev-util/intltool >=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 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Kino is a non-linear DV editor for GNU/Linux
 EAPI=6
 HOMEPAGE=http://www.kinodv.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.6.0:2 >=gnome-base/libglade-2.5.0 >=dev-libs/glib-2:2 x11-libs/libXv dev-libs/libxml2:2 media-libs/audiofile >=sys-libs/libraw1394-1.0.0 >=sys-libs/libavc1394-0.4.1 >=media-libs/libdv-0.103 media-libs/libsamplerate media-libs/libiec61883 media-libs/libv4l:0= alsa? ( >=media-libs/alsa-lib-1.0.9 ) >=media-video/ffmpeg-3:0= quicktime? ( >=media-libs/libquicktime-0.9.5 ) media-video/mjpegtools media-sound/rawrec dvdr? ( media-video/dvdauthor app-cdr/dvd+rw-tools ) gpac? ( media-video/gpac ) lame? ( media-sound/lame ) sox? ( media-sound/sox ) vorbis? ( media-sound/vorbis-tools )
 SLOT=0
 SRC_URI=mirror://sourceforge/kino/kino-1.3.4.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=4b77a5c518aa32438de6e1ee92148fc9
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4b2370983162e0bef3c572d6f2727bc2
diff --git a/metadata/md5-cache/media-video/movit-1.6.1 b/metadata/md5-cache/media-video/movit-1.6.1
index e71cf19fe180..743f56203587 100644
--- a/metadata/md5-cache/media-video/movit-1.6.1
+++ b/metadata/md5-cache/media-video/movit-1.6.1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile test
+DEFINED_PHASES=compile configure install test
 DEPEND=media-libs/mesa[X(+)] >=dev-cpp/eigen-3.2.0:3 media-libs/libepoxy >=sci-libs/fftw-3 media-libs/libsdl2
 DESCRIPTION=Modern Video Toolkit
 EAPI=5
@@ -10,4 +10,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://movit.sesse.net/movit-1.6.1.tar.gz https://googletest.googlecode.com/files/gtest-1.7.0.zip
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c945e025614a08f346a1b7a80b0a0e78
+_md5_=4c5dc0202bdd1fceafac06cf602ababb
diff --git a/metadata/md5-cache/media-video/movit-1.6.2 b/metadata/md5-cache/media-video/movit-1.6.2
index b9eb8185c65c..fa01cdd8f057 100644
--- a/metadata/md5-cache/media-video/movit-1.6.2
+++ b/metadata/md5-cache/media-video/movit-1.6.2
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile test
+DEFINED_PHASES=compile configure install test
 DEPEND=media-libs/mesa[X(+)] >=dev-cpp/eigen-3.2.0:3 media-libs/libepoxy >=sci-libs/fftw-3 media-libs/libsdl2
 DESCRIPTION=Modern Video Toolkit
 EAPI=5
@@ -10,4 +10,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://movit.sesse.net/movit-1.6.2.tar.gz https://googletest.googlecode.com/files/gtest-1.7.0.zip
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=52b55e791a1940b49bc21a20bbfd6af8
+_md5_=85bccd6689293c198bff3e6b869eac2d
diff --git a/metadata/md5-cache/media-video/mplayer-1.3.0-r6 b/metadata/md5-cache/media-video/mplayer-1.3.0-r6
index ee8312875f17..22b19d30921e 100644
--- a/metadata/md5-cache/media-video/mplayer-1.3.0-r6
+++ b/metadata/md5-cache/media-video/mplayer-1.3.0-r6
@@ -10,6 +10,6 @@ RDEPEND=sys-libs/ncurses:0= app-arch/bzip2 sys-libs/zlib >=media-video/ffmpeg-3.
 REQUIRED_USE=dga? ( X ) dvdnav? ( dvd ) enca? ( iconv ) ggi? ( X ) libass? ( truetype ) opengl? ( X ) osdmenu? ( X ) truetype? ( iconv ) vdpau? ( X ) vidix? ( X ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X )
 RESTRICT=faac? ( bindist )
 SLOT=0
-SRC_URI=mirror://mplayer/releases/MPlayer-1.3.0.tar.xz !truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
+SRC_URI=mirror://mplayer/releases/MPlayer-1.3.0.tar.xz https://dev.gentoo.org/~juippis/distfiles/tmp/mplayer-1.3-ffmpeg4.patch !truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=35d5188a4781c058b5df99b3160843fe
+_md5_=12b693a4615e823812adef4e9694902a
diff --git a/metadata/md5-cache/media-video/parole-1.0.5 b/metadata/md5-cache/media-video/parole-1.0.5
index 64380662cb52..b9147923c433 100644
--- a/metadata/md5-cache/media-video/parole-1.0.5
+++ b/metadata/md5-cache/media-video/parole-1.0.5
@@ -1,5 +1,5 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 sys-apps/dbus >=x11-libs/gtk+-3.20:3 x11-libs/libX11 >=xfce-base/libxfce4ui-4.11:=[gtk3(+)] >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfconf-4.10:= libnotify? ( >=x11-libs/libnotify-0.7 ) taglib? ( >=media-libs/taglib-1.6:0= ) dev-util/glib-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 sys-apps/dbus >=x11-libs/gtk+-3.20:3 x11-libs/libX11 >=xfce-base/libxfce4ui-4.11:=[gtk3(+)] >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfconf-4.10:= libnotify? ( >=x11-libs/libnotify-0.7 ) taglib? ( >=media-libs/taglib-1.6:0= ) dev-util/glib-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A simple Xfce4 media player using GStreamer
 EAPI=7
 HOMEPAGE=https://docs.xfce.org/apps/parole/start
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 sys-apps/dbus >=x11-libs/gtk+-3.20:3 x11-libs/libX11 >=xfce-base/libxfce4ui-4.11:=[gtk3(+)] >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfconf-4.10:= libnotify? ( >=x11-libs/libnotify-0.7 ) taglib? ( >=media-libs/taglib-1.6:0= ) media-plugins/gst-plugins-meta:1.0
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/parole/1.0/parole-1.0.5.tar.bz2
-_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=896fba2e0659b226513b5cfa716bc090
+_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d7dc29703ff64414cf9eea3db1d6b7b9
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.15 b/metadata/md5-cache/media-video/pipewire-0.3.15
new file mode 100644
index 000000000000..057f62122ee6
--- /dev/null
+++ b/metadata/md5-cache/media-video/pipewire-0.3.15
@@ -0,0 +1,15 @@
+BDEPEND=app-doc/xmltoman doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=media-libs/alsa-lib-1.1.7 media-libs/libsdl2 >=media-libs/libsndfile-1.0.20 sys-apps/dbus virtual/libudev bluetooth? ( media-libs/sbc net-wireless/bluez:= ) ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack? ( >=media-sound/jack2-1.9.10:2 ) pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-11.1 ) systemd? ( sys-apps/systemd ) vulkan? ( media-libs/vulkan-loader ) X? ( x11-libs/libX11 ) vulkan? ( dev-util/vulkan-headers )
+DESCRIPTION=Multimedia processing graphs
+EAPI=7
+HOMEPAGE=https://pipewire.org/
+IUSE=bluetooth debug doc ffmpeg gstreamer jack pulseaudio systemd test vulkan X
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=media-libs/alsa-lib-1.1.7 media-libs/libsdl2 >=media-libs/libsndfile-1.0.20 sys-apps/dbus virtual/libudev bluetooth? ( media-libs/sbc net-wireless/bluez:= ) ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack? ( >=media-sound/jack2-1.9.10:2 ) pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-11.1 ) systemd? ( sys-apps/systemd ) vulkan? ( media-libs/vulkan-loader ) X? ( x11-libs/libX11 )
+RESTRICT=!test? ( test )
+SLOT=0/0.3
+SRC_URI=https://github.com/PipeWire/pipewire/archive/0.3.15.tar.gz -> pipewire-0.3.15.tar.gz
+_eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4e6a602a1070a0a1684e25a568b6fd3e
diff --git a/metadata/md5-cache/media-video/unifi-video-3.10.13-r1 b/metadata/md5-cache/media-video/unifi-video-3.10.13-r1
new file mode 100644
index 000000000000..f94d07aa11a0
--- /dev/null
+++ b/metadata/md5-cache/media-video/unifi-video-3.10.13-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare setup unpack
+DEPEND=virtual/pkgconfig
+DESCRIPTION=UniFi Video Server
+EAPI=6
+HOMEPAGE=https://www.ubnt.com/download/unifi-video/
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=dev-db/mongodb dev-java/commons-daemon sys-apps/lsb-release sys-apps/util-linux sys-libs/libcap virtual/jre:1.8
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://dl.ubnt.com/firmwares/ufv/v3.10.13/unifi-video.Ubuntu18.04_amd64.v3.10.13.deb
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=f2f9195faf2f009732fbfe2bdaf5158b
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index e9f52ee7d969..8702e95b9c10 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/flent-1.3.2 b/metadata/md5-cache/net-analyzer/flent-1.3.2
index aef8f83f22ce..30aec71c6ae6 100644
--- a/metadata/md5-cache/net-analyzer/flent-1.3.2
+++ b/metadata/md5-cache/net-analyzer/flent-1.3.2
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] 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(-)] dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=The FLExible Network Tester
 EAPI=6
 HOMEPAGE=https://flent.org/
@@ -10,5 +10,5 @@ RDEPEND=qt5? ( dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/tohojo/flent/archive/v1.3.2.tar.gz -> flent-1.3.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e1a911edc81f200a2c7bb58839f67a60
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=84c80dc8ee09b67b99954d80249b8376
diff --git a/metadata/md5-cache/net-analyzer/icinga2-2.12.1 b/metadata/md5-cache/net-analyzer/icinga2-2.12.1
index 4ef8168edc5c..2e084d179475 100644
--- a/metadata/md5-cache/net-analyzer/icinga2-2.12.1
+++ b/metadata/md5-cache/net-analyzer/icinga2-2.12.1
@@ -5,11 +5,11 @@ DESCRIPTION=Distributed, general purpose, network monitoring engine
 EAPI=7
 HOMEPAGE=https://icinga.com/
 IUSE=console jumbo-build libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-libs/boost-1.66.0:=[context] console? ( dev-libs/libedit ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-libs/yajl:= acct-user/icinga acct-group/icinga acct-group/icingacmd plugins? ( || ( net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) mail? ( virtual/mailx ) acct-group/nagios
 REQUIRED_USE=!minimal? ( || ( mariadb mysql postgres ) )
 SLOT=0
 SRC_URI=https://github.com/Icinga/icinga2/archive/v2.12.1.tar.gz -> icinga2-2.12.1.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f3f40f0f3b96c00b47aa2c6541351341
+_md5_=81ee86ae5eed9dbd494c3d7a18356c33
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.24 b/metadata/md5-cache/net-analyzer/zabbix-4.0.24
deleted file mode 100644
index 3454b0c8b9cb..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-4.0.24
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) xmpp? ( dev-libs/iksemel ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=7
-HOMEPAGE=https://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) xmpp? ( dev-libs/iksemel ) java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/4.0/zabbix-4.0.24.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	webapp	16783e418aca3ffa461d68310bf7ab12	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=03007a6c810eb8099d3fed1ea405846f
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.25 b/metadata/md5-cache/net-analyzer/zabbix-4.0.25
index ed79e245bb2d..d4049d3ad3ee 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-4.0.25
+++ b/metadata/md5-cache/net-analyzer/zabbix-4.0.25
@@ -5,11 +5,11 @@ DESCRIPTION=ZABBIX is software for monitoring of your applications, network and
 EAPI=7
 HOMEPAGE=https://www.zabbix.com/
 IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) xmpp? ( dev-libs/iksemel ) java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
 SLOT=0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/4.0/zabbix-4.0.25.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	webapp	16783e418aca3ffa461d68310bf7ab12	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e4defb7ad955805f4c9311d83ed98f81
+_md5_=03007a6c810eb8099d3fed1ea405846f
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.3 b/metadata/md5-cache/net-analyzer/zabbix-5.0.3
deleted file mode 100644
index bf9ac2f244f0..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-5.0.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=7
-HOMEPAGE=https://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	webapp	16783e418aca3ffa461d68310bf7ab12	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f366b1da9545bb34489489844b157c00
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.4 b/metadata/md5-cache/net-analyzer/zabbix-5.0.4
index fd37eebb4571..35b307027de8 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-5.0.4
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.4
@@ -5,11 +5,11 @@ DESCRIPTION=ZABBIX is software for monitoring of your applications, network and
 EAPI=7
 HOMEPAGE=https://www.zabbix.com/
 IUSE=+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
 SLOT=0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	webapp	16783e418aca3ffa461d68310bf7ab12	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8bdfe178f739026dcd5249240e7849bd
+_md5_=f366b1da9545bb34489489844b157c00
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 1fb2b736895a..2dc63de29965 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/knot-3.0.1 b/metadata/md5-cache/net-dns/knot-3.0.2
similarity index 95%
rename from metadata/md5-cache/net-dns/knot-3.0.1
rename to metadata/md5-cache/net-dns/knot-3.0.2
index cf16373bfee5..201678825cf8 100644
--- a/metadata/md5-cache/net-dns/knot-3.0.1
+++ b/metadata/md5-cache/net-dns/knot-3.0.2
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=acct-group/knot acct-user/knot dev-db/lmdb dev-libs/libedit dev-libs/userspace-rcu:= dev-python/lmdb net-libs/gnutls:= caps? ( sys-libs/libcap-ng ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) geoip? ( dev-libs/libmaxminddb:= ) idn? ( !libidn2? ( net-dns/libidn:0= !net-dns/libidn2 ) libidn2? ( net-dns/libidn2:= ) ) systemd? ( sys-apps/systemd:= )
 SLOT=0
-SRC_URI=https://secure.nic.cz/files/knot-dns/knot-3.0.1.tar.xz
+SRC_URI=https://secure.nic.cz/files/knot-dns/knot-3.0.2.tar.xz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9f8a67f34a1e7dc0cb7218f538d8495a
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 2d105487c558..70b020599fc3 100644
Binary files a/metadata/md5-cache/net-firewall/Manifest.gz and b/metadata/md5-cache/net-firewall/Manifest.gz differ
diff --git a/metadata/md5-cache/net-firewall/ipt_netflow-2.4-r1 b/metadata/md5-cache/net-firewall/ipt_netflow-2.4-r1
index cebc2401d3f6..8a1e775198bb 100644
--- a/metadata/md5-cache/net-firewall/ipt_netflow-2.4-r1
+++ b/metadata/md5-cache/net-firewall/ipt_netflow-2.4-r1
@@ -10,4 +10,4 @@ RDEPEND=net-firewall/iptables:0= snmp? ( net-analyzer/net-snmp ) kernel_linux? (
 SLOT=0
 SRC_URI=https://github.com/aabc/ipt-netflow/archive/v2.4.tar.gz -> ipt_netflow-2.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a5b3282b791e16c7411b26bf41cc8e51
+_md5_=43425b2bf77654ef289e122988bf3e6a
diff --git a/metadata/md5-cache/net-firewall/ipt_netflow-2.5-r1 b/metadata/md5-cache/net-firewall/ipt_netflow-2.5-r1
deleted file mode 100644
index 6392e9e2e020..000000000000
--- a/metadata/md5-cache/net-firewall/ipt_netflow-2.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=net-firewall/iptables:0= snmp? ( net-analyzer/net-snmp ) virtual/linux-sources virtual/pkgconfig kernel_linux? ( sys-apps/kmod[tools] ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Netflow iptables module
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/ipt-netflow https://github.com/aabc/ipt-netflow
-IUSE=debug natevents snmp kernel_linux kernel_linux kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=net-firewall/iptables:0= snmp? ( net-analyzer/net-snmp ) kernel_linux? ( sys-apps/kmod[tools] )
-SLOT=0
-SRC_URI=https://github.com/aabc/ipt-netflow/archive/v2.5.tar.gz -> ipt_netflow-2.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f8811fe592d85f2a40269528da2880f7
diff --git a/metadata/md5-cache/net-firewall/ipt_netflow-2.5.1 b/metadata/md5-cache/net-firewall/ipt_netflow-2.5.1
deleted file mode 100644
index 9fef243931fb..000000000000
--- a/metadata/md5-cache/net-firewall/ipt_netflow-2.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=net-firewall/iptables:0= snmp? ( net-analyzer/net-snmp ) virtual/linux-sources virtual/pkgconfig kernel_linux? ( sys-apps/kmod[tools] ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Netflow iptables module
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/ipt-netflow https://github.com/aabc/ipt-netflow
-IUSE=debug natevents snmp kernel_linux kernel_linux kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=net-firewall/iptables:0= snmp? ( net-analyzer/net-snmp ) kernel_linux? ( sys-apps/kmod[tools] )
-SLOT=0
-SRC_URI=https://github.com/aabc/ipt-netflow/archive/v2.5.1.tar.gz -> ipt_netflow-2.5.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f8811fe592d85f2a40269528da2880f7
diff --git a/metadata/md5-cache/net-firewall/ipt_netflow-2.5.1-r1 b/metadata/md5-cache/net-firewall/ipt_netflow-2.5.1-r1
index 44faaf3c485f..c408b6664af6 100644
--- a/metadata/md5-cache/net-firewall/ipt_netflow-2.5.1-r1
+++ b/metadata/md5-cache/net-firewall/ipt_netflow-2.5.1-r1
@@ -10,4 +10,4 @@ RDEPEND=net-firewall/iptables:0= snmp? ( net-analyzer/net-snmp ) kernel_linux? (
 SLOT=0
 SRC_URI=https://github.com/aabc/ipt-netflow/archive/v2.5.1.tar.gz -> ipt_netflow-2.5.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1d1a55c93b68c1b4011b7cd022cdf214
+_md5_=6b4501f58ac75c5cfb7b18302970e0b5
diff --git a/metadata/md5-cache/net-firewall/ipt_netflow-9999 b/metadata/md5-cache/net-firewall/ipt_netflow-9999
index d59c6d8a65ce..dd78946171a3 100644
--- a/metadata/md5-cache/net-firewall/ipt_netflow-9999
+++ b/metadata/md5-cache/net-firewall/ipt_netflow-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=net-firewall/iptables:0= snmp? ( net-analyzer/net-snmp ) kernel_linux? ( sys-apps/kmod[tools] )
 SLOT=0
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=099d66d03b53eb5d58366beca43770d1
+_md5_=b5214377712b710eecdea6597a9e8108
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index eea419748459..241493da1684 100644
Binary files a/metadata/md5-cache/net-ftp/Manifest.gz and b/metadata/md5-cache/net-ftp/Manifest.gz differ
diff --git a/metadata/md5-cache/net-ftp/lftp-4.8.4-r1 b/metadata/md5-cache/net-ftp/lftp-4.8.4-r1
deleted file mode 100644
index 660456ec63db..000000000000
--- a/metadata/md5-cache/net-ftp/lftp-4.8.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn2:= ) socks5? ( >=net-proxy/dante-1.1.12 sys-libs/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 ) =sys-devel/libtool-2* app-arch/xz-utils nls? ( >=sys-devel/gettext-0.19 ) virtual/pkgconfig
-DESCRIPTION=A sophisticated ftp/sftp/http/https/torrent client and file transfer program
-EAPI=7
-HOMEPAGE=https://lftp.tech/
-IUSE=convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn2:= ) socks5? ( >=net-proxy/dante-1.1.12 sys-libs/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://lftp.tech/ftp/lftp-4.8.4.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b487dac2eac6bf604691c66f1173dd72
diff --git a/metadata/md5-cache/net-ftp/lftp-4.9.2 b/metadata/md5-cache/net-ftp/lftp-4.9.2
index 460d8cd354a4..74239f8f6742 100644
--- a/metadata/md5-cache/net-ftp/lftp-4.9.2
+++ b/metadata/md5-cache/net-ftp/lftp-4.9.2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://lftp.tech/ftp/lftp-4.9.2.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a80443b9047ae54c734c37ae10a97892
+_md5_=2a4ef99901d5bb6c6b7e1dcea4d672a8
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 30fc90fd6bf9..45734c69a720 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/librvp-0.9.7 b/metadata/md5-cache/net-im/librvp-0.9.7
index 4d17995cb6a1..e70afca17ba3 100644
--- a/metadata/md5-cache/net-im/librvp-0.9.7
+++ b/metadata/md5-cache/net-im/librvp-0.9.7
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure
+DEFINED_PHASES=configure install
 DEPEND=virtual/pkgconfig net-im/pidgin[gtk]
 DESCRIPTION=An RVP (Microsoft Exchange Instant Messaging) plugin for Pidgin
 EAPI=7
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=net-im/pidgin[gtk]
 SLOT=0
 SRC_URI=https://www.waider.ie/hacks/workshop/c/rvp/librvp-0.9.7.tar.gz
-_md5_=b0cc9f6fac6b1d4ebe0bcc305324df76
+_md5_=991e229df522eb2f14d80eb76432a31c
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-2.3.2 b/metadata/md5-cache/net-im/telegram-desktop-bin-2.3.2
deleted file mode 100644
index 026c00436eb6..000000000000
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-2.3.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Official desktop client for Telegram (binary package)
-EAPI=7
-HOMEPAGE=https://desktop.telegram.org
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=GPL-3-with-openssl-exception
-RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=media-libs/fontconfig-2.13 media-libs/freetype:2 media-libs/libglvnd[X] >=sys-apps/dbus-1.4.2[X] sys-libs/zlib x11-libs/libSM x11-libs/libdrm x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
-SLOT=0
-SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v2.3.2.tar.gz -> tdesktop-2.3.2.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.2.3.2.tar.xz ) x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.2.3.2.tar.xz )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	optfeature	6c9aa35fc16df43d7142ef2660e00e25	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8101a175c757895d0a307f888fe9c217
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-2.4.0 b/metadata/md5-cache/net-im/telegram-desktop-bin-2.4.7
similarity index 77%
rename from metadata/md5-cache/net-im/telegram-desktop-bin-2.4.0
rename to metadata/md5-cache/net-im/telegram-desktop-bin-2.4.7
index 1c2514ec99be..4d5b88153393 100644
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-2.4.0
+++ b/metadata/md5-cache/net-im/telegram-desktop-bin-2.4.7
@@ -3,10 +3,10 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Official desktop client for Telegram (binary package)
 EAPI=7
 HOMEPAGE=https://desktop.telegram.org
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* ~amd64
 LICENSE=GPL-3-with-openssl-exception
 RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=media-libs/fontconfig-2.13 media-libs/freetype:2 media-libs/libglvnd[X] >=sys-apps/dbus-1.4.2[X] sys-libs/zlib x11-libs/libSM x11-libs/libdrm x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
 SLOT=0
-SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v2.4.0.tar.gz -> tdesktop-2.4.0.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.2.4.0.tar.xz ) x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.2.4.0.tar.xz )
+SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v2.4.7.tar.gz -> tdesktop-2.4.7.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.2.4.7.tar.xz )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	optfeature	6c9aa35fc16df43d7142ef2660e00e25	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8101a175c757895d0a307f888fe9c217
+_md5_=27cc9d2d2254182f074bca9e4c6fad27
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 0539d8a8b5ee..2ca1f3ef5b02 100644
Binary files a/metadata/md5-cache/net-irc/Manifest.gz and b/metadata/md5-cache/net-irc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-irc/irssi-1.2.2 b/metadata/md5-cache/net-irc/irssi-1.2.2
deleted file mode 100644
index d52fe186de8a..000000000000
--- a/metadata/md5-cache/net-irc/irssi-1.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( >=dev-libs/libressl-2.7.4:= ) otr? ( >=dev-libs/libgcrypt-1.2.0:0= >=net-libs/libotr-4.1.0 ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) virtual/pkgconfig
-DESCRIPTION=A modular textUI IRC client with IPv6 support
-EAPI=6
-HOMEPAGE=https://irssi.org/
-IUSE=otr +perl selinux socks5 +proxy libressl
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( >=dev-libs/libressl-2.7.4:= ) otr? ( >=dev-libs/libgcrypt-1.2.0:0= >=net-libs/libotr-4.1.0 ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) selinux? ( sec-policy/selinux-irc )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/irssi/irssi/releases/download/1.2.2/irssi-1.2.2.tar.xz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a90f9f47afcd529240f06f84787a7e27
diff --git a/metadata/md5-cache/net-irc/irssi-1.2.2-r1 b/metadata/md5-cache/net-irc/irssi-1.2.2-r1
index 8a79488b29fc..8047de5792d7 100644
--- a/metadata/md5-cache/net-irc/irssi-1.2.2-r1
+++ b/metadata/md5-cache/net-irc/irssi-1.2.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A modular textUI IRC client with IPv6 support
 EAPI=6
 HOMEPAGE=https://irssi.org/
 IUSE=otr +perl selinux socks5 +proxy libressl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( >=dev-libs/libressl-2.7.4:= ) otr? ( >=dev-libs/libgcrypt-1.2.0:0= >=net-libs/libotr-4.1.0 ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) selinux? ( sec-policy/selinux-irc )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/irssi/irssi/releases/download/1.2.2/irssi-1.2.2.tar.xz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=68d55bc7cdd9cc08d7b4c3a84a281f08
+_md5_=19328413065d8090e5ca746d737c1fdd
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index a71a944c2b53..d4c4772aadc4 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/aqbanking-6.0.1 b/metadata/md5-cache/net-libs/aqbanking-6.0.1
deleted file mode 100644
index 3018f0d17326..000000000000
--- a/metadata/md5-cache/net-libs/aqbanking-6.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen )
-DEFINED_PHASES=configure install
-DEPEND=app-misc/ktoblzcheck dev-libs/gmp:0= >=sys-libs/gwenhywfar-5.1.1:= virtual/libintl ebics? ( dev-libs/xmlsec[gcrypt,gnutls] ) ofx? ( >=dev-libs/libofx-0.9.5 )
-DESCRIPTION=Generic Online Banking Interface
-EAPI=7
-HOMEPAGE=https://www.aquamaniac.de/sites/aqbanking/index.php
-IUSE=debug doc ebics examples ofx
-KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=app-misc/ktoblzcheck dev-libs/gmp:0= >=sys-libs/gwenhywfar-5.1.1:= virtual/libintl ebics? ( dev-libs/xmlsec[gcrypt,gnutls] ) ofx? ( >=dev-libs/libofx-0.9.5 )
-SLOT=0
-SRC_URI=https://www.aquamaniac.de/rdm/attachments/download/238/aqbanking-6.0.1.tar.gz
-_md5_=062a8d922cd367a0821e7655b16a2b37
diff --git a/metadata/md5-cache/net-libs/aqbanking-6.2.5 b/metadata/md5-cache/net-libs/aqbanking-6.2.5
index af7396a8b65e..eace128e7254 100644
--- a/metadata/md5-cache/net-libs/aqbanking-6.2.5
+++ b/metadata/md5-cache/net-libs/aqbanking-6.2.5
@@ -5,9 +5,9 @@ DESCRIPTION=Generic Online Banking Interface
 EAPI=7
 HOMEPAGE=https://www.aquamaniac.de/sites/aqbanking/index.php
 IUSE=debug doc ebics examples ofx
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=app-misc/ktoblzcheck dev-libs/gmp:0= >=sys-libs/gwenhywfar-5.4.1:= virtual/libintl ebics? ( dev-libs/xmlsec[gcrypt] ) ofx? ( >=dev-libs/libofx-0.9.5 )
 SLOT=0
 SRC_URI=https://www.aquamaniac.de/rdm/attachments/download/342/aqbanking-6.2.5.tar.gz
-_md5_=7c475c3b2584d9c0db3ca24c6c0f94ab
+_md5_=6fc712f37682108574aa2754b1ee5869
diff --git a/metadata/md5-cache/net-libs/balde-markdown-0.1 b/metadata/md5-cache/net-libs/balde-markdown-0.1
index 30f6364694a7..cbbfc74db012 100644
--- a/metadata/md5-cache/net-libs/balde-markdown-0.1
+++ b/metadata/md5-cache/net-libs/balde-markdown-0.1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure prepare
+DEFINED_PHASES=configure install prepare
 DEPEND=>=dev-libs/glib-2.34 >=net-libs/balde-0.1 app-text/discount
 DESCRIPTION=A balde extension that adds Markdown support
 EAPI=5
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.34 >=net-libs/balde-0.1 app-text/discount
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/balde/balde-markdown/releases/download/v0.1/balde-markdown-0.1.tar.bz2
-_md5_=2ddc86e0cd6c23ed736ce966722ee1ac
+_md5_=f4d2bb2c364f3d628723ad4f7570a246
diff --git a/metadata/md5-cache/net-libs/dleyna-renderer-0.6.0 b/metadata/md5-cache/net-libs/dleyna-renderer-0.6.0
index 4542723e33ef..27e4b02cdd5f 100644
--- a/metadata/md5-cache/net-libs/dleyna-renderer-0.6.0
+++ b/metadata/md5-cache/net-libs/dleyna-renderer-0.6.0
@@ -1,13 +1,13 @@
 BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install prepare
 DEPEND=>=dev-libs/glib-2.28:2 >=media-libs/gupnp-dlna-0.9.4:2.0 >=net-libs/dleyna-core-0.6.0 >=net-libs/gssdp-1.2.0:0= >=net-libs/gupnp-1.2.0:0= >=net-libs/gupnp-av-0.11.5 >=net-libs/libsoup-2.28.2:2.4
-DESCRIPTION=library implementing services that allow clients to discover and manipulate DLNA renderers
+DESCRIPTION=A library to discover and manipulate DLNA renderers
 EAPI=7
 HOMEPAGE=https://01.org/dleyna/
 KEYWORDS=amd64
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.28:2 >=media-libs/gupnp-dlna-0.9.4:2.0 >=net-libs/dleyna-core-0.6.0 >=net-libs/gssdp-1.2.0:0= >=net-libs/gupnp-1.2.0:0= >=net-libs/gupnp-av-0.11.5 >=net-libs/libsoup-2.28.2:2.4 net-libs/dleyna-connector-dbus
 SLOT=0
-SRC_URI=https://01.org/sites/default/files/downloads/dleyna/dleyna-renderer-0.6.0.tar_2.gz -> dleyna-renderer-0.6.0.tar.gz
+SRC_URI=https://01.org/sites/default/files/downloads/dleyna/dleyna-renderer-0.6.0.tar_2.gz -> dleyna-renderer-0.6.0.tar.gz https://dev.gentoo.org/~juippis/distfiles/tmp/dleyna-renderer-0.6.0-gupnp-1.2.patch
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=06e1dea6cce6426986c14448bc26c3bd
+_md5_=647b836bcb668caddb11a93c607bbb85
diff --git a/metadata/md5-cache/net-libs/glib-networking-2.64.3 b/metadata/md5-cache/net-libs/glib-networking-2.64.3
index 7757b8fed9ac..1c98daba834c 100644
--- a/metadata/md5-cache/net-libs/glib-networking-2.64.3
+++ b/metadata/md5-cache/net-libs/glib-networking-2.64.3
@@ -5,11 +5,11 @@ DESCRIPTION=Network-related giomodules for glib
 EAPI=7
 HOMEPAGE=https://git.gnome.org/browse/glib-networking/
 IUSE=+gnome +libproxy +ssl 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.64.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libproxy? ( >=net-libs/libproxy-0.4.11-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(-)?] ) >=net-libs/gnutls-3.6.5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ssl? ( app-misc/ca-certificates ) gnome? ( gnome-base/gsettings-desktop-schemas )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib-networking/2.64/glib-networking-2.64.3.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=33b52a981a0101f541c75d48d4deeb76
+_md5_=b59cc85d1c88956158aa5cb1c3816993
diff --git a/metadata/md5-cache/net-libs/http-parser-2.9.4 b/metadata/md5-cache/net-libs/http-parser-2.9.4
index c43b72b28d3f..89b4edc2e180 100644
--- a/metadata/md5-cache/net-libs/http-parser-2.9.4
+++ b/metadata/md5-cache/net-libs/http-parser-2.9.4
@@ -3,9 +3,9 @@ DESCRIPTION=HTTP request/response parser for C
 EAPI=7
 HOMEPAGE=https://github.com/nodejs/http-parser
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris
 LICENSE=MIT
 SLOT=0/2.9.0
 SRC_URI=https://github.com/nodejs/http-parser/archive/v2.9.4.tar.gz -> http-parser-2.9.4.tar.gz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=dd312346b4e463ad9f2ade5379943011
+_md5_=707a9d392e3931b7bc3a6bf2af21e46c
diff --git a/metadata/md5-cache/net-libs/libasr-1.0.4 b/metadata/md5-cache/net-libs/libasr-1.0.4
index 4233746855a0..6d0b7261a7f9 100644
--- a/metadata/md5-cache/net-libs/libasr-1.0.4
+++ b/metadata/md5-cache/net-libs/libasr-1.0.4
@@ -1,4 +1,4 @@
-DEFINED_PHASES=-
+DEFINED_PHASES=configure install
 DESCRIPTION=Async Resolver Library from OpenBSD/OpenSMTPD
 EAPI=7
 HOMEPAGE=https://github.com/OpenSMTPD/libasr
@@ -6,4 +6,4 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=ISC BSD BSD-1 BSD-2 BSD-4
 SLOT=0
 SRC_URI=https://www.opensmtpd.org/archives/libasr-1.0.4.tar.gz
-_md5_=a9f202d5975d2af2bc695b687aecf950
+_md5_=2ee6a44c3c4f5027625bc5992732a1fd
diff --git a/metadata/md5-cache/net-libs/libcapi-3.0.7-r1 b/metadata/md5-cache/net-libs/libcapi-3.0.7-r1
index 7e6de4a56475..9d083b2d113d 100644
--- a/metadata/md5-cache/net-libs/libcapi-3.0.7-r1
+++ b/metadata/md5-cache/net-libs/libcapi-3.0.7-r1
@@ -1,7 +1,8 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!net-dialup/capi4k-utils >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=!net-dialup/capi4k-utils
 DESCRIPTION=CAPI library used by AVM products
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.tabos.org/ffgtk
 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 ppc x86
@@ -9,5 +10,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=!net-dialup/capi4k-utils
 SLOT=0
 SRC_URI=http://www.tabos.org/ffgtk/download/libcapi20-3.0.7.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-multilib	9c600605e4462da7f90f41008447ba1c	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=34450f9c6123e6a8994ec087f71a9450
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d971f904aa375180f24e6c0f37148fb9
diff --git a/metadata/md5-cache/net-libs/libident-0.32-r1 b/metadata/md5-cache/net-libs/libident-0.32-r1
index 2f8c9fd459cc..3fe092d06c56 100644
--- a/metadata/md5-cache/net-libs/libident-0.32-r1
+++ b/metadata/md5-cache/net-libs/libident-0.32-r1
@@ -1,9 +1,11 @@
-DEFINED_PHASES=install
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
 DESCRIPTION=A small library to interface to the Ident protocol server
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.simphalempin.com/dev/libident/
 KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://people.via.ecp.fr/~rem/libident/libident-0.32.tar.bz2
-_md5_=d0ec460c89dcf97ef5a447cd2dab8601
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1d08133263347d39e71b04145f3103d9
diff --git a/metadata/md5-cache/net-libs/libpcap-1.9.1 b/metadata/md5-cache/net-libs/libpcap-1.9.1
deleted file mode 100644
index 6623e4e156b3..000000000000
--- a/metadata/md5-cache/net-libs/libpcap-1.9.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netlink? ( dev-libs/libnl: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(-)?] ) sys-devel/flex virtual/yacc dbus? ( 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
-DESCRIPTION=A system-independent library for user-level network packet capture
-EAPI=6
-HOMEPAGE=https://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap
-IUSE=bluetooth dbus netlink static-libs usb 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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netlink? ( dev-libs/libnl: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(-)?] )
-SLOT=0
-SRC_URI=https://github.com/the-tcpdump-group/libpcap/archive/libpcap-1.9.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b49f9b87c8f6ff8771a61d2e6e847e26
diff --git a/metadata/md5-cache/net-libs/libpcap-1.9.1-r3 b/metadata/md5-cache/net-libs/libpcap-1.9.1-r3
index 6d5d4bb7385b..5d3d76d534dc 100644
--- a/metadata/md5-cache/net-libs/libpcap-1.9.1-r3
+++ b/metadata/md5-cache/net-libs/libpcap-1.9.1-r3
@@ -5,10 +5,10 @@ DESCRIPTION=A system-independent library for user-level network packet capture
 EAPI=7
 HOMEPAGE=https://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap
 IUSE=bluetooth dbus netlink rdma -remote static-libs usb -yydebug 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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netlink? ( dev-libs/libnl: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(-)?] ) rdma? ( sys-cluster/rdma-core ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://github.com/the-tcpdump-group/libpcap/archive/libpcap-1.9.1.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f23da8e5dd1956f88bd9f3229c8c341b
+_md5_=005b89b88e2437507e2eed9e34000ba5
diff --git a/metadata/md5-cache/net-libs/libssh2-1.9.0_p20200614 b/metadata/md5-cache/net-libs/libssh2-1.9.0_p20200614
index 2479c2b6373f..c34e07751738 100644
--- a/metadata/md5-cache/net-libs/libssh2-1.9.0_p20200614
+++ b/metadata/md5-cache/net-libs/libssh2-1.9.0_p20200614
@@ -5,7 +5,7 @@ DESCRIPTION=Library implementing the SSH2 protocol
 EAPI=7
 HOMEPAGE=https://www.libssh2.org
 IUSE=gcrypt libressl mbedtls 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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gcrypt? ( mbedtls? ( net-libs/mbedtls[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !mbedtls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl: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(-)?] ) ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=?? ( gcrypt mbedtls )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/libssh2/libssh2/archive/6c7769dcc422250d14af1b06fce378b6ee009440.tar.gz -> libssh2-1.9.0_p20200614.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b3977a6360c9fc3f2f114a454e819d51
+_md5_=92111571adbdefbe202d3a6c0ce93588
diff --git a/metadata/md5-cache/net-libs/miniupnpc-2.1.20201016 b/metadata/md5-cache/net-libs/miniupnpc-2.1.20201016
index 8276a156bc9f..7b95ce2357d8 100644
--- a/metadata/md5-cache/net-libs/miniupnpc-2.1.20201016
+++ b/metadata/md5-cache/net-libs/miniupnpc-2.1.20201016
@@ -4,9 +4,9 @@ DESCRIPTION=UPnP client library and a simple UPnP client
 EAPI=7
 HOMEPAGE=http://miniupnp.free.fr/
 IUSE=ipv6 kernel_linux static-libs verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~amd64 arm arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=BSD
 SLOT=0/17
 SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.1.20201016.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpc-2.1.20201016.tar.gz.sig )
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=5cf53b1655935b30da95ff2973814b8d
+_md5_=e900ce5dc5b5d2024e8f365e723a8ad2
diff --git a/metadata/md5-cache/net-libs/nodejs-12.18.4-r1 b/metadata/md5-cache/net-libs/nodejs-12.18.4-r1
index 075f2c75b50d..5cc40bb4e100 100644
--- a/metadata/md5-cache/net-libs/nodejs-12.18.4-r1
+++ b/metadata/md5-cache/net-libs/nodejs-12.18.4-r1
@@ -5,12 +5,12 @@ DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=7
 HOMEPAGE=https://nodejs.org/
 IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos
+KEYWORDS=amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=>=app-arch/brotli-1.0.7 >=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/http-parser-2.9.3:= >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-ssl? ( ssl )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://nodejs.org/dist/v12.18.4/node-v12.18.4.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b12b5069c0956d8578dcf2698c1c0d57
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8443d681dfcc71e8d18440ecc2ca54fe
diff --git a/metadata/md5-cache/net-libs/nodejs-12.19.0 b/metadata/md5-cache/net-libs/nodejs-12.19.0
index 07602877cdf0..c2644ffd814b 100644
--- a/metadata/md5-cache/net-libs/nodejs-12.19.0
+++ b/metadata/md5-cache/net-libs/nodejs-12.19.0
@@ -5,7 +5,7 @@ DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=7
 HOMEPAGE=https://nodejs.org/
 IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/http-parser-2.9.3:= >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-ssl? ( ssl )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/12
 SRC_URI=https://nodejs.org/dist/v12.19.0/node-v12.19.0.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ce8a5dd152879d25c786745559e33ca6
+_md5_=51d37ac384590116d96b635a2f47578a
diff --git a/metadata/md5-cache/net-libs/nodejs-14.11.0 b/metadata/md5-cache/net-libs/nodejs-14.11.0
deleted file mode 100644
index 7662adf3c607..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-14.11.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) sys-apps/coreutils systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix )
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=7
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-ssl? ( ssl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nodejs.org/dist/v14.11.0/node-v14.11.0.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=05770c7bcd41c23ee23230f65e7e47cf
diff --git a/metadata/md5-cache/net-libs/nodejs-14.15.0 b/metadata/md5-cache/net-libs/nodejs-14.15.0
index 99a6f901ddac..4cc1b23526a7 100644
--- a/metadata/md5-cache/net-libs/nodejs-14.15.0
+++ b/metadata/md5-cache/net-libs/nodejs-14.15.0
@@ -5,7 +5,7 @@ DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=7
 HOMEPAGE=https://nodejs.org/
 IUSE=cpu_flags_x86_sse2 debug doc +icu inspector +npm +snapshot +ssl system-icu +system-ssl systemtap test
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x64-macos
+KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/14
 SRC_URI=https://nodejs.org/dist/v14.15.0/node-v14.15.0.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=168837b91a216e7c142bb077eb0ba347
+_md5_=698574226e28b5f516fce7a9e45cfc85
diff --git a/metadata/md5-cache/net-libs/nodejs-14.2.0 b/metadata/md5-cache/net-libs/nodejs-14.2.0
index feba369a3cae..8bde948b9789 100644
--- a/metadata/md5-cache/net-libs/nodejs-14.2.0
+++ b/metadata/md5-cache/net-libs/nodejs-14.2.0
@@ -1,16 +1,16 @@
-BDEPEND=|| ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) sys-apps/coreutils systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix )
+BDEPEND=|| ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) sys-apps/coreutils systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
 DEFINED_PHASES=compile configure install prepare pretend setup test
 DEPEND=>=dev-libs/libuv-1.37.0:= >=net-dns/c-ares-1.16.0 >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-65:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=7
 HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test
-KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x64-macos
+IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test
+KEYWORDS=ppc
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=>=dev-libs/libuv-1.37.0:= >=net-dns/c-ares-1.16.0 >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-65:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-ssl? ( ssl )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://nodejs.org/dist/v14.2.0/node-v14.2.0.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0fbb25a92ddb7df0f8ddcec089ad8a35
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c130820dbbf56ad6bb3258f8ccd4f287
diff --git a/metadata/md5-cache/net-libs/nodejs-99999999 b/metadata/md5-cache/net-libs/nodejs-99999999
index 0ba738347b91..d913cde6bc87 100644
--- a/metadata/md5-cache/net-libs/nodejs-99999999
+++ b/metadata/md5-cache/net-libs/nodejs-99999999
@@ -1,15 +1,15 @@
-BDEPEND=|| ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) sys-apps/coreutils systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) sys-apps/coreutils systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
 DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-67.1:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=7
 HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test
+IUSE=cpu_flags_x86_sse2 debug doc +icu inspector +npm +snapshot +ssl +system-ssl systemtap test
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 PROPERTIES=live
 RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-67.1:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-ssl? ( ssl )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c874b19d9a3046777fd712326ac4c66a
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=405fcdd3c817a042d32c59d71af7b8d5
diff --git a/metadata/md5-cache/net-libs/openmq-cclient-4.4.1 b/metadata/md5-cache/net-libs/openmq-cclient-4.4.1
index a4e826888257..c98d8805d1bf 100644
--- a/metadata/md5-cache/net-libs/openmq-cclient-4.4.1
+++ b/metadata/md5-cache/net-libs/openmq-cclient-4.4.1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/nss dev-libs/nspr virtual/pkgconfig app-arch/unzip >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=C-Client Library for Open Source Java Message Service (JMS)
 EAPI=5
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/nss dev-libs/nspr
 SLOT=0
 SRC_URI=http://download.java.net/mq/open-mq/4.4u1/b7-final/openmq4_4-source.zip -> openmq4.4u1b7-final-source.zip
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	estack	686eaab303305a908fd57b2fd7617800	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=f1df4acd7f0cb364e49e75e9e2447e6e
+_md5_=067c506c5dcd06f8321edf7db5007869
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index b70f37341788..38e78d181057 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/electrum-3.3.8 b/metadata/md5-cache/net-misc/electrum-3.3.8
deleted file mode 100644
index 0e36f13a2ebd..000000000000
--- a/metadata/md5-cache/net-misc/electrum-3.3.8
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DESCRIPTION=User friendly Bitcoin client
-EAPI=7
-HOMEPAGE=https://electrum.org/
-IUSE=cli ncurses qrcode +qt5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/aiohttp-socks[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] =dev-python/aiorpcX-0.18*[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/dnspython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ecdsa[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jsonrpclib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pbkdf2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyaes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/PySocks[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/qrcode[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ncurses? ( python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses] ) ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://download.electrum.org/3.3.8/Electrum-3.3.8.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=80fa733ca9772cf027c9789699c580fd
diff --git a/metadata/md5-cache/net-misc/gerbera-1.6.1 b/metadata/md5-cache/net-misc/gerbera-1.6.1-r1
similarity index 63%
rename from metadata/md5-cache/net-misc/gerbera-1.6.1
rename to metadata/md5-cache/net-misc/gerbera-1.6.1-r1
index 87e1dcfce7c3..360abb278aee 100644
--- a/metadata/md5-cache/net-misc/gerbera-1.6.1
+++ b/metadata/md5-cache/net-misc/gerbera-1.6.1-r1
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=acct-user/gerbera >=net-libs/libupnp-1.12.1:=[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/spdlog:= dev-libs/pugixml dev-libs/libfmt:0= mysql? ( dev-db/mysql-connector-c ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( >=media-video/ffmpeg-2.2:0= ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl ) magic? ( sys-apps/file ) matroska? ( media-libs/libmatroska ) sys-apps/util-linux sys-libs/zlib virtual/libiconv
+DEPEND=acct-user/gerbera >=net-libs/libupnp-1.12.1:=[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/spdlog:= dev-libs/pugixml dev-libs/libfmt:0= mysql? ( dev-db/mysql-connector-c ) javascript? ( dev-lang/duktape:= ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( >=media-video/ffmpeg-2.2:0= ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl ) magic? ( sys-apps/file ) matroska? ( media-libs/libmatroska ) sys-apps/util-linux sys-libs/zlib virtual/libiconv
 DESCRIPTION=UPnP Media Server
 EAPI=7
 HOMEPAGE=https://gerbera.io
 IUSE=curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=acct-user/gerbera >=net-libs/libupnp-1.12.1:=[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/spdlog:= dev-libs/pugixml dev-libs/libfmt:0= mysql? ( dev-db/mysql-connector-c ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( >=media-video/ffmpeg-2.2:0= ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl ) magic? ( sys-apps/file ) matroska? ( media-libs/libmatroska ) sys-apps/util-linux sys-libs/zlib virtual/libiconv virtual/tmpfiles
+RDEPEND=acct-user/gerbera >=net-libs/libupnp-1.12.1:=[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/spdlog:= dev-libs/pugixml dev-libs/libfmt:0= mysql? ( dev-db/mysql-connector-c ) javascript? ( dev-lang/duktape:= ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( >=media-video/ffmpeg-2.2:0= ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl ) magic? ( sys-apps/file ) matroska? ( media-libs/libmatroska ) sys-apps/util-linux sys-libs/zlib virtual/libiconv virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/gerbera/gerbera/archive/v1.6.1.tar.gz -> gerbera-1.6.1.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7cc88d8359fb95732c5385dd5ed14704
+_md5_=c6555948521d08686eb0f8677156ff36
diff --git a/metadata/md5-cache/net-misc/gerbera-9999 b/metadata/md5-cache/net-misc/gerbera-9999
index 54370854c7c9..74cd4678d829 100644
--- a/metadata/md5-cache/net-misc/gerbera-9999
+++ b/metadata/md5-cache/net-misc/gerbera-9999
@@ -1,13 +1,13 @@
 BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=acct-user/gerbera >=net-libs/libupnp-1.12.1:=[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/spdlog:= dev-libs/pugixml dev-libs/libfmt:0= mysql? ( dev-db/mysql-connector-c ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( >=media-video/ffmpeg-2.2:0= ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl ) magic? ( sys-apps/file ) matroska? ( media-libs/libmatroska ) sys-apps/util-linux sys-libs/zlib virtual/libiconv
+DEPEND=acct-user/gerbera >=net-libs/libupnp-1.12.1:=[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/spdlog:= dev-libs/pugixml dev-libs/libfmt:0= mysql? ( dev-db/mysql-connector-c ) javascript? ( dev-lang/duktape:= ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( >=media-video/ffmpeg-2.2:0= ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl ) magic? ( sys-apps/file ) matroska? ( media-libs/libmatroska ) sys-apps/util-linux sys-libs/zlib virtual/libiconv
 DESCRIPTION=UPnP Media Server
 EAPI=7
 HOMEPAGE=https://gerbera.io
 IUSE=curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib kernel_linux
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=acct-user/gerbera >=net-libs/libupnp-1.12.1:=[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/spdlog:= dev-libs/pugixml dev-libs/libfmt:0= mysql? ( dev-db/mysql-connector-c ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( >=media-video/ffmpeg-2.2:0= ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl ) magic? ( sys-apps/file ) matroska? ( media-libs/libmatroska ) sys-apps/util-linux sys-libs/zlib virtual/libiconv virtual/tmpfiles
+RDEPEND=acct-user/gerbera >=net-libs/libupnp-1.12.1:=[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/spdlog:= dev-libs/pugixml dev-libs/libfmt:0= mysql? ( dev-db/mysql-connector-c ) javascript? ( dev-lang/duktape:= ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( >=media-video/ffmpeg-2.2:0= ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl ) magic? ( sys-apps/file ) matroska? ( media-libs/libmatroska ) sys-apps/util-linux sys-libs/zlib virtual/libiconv virtual/tmpfiles
 SLOT=0
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8f09ab3c27593961f98f9931dc823461
+_md5_=1118f7c1881b82be77a906fba4317d04
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index a89d3f1cbbfe..02dd5e43319f 100644
Binary files a/metadata/md5-cache/net-p2p/Manifest.gz and b/metadata/md5-cache/net-p2p/Manifest.gz differ
diff --git a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1488 b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1488
new file mode 100644
index 000000000000..afb189f270af
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1488
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=app-arch/unzip >=virtual/jdk-1.8 dev-java/bcprov:1.54 dev-java/commons-compress:0 dev-java/fec:0 dev-java/java-service-wrapper:0 dev-java/jbitcollider-core:0 dev-java/jna:4 dev-java/lzma:0 dev-java/lzmajio:0 dev-java/mersennetwister:0 nss? ( dev-libs/nss ) test? ( dev-java/junit:0 dev-java/ant-junit:0 ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 virtual/pkgconfig
+DESCRIPTION=An encrypted network without censorship
+EAPI=6
+HOMEPAGE=https://freenetproject.org/
+IUSE=+nss test elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ GPL-2 MIT BSD-2 Apache-2.0
+PDEPEND=net-libs/NativeThread:0
+RDEPEND=>=virtual/jre-1.8 net-libs/nativebiginteger:0 dev-java/bcprov:1.54 dev-java/commons-compress:0 dev-java/fec:0 dev-java/java-service-wrapper:0 dev-java/jbitcollider-core:0 dev-java/jna:4 dev-java/lzma:0 dev-java/lzmajio:0 dev-java/mersennetwister:0 nss? ( dev-libs/nss ) acct-user/freenet acct-group/freenet >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/freenet/fred/archive/build01488.zip -> freenet-0.7.5_p1488.zip https://github.com/freenet/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip mirror://gentoo/freenet-ant-1.7.1.jar
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=9eef50693539152571f18c8f42c72eb5
diff --git a/metadata/md5-cache/net-p2p/syncthing-1.10.0 b/metadata/md5-cache/net-p2p/syncthing-1.10.0
index d2b2a601e21c..fe1b2f954776 100644
--- a/metadata/md5-cache/net-p2p/syncthing-1.10.0
+++ b/metadata/md5-cache/net-p2p/syncthing-1.10.0
@@ -4,11 +4,11 @@ DESCRIPTION=Open Source Continuous File Synchronization
 EAPI=7
 HOMEPAGE=https://syncthing.net
 IUSE=selinux tools
-KEYWORDS=amd64 arm arm64 ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc64 x86
 LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0 Unlicense
 RDEPEND=acct-group/syncthing acct-user/syncthing tools? ( acct-group/stdiscosrv acct-group/strelaysrv acct-user/stdiscosrv acct-user/strelaysrv ) selinux? ( sec-policy/selinux-syncthing )
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/syncthing/syncthing/archive/v1.10.0.tar.gz -> syncthing-1.10.0.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.31.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.31.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.37.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.37.0.mod mirror://goproxy//dmitri.shuralyov.com/app/changes/@v/v0.0.0-20180602232624-0a106ad413e3.mod -> dmitri.shuralyov.com%2Fapp%2Fchanges%2F@v%2Fv0.0.0-20180602232624-0a106ad413e3.mod mirror://goproxy//dmitri.shuralyov.com/html/belt/@v/v0.0.0-20180602232347-f7d459c86be0.mod -> dmitri.shuralyov.com%2Fhtml%2Fbelt%2F@v%2Fv0.0.0-20180602232347-f7d459c86be0.mod mirror://goproxy//dmitri.shuralyov.com/service/change/@v/v0.0.0-20181023043359-a85b471d5412.mod -> dmitri.shuralyov.com%2Fservice%2Fchange%2F@v%2Fv0.0.0-20181023043359-a85b471d5412.mod mirror://goproxy//dmitri.shuralyov.com/state/@v/v0.0.0-20180228185332-28bcc343414c.mod -> dmitri.shuralyov.com%2Fstate%2F@v%2Fv0.0.0-20180228185332-28bcc343414c.mod mirror://goproxy//git.apache.org/thrift.git/@v/v0.0.0-20180902110319-2566ecd5d999.mod -> git.apache.org%2Fthrift.git%2F@v%2Fv0.0.0-20180902110319-2566ecd5d999.mod mirror://goproxy//github.com/!audrius!butkevicius/pfilter/@v/v0.0.0-20190627213056-c55ef6137fc6.zip -> github.com%2F!audrius!butkevicius%2Fpfilter%2F@v%2Fv0.0.0-20190627213056-c55ef6137fc6.zip mirror://goproxy//github.com/!audrius!butkevicius/pfilter/@v/v0.0.0-20190627213056-c55ef6137fc6.mod -> github.com%2F!audrius!butkevicius%2Fpfilter%2F@v%2Fv0.0.0-20190627213056-c55ef6137fc6.mod mirror://goproxy//github.com/!audrius!butkevicius/recli/@v/v0.0.5.zip -> github.com%2F!audrius!butkevicius%2Frecli%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/!audrius!butkevicius/recli/@v/v0.0.5.mod -> github.com%2F!audrius!butkevicius%2Frecli%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.zip -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.zip mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.mod -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!data!dog/zstd/@v/v1.4.1.zip -> github.com%2F!data!dog%2Fzstd%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/!data!dog/zstd/@v/v1.4.1.mod -> github.com%2F!data!dog%2Fzstd%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.zip -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.zip -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.zip mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.zip -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.zip mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.mod -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bkaradzic/go-lz4/@v/v0.0.0-20160924222819-7224d8d8f27e.zip -> github.com%2Fbkaradzic%2Fgo-lz4%2F@v%2Fv0.0.0-20160924222819-7224d8d8f27e.zip mirror://goproxy//github.com/bkaradzic/go-lz4/@v/v0.0.0-20160924222819-7224d8d8f27e.mod -> github.com%2Fbkaradzic%2Fgo-lz4%2F@v%2Fv0.0.0-20160924222819-7224d8d8f27e.mod mirror://goproxy//github.com/bradfitz/go-smtpd/@v/v0.0.0-20170404230938-deb6d6237625.zip -> github.com%2Fbradfitz%2Fgo-smtpd%2F@v%2Fv0.0.0-20170404230938-deb6d6237625.zip mirror://goproxy//github.com/bradfitz/go-smtpd/@v/v0.0.0-20170404230938-deb6d6237625.mod -> github.com%2Fbradfitz%2Fgo-smtpd%2F@v%2Fv0.0.0-20170404230938-deb6d6237625.mod mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20181115193947-bf1c66bbce23.mod -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20181115193947-bf1c66bbce23.mod mirror://goproxy//github.com/calmh/xdr/@v/v1.1.0.zip -> github.com%2Fcalmh%2Fxdr%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/calmh/xdr/@v/v1.1.0.mod -> github.com%2Fcalmh%2Fxdr%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/ccding/go-stun/@v/v0.0.0-20180726100737-be486d185f3d.zip -> github.com%2Fccding%2Fgo-stun%2F@v%2Fv0.0.0-20180726100737-be486d185f3d.zip mirror://goproxy//github.com/ccding/go-stun/@v/v0.0.0-20180726100737-be486d185f3d.mod -> github.com%2Fccding%2Fgo-stun%2F@v%2Fv0.0.0-20180726100737-be486d185f3d.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/certifi/gocertifi/@v/v0.0.0-20190905060710-a5e0173ced67.zip -> github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20190905060710-a5e0173ced67.zip mirror://goproxy//github.com/certifi/gocertifi/@v/v0.0.0-20190905060710-a5e0173ced67.mod -> github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20190905060710-a5e0173ced67.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.0.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.0.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/cheekybits/genny/@v/v1.0.0.zip -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/cheekybits/genny/@v/v1.0.0.mod -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/chmduquesne/rollinghash/@v/v0.0.0-20180912150627-a60f8e7142b5.zip -> github.com%2Fchmduquesne%2Frollinghash%2F@v%2Fv0.0.0-20180912150627-a60f8e7142b5.zip mirror://goproxy//github.com/chmduquesne/rollinghash/@v/v0.0.0-20180912150627-a60f8e7142b5.mod -> github.com%2Fchmduquesne%2Frollinghash%2F@v%2Fv0.0.0-20180912150627-a60f8e7142b5.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20181012123002-c6f51f82210d.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.zip mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/d4l3k/messagediff/@v/v1.2.1.zip -> github.com%2Fd4l3k%2Fmessagediff%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/d4l3k/messagediff/@v/v1.2.1.mod -> github.com%2Fd4l3k%2Fmessagediff%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dchest/siphash/@v/v1.2.1.zip -> github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/dchest/siphash/@v/v1.2.1.mod -> github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/dgraph-io/badger/v2/@v/v2.0.3.zip -> github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.0.3.zip mirror://goproxy//github.com/dgraph-io/badger/v2/@v/v2.0.3.mod -> github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.0.3.mod mirror://goproxy//github.com/dgraph-io/ristretto/@v/v0.0.2-0.20200115201040-8f368f2f2ab3.zip -> github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.2-0.20200115201040-8f368f2f2ab3.zip mirror://goproxy//github.com/dgraph-io/ristretto/@v/v0.0.2-0.20200115201040-8f368f2f2ab3.mod -> github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.2-0.20200115201040-8f368f2f2ab3.mod mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190423205320-6a90982ecee2.zip -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.zip mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190423205320-6a90982ecee2.mod -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/flynn-archive/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.zip -> github.com%2Fflynn-archive%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.zip mirror://goproxy//github.com/flynn-archive/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn-archive%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/francoispqt/gojay/@v/v1.2.13.zip -> github.com%2Ffrancoispqt%2Fgojay%2F@v%2Fv1.2.13.zip mirror://goproxy//github.com/francoispqt/gojay/@v/v1.2.13.mod -> github.com%2Ffrancoispqt%2Fgojay%2F@v%2Fv1.2.13.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/getsentry/raven-go/@v/v0.2.0.zip -> github.com%2Fgetsentry%2Fraven-go%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/getsentry/raven-go/@v/v0.2.0.mod -> github.com%2Fgetsentry%2Fraven-go%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.1.1.mod -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.5.0.zip -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.5.0.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.mod -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.2.0.zip -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.2.0.zip mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.2.0.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.2.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gobwas/glob/@v/v0.2.3.zip -> github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/gobwas/glob/@v/v0.2.3.mod -> github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191027212112-611e8accdfc9.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191027212112-611e8accdfc9.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191027212112-611e8accdfc9.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191027212112-611e8accdfc9.mod mirror://goproxy//github.com/golang/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> github.com%2Fgolang%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.mod -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/googleapis/gax-go/@v/v2.0.0+incompatible.mod -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.3.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.3.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/greatroar/blobloom/@v/v0.3.0.zip -> github.com%2Fgreatroar%2Fblobloom%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/greatroar/blobloom/@v/v0.3.0.mod -> github.com%2Fgreatroar%2Fblobloom%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.5.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackpal/gateway/@v/v1.0.6.zip -> github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/jackpal/gateway/@v/v1.0.6.mod -> github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/jackpal/go-nat-pmp/@v/v1.0.2.zip -> github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/jackpal/go-nat-pmp/@v/v1.0.2.mod -> github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/jellevandenhooff/dkim/@v/v0.0.0-20150330215556-f50fe3d243e1.mod -> github.com%2Fjellevandenhooff%2Fdkim%2F@v%2Fv0.0.0-20150330215556-f50fe3d243e1.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.zip -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.mod -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.3.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.2.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.2.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.18.0.zip -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.18.0.mod -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/lunixbochs/vtclean/@v/v1.0.0.mod -> github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190312143242-1de009706dbe.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod mirror://goproxy//github.com/marten-seemann/qpack/@v/v0.2.0.mod -> github.com%2Fmarten-seemann%2Fqpack%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/marten-seemann/qtls/@v/v0.10.0.zip -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/marten-seemann/qtls/@v/v0.10.0.mod -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/marten-seemann/qtls-go1-15/@v/v0.1.0.zip -> github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/marten-seemann/qtls-go1-15/@v/v0.1.0.mod -> github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/maruel/panicparse/@v/v1.3.0.zip -> github.com%2Fmaruel%2Fpanicparse%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/maruel/panicparse/@v/v1.3.0.mod -> github.com%2Fmaruel%2Fpanicparse%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/maruel/panicparse/@v/v1.5.1.zip -> github.com%2Fmaruel%2Fpanicparse%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/maruel/panicparse/@v/v1.5.1.mod -> github.com%2Fmaruel%2Fpanicparse%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.1.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.1.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.5.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.7.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.zip -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.zip mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.1.mod -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.zip -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/neelance/astrewrite/@v/v0.0.0-20160511093645-99348263ae86.mod -> github.com%2Fneelance%2Fastrewrite%2F@v%2Fv0.0.0-20160511093645-99348263ae86.mod mirror://goproxy//github.com/neelance/sourcemap/@v/v0.0.0-20151028013722-8c68805598ab.mod -> github.com%2Fneelance%2Fsourcemap%2F@v%2Fv0.0.0-20151028013722-8c68805598ab.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.zip -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.1.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/oschwald/geoip2-golang/@v/v1.4.0.zip -> github.com%2Foschwald%2Fgeoip2-golang%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/oschwald/geoip2-golang/@v/v1.4.0.mod -> github.com%2Foschwald%2Fgeoip2-golang%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/oschwald/maxminddb-golang/@v/v1.6.0.zip -> github.com%2Foschwald%2Fmaxminddb-golang%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/oschwald/maxminddb-golang/@v/v1.6.0.mod -> github.com%2Foschwald%2Fmaxminddb-golang%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/petermattis/goid/@v/v0.0.0-20180202154549-b0b1615b78e5.zip -> github.com%2Fpetermattis%2Fgoid%2F@v%2Fv0.0.0-20180202154549-b0b1615b78e5.zip mirror://goproxy//github.com/petermattis/goid/@v/v0.0.0-20180202154549-b0b1615b78e5.mod -> github.com%2Fpetermattis%2Fgoid%2F@v%2Fv0.0.0-20180202154549-b0b1615b78e5.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.8.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.2.1.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.2.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20180801064454-c7de2306084e.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180801064454-c7de2306084e.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20180725123919-05ee40e3a273.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180725123919-05ee40e3a273.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.5.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.5.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20190826022208-cac0b30c2563.zip -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20190826022208-cac0b30c2563.zip mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20190826022208-cac0b30c2563.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20190826022208-cac0b30c2563.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/sasha-s/go-deadlock/@v/v0.2.0.zip -> github.com%2Fsasha-s%2Fgo-deadlock%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/sasha-s/go-deadlock/@v/v0.2.0.mod -> github.com%2Fsasha-s%2Fgo-deadlock%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v2.20.7+incompatible.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.7+incompatible.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v2.20.7+incompatible.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.7+incompatible.mod mirror://goproxy//github.com/shurcoo!l/component/@v/v0.0.0-20170202220835-f88ec8f54cc4.mod -> github.com%2Fshurcoo!l%2Fcomponent%2F@v%2Fv0.0.0-20170202220835-f88ec8f54cc4.mod mirror://goproxy//github.com/shurcoo!l/events/@v/v0.0.0-20181021180414-410e4ca65f48.mod -> github.com%2Fshurcoo!l%2Fevents%2F@v%2Fv0.0.0-20181021180414-410e4ca65f48.mod mirror://goproxy//github.com/shurcoo!l/github_flavored_markdown/@v/v0.0.0-20181002035957-2122de532470.mod -> github.com%2Fshurcoo!l%2Fgithub_flavored_markdown%2F@v%2Fv0.0.0-20181002035957-2122de532470.mod mirror://goproxy//github.com/shurcoo!l/go/@v/v0.0.0-20180423040247-9e1955d9fb6e.mod -> github.com%2Fshurcoo!l%2Fgo%2F@v%2Fv0.0.0-20180423040247-9e1955d9fb6e.mod mirror://goproxy//github.com/shurcoo!l/go-goon/@v/v0.0.0-20170922171312-37c2f522c041.mod -> github.com%2Fshurcoo!l%2Fgo-goon%2F@v%2Fv0.0.0-20170922171312-37c2f522c041.mod mirror://goproxy//github.com/shurcoo!l/gofontwoff/@v/v0.0.0-20180329035133-29b52fc0a18d.mod -> github.com%2Fshurcoo!l%2Fgofontwoff%2F@v%2Fv0.0.0-20180329035133-29b52fc0a18d.mod mirror://goproxy//github.com/shurcoo!l/gopherjslib/@v/v0.0.0-20160914041154-feb6d3990c2c.mod -> github.com%2Fshurcoo!l%2Fgopherjslib%2F@v%2Fv0.0.0-20160914041154-feb6d3990c2c.mod mirror://goproxy//github.com/shurcoo!l/highlight_diff/@v/v0.0.0-20170515013008-09bb4053de1b.mod -> github.com%2Fshurcoo!l%2Fhighlight_diff%2F@v%2Fv0.0.0-20170515013008-09bb4053de1b.mod mirror://goproxy//github.com/shurcoo!l/highlight_go/@v/v0.0.0-20181028180052-98c3abbbae20.mod -> github.com%2Fshurcoo!l%2Fhighlight_go%2F@v%2Fv0.0.0-20181028180052-98c3abbbae20.mod mirror://goproxy//github.com/shurcoo!l/home/@v/v0.0.0-20181020052607-80b7ffcb30f9.mod -> github.com%2Fshurcoo!l%2Fhome%2F@v%2Fv0.0.0-20181020052607-80b7ffcb30f9.mod mirror://goproxy//github.com/shurcoo!l/htmlg/@v/v0.0.0-20170918183704-d01228ac9e50.mod -> github.com%2Fshurcoo!l%2Fhtmlg%2F@v%2Fv0.0.0-20170918183704-d01228ac9e50.mod mirror://goproxy//github.com/shurcoo!l/httperror/@v/v0.0.0-20170206035902-86b7830d14cc.mod -> github.com%2Fshurcoo!l%2Fhttperror%2F@v%2Fv0.0.0-20170206035902-86b7830d14cc.mod mirror://goproxy//github.com/shurcoo!l/httpfs/@v/v0.0.0-20171119174359-809beceb2371.mod -> github.com%2Fshurcoo!l%2Fhttpfs%2F@v%2Fv0.0.0-20171119174359-809beceb2371.mod mirror://goproxy//github.com/shurcoo!l/httpgzip/@v/v0.0.0-20180522190206-b1c53ac65af9.mod -> github.com%2Fshurcoo!l%2Fhttpgzip%2F@v%2Fv0.0.0-20180522190206-b1c53ac65af9.mod mirror://goproxy//github.com/shurcoo!l/issues/@v/v0.0.0-20181008053335-6292fdc1e191.mod -> github.com%2Fshurcoo!l%2Fissues%2F@v%2Fv0.0.0-20181008053335-6292fdc1e191.mod mirror://goproxy//github.com/shurcoo!l/issuesapp/@v/v0.0.0-20180602232740-048589ce2241.mod -> github.com%2Fshurcoo!l%2Fissuesapp%2F@v%2Fv0.0.0-20180602232740-048589ce2241.mod mirror://goproxy//github.com/shurcoo!l/notifications/@v/v0.0.0-20181007000457-627ab5aea122.mod -> github.com%2Fshurcoo!l%2Fnotifications%2F@v%2Fv0.0.0-20181007000457-627ab5aea122.mod mirror://goproxy//github.com/shurcoo!l/octicon/@v/v0.0.0-20181028054416-fa4f57f9efb2.mod -> github.com%2Fshurcoo!l%2Focticon%2F@v%2Fv0.0.0-20181028054416-fa4f57f9efb2.mod mirror://goproxy//github.com/shurcoo!l/reactions/@v/v0.0.0-20181006231557-f2e0b4ca5b82.mod -> github.com%2Fshurcoo!l%2Freactions%2F@v%2Fv0.0.0-20181006231557-f2e0b4ca5b82.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v0.0.0-20170918181015-86672fcb3f95.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv0.0.0-20170918181015-86672fcb3f95.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/users/@v/v0.0.0-20180125191416-49c67e49c537.mod -> github.com%2Fshurcoo!l%2Fusers%2F@v%2Fv0.0.0-20180125191416-49c67e49c537.mod mirror://goproxy//github.com/shurcoo!l/webdavfs/@v/v0.0.0-20170829043945-18c3829fa133.mod -> github.com%2Fshurcoo!l%2Fwebdavfs%2F@v%2Fv0.0.0-20170829043945-18c3829fa133.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sourcegraph/annotate/@v/v0.0.0-20160123013949-f4cad6c6324d.mod -> github.com%2Fsourcegraph%2Fannotate%2F@v%2Fv0.0.0-20160123013949-f4cad6c6324d.mod mirror://goproxy//github.com/sourcegraph/syntaxhighlight/@v/v0.0.0-20170531221838-bd320f5d308e.mod -> github.com%2Fsourcegraph%2Fsyntaxhighlight%2F@v%2Fv0.0.0-20170531221838-bd320f5d308e.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.zip -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/syncthing/notify/@v/v0.0.0-20190709140112-69c7a957d3e2.zip -> github.com%2Fsyncthing%2Fnotify%2F@v%2Fv0.0.0-20190709140112-69c7a957d3e2.zip mirror://goproxy//github.com/syncthing/notify/@v/v0.0.0-20190709140112-69c7a957d3e2.mod -> github.com%2Fsyncthing%2Fnotify%2F@v%2Fv0.0.0-20190709140112-69c7a957d3e2.mod mirror://goproxy//github.com/syndtr/goleveldb/@v/v1.0.1-0.20200815071216-d9e9293bd0f7.zip -> github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.1-0.20200815071216-d9e9293bd0f7.zip mirror://goproxy//github.com/syndtr/goleveldb/@v/v1.0.1-0.20200815071216-d9e9293bd0f7.mod -> github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.1-0.20200815071216-d9e9293bd0f7.mod mirror://goproxy//github.com/tarm/serial/@v/v0.0.0-20180830185346-98f6abe2eb07.mod -> github.com%2Ftarm%2Fserial%2F@v%2Fv0.0.0-20180830185346-98f6abe2eb07.mod mirror://goproxy//github.com/thejerf/suture/@v/v3.0.2+incompatible.zip -> github.com%2Fthejerf%2Fsuture%2F@v%2Fv3.0.2+incompatible.zip mirror://goproxy//github.com/thejerf/suture/@v/v3.0.2+incompatible.mod -> github.com%2Fthejerf%2Fsuture%2F@v%2Fv3.0.2+incompatible.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.zip mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.zip mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod mirror://goproxy//github.com/viant/assertly/@v/v0.4.8.mod -> github.com%2Fviant%2Fassertly%2F@v%2Fv0.4.8.mod mirror://goproxy//github.com/viant/toolbox/@v/v0.24.0.mod -> github.com%2Fviant%2Ftoolbox%2F@v%2Fv0.24.0.mod mirror://goproxy//github.com/vitrun/qart/@v/v0.0.0-20160531060029-bf64b92db6b0.zip -> github.com%2Fvitrun%2Fqart%2F@v%2Fv0.0.0-20160531060029-bf64b92db6b0.zip mirror://goproxy//github.com/vitrun/qart/@v/v0.0.0-20160531060029-bf64b92db6b0.mod -> github.com%2Fvitrun%2Fqart%2F@v%2Fv0.0.0-20160531060029-bf64b92db6b0.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//go.opencensus.io/@v/v0.18.0.mod -> go.opencensus.io%2F@v%2Fv0.18.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go4.org/@v/v0.0.0-20180809161055-417644f6feb5.mod -> go4.org%2F@v%2Fv0.0.0-20180809161055-417644f6feb5.mod mirror://goproxy//golang.org/x/build/@v/v0.0.0-20190111050920-041ab4dc3f9d.mod -> golang.org%2Fx%2Fbuild%2F@v%2Fv0.0.0-20190111050920-041ab4dc3f9d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181030102418-4d3f4d9ffa16.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181030102418-4d3f4d9ffa16.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190313024323-a1f597ede03a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190313024323-a1f597ede03a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200221231518-2aa609cf4a9d.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200221231518-2aa609cf4a9d.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200221231518-2aa609cf4a9d.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200221231518-2aa609cf4a9d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200728195943-123391ffb6de.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200728195943-123391ffb6de.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181029044818-c44066c5c816.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181029044818-c44066c5c816.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181106065722-10aee1819953.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181106065722-10aee1819953.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190313220215-9f648a60d977.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190313220215-9f648a60d977.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520004742-59133d7f0dd7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200813134508-3edf25e44fcc.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200813134508-3edf25e44fcc.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200813134508-3edf25e44fcc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200813134508-3edf25e44fcc.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181017192945-9dcd33a902f4.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181017192945-9dcd33a902f4.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181203162652-d668ce993890.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181203162652-d668ce993890.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/perf/@v/v0.0.0-20180704124530-6e6d33e29852.mod -> golang.org%2Fx%2Fperf%2F@v%2Fv0.0.0-20180704124530-6e6d33e29852.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180926160741-c2ed4eda69e7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180926160741-c2ed4eda69e7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181029174526-d69651ed3497.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181029174526-d69651ed3497.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190316082340-a2f829d7f35f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190316082340-a2f829d7f35f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190626221950-04f50cda93cb.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626221950-04f50cda93cb.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190904154756-749cb33beabd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191010194322-b09406accb47.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191010194322-b09406accb47.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191010194322-b09406accb47.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191010194322-b09406accb47.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191224085550-c709ea063b76.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191224085550-c709ea063b76.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191224085550-c709ea063b76.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191224085550-c709ea063b76.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200519105757-fe76b779f299.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200519105757-fe76b779f299.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200814200057-3d37ad5750ed.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200814200057-3d37ad5750ed.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200819171115-d785dc25833f.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200819171115-d785dc25833f.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200819171115-d785dc25833f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200819171115-d785dc25833f.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180828015842-6cd1fcedba52.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030000716-a0a13e073c7b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030000716-a0a13e073c7b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20180910000450-7ca32eb868bf.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180910000450-7ca32eb868bf.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20181030000543-1d582fd0359e.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20181030000543-1d582fd0359e.mod mirror://goproxy//google.golang.org/api/@v/v0.1.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.2.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.3.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.3.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180831171423-11092d34479b.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180831171423-11092d34479b.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20181029155118-b69ba1387ce2.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181029155118-b69ba1387ce2.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20181202183823-bd91e49a0898.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181202183823-bd91e49a0898.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190306203927-b5d61aea6440.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190306203927-b5d61aea6440.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.16.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.16.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.17.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.zip -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//grpc.go4.org/@v/v0.0.0-20170609214715-11d0a25b4919.mod -> grpc.go4.org%2F@v%2Fv0.0.0-20170609214715-11d0a25b4919.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20180728063816-88497007e858.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sourcegraph.com/sourcegraph/go-diff/@v/v0.5.0.mod -> sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod mirror://goproxy//sourcegraph.com/sqs/pbtypes/@v/v0.0.0-20180604144634-d3ebe8f20ae4.mod -> sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	go-module	92660621959e7fab813173772987588b	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=247da9d1b05ce8c601572641dd818dc2
+_md5_=bd31453b3a764d3d4c3a2fd0be7e0c83
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 3042b0bbac4e..6384bbf2769e 100644
Binary files a/metadata/md5-cache/net-print/Manifest.gz and b/metadata/md5-cache/net-print/Manifest.gz differ
diff --git a/metadata/md5-cache/net-print/hplip-3.20.9-r3 b/metadata/md5-cache/net-print/hplip-3.20.9-r3
index 6558ddf02637..bbc3c4ac911c 100644
--- a/metadata/md5-cache/net-print/hplip-3.20.9-r3
+++ b/metadata/md5-cache/net-print/hplip-3.20.9-r3
@@ -5,11 +5,11 @@ DESCRIPTION=HP Linux Imaging and Printing - Print, scan, fax drivers and service
 EAPI=7
 HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing
 IUSE=doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~arm arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp:= python_single_target_python3_6? ( net-dns/avahi[python_targets_python3_6(-)] ) python_single_target_python3_7? ( net-dns/avahi[python_targets_python3_7(-)] ) python_single_target_python3_8? ( net-dns/avahi[python_targets_python3_8(-)] ) ) ) app-text/ghostscript-gpl !minimal? ( python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) kernel_linux? ( virtual/udev ) python_single_target_python3_6? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_6(-)] dev-python/distro[python_targets_python3_6(-)] fax? ( dev-python/reportlab[python_targets_python3_6(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_6(-)] libnotify? ( dev-python/notify2[python_targets_python3_6(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_6(-)] >=dev-python/pillow-3.1.1[python_targets_python3_6(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) python_single_target_python3_7? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_7(-)] dev-python/distro[python_targets_python3_7(-)] fax? ( dev-python/reportlab[python_targets_python3_7(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_7(-)] libnotify? ( dev-python/notify2[python_targets_python3_7(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_7(-)] >=dev-python/pillow-3.1.1[python_targets_python3_7(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) python_single_target_python3_8? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] fax? ( dev-python/reportlab[python_targets_python3_8(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_8(-)] libnotify? ( dev-python/notify2[python_targets_python3_8(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_8(-)] >=dev-python/pillow-3.1.1[python_targets_python3_8(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) ) policykit? ( sys-auth/polkit )
 REQUIRED_USE=!minimal? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/hplip/hplip-3.20.9.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.20.9-patches-2.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=9890fe7967253ff8a69c9e230225bd76
+_md5_=6d9341586694c18f721493335887508a
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 4c717d29a0d8..91c55ffa82de 100644
Binary files a/metadata/md5-cache/net-vpn/Manifest.gz and b/metadata/md5-cache/net-vpn/Manifest.gz differ
diff --git a/metadata/md5-cache/net-vpn/ipsec-tools-0.8.2-r6 b/metadata/md5-cache/net-vpn/ipsec-tools-0.8.2-r6
index 5c9d4daf8b0d..beae74db668b 100644
--- a/metadata/md5-cache/net-vpn/ipsec-tools-0.8.2-r6
+++ b/metadata/md5-cache/net-vpn/ipsec-tools-0.8.2-r6
@@ -8,6 +8,6 @@ KEYWORDS=amd64 arm ~ia64 ~mips ppc ppc64 x86
 LICENSE=BSD GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline:0= ) selinux? ( sys-libs/libselinux ) selinux? ( sec-policy/selinux-ipsec )
 SLOT=0
-SRC_URI=mirror://sourceforge/ipsec-tools/ipsec-tools-0.8.2.tar.bz2
+SRC_URI=mirror://sourceforge/ipsec-tools/ipsec-tools-0.8.2.tar.bz2 https://dev.gentoo.org/~juippis/distfiles/tmp/ipsec-tools-add-openssl-1.1.x-support.patch
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	pam	226d8d2ff588bdfd7d188512dbdb189d	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e4ee2689eb7320997bd91cbd80146771
+_md5_=6ce02712d5e7980918ce60e9fa2c90c3
diff --git a/metadata/md5-cache/net-vpn/strongswan-5.8.4 b/metadata/md5-cache/net-vpn/strongswan-5.8.4
deleted file mode 100644
index 8fd07c1e6377..000000000000
--- a/metadata/md5-cache/net-vpn/strongswan-5.8.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst preinst setup
-DEPEND=!net-misc/openswan gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist] ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns ) virtual/linux-sources sys-kernel/linux-headers
-DESCRIPTION=IPsec-based VPN solution, supporting IKEv1/IKEv2 and MOBIKE
-EAPI=7
-HOMEPAGE=https://www.strongswan.org/
-IUSE=+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11 +strongswan_plugins_led +strongswan_plugins_lookip +strongswan_plugins_systime-fix +strongswan_plugins_unity +strongswan_plugins_vici strongswan_plugins_aesni strongswan_plugins_blowfish strongswan_plugins_ccm strongswan_plugins_chapoly strongswan_plugins_ctr strongswan_plugins_forecast strongswan_plugins_gcm strongswan_plugins_ha strongswan_plugins_ipseckey strongswan_plugins_newhope strongswan_plugins_ntru strongswan_plugins_padlock strongswan_plugins_rdrand strongswan_plugins_save-keys strongswan_plugins_unbound strongswan_plugins_whitelist kernel_linux
-KEYWORDS=amd64 arm ~arm64 ppc ~ppc64 x86
-LICENSE=GPL-2 RSA DES
-RDEPEND=!net-misc/openswan gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist] ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns ) virtual/logger sys-apps/iproute2 !net-vpn/libreswan selinux? ( sec-policy/selinux-ipsec )
-SLOT=0
-SRC_URI=https://download.strongswan.org/strongswan-5.8.4.tar.bz2
-_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=cd0152fe23bd885788ae83467709752a
diff --git a/metadata/md5-cache/net-vpn/strongswan-5.9.1 b/metadata/md5-cache/net-vpn/strongswan-5.9.1
new file mode 100644
index 000000000000..eab2feab98cc
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/strongswan-5.9.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst preinst setup
+DEPEND=non-root? ( acct-user/ipsec acct-group/ipsec ) gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist] ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns ) virtual/linux-sources sys-kernel/linux-headers
+DESCRIPTION=IPsec-based VPN solution, supporting IKEv1/IKEv2 and MOBIKE
+EAPI=7
+HOMEPAGE=https://www.strongswan.org/
+IUSE=+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11 +strongswan_plugins_led +strongswan_plugins_lookip +strongswan_plugins_systime-fix +strongswan_plugins_unity +strongswan_plugins_vici strongswan_plugins_aesni strongswan_plugins_blowfish strongswan_plugins_bypass-lan strongswan_plugins_ccm strongswan_plugins_chapoly strongswan_plugins_ctr strongswan_plugins_forecast strongswan_plugins_gcm strongswan_plugins_ha strongswan_plugins_ipseckey strongswan_plugins_newhope strongswan_plugins_ntru strongswan_plugins_padlock strongswan_plugins_rdrand strongswan_plugins_save-keys strongswan_plugins_unbound strongswan_plugins_whitelist kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 RSA DES
+RDEPEND=non-root? ( acct-user/ipsec acct-group/ipsec ) gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist] ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns ) virtual/logger sys-apps/iproute2 !net-vpn/libreswan selinux? ( sec-policy/selinux-ipsec )
+SLOT=0
+SRC_URI=https://download.strongswan.org/strongswan-5.9.1.tar.bz2
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a46de628bc23f757f72d8b4a5eef9db3
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index d4c22aeaf9e2..57dce1f4e0d3 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/lorcon-0.0_p20200214 b/metadata/md5-cache/net-wireless/lorcon-0.0_p20200214
index f1e7912ec498..b3bcc4b1713a 100644
--- a/metadata/md5-cache/net-wireless/lorcon-0.0_p20200214
+++ b/metadata/md5-cache/net-wireless/lorcon-0.0_p20200214
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kismetwireless/lorcon/archive/7dbf24ee6f7c277240c0fbd988b6902850577772.tar.gz -> lorcon-0.0_p20200214.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=dba0b48a2d938a6a5a58393800fbc680
+_md5_=ebe5e896b40821eac72c779eb0374472
diff --git a/metadata/md5-cache/net-wireless/lorcon-9999 b/metadata/md5-cache/net-wireless/lorcon-9999
index 0679ecc14ba2..ae9040ade5a4 100644
--- a/metadata/md5-cache/net-wireless/lorcon-9999
+++ b/metadata/md5-cache/net-wireless/lorcon-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 py
 RESTRICT=test
 SLOT=0
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1d55e2fcd30cc9b93dbbc944b6a27a84
+_md5_=d8ffc8d3dcef9886969a6ce86ef0ade5
diff --git a/metadata/md5-cache/net-wireless/unifi-6.0.36 b/metadata/md5-cache/net-wireless/unifi-6.0.36
new file mode 100644
index 000000000000..3d9c4f9bf193
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/unifi-6.0.36
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install prepare
+DEPEND=app-arch/unzip
+DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
+EAPI=7
+HOMEPAGE=https://www.ubnt.com
+IUSE=systemd
+KEYWORDS=~amd64
+LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
+RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8
+RESTRICT=bindist mirror
+SLOT=0/6.0
+SRC_URI=https://dl.ui.com/unifi/6.0.36-35c9dd953e/UniFi.unix.zip -> unifi-6.0.36.zip
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=981993a267078757472e6811bb5383dc
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 8fc94eec1878..791b43a50437 100644
Binary files a/metadata/md5-cache/sci-chemistry/Manifest.gz and b/metadata/md5-cache/sci-chemistry/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-chemistry/mopac7-1.15-r1 b/metadata/md5-cache/sci-chemistry/mopac7-1.15-r1
index c43d125ab9bd..6570be2348dc 100644
--- a/metadata/md5-cache/sci-chemistry/mopac7-1.15-r1
+++ b/metadata/md5-cache/sci-chemistry/mopac7-1.15-r1
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile install prepare setup
+DEFINED_PHASES=compile configure install prepare setup
 DEPEND=dev-libs/libf2c >=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/fortran
 DESCRIPTION=Autotooled, updated version of a powerful, fast semi-empirical package
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/mopac7/
-IUSE=gmxmopac7 static-libs
+IUSE=gmxmopac7
 KEYWORDS=amd64 ppc x86 ~amd64-linux
 LICENSE=public-domain
 RDEPEND=dev-libs/libf2c virtual/fortran
 SLOT=0
 SRC_URI=http://www.bioinformatics.org/ghemical/download/current/mopac7-1.15.tar.gz http://wwwuser.gwdg.de/~ggroenh/qmmm/mopac/dcart.f http://wwwuser.gwdg.de/~ggroenh/qmmm/mopac/gmxmop.f
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=de26a344ed3b63ce8e266a5ddb96f4ab
+_md5_=3771f029b2ebed87ddf490178be003a2
diff --git a/metadata/md5-cache/sci-chemistry/vmd-1.9.4_alpha43 b/metadata/md5-cache/sci-chemistry/vmd-1.9.4_alpha43
index 534aebd9ef12..f3b7095d7d81 100644
--- a/metadata/md5-cache/sci-chemistry/vmd-1.9.4_alpha43
+++ b/metadata/md5-cache/sci-chemistry/vmd-1.9.4_alpha43
@@ -11,6 +11,6 @@ RDEPEND=>=dev-lang/tk-8.6.1:0= dev-lang/perl dev-libs/expat python_single_target
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=fetch
 SLOT=0
-SRC_URI=vmd-1.9.4a43.src.tar https://dev.gentoo.org/~jlec/distfiles/vmd-1.9.3-gentoo-patches.tar.xz
+SRC_URI=vmd-1.9.4a43.src.tar https://dev.gentoo.org/~jlec/distfiles/vmd-1.9.3-gentoo-patches.tar.xz https://dev.gentoo.org/~juippis/distfiles/tmp/vmd-1.9.4-gentoo-plugins.patch
 _eclasses_=cuda	c2f1b334711bbbf2130f339636dc7515	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=89744ba5c8dd8ee827c8775ee8fd7de6
+_md5_=b8977005d07546a65d407f1eec48adcf
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index af19c22aa813..9f479d961f37 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/blas-reference-20070226-r4 b/metadata/md5-cache/sci-libs/blas-reference-20070226-r4
deleted file mode 100644
index 4e1fd2f9f5f8..000000000000
--- a/metadata/md5-cache/sci-libs/blas-reference-20070226-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=app-eselect/eselect-blas virtual/fortran >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Basic Linear Algebra Subprograms F77 reference implementations
-EAPI=5
-HOMEPAGE=http://www.netlib.org/blas/
-IUSE=doc
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=BSD
-RDEPEND=app-eselect/eselect-blas doc? ( app-doc/blas-docs ) virtual/fortran
-SLOT=0
-SRC_URI=http://www.netlib.org/lapack/lapack-lite-3.1.1.tgz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0fff0a20cadad449262580679018bdc1
diff --git a/metadata/md5-cache/sci-libs/blas-reference-20151113-r1 b/metadata/md5-cache/sci-libs/blas-reference-20151113-r1
deleted file mode 100644
index 2f5ed78b4985..000000000000
--- a/metadata/md5-cache/sci-libs/blas-reference-20151113-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=app-eselect/eselect-blas doc? ( app-doc/blas-docs ) virtual/pkgconfig virtual/fortran sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Basic Linear Algebra Subprograms F77 reference implementations
-EAPI=6
-HOMEPAGE=http://www.netlib.org/blas/
-IUSE=doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=BSD
-RDEPEND=app-eselect/eselect-blas doc? ( app-doc/blas-docs ) virtual/fortran
-SLOT=0
-SRC_URI=http://www.netlib.org/lapack/lapack-3.6.0.tgz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=efd8f04d6878fbb66a0c65acec7714d0
diff --git a/metadata/md5-cache/sci-libs/blas-reference-20161223 b/metadata/md5-cache/sci-libs/blas-reference-20161223
deleted file mode 100644
index 6373a3e62427..000000000000
--- a/metadata/md5-cache/sci-libs/blas-reference-20161223
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=app-eselect/eselect-blas doc? ( app-doc/blas-docs ) virtual/pkgconfig virtual/fortran sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Basic Linear Algebra Subprograms F77 reference implementations
-EAPI=6
-HOMEPAGE=http://www.netlib.org/blas/
-IUSE=doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=BSD
-RDEPEND=app-eselect/eselect-blas doc? ( app-doc/blas-docs ) virtual/fortran
-SLOT=0
-SRC_URI=http://www.netlib.org/lapack/lapack-3.7.0.tgz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ddf827a1dd8451f90b8e8e229d94b82e
diff --git a/metadata/md5-cache/sci-libs/cblas-reference-20030223-r6 b/metadata/md5-cache/sci-libs/cblas-reference-20030223-r6
deleted file mode 100644
index 288295a21eff..000000000000
--- a/metadata/md5-cache/sci-libs/cblas-reference-20030223-r6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=virtual/blas app-eselect/eselect-cblas virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/fortran
-DESCRIPTION=C wrapper interface to the F77 reference BLAS implementation
-EAPI=5
-HOMEPAGE=http://www.netlib.org/blas/
-KEYWORDS=~alpha amd64 hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=public-domain
-RDEPEND=virtual/blas app-eselect/eselect-cblas virtual/fortran
-SLOT=0
-SRC_URI=http://www.netlib.org/blas/blast-forum/cblas.tgz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d5f98e35b9584429291d1adabf419522
diff --git a/metadata/md5-cache/sci-libs/cblas-reference-20151113-r2 b/metadata/md5-cache/sci-libs/cblas-reference-20151113-r2
deleted file mode 100644
index 252b62b3ed2c..000000000000
--- a/metadata/md5-cache/sci-libs/cblas-reference-20151113-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=app-eselect/eselect-cblas >=virtual/blas-3.6 virtual/pkgconfig virtual/fortran sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=C wrapper interface to the F77 reference BLAS implementation
-EAPI=6
-HOMEPAGE=http://www.netlib.org/cblas/
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=app-eselect/eselect-cblas >=virtual/blas-3.6 virtual/pkgconfig virtual/fortran
-SLOT=0
-SRC_URI=http://www.netlib.org/lapack/lapack-3.6.0.tgz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=642353eb4dcbe7713cb04a72200e9b57
diff --git a/metadata/md5-cache/sci-libs/cblas-reference-20161223 b/metadata/md5-cache/sci-libs/cblas-reference-20161223
deleted file mode 100644
index bbe1696b7571..000000000000
--- a/metadata/md5-cache/sci-libs/cblas-reference-20161223
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=app-eselect/eselect-cblas >=virtual/blas-3.6 virtual/pkgconfig virtual/fortran sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=C wrapper interface to the F77 reference BLAS implementation
-EAPI=6
-HOMEPAGE=http://www.netlib.org/cblas/
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=app-eselect/eselect-cblas >=virtual/blas-3.6 virtual/pkgconfig virtual/fortran
-SLOT=0
-SRC_URI=http://www.netlib.org/lapack/lapack-3.7.0.tgz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9092edcf5a47c3f23322d0c5ac9ab715
diff --git a/metadata/md5-cache/sci-libs/cln-1.3.3 b/metadata/md5-cache/sci-libs/cln-1.3.3
index 1a3ad5d32e39..79028d40be65 100644
--- a/metadata/md5-cache/sci-libs/cln-1.3.3
+++ b/metadata/md5-cache/sci-libs/cln-1.3.3
@@ -3,11 +3,11 @@ DEPEND=dev-libs/gmp:0= doc? ( virtual/latex-base ) >=app-portage/elt-patches-201
 DESCRIPTION=Class library (C++) for numbers
 EAPI=5
 HOMEPAGE=https://www.ginac.de/CLN/
-IUSE=doc examples static-libs
+IUSE=doc examples
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0=
 SLOT=1
 SRC_URI=ftp://ftpthep.physik.uni-mainz.de/pub/gnu/cln-1.3.3.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6d7954fb38ed0b06b520523d0d1384ce
+_md5_=ea227019b58d62a59846dc6cefdaceac
diff --git a/metadata/md5-cache/sci-libs/cln-1.3.4 b/metadata/md5-cache/sci-libs/cln-1.3.4
index ee9caa56d9e0..13e9f57ff780 100644
--- a/metadata/md5-cache/sci-libs/cln-1.3.4
+++ b/metadata/md5-cache/sci-libs/cln-1.3.4
@@ -3,11 +3,11 @@ DEPEND=dev-libs/gmp:0= doc? ( virtual/latex-base ) >=app-portage/elt-patches-201
 DESCRIPTION=Class library (C++) for numbers
 EAPI=5
 HOMEPAGE=https://www.ginac.de/CLN/
-IUSE=doc examples static-libs
+IUSE=doc examples
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0=
 SLOT=1
 SRC_URI=https://www.ginac.de/CLN/cln-1.3.4.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8ebf6e7abb7bae446a675ccda6840e50
+_md5_=f0221ff9654903e711f5558aee8217bf
diff --git a/metadata/md5-cache/sci-libs/cln-1.3.6 b/metadata/md5-cache/sci-libs/cln-1.3.6
index 07d593781d47..fcfbde924877 100644
--- a/metadata/md5-cache/sci-libs/cln-1.3.6
+++ b/metadata/md5-cache/sci-libs/cln-1.3.6
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile install prepare setup
+DEFINED_PHASES=compile configure install prepare setup
 DEPEND=dev-libs/gmp:0= doc? ( virtual/latex-base )
 DESCRIPTION=Class library (C++) for numbers
 EAPI=7
 HOMEPAGE=https://www.ginac.de/CLN/
-IUSE=doc examples static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+IUSE=doc examples
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0=
 SLOT=1
 SRC_URI=https://www.ginac.de/CLN/cln-1.3.6.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ac9c754ed1a720b26add55094b94ce8d
+_md5_=90e41f0615507cbe017a075cc90f6322
diff --git a/metadata/md5-cache/sci-libs/gerris-20131206-r1 b/metadata/md5-cache/sci-libs/gerris-20131206-r1
index caa6a087716e..ee009b6ece6a 100644
--- a/metadata/md5-cache/sci-libs/gerris-20131206-r1
+++ b/metadata/md5-cache/sci-libs/gerris-20131206-r1
@@ -1,5 +1,5 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 dev-games/ode sci-libs/netcdf:= sci-libs/gsl:= sci-libs/gts sci-libs/hypre[mpi?] sci-libs/lis[mpi?] sci-libs/proj sci-libs/fftw:3.0= virtual/lapack mpi? ( virtual/mpi ) 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 postinst postrm preinst prepare
+DEPEND=dev-libs/glib:2 dev-games/ode sci-libs/netcdf:= sci-libs/gsl:= sci-libs/gts sci-libs/hypre[mpi?] sci-libs/lis[mpi?] sci-libs/proj sci-libs/fftw:3.0= virtual/lapack mpi? ( virtual/mpi ) 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-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Gerris Flow Solver
 EAPI=6
 HOMEPAGE=http://gfs.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 dev-games/ode sci-libs/netcdf:= sci-libs/gsl:= sci-libs/
 RESTRICT=test
 SLOT=0
 SRC_URI=http://gerris.dalembert.upmc.fr/gerris/tarballs/gerris-snapshot-131206.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6dbbcb42e14888886c1821828196b788
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=08901afc5ea91cdc41ebdf0fae5a5acc
diff --git a/metadata/md5-cache/sci-libs/lapack-3.8.0 b/metadata/md5-cache/sci-libs/lapack-3.8.0
index 495ee181d3b5..0c1dcd91422b 100644
--- a/metadata/md5-cache/sci-libs/lapack-3.8.0
+++ b/metadata/md5-cache/sci-libs/lapack-3.8.0
@@ -1,14 +1,14 @@
 BDEPEND=sys-devel/make >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=eselect-ldso? ( >=app-eselect/eselect-blas-0.2 >=app-eselect/eselect-lapack-0.2 ) !app-eselect/eselect-cblas !sci-libs/blas-reference !sci-libs/cblas-reference !sci-libs/lapack-reference !sci-libs/lapacke-reference virtual/fortran doc? ( app-doc/blas-docs ) virtual/pkgconfig
+DEPEND=eselect-ldso? ( >=app-eselect/eselect-blas-0.2 >=app-eselect/eselect-lapack-0.2 ) !app-eselect/eselect-cblas virtual/fortran doc? ( app-doc/blas-docs ) virtual/pkgconfig
 DESCRIPTION=BLAS,CBLAS,LAPACK,LAPACKE reference implementations
 EAPI=7
 HOMEPAGE=http://www.netlib.org/lapack/
 IUSE=lapacke doc eselect-ldso
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
-RDEPEND=eselect-ldso? ( >=app-eselect/eselect-blas-0.2 >=app-eselect/eselect-lapack-0.2 ) !app-eselect/eselect-cblas !sci-libs/blas-reference !sci-libs/cblas-reference !sci-libs/lapack-reference !sci-libs/lapacke-reference virtual/fortran doc? ( app-doc/blas-docs )
+RDEPEND=eselect-ldso? ( >=app-eselect/eselect-blas-0.2 >=app-eselect/eselect-lapack-0.2 ) !app-eselect/eselect-cblas virtual/fortran doc? ( app-doc/blas-docs )
 SLOT=0
 SRC_URI=http://www.netlib.org/lapack/lapack-3.8.0.tar.gz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c7022fc8e78078fc7a182298c5b61f9c
+_md5_=62987b0cd8cfe81f02b1a873e9379689
diff --git a/metadata/md5-cache/sci-libs/lapack-3.8.0-r1 b/metadata/md5-cache/sci-libs/lapack-3.8.0-r1
index 9c5b9b25b9a3..5c8022aff56c 100644
--- a/metadata/md5-cache/sci-libs/lapack-3.8.0-r1
+++ b/metadata/md5-cache/sci-libs/lapack-3.8.0-r1
@@ -1,14 +1,14 @@
 BDEPEND=sys-devel/make >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=eselect-ldso? ( >=app-eselect/eselect-blas-0.2 >=app-eselect/eselect-lapack-0.2 ) !app-eselect/eselect-cblas !sci-libs/blas-reference !sci-libs/cblas-reference !sci-libs/lapack-reference !sci-libs/lapacke-reference virtual/fortran doc? ( app-doc/blas-docs ) virtual/pkgconfig
+DEPEND=eselect-ldso? ( >=app-eselect/eselect-blas-0.2 >=app-eselect/eselect-lapack-0.2 ) !app-eselect/eselect-cblas virtual/fortran doc? ( app-doc/blas-docs ) virtual/pkgconfig
 DESCRIPTION=BLAS,CBLAS,LAPACK,LAPACKE reference implementations
 EAPI=7
 HOMEPAGE=http://www.netlib.org/lapack/
 IUSE=lapacke deprecated doc eselect-ldso
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
-RDEPEND=eselect-ldso? ( >=app-eselect/eselect-blas-0.2 >=app-eselect/eselect-lapack-0.2 ) !app-eselect/eselect-cblas !sci-libs/blas-reference !sci-libs/cblas-reference !sci-libs/lapack-reference !sci-libs/lapacke-reference virtual/fortran doc? ( app-doc/blas-docs )
+RDEPEND=eselect-ldso? ( >=app-eselect/eselect-blas-0.2 >=app-eselect/eselect-lapack-0.2 ) !app-eselect/eselect-cblas virtual/fortran doc? ( app-doc/blas-docs )
 SLOT=0
 SRC_URI=http://www.netlib.org/lapack/lapack-3.8.0.tar.gz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f41ce5593a65465f21a0e20644fbd7a6
+_md5_=d4b1006160e9c670aed1d6093d179d9a
diff --git a/metadata/md5-cache/sci-libs/lapack-3.9.0 b/metadata/md5-cache/sci-libs/lapack-3.9.0
index e4b6693732cc..42c36381e71f 100644
--- a/metadata/md5-cache/sci-libs/lapack-3.9.0
+++ b/metadata/md5-cache/sci-libs/lapack-3.9.0
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=eselect-ldso? ( >=app-eselect/eselect-blas-0.2 >=app-eselect/eselect-lapack-0.2 ) !app-eselect/eselect-cblas !sci-libs/blas-reference !sci-libs/cblas-reference !sci-libs/lapack-reference !sci-libs/lapacke-reference virtual/fortran doc? ( app-doc/blas-docs ) virtual/pkgconfig
+DEPEND=eselect-ldso? ( >=app-eselect/eselect-blas-0.2 >=app-eselect/eselect-lapack-0.2 ) !app-eselect/eselect-cblas virtual/fortran doc? ( app-doc/blas-docs ) virtual/pkgconfig
 DESCRIPTION=BLAS,CBLAS,LAPACK,LAPACKE reference implementations
 EAPI=7
 HOMEPAGE=http://www.netlib.org/lapack/
 IUSE=lapacke doc eselect-ldso test
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
-RDEPEND=eselect-ldso? ( >=app-eselect/eselect-blas-0.2 >=app-eselect/eselect-lapack-0.2 ) !app-eselect/eselect-cblas !sci-libs/blas-reference !sci-libs/cblas-reference !sci-libs/lapack-reference !sci-libs/lapacke-reference virtual/fortran doc? ( app-doc/blas-docs )
+RDEPEND=eselect-ldso? ( >=app-eselect/eselect-blas-0.2 >=app-eselect/eselect-lapack-0.2 ) !app-eselect/eselect-cblas virtual/fortran doc? ( app-doc/blas-docs )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Reference-LAPACK/lapack/archive/v3.9.0.tar.gz -> lapack-3.9.0.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=74227ae3e16118516b9d88d39875b0c8
+_md5_=183c5cdccbb833c349775d4693e02a09
diff --git a/metadata/md5-cache/sci-libs/lapack-reference-3.2.1-r4 b/metadata/md5-cache/sci-libs/lapack-reference-3.2.1-r4
deleted file mode 100644
index 3b2a72b14ddb..000000000000
--- a/metadata/md5-cache/sci-libs/lapack-reference-3.2.1-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=app-eselect/eselect-lapack virtual/blas virtual/pkgconfig doc? ( app-doc/lapack-docs ) >=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/fortran
-DESCRIPTION=FORTRAN reference implementation of LAPACK Linear Algebra PACKage
-EAPI=5
-HOMEPAGE=http://www.netlib.org/lapack/index.html
-IUSE=doc
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=BSD
-RDEPEND=app-eselect/eselect-lapack virtual/blas virtual/fortran
-SLOT=0
-SRC_URI=mirror://gentoo/lapack-3.2.1.tgz mirror://gentoo/lapack-reference-3.2.1-autotools.patch.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=205ec1f01e53d939f1031b10f214a79b
diff --git a/metadata/md5-cache/sci-libs/lapack-reference-3.6.0 b/metadata/md5-cache/sci-libs/lapack-reference-3.6.0
deleted file mode 100644
index bcf41ee25599..000000000000
--- a/metadata/md5-cache/sci-libs/lapack-reference-3.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=app-eselect/eselect-lapack >=virtual/blas-3.6 virtual/pkgconfig virtual/fortran sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Reference implementation of LAPACK
-EAPI=6
-HOMEPAGE=http://www.netlib.org/lapack/
-IUSE=+deprecated
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=BSD
-RDEPEND=app-eselect/eselect-lapack >=virtual/blas-3.6 virtual/pkgconfig virtual/fortran
-SLOT=0
-SRC_URI=http://www.netlib.org/lapack/lapack-3.6.0.tgz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d2d41e6ed0872105f957b5e488acd31a
diff --git a/metadata/md5-cache/sci-libs/lapack-reference-3.7.0 b/metadata/md5-cache/sci-libs/lapack-reference-3.7.0
deleted file mode 100644
index 80d13ce3851d..000000000000
--- a/metadata/md5-cache/sci-libs/lapack-reference-3.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=app-eselect/eselect-lapack >=virtual/blas-3.6 virtual/pkgconfig virtual/fortran sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Reference implementation of LAPACK
-EAPI=6
-HOMEPAGE=http://www.netlib.org/lapack/
-IUSE=+deprecated
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=BSD
-RDEPEND=app-eselect/eselect-lapack >=virtual/blas-3.6 virtual/pkgconfig virtual/fortran
-SLOT=0
-SRC_URI=http://www.netlib.org/lapack/lapack-3.7.0.tgz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=540f429e8fa10db4a34e32100cb92b39
diff --git a/metadata/md5-cache/sci-libs/pastix-5.2.2.22-r1 b/metadata/md5-cache/sci-libs/pastix-5.2.2.22-r1
index f41220234bbd..525d8b0a9394 100644
--- a/metadata/md5-cache/sci-libs/pastix-5.2.2.22-r1
+++ b/metadata/md5-cache/sci-libs/pastix-5.2.2.22-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Parallel solver for very large sparse linear systems
 EAPI=6
 HOMEPAGE=http://pastix.gforge.inria.fr
 IUSE=doc int64 mpi +smp starpu static-libs
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=CeCILL-C
 RDEPEND=sci-libs/scotch:0=[int64?,mpi?] sys-apps/hwloc:0= virtual/blas mpi? ( virtual/mpi ) starpu? ( dev-libs/starpu:0= ) virtual/fortran
 SLOT=0
 SRC_URI=https://gforge.inria.fr/frs/download.php/35070/pastix_5.2.2.22.tar.bz2
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ce76d28dcad81df7d6db9c9f821eb362
+_md5_=3349ea9ae74eb1b16e00f4e314cbf0c1
diff --git a/metadata/md5-cache/sci-libs/scikits_image-0.13.0-r1 b/metadata/md5-cache/sci-libs/scikit-image-0.13.0-r1
similarity index 99%
rename from metadata/md5-cache/sci-libs/scikits_image-0.13.0-r1
rename to metadata/md5-cache/sci-libs/scikit-image-0.13.0-r1
index c770eb454b55..b4e01d258c0d 100644
--- a/metadata/md5-cache/sci-libs/scikits_image-0.13.0-r1
+++ b/metadata/md5-cache/sci-libs/scikit-image-0.13.0-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-image/scikit-image-0.13.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=102666692d2d916e33de9c7a7d863047
+_md5_=f039362b41a1b82ffb75f7b923b05540
diff --git a/metadata/md5-cache/sci-libs/scikit-image-0.17.2 b/metadata/md5-cache/sci-libs/scikit-image-0.17.2
new file mode 100644
index 000000000000..6bb86618120a
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/scikit-image-0.17.2
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/imageio[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/matplotlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/networkx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pywavelets[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/scipy[sparse,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Image processing routines for SciPy
+EAPI=7
+HOMEPAGE=https://scikit-image.org/
+IUSE=python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/imageio[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/matplotlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/networkx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pywavelets[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/scipy[sparse,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/s/scikit-image/scikit-image-0.17.2.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=fa6d848b13bddbaa58d8be02ae677271
diff --git a/metadata/md5-cache/sci-libs/scikits_learn-0.22.2_p1-r1 b/metadata/md5-cache/sci-libs/scikit-learn-0.22.2_p1-r1
similarity index 95%
rename from metadata/md5-cache/sci-libs/scikits_learn-0.22.2_p1-r1
rename to metadata/md5-cache/sci-libs/scikit-learn-0.22.2_p1-r1
index 651b60ee4234..e39d095addb0 100644
--- a/metadata/md5-cache/sci-libs/scikits_learn-0.22.2_p1-r1
+++ b/metadata/md5-cache/sci-libs/scikit-learn-0.22.2_p1-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=virtual/blas:= virtual/cblas:=
 DESCRIPTION=Machine learning library for Python
 EAPI=7
-HOMEPAGE=https://scikit-learn.org/stable/ https://github.com/scikit-learn/scikit-learn
+HOMEPAGE=https://scikit-learn.org/stable/
 IUSE=examples test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=BSD
@@ -11,6 +11,6 @@ RDEPEND=dev-python/wheel[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/scikit-learn/scikit-learn/archive/0.22.2.post1.tar.gz -> scikits_learn-0.22.2_p1.tar.gz
+SRC_URI=https://github.com/scikit-learn/scikit-learn/archive/0.22.2.post1.tar.gz -> scikit-learn-0.22.2_p1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7595e701b8926f680f130f0a8216304e
+_md5_=298d0bd7b6c53b126845f1ee05e9f655
diff --git a/metadata/md5-cache/sci-libs/scikits_learn-0.23.2 b/metadata/md5-cache/sci-libs/scikit-learn-0.23.2
similarity index 97%
rename from metadata/md5-cache/sci-libs/scikits_learn-0.23.2
rename to metadata/md5-cache/sci-libs/scikit-learn-0.23.2
index a24a0cf4aa86..e638722632b2 100644
--- a/metadata/md5-cache/sci-libs/scikits_learn-0.23.2
+++ b/metadata/md5-cache/sci-libs/scikit-learn-0.23.2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=virtual/blas:= virtual/cblas:=
 DESCRIPTION=Machine learning library for Python
 EAPI=7
-HOMEPAGE=https://scikit-learn.org/stable/ https://github.com/scikit-learn/scikit-learn
+HOMEPAGE=https://scikit-learn.org/stable/
 IUSE=examples test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD
@@ -11,6 +11,6 @@ RDEPEND=virtual/blas:= virtual/cblas:= dev-python/wheel[python_targets_python3_6
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/scikit-learn/scikit-learn/archive/0.23.2.tar.gz -> scikits_learn-0.23.2.tar.gz
+SRC_URI=https://github.com/scikit-learn/scikit-learn/archive/0.23.2.tar.gz -> scikit-learn-0.23.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1ff925587810b6c25cc7f5ae9ba14e39
+_md5_=236bcedae8ea93c1b6f89277ec9f06cb
diff --git a/metadata/md5-cache/sci-libs/scikit-optimize-0.8.1 b/metadata/md5-cache/sci-libs/scikit-optimize-0.8.1
new file mode 100644
index 000000000000..accdd2a2eb2d
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/scikit-optimize-0.8.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/joblib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/matplotlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pretty-yaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sci-libs/scikit-learn[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Sequential model-based optimization library
+EAPI=7
+HOMEPAGE=https://scikit-optimize.github.io/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-python/joblib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/matplotlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pretty-yaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sci-libs/scikit-learn[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/scikit-optimize/scikit-optimize-0.8.1.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=77a2dfb141ac48205b4b68f3516646f0
diff --git a/metadata/md5-cache/sci-libs/sktime-0.4.2 b/metadata/md5-cache/sci-libs/sktime-0.4.2
new file mode 100644
index 000000000000..2d68c91e0d42
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/sktime-0.4.2
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=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/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pandas[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/statsmodels[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wheel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sci-libs/scikit-learn[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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=scikit-learn toolbox for working with time series
+EAPI=7
+HOMEPAGE=https://sktime.org
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pandas[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/statsmodels[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wheel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sci-libs/scikit-learn[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/s/sktime/sktime-0.4.2.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8ef5ef116d561cd44eab19a0905b9950
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index c64cf8b55043..89bd910c14ed 100644
Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-mathematics/agda-2.5.2-r2 b/metadata/md5-cache/sci-mathematics/agda-2.5.2-r2
index f48d9ed41ca7..b61c765c3155 100644
--- a/metadata/md5-cache/sci-mathematics/agda-2.5.2-r2
+++ b/metadata/md5-cache/sci-mathematics/agda-2.5.2-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/boxes-0.1.3:=[profile?] <dev-haskell/boxes-0.2:=[profile?] >=dev-haskell/data-hash-0.2.0.0:=[profile?] <dev-haskell/data-hash-0.3:=[profile?] >=dev-haskell/edisoncore-1.3.1.1:=[profile?] >=dev-haskell/edit-distance-0.2.1.2:=[profile?] <dev-haskell/edit-distance-0.3:=[profile?] >=dev-haskell/equivalence-0.2.5:=[profile?] <dev-haskell/equivalence-0.4:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/geniplate-mirror-0.6.0.6:=[profile?] <dev-haskell/geniplate-mirror-0.8:=[profile?] >=dev-haskell/gitrev-1.2:=[profile?] <dev-haskell/gitrev-2.0:=[profile?] >=dev-haskell/hashable-1.2.1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/haskeline-0.7.1.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] >=dev-haskell/ieee754-0.7.8:=[profile?] <dev-haskell/ieee754-0.8:=[profile?] >=dev-haskell/monadplus-1.4:=[profile?] <dev-haskell/monadplus-1.5:=[profile?] >=dev-haskell/murmur-hash-0.1:=[profile?] <dev-haskell/murmur-hash-0.2:=[profile?] >=dev-haskell/parallel-3.2.0.4:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/regex-tdfa-1.2.2:=[profile?] <dev-haskell/regex-tdfa-1.3:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/strict-0.3.2:=[profile?] <dev-haskell/strict-0.4:=[profile?] >=dev-haskell/text-0.11.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-compat-0.3.3.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-haskell/unordered-containers-0.2.5.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/xhtml-3000.2.1:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-haskell/zlib-0.4.0.1:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/hashtables-1.0.1.8:=[profile?] <dev-haskell/hashtables-1.3:=[profile?] >=dev-haskell/mtl-2.1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] uhc? ( >=dev-haskell/shuffle-0.1.3.3:=[profile?] >=dev-haskell/uhc-light-1.1.9.2:=[profile?] <dev-haskell/uhc-light-1.2:=[profile?] >=dev-haskell/uhc-util-0.1.6.7:=[profile?] <dev-haskell/uhc-util-0.1.7:=[profile?] >=dev-haskell/uulib-0.9.20:=[profile?] ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/haskell-mode ) dev-haskell/alex >=dev-haskell/cabal-1.22.2.0 dev-haskell/happy cpphs? ( dev-haskell/cpphs ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/boxes-0.1.3:=[profile?] <dev-haskell/boxes-0.2:=[profile?] >=dev-haskell/data-hash-0.2.0.0:=[profile?] <dev-haskell/data-hash-0.3:=[profile?] >=dev-haskell/edisoncore-1.3.1.1:=[profile?] >=dev-haskell/edit-distance-0.2.1.2:=[profile?] <dev-haskell/edit-distance-0.3:=[profile?] >=dev-haskell/equivalence-0.2.5:=[profile?] <dev-haskell/equivalence-0.4:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/geniplate-mirror-0.6.0.6:=[profile?] <dev-haskell/geniplate-mirror-0.8:=[profile?] >=dev-haskell/gitrev-1.2:=[profile?] <dev-haskell/gitrev-2.0:=[profile?] >=dev-haskell/hashable-1.2.1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/haskeline-0.7.1.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] >=dev-haskell/ieee754-0.7.8:=[profile?] <dev-haskell/ieee754-0.8:=[profile?] >=dev-haskell/monadplus-1.4:=[profile?] <dev-haskell/monadplus-1.5:=[profile?] >=dev-haskell/murmur-hash-0.1:=[profile?] <dev-haskell/murmur-hash-0.2:=[profile?] >=dev-haskell/parallel-3.2.0.4:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/regex-tdfa-1.2.2:=[profile?] <dev-haskell/regex-tdfa-1.3:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/strict-0.3.2:=[profile?] <dev-haskell/strict-0.4:=[profile?] >=dev-haskell/text-0.11.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-compat-0.3.3.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-haskell/unordered-containers-0.2.5.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/xhtml-3000.2.1:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-haskell/zlib-0.4.0.1:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/hashtables-1.0.1.8:=[profile?] <dev-haskell/hashtables-1.3:=[profile?] >=dev-haskell/mtl-2.1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] emacs? ( >=app-editors/emacs-23.1:* app-emacs/haskell-mode ) dev-haskell/alex >=dev-haskell/cabal-1.22.2.0 dev-haskell/happy cpphs? ( dev-haskell/cpphs ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A dependently typed functional programming language and proof assistant
 EAPI=7
 HOMEPAGE=https://wiki.portal.chalmers.se/agda/
-IUSE=+cpphs debug uhc +stdlib emacs doc hscolour profile
+IUSE=+cpphs debug +stdlib emacs doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 PDEPEND=stdlib? ( ~sci-mathematics/agda-stdlib-2.5.2.0.13 )
-RDEPEND=>=dev-haskell/boxes-0.1.3:=[profile?] <dev-haskell/boxes-0.2:=[profile?] >=dev-haskell/data-hash-0.2.0.0:=[profile?] <dev-haskell/data-hash-0.3:=[profile?] >=dev-haskell/edisoncore-1.3.1.1:=[profile?] >=dev-haskell/edit-distance-0.2.1.2:=[profile?] <dev-haskell/edit-distance-0.3:=[profile?] >=dev-haskell/equivalence-0.2.5:=[profile?] <dev-haskell/equivalence-0.4:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/geniplate-mirror-0.6.0.6:=[profile?] <dev-haskell/geniplate-mirror-0.8:=[profile?] >=dev-haskell/gitrev-1.2:=[profile?] <dev-haskell/gitrev-2.0:=[profile?] >=dev-haskell/hashable-1.2.1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/haskeline-0.7.1.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] >=dev-haskell/ieee754-0.7.8:=[profile?] <dev-haskell/ieee754-0.8:=[profile?] >=dev-haskell/monadplus-1.4:=[profile?] <dev-haskell/monadplus-1.5:=[profile?] >=dev-haskell/murmur-hash-0.1:=[profile?] <dev-haskell/murmur-hash-0.2:=[profile?] >=dev-haskell/parallel-3.2.0.4:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/regex-tdfa-1.2.2:=[profile?] <dev-haskell/regex-tdfa-1.3:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/strict-0.3.2:=[profile?] <dev-haskell/strict-0.4:=[profile?] >=dev-haskell/text-0.11.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-compat-0.3.3.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-haskell/unordered-containers-0.2.5.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/xhtml-3000.2.1:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-haskell/zlib-0.4.0.1:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/hashtables-1.0.1.8:=[profile?] <dev-haskell/hashtables-1.3:=[profile?] >=dev-haskell/mtl-2.1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] uhc? ( >=dev-haskell/shuffle-0.1.3.3:=[profile?] >=dev-haskell/uhc-light-1.1.9.2:=[profile?] <dev-haskell/uhc-light-1.2:=[profile?] >=dev-haskell/uhc-util-0.1.6.7:=[profile?] <dev-haskell/uhc-util-0.1.7:=[profile?] >=dev-haskell/uulib-0.9.20:=[profile?] ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/haskell-mode ) !sci-mathematics/agda-executable
+RDEPEND=>=dev-haskell/boxes-0.1.3:=[profile?] <dev-haskell/boxes-0.2:=[profile?] >=dev-haskell/data-hash-0.2.0.0:=[profile?] <dev-haskell/data-hash-0.3:=[profile?] >=dev-haskell/edisoncore-1.3.1.1:=[profile?] >=dev-haskell/edit-distance-0.2.1.2:=[profile?] <dev-haskell/edit-distance-0.3:=[profile?] >=dev-haskell/equivalence-0.2.5:=[profile?] <dev-haskell/equivalence-0.4:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/geniplate-mirror-0.6.0.6:=[profile?] <dev-haskell/geniplate-mirror-0.8:=[profile?] >=dev-haskell/gitrev-1.2:=[profile?] <dev-haskell/gitrev-2.0:=[profile?] >=dev-haskell/hashable-1.2.1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/haskeline-0.7.1.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] >=dev-haskell/ieee754-0.7.8:=[profile?] <dev-haskell/ieee754-0.8:=[profile?] >=dev-haskell/monadplus-1.4:=[profile?] <dev-haskell/monadplus-1.5:=[profile?] >=dev-haskell/murmur-hash-0.1:=[profile?] <dev-haskell/murmur-hash-0.2:=[profile?] >=dev-haskell/parallel-3.2.0.4:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/regex-tdfa-1.2.2:=[profile?] <dev-haskell/regex-tdfa-1.3:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/strict-0.3.2:=[profile?] <dev-haskell/strict-0.4:=[profile?] >=dev-haskell/text-0.11.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-compat-0.3.3.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-haskell/unordered-containers-0.2.5.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/xhtml-3000.2.1:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-haskell/zlib-0.4.0.1:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/hashtables-1.0.1.8:=[profile?] <dev-haskell/hashtables-1.3:=[profile?] >=dev-haskell/mtl-2.1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] emacs? ( >=app-editors/emacs-23.1:* app-emacs/haskell-mode ) !sci-mathematics/agda-executable
 RESTRICT=test
 SLOT=0/2.5.2
 SRC_URI=https://hackage.haskell.org/package/Agda-2.5.2/Agda-2.5.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=95e61a26cb4aaa45c0a27c0a45ffa1e0
+_md5_=9bd405ce6f52b6c997f5f3efb9ac202d
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index 5ec7eb7a28ac..5c43b8c6616b 100644
Binary files a/metadata/md5-cache/sci-physics/Manifest.gz and b/metadata/md5-cache/sci-physics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-physics/lhapdf-6.2.3 b/metadata/md5-cache/sci-physics/lhapdf-6.2.3
index 373b19a99792..cad9338a59bd 100644
--- a/metadata/md5-cache/sci-physics/lhapdf-6.2.3
+++ b/metadata/md5-cache/sci-physics/lhapdf-6.2.3
@@ -1,10 +1,10 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=doc? ( app-doc/doxygen dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/boost:0= python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( app-doc/doxygen dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra )
+DEPEND=dev-libs/boost:0= python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Les Houches Parton Density Function unified library
 EAPI=7
 HOMEPAGE=http://lhapdf.hepforge.org/
-IUSE=doc examples python static-libs python_targets_python3_6 python_targets_python3_7
+IUSE=doc examples python python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/boost:0= python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=http://www.hepforge.org/archive/lhapdf/LHAPDF-6.2.3.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a2a0fdbf9b7d7b3ab91afd6b9769bf64
+_md5_=4caaf371f4805dcd5f2d75c12b30be76
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index acc684b00346..914eed5145cc 100644
Binary files a/metadata/md5-cache/sci-visualization/Manifest.gz and b/metadata/md5-cache/sci-visualization/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-visualization/ggobi-2.1.10 b/metadata/md5-cache/sci-visualization/ggobi-2.1.10
index 86d317a10819..8f8ec392e1cc 100644
--- a/metadata/md5-cache/sci-visualization/ggobi-2.1.10
+++ b/metadata/md5-cache/sci-visualization/ggobi-2.1.10
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/libxml2:2 media-gfx/graphviz x11-libs/gtk+:2 virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-libs/libxml2:2 media-gfx/graphviz x11-libs/gtk+:2 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-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Visualization program for exploring high-dimensional data
 EAPI=5
 HOMEPAGE=http://www.ggobi.org/
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0
 RDEPEND=dev-libs/libxml2:2 media-gfx/graphviz x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/g/ggobi/ggobi_2.1.10.orig.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=216741daaf844e764955cff481a95bc0
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cd2327ce6397d3211f65c8c89f0c58f5
diff --git a/metadata/md5-cache/sci-visualization/ggobi-2.1.11 b/metadata/md5-cache/sci-visualization/ggobi-2.1.11
index 9a3876687667..0ef9c967010d 100644
--- a/metadata/md5-cache/sci-visualization/ggobi-2.1.11
+++ b/metadata/md5-cache/sci-visualization/ggobi-2.1.11
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/libxml2:2 media-gfx/graphviz x11-libs/gtk+:2 virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-libs/libxml2:2 media-gfx/graphviz x11-libs/gtk+:2 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-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Visualization program for exploring high-dimensional data
 EAPI=5
 HOMEPAGE=http://www.ggobi.org/
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0
 RDEPEND=dev-libs/libxml2:2 media-gfx/graphviz x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/g/ggobi/ggobi_2.1.11.orig.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=109269c513172107ff1ffe25a9159679
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bbf8e418a04344ce656d1cbd5cad7107
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 28fa401464ab..6f5952a7eb14 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/acl-2.2.53-r1 b/metadata/md5-cache/sys-apps/acl-2.2.53-r1
index b4219224fc9c..4994018546fd 100644
--- a/metadata/md5-cache/sys-apps/acl-2.2.53-r1
+++ b/metadata/md5-cache/sys-apps/acl-2.2.53-r1
@@ -5,10 +5,10 @@ DESCRIPTION=access control list utilities, libraries and headers
 EAPI=7
 HOMEPAGE=https://savannah.nongnu.org/projects/acl
 IUSE=nls 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 split-usr
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=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(-)?]
 SLOT=0
 SRC_URI=mirror://nongnu/acl/acl-2.2.53.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=77db608e197165909a9d4fd1bedea2a1
+_md5_=e964f6ba623f79985a6e7bcfa6deadbb
diff --git a/metadata/md5-cache/sys-apps/attr-2.4.48-r4 b/metadata/md5-cache/sys-apps/attr-2.4.48-r4
index 155d3b7888cf..a1b0d0ef3a0f 100644
--- a/metadata/md5-cache/sys-apps/attr-2.4.48-r4
+++ b/metadata/md5-cache/sys-apps/attr-2.4.48-r4
@@ -4,9 +4,9 @@ DESCRIPTION=Extended attributes tools
 EAPI=7
 HOMEPAGE=https://savannah.nongnu.org/projects/attr
 IUSE=debug nls 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 split-usr
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://nongnu/attr/attr-2.4.48.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=eea9e13ec89898247c8eb7b3dccb7df5
+_md5_=4632d6e39824cd802021b5a76732a6e9
diff --git a/metadata/md5-cache/sys-apps/baselayout-2.7-r1 b/metadata/md5-cache/sys-apps/baselayout-2.7-r1
new file mode 100644
index 000000000000..59087e1d48a6
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/baselayout-2.7-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst preinst prepare setup
+DESCRIPTION=Filesystem baselayout and init scripts
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+IUSE=build kernel_FreeBSD kernel_linux +split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.7.tar.bz2
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_md5_=595287f2cf0fbd6740ec76903a3f205f
diff --git a/metadata/md5-cache/sys-apps/cpuid-20200427 b/metadata/md5-cache/sys-apps/cpuid-20200427
deleted file mode 100644
index 70f5453979aa..000000000000
--- a/metadata/md5-cache/sys-apps/cpuid-20200427
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-lang/perl
-DEFINED_PHASES=install prepare
-DEPEND=app-arch/gzip
-DESCRIPTION=Linux tool to dump x86 CPUID information about the CPUs
-EAPI=7
-HOMEPAGE=http://www.etallen.com/cpuid.html
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=http://www.etallen.com/cpuid/cpuid-20200427.src.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=15a78e9120fa26228f22f14175cbbcc1
diff --git a/metadata/md5-cache/sys-apps/cpuid-20201006 b/metadata/md5-cache/sys-apps/cpuid-20201006
index ad3e65056a73..f62bb0f83568 100644
--- a/metadata/md5-cache/sys-apps/cpuid-20201006
+++ b/metadata/md5-cache/sys-apps/cpuid-20201006
@@ -4,9 +4,9 @@ DEPEND=app-arch/gzip
 DESCRIPTION=Linux tool to dump x86 CPUID information about the CPUs
 EAPI=7
 HOMEPAGE=http://www.etallen.com/cpuid.html
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=http://www.etallen.com/cpuid/cpuid-20201006.src.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=54db98d9ea4b6feeb43d6fc4dd3ddc45
+_md5_=15a78e9120fa26228f22f14175cbbcc1
diff --git a/metadata/md5-cache/sys-apps/firejail-0.9.64 b/metadata/md5-cache/sys-apps/firejail-0.9.64
index 1e765775c70a..d2ffe645069e 100644
--- a/metadata/md5-cache/sys-apps/firejail-0.9.64
+++ b/metadata/md5-cache/sys-apps/firejail-0.9.64
@@ -4,7 +4,7 @@ DESCRIPTION=Security sandbox for any type of processes
 EAPI=7
 HOMEPAGE=https://firejail.wordpress.com/
 IUSE=X apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +overlayfs +private-home +suid test +userns +whitelist python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-apps/firejail-lts apparmor? ( sys-libs/libapparmor ) contrib? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) dbusproxy? ( sys-apps/xdg-dbus-proxy )
 REQUIRED_USE=contrib? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/netblue30/firejail/releases/download/0.9.64/firejail-0.9.64.tar.xz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=835415412f18b396caf57f4a1b9385c7
+_md5_=aa5e2ac0d06b1921b0527b9d05714385
diff --git a/metadata/md5-cache/sys-apps/grep-3.5 b/metadata/md5-cache/sys-apps/grep-3.5
index ba5585a31181..03edc3386f1a 100644
--- a/metadata/md5-cache/sys-apps/grep-3.5
+++ b/metadata/md5-cache/sys-apps/grep-3.5
@@ -5,10 +5,10 @@ DESCRIPTION=GNU regular expression matcher
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/grep/
 IUSE=nls pcre static
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=!static? ( pcre? ( >=dev-libs/libpcre-7.8-r1 ) ) nls? ( virtual/libintl ) virtual/libiconv
 SLOT=0
 SRC_URI=mirror://gnu/grep/grep-3.5.tar.xz mirror://gentoo/grep-3.5.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a8a50f1ced9f8991d4d0e60cdedd28f0
+_md5_=434074b744ef0c55884e7ff802906f7d
diff --git a/metadata/md5-cache/sys-apps/hw-probe-1.5-r1 b/metadata/md5-cache/sys-apps/hw-probe-1.5-r1
deleted file mode 100644
index d88a25b480c0..000000000000
--- a/metadata/md5-cache/sys-apps/hw-probe-1.5-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DESCRIPTION=A tool to probe for hardware, check it's operability and find drivers
-EAPI=7
-HOMEPAGE=https://github.com/linuxhw/hw-probe/
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-lang/perl dev-perl/Digest-SHA1 net-misc/curl sys-apps/dmidecode sys-apps/edid-decode sys-apps/hwinfo sys-apps/pciutils sys-apps/smartmontools sys-apps/usbutils virtual/perl-Data-Dumper
-SLOT=0
-SRC_URI=https://github.com/linuxhw/hw-probe/archive/1.5.tar.gz -> hw-probe-1.5.tar.gz
-_eclasses_=optfeature	6c9aa35fc16df43d7142ef2660e00e25	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=58da55ccb131eabf19c38e4b5ca86d3b
diff --git a/metadata/md5-cache/sys-apps/hw-probe-1.6_beta2-r1 b/metadata/md5-cache/sys-apps/hw-probe-1.6_beta2-r1
index d2a83c8883ee..d5c98f967119 100644
--- a/metadata/md5-cache/sys-apps/hw-probe-1.6_beta2-r1
+++ b/metadata/md5-cache/sys-apps/hw-probe-1.6_beta2-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install postinst
 DESCRIPTION=A tool to probe for hardware, check it's operability and find drivers
 EAPI=7
 HOMEPAGE=https://github.com/linuxhw/hw-probe/
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-lang/perl dev-perl/Digest-SHA1 net-misc/curl sys-apps/dmidecode sys-apps/edid-decode sys-apps/hwinfo sys-apps/pciutils sys-apps/smartmontools sys-apps/usbutils virtual/perl-Data-Dumper
 SLOT=0
 SRC_URI=https://github.com/linuxhw/hw-probe/archive/1.6-beta.tar.gz -> hw-probe-1.6_beta2.tar.gz
 _eclasses_=optfeature	6c9aa35fc16df43d7142ef2660e00e25	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=d2013e7f1e84f15498cf61f9b26c790a
+_md5_=4bcda92675bc8731fe2180f366e28a6f
diff --git a/metadata/md5-cache/sys-apps/ipmitool-1.8.18_p20201004-r1 b/metadata/md5-cache/sys-apps/ipmitool-1.8.18_p20201004-r1
index 92ec9d4832ab..9b1686908508 100644
--- a/metadata/md5-cache/sys-apps/ipmitool-1.8.18_p20201004-r1
+++ b/metadata/md5-cache/sys-apps/ipmitool-1.8.18_p20201004-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Utility for controlling IPMI enabled devices.
 EAPI=6
 HOMEPAGE=http://ipmitool.sf.net/
 IUSE=libressl openbmc openipmi static
-KEYWORDS=amd64 ~arm64 ~hppa ~ia64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm64 hppa ~ia64 ppc ~ppc64 x86
 LICENSE=BSD
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) openbmc? ( sys-apps/systemd:0= ) sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/ipmitool/ipmitool/archive/7fd7c0f2ba39e223868a8d83d81d4074f057d6fc.tar.gz -> ipmitool-1.8.18_p20201004.tar.gz https://dev.gentoo.org/~robbat2/distfiles/ipmitool_1.8.18-9.debian-ported-gentoo.tar.xz https://dev.gentoo.org/~robbat2/distfiles/enterprise-numbers.2020-10-21.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f8ebe7374cfef61b7fbffd7fd4a12ae7
+_md5_=20ad4f9e4d8b0be1d847253faef407af
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.20 b/metadata/md5-cache/sys-apps/sandbox-2.20
index 792e2c640f26..8d1ee5b966ee 100644
--- a/metadata/md5-cache/sys-apps/sandbox-2.20
+++ b/metadata/md5-cache/sys-apps/sandbox-2.20
@@ -4,9 +4,9 @@ DESCRIPTION=sandbox'd LD_PRELOAD hack
 EAPI=7
 HOMEPAGE=https://www.gentoo.org/proj/en/portage/sandbox/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/sandbox-2.20.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6ff07703879641d040cc8fc52bee7311
+_md5_=24c77627e175686500bbdfef471849ed
diff --git a/metadata/md5-cache/sys-apps/unscd-0.54-r1 b/metadata/md5-cache/sys-apps/unscd-0.54-r1
index f2da89bca887..090c09faaf8d 100644
--- a/metadata/md5-cache/sys-apps/unscd-0.54-r1
+++ b/metadata/md5-cache/sys-apps/unscd-0.54-r1
@@ -4,10 +4,10 @@ DEPEND=sys-libs/glibc[nscd(+)]
 DESCRIPTION=simple & stable nscd replacement
 EAPI=7
 HOMEPAGE=https://busybox.net/~vda/unscd/README
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/glibc[nscd(+)]
 SLOT=0
 SRC_URI=https://busybox.net/~vda/unscd/nscd-0.54.c -> nscd-0.54-r1.c
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d8e52a4d0f5f34b26bc21aff2f5183ee
+_md5_=77afe888bdf33ef3a0b4e55e28fa3ca8
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index b7949d7a1ecd..15c7abaa717b 100644
Binary files a/metadata/md5-cache/sys-auth/Manifest.gz and b/metadata/md5-cache/sys-auth/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-auth/libfprint-1.90.3 b/metadata/md5-cache/sys-auth/libfprint-1.90.3
new file mode 100644
index 000000000000..f9ced6b8974f
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/libfprint-1.90.3
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=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 dev-libs/nss >=dev-libs/libgusb-0.3.1 virtual/libusb:1= x11-libs/gtk+:3 x11-libs/pixman x11-libs/libX11 x11-libs/libXv dev-util/gtk-doc
+DESCRIPTION=library to add support for consumer fingerprint readers
+EAPI=7
+HOMEPAGE=https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint https://gitlab.freedesktop.org/libfprint/libfprint
+IUSE=examples
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/glib:2 dev-libs/nss >=dev-libs/libgusb-0.3.1 virtual/libusb:1= x11-libs/gtk+:3 x11-libs/pixman x11-libs/libX11 x11-libs/libXv
+SLOT=0
+SRC_URI=https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/v1.90.3/libfprint-v1.90.3.tar.gz -> libfprint-1.90.3.tar.gz
+_eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=5c39d7676030ed8ca1d629daac5782bf
diff --git a/metadata/md5-cache/sys-auth/pam_mount-2.16-r2 b/metadata/md5-cache/sys-auth/pam_mount-2.16-r2
index df2b422ee199..a46189cec84b 100644
--- a/metadata/md5-cache/sys-auth/pam_mount-2.16-r2
+++ b/metadata/md5-cache/sys-auth/pam_mount-2.16-r2
@@ -4,9 +4,9 @@ DESCRIPTION=A PAM module that can mount volumes for a user session
 EAPI=7
 HOMEPAGE=http://pam-mount.sourceforge.net
 IUSE=crypt libressl ssl selinux
-KEYWORDS=~amd64 ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/pam-0.99 >=sys-libs/libhx-3.12.1 >=dev-libs/libxml2-2.6 crypt? ( >=sys-fs/cryptsetup-1.1.0:= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) selinux? ( sys-libs/libselinux ) >=sys-apps/util-linux-2.20
 SLOT=0
 SRC_URI=mirror://sourceforge/pam-mount/pam_mount-2.16.tar.xz
-_md5_=4fe7b87f5ae108c82cd9e3893e438b41
+_md5_=a7e271edf188223670b237dfd271428f
diff --git a/metadata/md5-cache/sys-auth/pam_passwdqc-1.3.0 b/metadata/md5-cache/sys-auth/pam_passwdqc-1.3.0
deleted file mode 100644
index bf218a6f4c39..000000000000
--- a/metadata/md5-cache/sys-auth/pam_passwdqc-1.3.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=sys-auth/passwdqc[pam(+)]
-DESCRIPTION=Stub ebuild to help migrate to newer package name
-EAPI=5
-HOMEPAGE=http://www.openwall.com/passwdqc/
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=Openwall BSD public-domain
-RDEPEND=sys-auth/passwdqc[pam(+)]
-SLOT=0
-_md5_=8730e44582ad74465d6c4c409fc31ef0
diff --git a/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.10.3 b/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.10.3
index 8a8db7bf16ee..b3075a499094 100644
--- a/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.10.3
+++ b/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.10.3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
 RDEPEND=sys-libs/pam dev-libs/openssl:0= virtual/ssh
 SLOT=0
-SRC_URI=mirror://sourceforge/pamsshagentauth/pam_ssh_agent_auth/v0.10.3/pam_ssh_agent_auth-0.10.3.tar.bz2
+SRC_URI=mirror://sourceforge/pamsshagentauth/pam_ssh_agent_auth/v0.10.3/pam_ssh_agent_auth-0.10.3.tar.bz2 https://dev.gentoo.org/~juippis/distfiles/tmp/pam_ssh_agent_auth-0.10.3-openssl-1.1.1.patch
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pam	226d8d2ff588bdfd7d188512dbdb189d	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c2a1448739afd9fc81567947c443b594
+_md5_=95fcda1f4d38c5bfd733471be8d6b0d2
diff --git a/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-9999 b/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-9999
index 510d3325cbc9..7f0abd44ac1a 100644
--- a/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-9999
+++ b/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=sys-libs/pam dev-libs/openssl:0= virtual/ssh
 SLOT=0
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pam	226d8d2ff588bdfd7d188512dbdb189d	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ee978b3f21e1d45d106e13e6d03ce06b
+_md5_=95fcda1f4d38c5bfd733471be8d6b0d2
diff --git a/metadata/md5-cache/sys-auth/seatd-0.4.0 b/metadata/md5-cache/sys-auth/seatd-0.4.0
index b49f49280a56..c725f9373a73 100644
--- a/metadata/md5-cache/sys-auth/seatd-0.4.0
+++ b/metadata/md5-cache/sys-auth/seatd-0.4.0
@@ -12,4 +12,4 @@ REQUIRED_USE=?? ( elogind systemd )
 SLOT=0/1
 SRC_URI=https://git.sr.ht/~kennylevinsen/seatd/archive/0.4.0.tar.gz -> seatd-0.4.0.tar.gz
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0230ec5c9698d766df37b97f431fb99e
+_md5_=700922821fc4e223f8d925d6d70627a1
diff --git a/metadata/md5-cache/sys-auth/seatd-9999 b/metadata/md5-cache/sys-auth/seatd-9999
index 11fb9162a738..0df05c3a2a8c 100644
--- a/metadata/md5-cache/sys-auth/seatd-9999
+++ b/metadata/md5-cache/sys-auth/seatd-9999
@@ -11,4 +11,4 @@ RDEPEND=elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0/1
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f312795027cc9d408d9d851e40785716
+_md5_=f6e5782855f489deade10d26b06f43cd
diff --git a/metadata/md5-cache/sys-auth/ykclient-2.15 b/metadata/md5-cache/sys-auth/ykclient-2.15
index ecbc391cad5f..3f6befae974a 100644
--- a/metadata/md5-cache/sys-auth/ykclient-2.15
+++ b/metadata/md5-cache/sys-auth/ykclient-2.15
@@ -1,13 +1,12 @@
-DEFINED_PHASES=-
-DEPEND=>=net-misc/curl-7.21.1
+DEFINED_PHASES=configure install
+DEPEND=net-misc/curl
 DESCRIPTION=Yubico C client library
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/Yubico/yubico-c-client
-IUSE=static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
-RDEPEND=>=net-misc/curl-7.21.1
+RDEPEND=net-misc/curl
 RESTRICT=test
 SLOT=0
 SRC_URI=http://opensource.yubico.com/yubico-c-client/releases/ykclient-2.15.tar.gz
-_md5_=08ff4347542daf4711fc809c4128f9fb
+_md5_=7620e556197936bb3115831e8ac0cf45
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 2108b7085412..fbbe98a4831b 100644
Binary files a/metadata/md5-cache/sys-block/Manifest.gz and b/metadata/md5-cache/sys-block/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-block/libzbc-5.5.1 b/metadata/md5-cache/sys-block/libzbc-5.5.1
index 5ad5a72c6cd0..8f0263190cd3 100644
--- a/metadata/md5-cache/sys-block/libzbc-5.5.1
+++ b/metadata/md5-cache/sys-block/libzbc-5.5.1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure prepare
+DEFINED_PHASES=configure install prepare
 DEPEND=virtual/pkgconfig >=sys-kernel/linux-headers-4.13 gtk? ( x11-libs/gtk+:3 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A library and tools for working with ZBC and ZAC disks
 EAPI=6
@@ -9,4 +9,4 @@ LICENSE=BSD-2 GPL-3 LGPL-3
 SLOT=0
 SRC_URI=https://github.com/hgst/libzbc/archive/v5.5.1.tar.gz -> libzbc-5.5.1.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bebe8b57a011e39c8ba34887a6dd1664
+_md5_=621c15bf0e3262606fd0c880a1b9440c
diff --git a/metadata/md5-cache/sys-block/parted-3.2-r1 b/metadata/md5-cache/sys-block/parted-3.2-r1
deleted file mode 100644
index 3bb094bc70b2..000000000000
--- a/metadata/md5-cache/sys-block/parted-3.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-fs/e2fsprogs-1.27 device-mapper? ( >=sys-fs/lvm2-2.02.45 ) readline? ( >=sys-libs/readline-5.2:0= >=sys-libs/ncurses-5.7-r7:0= ) selinux? ( sys-libs/libselinux ) elibc_uclibc? ( dev-libs/libiconv ) nls? ( >=sys-devel/gettext-0.12.1-r2 ) 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
-DESCRIPTION=Create, destroy, resize, check, copy partitions and file systems
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/parted
-IUSE=+debug device-mapper nls readline selinux static-libs
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=GPL-3
-RDEPEND=>=sys-fs/e2fsprogs-1.27 device-mapper? ( >=sys-fs/lvm2-2.02.45 ) readline? ( >=sys-libs/readline-5.2:0= >=sys-libs/ncurses-5.7-r7:0= ) selinux? ( sys-libs/libselinux ) elibc_uclibc? ( dev-libs/libiconv )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnu/parted/parted-3.2.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3ad6049566e21351163f3923699d2a97
diff --git a/metadata/md5-cache/sys-block/parted-3.2_p23 b/metadata/md5-cache/sys-block/parted-3.2_p23
deleted file mode 100644
index 529814c04087..000000000000
--- a/metadata/md5-cache/sys-block/parted-3.2_p23
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-fs/e2fsprogs-1.27 device-mapper? ( >=sys-fs/lvm2-2.02.45 ) readline? ( >=sys-libs/readline-5.2:0= >=sys-libs/ncurses-5.7-r7:0= ) selinux? ( sys-libs/libselinux ) elibc_uclibc? ( dev-libs/libiconv ) nls? ( >=sys-devel/gettext-0.12.1-r2 ) virtual/pkgconfig
-DESCRIPTION=Create, destroy, resize, check, copy partitions and file systems
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/parted
-IUSE=+debug device-mapper nls readline selinux static-libs
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=>=sys-fs/e2fsprogs-1.27 device-mapper? ( >=sys-fs/lvm2-2.02.45 ) readline? ( >=sys-libs/readline-5.2:0= >=sys-libs/ncurses-5.7-r7:0= ) selinux? ( sys-libs/libselinux ) elibc_uclibc? ( dev-libs/libiconv )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnu/parted/parted-3.2.tar.xz mirror://debian/pool/main/p/parted/parted_3.2-23.debian.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cded5185dddd330b5003bdac842b2216
diff --git a/metadata/md5-cache/sys-block/parted-3.2_p25 b/metadata/md5-cache/sys-block/parted-3.2_p25
deleted file mode 100644
index 589d26144d8a..000000000000
--- a/metadata/md5-cache/sys-block/parted-3.2_p25
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-fs/e2fsprogs-1.27 device-mapper? ( >=sys-fs/lvm2-2.02.45 ) readline? ( >=sys-libs/readline-5.2:0= >=sys-libs/ncurses-5.7-r7:0= ) selinux? ( sys-libs/libselinux ) elibc_uclibc? ( dev-libs/libiconv ) nls? ( >=sys-devel/gettext-0.12.1-r2 ) virtual/pkgconfig
-DESCRIPTION=Create, destroy, resize, check, copy partitions and file systems
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/parted
-IUSE=+debug device-mapper nls readline selinux static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=>=sys-fs/e2fsprogs-1.27 device-mapper? ( >=sys-fs/lvm2-2.02.45 ) readline? ( >=sys-libs/readline-5.2:0= >=sys-libs/ncurses-5.7-r7:0= ) selinux? ( sys-libs/libselinux ) elibc_uclibc? ( dev-libs/libiconv )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnu/parted/parted-3.2.tar.xz mirror://debian/pool/main/p/parted/parted_3.2-25.debian.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=24741f0a4826321b2916c60e2f970c0c
diff --git a/metadata/md5-cache/sys-block/parted-3.3-r2 b/metadata/md5-cache/sys-block/parted-3.3-r2
index 00e4e841eb0e..91ebbac85c29 100644
--- a/metadata/md5-cache/sys-block/parted-3.3-r2
+++ b/metadata/md5-cache/sys-block/parted-3.3-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Create, destroy, resize, check, copy partitions and file systems
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/parted
 IUSE=+debug device-mapper nls readline selinux
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-3
 RDEPEND=>=sys-fs/e2fsprogs-1.27 device-mapper? ( >=sys-fs/lvm2-2.02.45 ) readline? ( >=sys-libs/ncurses-5.7-r7:0= >=sys-libs/readline-5.2:0= ) selinux? ( sys-libs/libselinux ) elibc_uclibc? ( dev-libs/libiconv )
 SLOT=0
 SRC_URI=mirror://gnu/parted/parted-3.3.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e607bd87e9033fb356c2704cd96764c9
+_md5_=b8e947d08e4535f0dc13592b4fd7bd9c
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 9f3cc46e3d16..fbbfd31c303f 100644
Binary files a/metadata/md5-cache/sys-boot/Manifest.gz and b/metadata/md5-cache/sys-boot/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-boot/unetbootin-700 b/metadata/md5-cache/sys-boot/unetbootin-700
index a8c961fb15bb..7f979cb149d5 100644
--- a/metadata/md5-cache/sys-boot/unetbootin-700
+++ b/metadata/md5-cache/sys-boot/unetbootin-700
@@ -5,10 +5,10 @@ DESCRIPTION=UNetbootin installs Linux/BSD distributions to a partition or USB dr
 EAPI=7
 HOMEPAGE=https://github.com/unetbootin/unetbootin
 IUSE=l10n_am l10n_ar l10n_ast l10n_be l10n_bg l10n_bn l10n_ca l10n_cs l10n_da l10n_de l10n_el l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fo l10n_fr l10n_gl l10n_he l10n_hr l10n_hu l10n_id l10n_it l10n_ja l10n_lt l10n_lv l10n_ml l10n_ms l10n_nan l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt-BR l10n_pt l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sr l10n_sv l10n_sw l10n_tr l10n_uk l10n_ur l10n_vi l10n_zh-CN l10n_zh-TW
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 app-arch/p7zip sys-boot/syslinux sys-fs/mtools
 SLOT=0
 SRC_URI=https://github.com/unetbootin/unetbootin/archive/700.tar.gz -> unetbootin-700.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3e050f122560cb689027f53deadebd94
+_md5_=454a3ac624818b90b787f3bcbce3805b
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index d7f88af01d54..7ff6e48025ff 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/ceph-14.2.11 b/metadata/md5-cache/sys-cluster/ceph-14.2.11
index 0a63f241b1f6..743e44fe7be6 100644
--- a/metadata/md5-cache/sys-cluster/ceph-14.2.11
+++ b/metadata/md5-cache/sys-cluster/ceph-14.2.11
@@ -7,10 +7,10 @@ HOMEPAGE=https://ceph.com/
 IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc kafka kerberos ldap libressl lttng +mgr numa +openssl rabbitmq +radosgw +ssl spdk system-boost systemd +tcmalloc test xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~ppc64
 LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
-RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/xmlsec:=[!openssl?,!libressl?] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= openssl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) ssl? ( openssl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) system-boost? ( =dev-libs/boost-1.72*[threads,context,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) 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(-)] app-admin/sudo net-misc/socat sys-apps/gptfdisk >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_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/cherrypy[python_targets_python3_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/flask[python_targets_python3_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/jinja[python_targets_python3_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/pecan[python_targets_python3_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/prettytable[python_targets_python3_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/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_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/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] mgr? ( dev-python/more-itertools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyjwt[python_targets_python3_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/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/routes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] diskprediction? ( python_targets_python3_6? ( <dev-python/scipy-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( <dev-python/scipy-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) sci-libs/scikits_learn[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) virtual/tmpfiles
+RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/xmlsec:=[!openssl?,!libressl?] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= openssl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) ssl? ( openssl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) system-boost? ( =dev-libs/boost-1.72*[threads,context,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) 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(-)] app-admin/sudo net-misc/socat sys-apps/gptfdisk >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_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/cherrypy[python_targets_python3_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/flask[python_targets_python3_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/jinja[python_targets_python3_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/pecan[python_targets_python3_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/prettytable[python_targets_python3_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/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_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/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] mgr? ( dev-python/more-itertools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyjwt[python_targets_python3_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/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/routes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] diskprediction? ( python_targets_python3_6? ( <dev-python/scipy-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( <dev-python/scipy-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) sci-libs/scikit-learn[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) virtual/tmpfiles
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ?? ( jemalloc tcmalloc ) ^^ ( openssl libressl ) diskprediction? ( mgr !python_targets_python3_8 ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw )
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.11.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d6daf1a3fdb9007ee5643e5fdbeb4d43
+_md5_=f69a297fbb0cfbfebfeb2b3123d11112
diff --git a/metadata/md5-cache/sys-cluster/ceph-14.2.11-r1 b/metadata/md5-cache/sys-cluster/ceph-14.2.11-r1
index 7a107aff5ba3..5d68384b8362 100644
--- a/metadata/md5-cache/sys-cluster/ceph-14.2.11-r1
+++ b/metadata/md5-cache/sys-cluster/ceph-14.2.11-r1
@@ -7,10 +7,10 @@ HOMEPAGE=https://ceph.com/
 IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc kafka kerberos ldap libressl lttng +mgr numa +openssl rabbitmq +radosgw +ssl spdk system-boost systemd +tcmalloc test xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~ppc64
 LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
-RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/xmlsec:=[!openssl?,!libressl?] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= openssl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) ssl? ( openssl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) system-boost? ( =dev-libs/boost-1.72*[threads,context,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) 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(-)] app-admin/sudo net-misc/socat sys-apps/gptfdisk >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_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/cherrypy[python_targets_python3_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/flask[python_targets_python3_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/jinja[python_targets_python3_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/pecan[python_targets_python3_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/prettytable[python_targets_python3_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/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_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/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] mgr? ( dev-python/more-itertools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyjwt[python_targets_python3_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/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/routes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] diskprediction? ( python_targets_python3_6? ( <dev-python/scipy-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( <dev-python/scipy-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) sci-libs/scikits_learn[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) virtual/tmpfiles
+RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/xmlsec:=[!openssl?,!libressl?] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= openssl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) ssl? ( openssl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) system-boost? ( =dev-libs/boost-1.72*[threads,context,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) 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(-)] app-admin/sudo net-misc/socat sys-apps/gptfdisk >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_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/cherrypy[python_targets_python3_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/flask[python_targets_python3_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/jinja[python_targets_python3_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/pecan[python_targets_python3_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/prettytable[python_targets_python3_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/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_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/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] mgr? ( dev-python/more-itertools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyjwt[python_targets_python3_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/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/routes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] diskprediction? ( python_targets_python3_6? ( <dev-python/scipy-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( <dev-python/scipy-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) sci-libs/scikit-learn[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) virtual/tmpfiles
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ?? ( jemalloc tcmalloc ) ^^ ( openssl libressl ) diskprediction? ( mgr !python_targets_python3_8 ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw )
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.11.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=45f68c1450a00f8e818868052c6e4369
+_md5_=704b1eec69338717966a65434770e86b
diff --git a/metadata/md5-cache/sys-cluster/ceph-14.2.13 b/metadata/md5-cache/sys-cluster/ceph-14.2.13
index c333cccb2aef..fb3f9274edd9 100644
--- a/metadata/md5-cache/sys-cluster/ceph-14.2.13
+++ b/metadata/md5-cache/sys-cluster/ceph-14.2.13
@@ -7,10 +7,10 @@ HOMEPAGE=https://ceph.com/
 IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc kafka kerberos ldap libressl lttng +mgr numa +openssl rabbitmq +radosgw +ssl spdk system-boost systemd +tcmalloc test xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~ppc64
 LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
-RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/xmlsec:=[!openssl?,!libressl?] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= openssl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) ssl? ( openssl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) system-boost? ( =dev-libs/boost-1.72*[threads,context,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) 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(-)] app-admin/sudo net-misc/socat sys-apps/gptfdisk >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_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/cherrypy[python_targets_python3_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/flask[python_targets_python3_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/jinja[python_targets_python3_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/pecan[python_targets_python3_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/prettytable[python_targets_python3_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/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_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/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] mgr? ( dev-python/more-itertools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyjwt[python_targets_python3_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/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/routes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] diskprediction? ( python_targets_python3_6? ( <dev-python/scipy-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( <dev-python/scipy-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) sci-libs/scikits_learn[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) virtual/tmpfiles
+RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/xmlsec:=[!openssl?,!libressl?] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= openssl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) ssl? ( openssl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) system-boost? ( =dev-libs/boost-1.72*[threads,context,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) 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(-)] app-admin/sudo net-misc/socat sys-apps/gptfdisk >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_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/cherrypy[python_targets_python3_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/flask[python_targets_python3_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/jinja[python_targets_python3_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/pecan[python_targets_python3_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/prettytable[python_targets_python3_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/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_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/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] mgr? ( dev-python/more-itertools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyjwt[python_targets_python3_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/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/routes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] diskprediction? ( python_targets_python3_6? ( <dev-python/scipy-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( <dev-python/scipy-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) sci-libs/scikit-learn[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) virtual/tmpfiles
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ?? ( jemalloc tcmalloc ) ^^ ( openssl libressl ) diskprediction? ( mgr !python_targets_python3_8 ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw )
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.13.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2177a862b9d820dfe86e21723f26c42a
+_md5_=41fd858b33081fdf59659deee60b6778
diff --git a/metadata/md5-cache/sys-cluster/ceph-15.2.4-r3 b/metadata/md5-cache/sys-cluster/ceph-15.2.4-r3
index aa3eed3f6d09..6fc57e92dfba 100644
--- a/metadata/md5-cache/sys-cluster/ceph-15.2.4-r3
+++ b/metadata/md5-cache/sys-cluster/ceph-15.2.4-r3
@@ -7,10 +7,10 @@ HOMEPAGE=https://ceph.com/
 IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc kafka kerberos ldap libressl lttng +mgr numa +openssl pmdk rabbitmq +radosgw rbd-rwl +ssl spdk system-boost systemd +tcmalloc test uring xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
-RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/xmlsec:=[!openssl?,!libressl?] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= openssl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) ssl? ( openssl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) system-boost? ( =dev-libs/boost-1.72*[threads,context,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) 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(-)] app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_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/cherrypy[python_targets_python3_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/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask[python_targets_python3_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/jinja[python_targets_python3_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/pecan[python_targets_python3_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/prettytable[python_targets_python3_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/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_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/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] mgr? ( dev-python/jsonpatch[python_targets_python3_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/more-itertools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyjwt[python_targets_python3_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/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/routes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] diskprediction? ( python_targets_python3_6? ( <dev-python/scipy-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( <dev-python/scipy-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) sci-libs/scikits_learn[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) virtual/tmpfiles
+RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/xmlsec:=[!openssl?,!libressl?] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= openssl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) ssl? ( openssl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) system-boost? ( =dev-libs/boost-1.72*[threads,context,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) 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(-)] app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_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/cherrypy[python_targets_python3_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/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask[python_targets_python3_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/jinja[python_targets_python3_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/pecan[python_targets_python3_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/prettytable[python_targets_python3_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/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_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/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] mgr? ( dev-python/jsonpatch[python_targets_python3_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/more-itertools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyjwt[python_targets_python3_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/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/routes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] diskprediction? ( python_targets_python3_6? ( <dev-python/scipy-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( <dev-python/scipy-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) sci-libs/scikit-learn[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) virtual/tmpfiles
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ?? ( jemalloc tcmalloc ) ^^ ( openssl libressl ) diskprediction? ( mgr !python_targets_python3_8 ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw )
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-15.2.4.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e216171b26c54af5b9306499c5005d5a
+_md5_=c131dff91369f7b74089e08cb0e19f16
diff --git a/metadata/md5-cache/sys-cluster/ceph-15.2.5-r1 b/metadata/md5-cache/sys-cluster/ceph-15.2.5-r1
index 554b3725bebb..333b2d52cc0b 100644
--- a/metadata/md5-cache/sys-cluster/ceph-15.2.5-r1
+++ b/metadata/md5-cache/sys-cluster/ceph-15.2.5-r1
@@ -7,10 +7,10 @@ HOMEPAGE=https://ceph.com/
 IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc kafka kerberos ldap libressl lttng +mgr numa +openssl pmdk rabbitmq +radosgw rbd-rwl +ssl spdk system-boost systemd +tcmalloc test uring xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
-RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/xmlsec:=[!openssl?,!libressl?] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= openssl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) ssl? ( openssl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) system-boost? ( =dev-libs/boost-1.72*[threads,context,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) 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(-)] app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_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/cherrypy[python_targets_python3_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/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask[python_targets_python3_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/jinja[python_targets_python3_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/pecan[python_targets_python3_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/prettytable[python_targets_python3_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/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_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/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] mgr? ( dev-python/jsonpatch[python_targets_python3_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/more-itertools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyjwt[python_targets_python3_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/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/routes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] diskprediction? ( python_targets_python3_6? ( <dev-python/scipy-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( <dev-python/scipy-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) sci-libs/scikits_learn[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) virtual/tmpfiles
+RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/xmlsec:=[!openssl?,!libressl?] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= openssl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) ssl? ( openssl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) system-boost? ( =dev-libs/boost-1.72*[threads,context,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) 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(-)] app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_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/cherrypy[python_targets_python3_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/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask[python_targets_python3_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/jinja[python_targets_python3_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/pecan[python_targets_python3_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/prettytable[python_targets_python3_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/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_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/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] mgr? ( dev-python/jsonpatch[python_targets_python3_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/more-itertools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyjwt[python_targets_python3_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/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/routes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] diskprediction? ( python_targets_python3_6? ( <dev-python/scipy-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( <dev-python/scipy-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) sci-libs/scikit-learn[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) virtual/tmpfiles
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ?? ( jemalloc tcmalloc ) ^^ ( openssl libressl ) diskprediction? ( mgr !python_targets_python3_8 ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw )
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-15.2.5.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=76a4a2f059febbef5dcb2b03d3fe9ca1
+_md5_=af2a0eddf2da0b84208842852592c5bf
diff --git a/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12-r1 b/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12-r1
index 07749d6b74f9..5dda048fa029 100644
--- a/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12-r1
+++ b/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Library pack for Heartbeat / Pacemaker
 EAPI=7
 HOMEPAGE=http://www.linux-ha.org/wiki/Cluster_Glue
 IUSE=doc ipmilan libnet static-libs
-KEYWORDS=~amd64 ~hppa x86
+KEYWORDS=amd64 hppa x86
 LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 app-text/asciidoc app-text/docbook-xml-dtd:4.4 dev-libs/glib:2 dev-libs/libaio dev-libs/libltdl:= dev-libs/libxml2 ipmilan? ( sys-libs/openipmi ) libnet? ( net-libs/libnet:1.1 ) net-misc/curl net-misc/iputils || ( net-misc/netkit-telnetd net-misc/telnet-bsd )
 SLOT=0
 SRC_URI=http://hg.linux-ha.org/glue/archive/glue-1.0.12.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d5b9646bf7391149843c6fbe44ba4867
+_md5_=1acd644655f2695829a9374999804e05
diff --git a/metadata/md5-cache/sys-cluster/galera-26.4.4 b/metadata/md5-cache/sys-cluster/galera-26.4.4
index c04bbb22814c..0df8b49de695 100644
--- a/metadata/md5-cache/sys-cluster/galera-26.4.4
+++ b/metadata/md5-cache/sys-cluster/galera-26.4.4
@@ -5,11 +5,11 @@ DESCRIPTION=Synchronous multi-master replication engine that provides the wsrep
 EAPI=7
 HOMEPAGE=https://galeracluster.com
 IUSE=cpu_flags_x86_sse4_2 garbd test
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 x86
 LICENSE=GPL-2 BSD
 RDEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.41:0=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.4.13/galera-26.4.4/src/galera-26.4.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=81fc35526c5dd0435540f67bf85911a9
+_md5_=b89c680b4ae479f29c000389d9d61889
diff --git a/metadata/md5-cache/sys-cluster/libqb-1.9.0 b/metadata/md5-cache/sys-cluster/libqb-1.9.0
index d11e8d732fd0..4eeadbff11a3 100644
--- a/metadata/md5-cache/sys-cluster/libqb-1.9.0
+++ b/metadata/md5-cache/sys-cluster/libqb-1.9.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/20
 SRC_URI=https://github.com/ClusterLabs/libqb/archive/v1.9.0.tar.gz -> libqb-1.9.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b6b0f10ec30f7ebfbbcaeeba158b801d
+_md5_=c9d3a0252bad234f89e2b2787cea9aea
diff --git a/metadata/md5-cache/sys-cluster/mpich-3.3 b/metadata/md5-cache/sys-cluster/mpich-3.3-r1
similarity index 63%
rename from metadata/md5-cache/sys-cluster/mpich-3.3
rename to metadata/md5-cache/sys-cluster/mpich-3.3-r1
index 928cdddfe571..117396437c2a 100644
--- a/metadata/md5-cache/sys-cluster/mpich-3.3
+++ b/metadata/md5-cache/sys-cluster/mpich-3.3-r1
@@ -1,13 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/libaio-0.3.109-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(-)?] >=sys-apps/hwloc-2.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] romio? ( net-fs/nfs-utils ) dev-lang/perl sys-devel/libtool fortran? ( virtual/fortran ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/libaio-0.3.109-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(-)?] >=sys-apps/hwloc-2.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] romio? ( net-fs/nfs-utils ) dev-lang/perl sys-devel/libtool fortran? ( virtual/fortran ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A high performance and portable MPI implementation
 EAPI=6
 HOMEPAGE=http://www.mpich.org/
-IUSE=+cxx doc fortran mpi-threads romio threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=+cxx doc fortran mpi-threads +romio threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=mpich2
-RDEPEND=>=dev-libs/libaio-0.3.109-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(-)?] >=sys-apps/hwloc-2.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] romio? ( net-fs/nfs-utils ) !sys-cluster/mpich2 !sys-cluster/openmpi !sys-cluster/nullmpi fortran? ( virtual/fortran )
+RDEPEND=>=dev-libs/libaio-0.3.109-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(-)?] >=sys-apps/hwloc-2.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] romio? ( net-fs/nfs-utils ) !sys-cluster/mpich2 !sys-cluster/openmpi !sys-cluster/nullmpi fortran? ( virtual/fortran )
+REQUIRED_USE=mpi-threads? ( threads )
 SLOT=0
 SRC_URI=http://www.mpich.org/static/downloads/3.3/mpich-3.3.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f94521f5b0acf8635925681ac5c78128
+_md5_=19e5e30df2f748fca2badabd87065755
diff --git a/metadata/md5-cache/sys-cluster/torque-6.0.4-r1 b/metadata/md5-cache/sys-cluster/torque-6.0.4-r1
index 370e5cb3ac28..ade7321251d4 100644
--- a/metadata/md5-cache/sys-cluster/torque-6.0.4-r1
+++ b/metadata/md5-cache/sys-cluster/torque-6.0.4-r1
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=torque-2.5
 RDEPEND=sys-libs/zlib sys-libs/readline:0= dev-libs/libxml2 >=dev-libs/boost-1.41 cpusets? ( sys-apps/hwloc ) munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 ) tk? ( dev-lang/tk:0= dev-lang/tcl:0= ) syslog? ( virtual/logger ) !!games-util/qstat crypt? ( net-misc/openssh ) !crypt? ( net-misc/netkit-rsh ) !dev-libs/uthash
 SLOT=0
-SRC_URI=https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e9217cbab1542792d646f59a6.tar.gz -> torque-6.0.4-gh-20170829.tar.gz
+SRC_URI=https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e9217cbab1542792d646f59a6.tar.gz -> torque-6.0.4-gh-20170829.tar.gz https://dev.gentoo.org/~juippis/distfiles/tmp/torque-6.0.4-gcc7.patch
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1edb9c15de636439e79adfda5a337c72
+_md5_=d29ee8dacc1305ceef214ee1962bc7cc
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index f3e7f2ee39b3..00b69b09f828 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/binutils-2.34-r2 b/metadata/md5-cache/sys-devel/binutils-2.34-r2
index 28662c545711..5d8b0eb62916 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.34-r2
+++ b/metadata/md5-cache/sys-devel/binutils-2.34-r2
@@ -5,7 +5,7 @@ DESCRIPTION=Tools necessary to build programs
 EAPI=7
 HOMEPAGE=https://sourceware.org/binutils/
 IUSE=default-gold doc +gold multitarget +nls +plugins static-libs test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-3+
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 REQUIRED_USE=default-gold? ( gold )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2.34
 SRC_URI=mirror://gnu/binutils/binutils-2.34.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.34-patches-6.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnuconfig	f9125410be4c062f2fcefc8ec59fc223	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f9bd7d3a69b228e1661bb492fd4c4c20
+_md5_=dc18a21a831de332a16f3d5aee59535f
diff --git a/metadata/md5-cache/sys-devel/bison-3.7.2 b/metadata/md5-cache/sys-devel/bison-3.7.4
similarity index 75%
rename from metadata/md5-cache/sys-devel/bison-3.7.2
rename to metadata/md5-cache/sys-devel/bison-3.7.4
index af35fd729193..1c809fba531a 100644
--- a/metadata/md5-cache/sys-devel/bison-3.7.2
+++ b/metadata/md5-cache/sys-devel/bison-3.7.4
@@ -8,8 +8,8 @@ IUSE=examples nls static test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=sys-devel/m4-1.4.16 >=sys-devel/gettext-0.21
-RESTRICT=!test? ( test )
+RESTRICT=!test? ( test ) mirror
 SLOT=0
-SRC_URI=mirror://gnu/bison/bison-3.7.2.tar.xz mirror://gentoo/bison-3.7.2-patches-02.tar.xz https://dev.gentoo.org/~whissi/dist/bison/bison-3.7.2-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/dist/bison/bison-3.7.2-patches-02.tar.xz
+SRC_URI=mirror://gnu/bison/bison-3.7.4.tar.xz mirror://gentoo/bison-3.7.3-patches-01.tar.xz https://dev.gentoo.org/~whissi/dist/bison/bison-3.7.3-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/bison/bison-3.7.3-patches-01.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ff391d0e774a8dca5319ea0ba1843b7e
+_md5_=f516ad6cc54f31e92adfe99f4536d9ee
diff --git a/metadata/md5-cache/sys-devel/clang-10.0.1 b/metadata/md5-cache/sys-devel/clang-10.0.1
index 188831e1ddc1..e810b3b2cbe8 100644
--- a/metadata/md5-cache/sys-devel/clang-10.0.1
+++ b/metadata/md5-cache/sys-devel/clang-10.0.1
@@ -12,6 +12,6 @@ RDEPEND=~sys-devel/llvm-10.0.1:10=[debug=,llvm_targets_AArch64?,llvm_targets_AMD
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_AVR )
 RESTRICT=!test? ( test )
 SLOT=10
-SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-10.0.1-manpages.tar.bz2 )
+SRC_URI=https://dev.gentoo.org/~juippis/distfiles/tmp/10.0.1-0003-clang-tools-extra-Prevent-linking-to-duplicate-.a-li.patch https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-10.0.1-manpages.tar.bz2 )
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e5d9cb0f7ac3fe5ffef032424e92a487
+_md5_=6ba082e1284b81af79f35ded6914dca8
diff --git a/metadata/md5-cache/sys-fabric/Manifest.gz b/metadata/md5-cache/sys-fabric/Manifest.gz
index 1ede824580c3..3da38cb56bab 100644
Binary files a/metadata/md5-cache/sys-fabric/Manifest.gz and b/metadata/md5-cache/sys-fabric/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fabric/infiniband-diags-1.6.4 b/metadata/md5-cache/sys-fabric/infiniband-diags-1.6.4
index d7dcccab284f..50747c0d1a87 100644
--- a/metadata/md5-cache/sys-fabric/infiniband-diags-1.6.4
+++ b/metadata/md5-cache/sys-fabric/infiniband-diags-1.6.4
@@ -1,4 +1,4 @@
-DEFINED_PHASES=unpack
+DEFINED_PHASES=configure install unpack
 DEPEND=sys-fabric/libibumad:3.12 sys-fabric/libibmad:3.12 sys-fabric/opensm:3.12 >=app-arch/rpm2targz-9.0.0.3g
 DESCRIPTION=OpenIB diagnostic programs and scripts needed to diagnose an IB subnet
 EAPI=5
@@ -9,4 +9,4 @@ RDEPEND=sys-fabric/libibumad:3.12 sys-fabric/libibmad:3.12 sys-fabric/opensm:3.1
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=92acbe519dd4ecb4ba953924768c0be0
+_md5_=817a03c67dafbe42fecbb607328f3d02
diff --git a/metadata/md5-cache/sys-fabric/libcxgb3-1.3.1-r2 b/metadata/md5-cache/sys-fabric/libcxgb3-1.3.1-r2
index 15f0764c3bb8..03d9f1efd18d 100644
--- a/metadata/md5-cache/sys-fabric/libcxgb3-1.3.1-r2
+++ b/metadata/md5-cache/sys-fabric/libcxgb3-1.3.1-r2
@@ -1,4 +1,4 @@
-DEFINED_PHASES=unpack
+DEFINED_PHASES=configure install unpack
 DEPEND=sys-fabric/libibverbs:3.12 >=app-arch/rpm2targz-9.0.0.3g
 DESCRIPTION=OpenIB - driver for Chelsio T3-based iWARP (RDMA over IP/ethernet)
 EAPI=5
@@ -9,4 +9,4 @@ RDEPEND=sys-fabric/libibverbs:3.12 !sys-fabric/libcxgb3:0 !sys-fabric/libcxgb3:3
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fa3cb8679e25310f4ee503908375c4c3
+_md5_=8a4d256e143a65d37b9b746eb8ff9aff
diff --git a/metadata/md5-cache/sys-fabric/libcxgb4-1.3.2 b/metadata/md5-cache/sys-fabric/libcxgb4-1.3.2
index f83971a5bd72..f22efaa2b4f6 100644
--- a/metadata/md5-cache/sys-fabric/libcxgb4-1.3.2
+++ b/metadata/md5-cache/sys-fabric/libcxgb4-1.3.2
@@ -1,4 +1,4 @@
-DEFINED_PHASES=unpack
+DEFINED_PHASES=configure install unpack
 DEPEND=sys-fabric/libibverbs:3.12 >=app-arch/rpm2targz-9.0.0.3g
 DESCRIPTION=OpenIB - driver for Chelsio T4-based iWARP (RDMA over IP/ethernet)
 EAPI=5
@@ -9,4 +9,4 @@ RDEPEND=sys-fabric/libibverbs:3.12 !sys-fabric/libcxgb4:0 !sys-fabric/libcxgb4:3
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=621772fee1542a2c9762c477abbf9bb0
+_md5_=7f8b15ae7877a1fe2bba51bbd54df0ff
diff --git a/metadata/md5-cache/sys-fabric/libibcm-1.0.5-r3 b/metadata/md5-cache/sys-fabric/libibcm-1.0.5-r3
index e2b87e94c605..226e677f0774 100644
--- a/metadata/md5-cache/sys-fabric/libibcm-1.0.5-r3
+++ b/metadata/md5-cache/sys-fabric/libibcm-1.0.5-r3
@@ -1,4 +1,4 @@
-DEFINED_PHASES=unpack
+DEFINED_PHASES=configure install unpack
 DEPEND=sys-fabric/libibverbs:3.12 >=app-arch/rpm2targz-9.0.0.3g
 DESCRIPTION=OpenIB Userspace CM library
 EAPI=5
@@ -9,4 +9,4 @@ RDEPEND=sys-fabric/libibverbs:3.12 !sys-fabric/libibcm:0 !sys-fabric/libibcm:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=717b23a7fdb41edb8d96de79d20696e4
+_md5_=a0abaab6d8b8ec5a09188931fbd6433c
diff --git a/metadata/md5-cache/sys-fabric/libibmad-1.3.11 b/metadata/md5-cache/sys-fabric/libibmad-1.3.11
index 77d07f55a582..c82d0365a4ce 100644
--- a/metadata/md5-cache/sys-fabric/libibmad-1.3.11
+++ b/metadata/md5-cache/sys-fabric/libibmad-1.3.11
@@ -1,4 +1,4 @@
-DEFINED_PHASES=unpack
+DEFINED_PHASES=configure install unpack
 DEPEND=sys-fabric/libibumad:3.12 >=app-arch/rpm2targz-9.0.0.3g
 DESCRIPTION=OpenIB library provides the API for use interfacing with IB management programs
 EAPI=5
@@ -9,4 +9,4 @@ RDEPEND=sys-fabric/libibumad:3.12 !sys-fabric/libibmad:0 !sys-fabric/libibmad:3.
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d5389de184c4fea08179827ad8b1dd90
+_md5_=0193d5f35a34b20e85836cab9a390993
diff --git a/metadata/md5-cache/sys-fabric/libibumad-1.3.9 b/metadata/md5-cache/sys-fabric/libibumad-1.3.9
index 5034144961b2..3f90aa4d1ae0 100644
--- a/metadata/md5-cache/sys-fabric/libibumad-1.3.9
+++ b/metadata/md5-cache/sys-fabric/libibumad-1.3.9
@@ -1,4 +1,4 @@
-DEFINED_PHASES=unpack
+DEFINED_PHASES=configure install unpack
 DEPEND=sys-fabric/libibverbs:3.12 >=app-arch/rpm2targz-9.0.0.3g
 DESCRIPTION=OpenIB User MAD lib functions which sit on top of the user MAD kernel modules
 EAPI=5
@@ -9,4 +9,4 @@ RDEPEND=sys-fabric/libibverbs:3.12 !sys-fabric/libibumad:0 !sys-fabric/libibumad
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ba04938ff993cdd4d00122280f8037ac
+_md5_=f7933d81975c48e1be27c63e9cfc83fa
diff --git a/metadata/md5-cache/sys-fabric/libipathverbs-1.2.1 b/metadata/md5-cache/sys-fabric/libipathverbs-1.2.1
index 2db46f4d77ff..9717a17a6089 100644
--- a/metadata/md5-cache/sys-fabric/libipathverbs-1.2.1
+++ b/metadata/md5-cache/sys-fabric/libipathverbs-1.2.1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=unpack
+DEFINED_PHASES=configure install unpack
 DEPEND=sys-fabric/libibverbs:3.12 >=app-arch/rpm2targz-9.0.0.3g
 DESCRIPTION=OpenIB userspace driver for the PathScale InfiniBand HCAs
 EAPI=5
@@ -9,4 +9,4 @@ RDEPEND=sys-fabric/libibverbs:3.12 !sys-fabric/libipathverbs:0 !sys-fabric/libip
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=67d99b940226accf00e62c12d3173410
+_md5_=f5c3b8022c98a787d51f977ef47faa49
diff --git a/metadata/md5-cache/sys-fabric/libmlx4-1.0.5 b/metadata/md5-cache/sys-fabric/libmlx4-1.0.5
index 6ebdc7a71a5c..a029b9f969a5 100644
--- a/metadata/md5-cache/sys-fabric/libmlx4-1.0.5
+++ b/metadata/md5-cache/sys-fabric/libmlx4-1.0.5
@@ -1,4 +1,4 @@
-DEFINED_PHASES=unpack
+DEFINED_PHASES=configure install unpack
 DEPEND=sys-fabric/libibverbs:3.12 >=app-arch/rpm2targz-9.0.0.3g
 DESCRIPTION=OpenIB userspace driver for Mellanox ConnectX HCA
 EAPI=5
@@ -9,4 +9,4 @@ RDEPEND=!sys-fabric/openib-userspace !sys-fabric/libmlx4:0 !sys-fabric/libmlx4:3
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=73cf2f8f6adc101ee8dfedc307499c9d
+_md5_=eba193aaa8b63831b3fbb39b77202b2e
diff --git a/metadata/md5-cache/sys-fabric/libmlx5-1.0.1 b/metadata/md5-cache/sys-fabric/libmlx5-1.0.1
index 5c7fbcdce41e..23d796070ab6 100644
--- a/metadata/md5-cache/sys-fabric/libmlx5-1.0.1
+++ b/metadata/md5-cache/sys-fabric/libmlx5-1.0.1
@@ -1,7 +1,7 @@
-DEFINED_PHASES=unpack
+DEFINED_PHASES=configure install prepare unpack
 DEPEND=sys-fabric/libibverbs:3.12 >=app-arch/rpm2targz-9.0.0.3g
 DESCRIPTION=OpenIB userspace driver for Mellanox ConnectIB HCA
-EAPI=5
+EAPI=6
 HOMEPAGE=https://www.openfabrics.org/
 KEYWORDS=amd64 ~x86 ~amd64-linux
 LICENSE=|| ( GPL-2 BSD-2 )
@@ -9,4 +9,4 @@ RDEPEND=!sys-fabric/openib-userspace !sys-fabric/libmlx5:0 !sys-fabric/libmlx5:3
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=902d942e19bb90a7008563b6b8c72c65
+_md5_=ce530c8d3236d09d90e510c91add640e
diff --git a/metadata/md5-cache/sys-fabric/libmthca-1.0.6 b/metadata/md5-cache/sys-fabric/libmthca-1.0.6
index fef0dde92202..c6c60df68f2f 100644
--- a/metadata/md5-cache/sys-fabric/libmthca-1.0.6
+++ b/metadata/md5-cache/sys-fabric/libmthca-1.0.6
@@ -1,4 +1,4 @@
-DEFINED_PHASES=unpack
+DEFINED_PHASES=configure install unpack
 DEPEND=sys-fabric/libibverbs:3.12 >=app-arch/rpm2targz-9.0.0.3g
 DESCRIPTION=OpenIB userspace driver for Mellanox InfiniBand HCAs
 EAPI=5
@@ -9,4 +9,4 @@ RDEPEND=sys-fabric/libibverbs:3.12 !sys-fabric/openib-userspace !sys-fabric/libm
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3987bfbd712f82a66ce0e6b2498baa81
+_md5_=f2394e5e2f8e07a29ecea35a5224e266
diff --git a/metadata/md5-cache/sys-fabric/libocrdma-1.0.2 b/metadata/md5-cache/sys-fabric/libocrdma-1.0.2
index 1ca8c6a735e2..42a539259028 100644
--- a/metadata/md5-cache/sys-fabric/libocrdma-1.0.2
+++ b/metadata/md5-cache/sys-fabric/libocrdma-1.0.2
@@ -1,4 +1,4 @@
-DEFINED_PHASES=unpack
+DEFINED_PHASES=configure install unpack
 DEPEND=sys-fabric/libibverbs:3.12 >=app-arch/rpm2targz-9.0.0.3g
 DESCRIPTION=OpenIB userspace driver for Emulex OneConnect RDMA
 EAPI=5
@@ -9,4 +9,4 @@ RDEPEND=!sys-fabric/openib-userspace !sys-fabric/libocrdma:0 !sys-fabric/libocrd
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bb059b01b4f2697685097193db47563e
+_md5_=fa85489dbfbe9ec10d33db1bf2ccb70d
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 42d4deab1fa9..7362620ae249 100644
Binary files a/metadata/md5-cache/sys-firmware/Manifest.gz and b/metadata/md5-cache/sys-firmware/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20201112_p20201116 b/metadata/md5-cache/sys-firmware/intel-microcode-20201112_p20201116
new file mode 100644
index 000000000000..6ba1425c00ed
--- /dev/null
+++ b/metadata/md5-cache/sys-firmware/intel-microcode-20201112_p20201116
@@ -0,0 +1,15 @@
+BDEPEND=>=sys-apps/iucode_tool-2.3
+DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup
+DESCRIPTION=Intel IA32/IA64 microcode update data
+EAPI=7
+HOMEPAGE=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/
+IUSE=hostonly initramfs +split-ucode vanilla kernel_linux
+KEYWORDS=-* amd64 x86
+LICENSE=intel-ucode
+RDEPEND=hostonly? ( sys-apps/iucode_tool )
+REQUIRED_USE=|| ( initramfs split-ucode )
+RESTRICT=binchecks bindist mirror strip
+SLOT=0
+SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20201112.tar.gz https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20201116.tar.xz
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=07ade4d29f5a4213666e5f2aefe8d734
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index e7a516923003..a1a9afe83185 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/clamfs-1.2.0 b/metadata/md5-cache/sys-fs/clamfs-1.2.0
index f37dd0d9214e..2dbe54944cbb 100644
--- a/metadata/md5-cache/sys-fs/clamfs-1.2.0
+++ b/metadata/md5-cache/sys-fs/clamfs-1.2.0
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/boost-1.33 dev-libs/poco dev-libs/rlog sys-fs/fuse:3 app-anti
 SLOT=0
 SRC_URI=https://github.com/burghardt/clamfs/releases/download/clamfs-1.2.0/clamfs-1.2.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=86f684decb50d3d2d069d40a62d7a006
+_md5_=d4628148acabb95daf37eb3f5d0d1b4a
diff --git a/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r4 b/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r4
index bdda5d5c00c1..30381534a0a3 100644
--- a/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r4
+++ b/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r4
@@ -4,10 +4,10 @@ DESCRIPTION=HFS and HFS+ utils ported from OSX, supplies mkfs and fsck
 EAPI=7
 HOMEPAGE=http://opendarwin.org
 IUSE=libressl
-KEYWORDS=~amd64 ~arm ppc ppc64 x86
+KEYWORDS=amd64 ~arm ppc ppc64 x86
 LICENSE=APSL-2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
 SRC_URI=http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-332.14.tar.gz mirror://gentoo/diskdev_cmds-332.14_p1.patch.bz2
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a3d088d4972966a8de8ae5f6167e45b6
+_md5_=65929f6a23bb55f6bb37ab86f0b698a9
diff --git a/metadata/md5-cache/sys-fs/dislocker-0.7.1-r3 b/metadata/md5-cache/sys-fs/dislocker-0.7.1-r3
index 7b8c9e15c873..4c03f4b4a2ce 100644
--- a/metadata/md5-cache/sys-fs/dislocker-0.7.1-r3
+++ b/metadata/md5-cache/sys-fs/dislocker-0.7.1-r3
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-fs/fuse:0= net-libs/mbedtls:0= ruby? ( dev-lang/ruby:* )
 SLOT=0
-SRC_URI=https://github.com/Aorimn/dislocker/archive/v0.7.1.tar.gz -> dislocker-0.7.1.tar.gz
+SRC_URI=https://github.com/Aorimn/dislocker/archive/v0.7.1.tar.gz -> dislocker-0.7.1.tar.gz https://dev.gentoo.org/~juippis/distfiles/tmp/dislocker-0.7.1-fix-find-ruby.patch
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=daa74b891c737acf04e8724cb7fc003a
+_md5_=490cecf285fcb931a39b80593572ba7b
diff --git a/metadata/md5-cache/sys-fs/dislocker-9999 b/metadata/md5-cache/sys-fs/dislocker-9999
index bec7fc6285b8..0558b894c392 100644
--- a/metadata/md5-cache/sys-fs/dislocker-9999
+++ b/metadata/md5-cache/sys-fs/dislocker-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=sys-fs/fuse:0= net-libs/mbedtls:0= ruby? ( dev-lang/ruby:* )
 SLOT=0
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=daa74b891c737acf04e8724cb7fc003a
+_md5_=490cecf285fcb931a39b80593572ba7b
diff --git a/metadata/md5-cache/sys-fs/fatsort-1.6.3.622 b/metadata/md5-cache/sys-fs/fatsort-1.6.3.622
index bba3fba93ee6..68077caa2559 100644
--- a/metadata/md5-cache/sys-fs/fatsort-1.6.3.622
+++ b/metadata/md5-cache/sys-fs/fatsort-1.6.3.622
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile prepare test
 DESCRIPTION=Sorts files on FAT16/32 partitions, ideal for basic audio players
 EAPI=7
 HOMEPAGE=http://fatsort.sourceforge.net/
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/fatsort/fatsort-1.6.3.622.tar.xz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a57ef90d70d877697142d78309080041
+_md5_=2a1820ce0258b33b537f08f7fd554b90
diff --git a/metadata/md5-cache/sys-fs/inotify-tools-3.20.11.0 b/metadata/md5-cache/sys-fs/inotify-tools-3.20.11.0
new file mode 100644
index 000000000000..a7302914ed7f
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/inotify-tools-3.20.11.0
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=doc? ( app-doc/doxygen )
+DESCRIPTION=a set of command-line programs providing a simple interface to inotify
+EAPI=7
+HOMEPAGE=https://github.com/inotify-tools/inotify-tools
+IUSE=doc
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/inotify-tools/inotify-tools/archive/3.20.11.0.tar.gz -> inotify-tools-3.20.11.0.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6ead840d08925da5dd2fc65ff73466cc
diff --git a/metadata/md5-cache/sys-fs/inotify-tools-3.20.2.2 b/metadata/md5-cache/sys-fs/inotify-tools-3.20.2.2
index d86b80c8e510..958dc79f71e8 100644
--- a/metadata/md5-cache/sys-fs/inotify-tools-3.20.2.2
+++ b/metadata/md5-cache/sys-fs/inotify-tools-3.20.2.2
@@ -5,9 +5,9 @@ DESCRIPTION=a set of command-line programs providing a simple interface to inoti
 EAPI=7
 HOMEPAGE=https://github.com/inotify-tools/inotify-tools
 IUSE=doc
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~mips ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/inotify-tools/inotify-tools/archive/3.20.2.2.tar.gz -> inotify-tools-3.20.2.2.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4ccd9f3b6c6d657e1e45294acac37121
+_md5_=438ae487a0a791b2020a831d763db300
diff --git a/metadata/md5-cache/sys-fs/multipath-tools-0.8.5 b/metadata/md5-cache/sys-fs/multipath-tools-0.8.5
new file mode 100644
index 000000000000..92bad55f948f
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/multipath-tools-0.8.5
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare setup unpack
+DEPEND=dev-libs/json-c:= dev-libs/libaio dev-libs/userspace-rcu:= >=sys-fs/lvm2-2.02.45 >=virtual/libudev-232-r3 sys-libs/readline:0= rbd? ( sys-cluster/ceph ) systemd? ( sys-apps/systemd )
+DESCRIPTION=Device mapper target autoconfig
+EAPI=7
+HOMEPAGE=http://christophe.varoqui.free.fr/
+IUSE=systemd rbd kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/json-c:= dev-libs/libaio dev-libs/userspace-rcu:= >=sys-fs/lvm2-2.02.45 >=virtual/libudev-232-r3 sys-libs/readline:0= rbd? ( sys-cluster/ceph ) systemd? ( sys-apps/systemd )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.8.5;sf=tgz -> multipath-tools-0.8.5.tar.gz
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_md5_=c381278a14b53f0a5ddae1459d1dede9
diff --git a/metadata/md5-cache/sys-fs/zfs-2.0.0_rc5-r1 b/metadata/md5-cache/sys-fs/zfs-2.0.0_rc5-r1
deleted file mode 100644
index c17c3d24ec0c..000000000000
--- a/metadata/md5-cache/sys-fs/zfs-2.0.0_rc5-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/awk virtual/pkgconfig nls? ( sys-devel/gettext ) python? ( dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) >=app-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 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) !minimal? ( 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(-)] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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=Userland utilities for ZFS Linux kernel module
-EAPI=7
-HOMEPAGE=https://github.com/openzfs/zfs
-IUSE=custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 kernel_linux split-usr
-KEYWORDS=~amd64 ~arm64 ~ppc64
-LICENSE=BSD-2 CDDL MIT
-RDEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) !minimal? ( 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(-)] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-2.0.0_rc5 ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-kernel/genkernel-3.5.1.1 ) test-suite? ( sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps )
-REQUIRED_USE=!minimal? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) ) python? ( !minimal ) test-suite? ( !minimal )
-RESTRICT=test
-SLOT=0/4
-SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.0.0-rc5/zfs-2.0.0-rc5.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	226d8d2ff588bdfd7d188512dbdb189d	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9523a2898905a729b62973baae8d02dc
diff --git a/metadata/md5-cache/sys-fs/zfs-9999 b/metadata/md5-cache/sys-fs/zfs-9999
index 2782fd5d9fb7..558529e61994 100644
--- a/metadata/md5-cache/sys-fs/zfs-9999
+++ b/metadata/md5-cache/sys-fs/zfs-9999
@@ -1,15 +1,15 @@
-BDEPEND=virtual/awk virtual/pkgconfig nls? ( sys-devel/gettext ) python? ( dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) >=app-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 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/awk virtual/pkgconfig nls? ( sys-devel/gettext ) python? ( dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) >=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 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) !minimal? ( 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(-)] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) kernel_linux? ( sys-apps/kmod[tools] ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) !minimal? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) kernel_linux? ( sys-apps/kmod[tools] ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
 DESCRIPTION=Userland utilities for ZFS Linux kernel module
 EAPI=7
 HOMEPAGE=https://github.com/openzfs/zfs
-IUSE=custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 kernel_linux split-usr kernel_linux kernel_linux
+IUSE=custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 kernel_linux split-usr kernel_linux kernel_linux
 LICENSE=BSD-2 CDDL MIT
 PROPERTIES=live
-RDEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) !minimal? ( 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(-)] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-9999 ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-kernel/genkernel-3.5.1.1 ) test-suite? ( sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps ) kernel_linux? ( sys-apps/kmod[tools] )
-REQUIRED_USE=!minimal? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) ) python? ( !minimal ) test-suite? ( !minimal )
+RDEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) !minimal? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-9999 ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-kernel/genkernel-3.5.1.1 ) test-suite? ( sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps ) kernel_linux? ( sys-apps/kmod[tools] )
+REQUIRED_USE=!minimal? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) ) python? ( !minimal ) test-suite? ( !minimal )
 RESTRICT=test
 SLOT=0/4
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	226d8d2ff588bdfd7d188512dbdb189d	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9523a2898905a729b62973baae8d02dc
+_md5_=497896e8e1f62391c142fae1410b7a7a
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-2.0.0_rc5 b/metadata/md5-cache/sys-fs/zfs-kmod-2.0.0_rc5
deleted file mode 100644
index b69983368210..000000000000
--- a/metadata/md5-cache/sys-fs/zfs-kmod-2.0.0_rc5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/awk >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=kernel_linux? ( sys-apps/kmod[tools] ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
-EAPI=7
-HOMEPAGE=https://github.com/openzfs/zfs
-IUSE=custom-cflags debug +rootfs kernel_linux kernel_linux
-KEYWORDS=~amd64 ~arm64 ~ppc64
-LICENSE=CDDL MIT debug? ( GPL-2+ )
-RDEPEND=!sys-kernel/spl kernel_linux? ( sys-apps/kmod[tools] )
-RESTRICT=debug? ( strip ) test
-SLOT=0
-SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.0.0-rc5/zfs-2.0.0-rc5.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8e4b610dbf04fabfd99710b1490766a9
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index e75ad6ff1773..feecc1d260cb 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.72 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.72
index ded13f2036ca..7f089985a209 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.72
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.72
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/vanilla-kernel:5.4.72 !sys-kernel/vanilla-kernel-bin:5.4.72
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.72
 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-73.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-73.extras.tar.xz 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	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	042733ebde23be39ae073ec82458bcb0	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=21431a8d51140642aa3737b047c27ad1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.73 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.73
deleted file mode 100644
index 5ebdfd4054dd..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.73
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel:5.4.73 !sys-kernel/vanilla-kernel-bin:5.4.73 || ( 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.73
-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-74.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-74.extras.tar.xz 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	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ce9b00d2a221f54ba0f3676bfc5f315b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.74 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.74
deleted file mode 100644
index e677e4dc37e4..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.74
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel:5.4.74 !sys-kernel/vanilla-kernel-bin:5.4.74 || ( 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.74
-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-75.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-75.extras.tar.xz 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	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ce9b00d2a221f54ba0f3676bfc5f315b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.76 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.76
deleted file mode 100644
index 3b65f1c1300b..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.76
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel:5.4.76 !sys-kernel/vanilla-kernel-bin:5.4.76 || ( 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.76
-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-77.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-77.extras.tar.xz 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	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ce9b00d2a221f54ba0f3676bfc5f315b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.77 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.77
index ef97fda444e6..8350a1a3ddc3 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.77
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.77
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/vanilla-kernel:5.4.77 !sys-kernel/vanilla-kernel-bin:5.4.77
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.77
 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-78.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-78.extras.tar.xz 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	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	042733ebde23be39ae073ec82458bcb0	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ce9b00d2a221f54ba0f3676bfc5f315b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.75 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.77-r1
similarity index 55%
rename from metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.75
rename to metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.77-r1
index 194d21627c45..956de12b078f 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.75
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.77-r1
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kernel.org/
 IUSE=debug savedconfig +initramfs test
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel:5.4.75 !sys-kernel/vanilla-kernel-bin:5.4.75 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RDEPEND=!sys-kernel/vanilla-kernel:5.4.77 !sys-kernel/vanilla-kernel-bin:5.4.77 || ( 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.75
-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-76.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-76.extras.tar.xz 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	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ce9b00d2a221f54ba0f3676bfc5f315b
+SLOT=5.4.77
+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-78.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-78.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	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6e3e262157fa61eec5c26df11c5d9c70
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.16 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.16
deleted file mode 100644
index 585c5a42b8a0..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.16
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel:5.8.16 !sys-kernel/vanilla-kernel-bin:5.8.16 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.16
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-19.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-19.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.5 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.5 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.8.5 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.5 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d212fbc8495cd9e8c7e3bc55776788f7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.17 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.17
deleted file mode 100644
index af9678e020af..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.17
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel:5.8.17 !sys-kernel/vanilla-kernel-bin:5.8.17 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.17
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-20.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-20.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.5 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.5 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.8.5 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.5 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d212fbc8495cd9e8c7e3bc55776788f7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.18 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.18
deleted file mode 100644
index c84c501bd0fc..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.18
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel:5.8.18 !sys-kernel/vanilla-kernel-bin:5.8.18 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.18
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-21.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-21.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.5 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.5 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.8.5 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.5 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d212fbc8495cd9e8c7e3bc55776788f7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.1
deleted file mode 100644
index e06e4c6ba03b..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel:5.9.1 !sys-kernel/vanilla-kernel-bin:5.9.1 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.9.1
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-2.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-2.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/aa6d9438d030fa4682d5d450481085c901503da5/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.9.0 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/aa6d9438d030fa4682d5d450481085c901503da5/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.9.0 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/aa6d9438d030fa4682d5d450481085c901503da5/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.9.0 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/aa6d9438d030fa4682d5d450481085c901503da5/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.9.0 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2dd6e37137e6001df6ab30535126da92
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.3 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.3
deleted file mode 100644
index a801b09b3844..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel:5.9.3 !sys-kernel/vanilla-kernel-bin:5.9.3 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.9.3
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-4.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-4.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.9.2 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.9.2 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.9.2 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.9.2 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=84b3ac572741ffcf55bd650d5f000d06
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.4 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.4
deleted file mode 100644
index cee5ed1d54a4..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel:5.9.4 !sys-kernel/vanilla-kernel-bin:5.9.4 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.9.4
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-5.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-5.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.9.2 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.9.2 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.9.2 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.9.2 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=84b3ac572741ffcf55bd650d5f000d06
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.6 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.6
deleted file mode 100644
index ddefcae41c84..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel:5.9.6 !sys-kernel/vanilla-kernel-bin:5.9.6 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.9.6
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-6.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-6.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.9.2 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.9.2 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.9.2 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.9.2 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e4afae92eb3f3ba15fa5e69d8e5601ed
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.7 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.7
deleted file mode 100644
index 36a5edffda95..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel:5.9.7 !sys-kernel/vanilla-kernel-bin:5.9.7 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.9.7
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-7.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-7.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.9.2 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.9.2 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.9.2 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.9.2 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e4afae92eb3f3ba15fa5e69d8e5601ed
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.8 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.8
index d4edc78c0d68..7d5ada026823 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.8
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.8
@@ -11,5 +11,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.9.8
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-8.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-8.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.9.2 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.9.2 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.9.2 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.9.2 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	042733ebde23be39ae073ec82458bcb0	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e4afae92eb3f3ba15fa5e69d8e5601ed
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.2 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.8-r1
similarity index 52%
rename from metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.2
rename to metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.8-r1
index f31375cb5e3b..c70423f3bd98 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.2
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.8-r1
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.kernel.org/
 IUSE=debug savedconfig +initramfs test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel:5.9.2 !sys-kernel/vanilla-kernel-bin:5.9.2 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RDEPEND=!sys-kernel/vanilla-kernel:5.9.8 !sys-kernel/vanilla-kernel-bin:5.9.8 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
 REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.9.2
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-3.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-3.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.9.2 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.9.2 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.9.2 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.9.2 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=84b3ac572741ffcf55bd650d5f000d06
+SLOT=5.9.8
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-8.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-8.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.9.8-r1.tar.gz -> gentoo-kernel-config-5.9.8-r1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.9.2 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.9.2 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.9.2 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.9.2 )
+_eclasses_=kernel-build	042733ebde23be39ae073ec82458bcb0	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3bb6b661289c30af426aafc1ca21e58c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.73 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.73
deleted file mode 100644
index 8964ac7f74a4..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.73
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.73 !sys-kernel/vanilla-kernel:5.4.73 !sys-kernel/vanilla-kernel-bin:5.4.73 || ( 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.73
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.73-1.xpak -> gentoo-kernel-5.4.73-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.73-1.xpak -> gentoo-kernel-5.4.73-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a20bdd6958940f81fa50e2ccd2ec6d97
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.73-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.73-r1
deleted file mode 100644
index e68471dad9f4..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.73-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.73 !sys-kernel/vanilla-kernel:5.4.73 !sys-kernel/vanilla-kernel-bin:5.4.73 || ( 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.73
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.73-1.xpak -> gentoo-kernel-5.4.73-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.73-1.xpak -> gentoo-kernel-5.4.73-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.73-1.xpak -> gentoo-kernel-5.4.73-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a233ac0f8da53036540d5f704213ef4e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.74 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.74
deleted file mode 100644
index e90e023ee5dc..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.74
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.74 !sys-kernel/vanilla-kernel:5.4.74 !sys-kernel/vanilla-kernel-bin:5.4.74 || ( 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.74
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.74-1.xpak -> gentoo-kernel-5.4.74-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.74-1.xpak -> gentoo-kernel-5.4.74-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a20bdd6958940f81fa50e2ccd2ec6d97
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.74-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.74-r1
deleted file mode 100644
index 2d4960c9fd89..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.74-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.74 !sys-kernel/vanilla-kernel:5.4.74 !sys-kernel/vanilla-kernel-bin:5.4.74 || ( 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.74
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.74-1.xpak -> gentoo-kernel-5.4.74-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.74-1.xpak -> gentoo-kernel-5.4.74-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.74-1.xpak -> gentoo-kernel-5.4.74-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a233ac0f8da53036540d5f704213ef4e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.75 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.75
deleted file mode 100644
index 3b22f1240184..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.75
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.75 !sys-kernel/vanilla-kernel:5.4.75 !sys-kernel/vanilla-kernel-bin:5.4.75 || ( 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.75
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.75-1.xpak -> gentoo-kernel-5.4.75-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.75-1.xpak -> gentoo-kernel-5.4.75-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a20bdd6958940f81fa50e2ccd2ec6d97
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.76 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.76
deleted file mode 100644
index f1cd9c533c1e..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.76
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.76 !sys-kernel/vanilla-kernel:5.4.76 !sys-kernel/vanilla-kernel-bin:5.4.76 || ( 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.76
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.76-1.xpak -> gentoo-kernel-5.4.76-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.76-1.xpak -> gentoo-kernel-5.4.76-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a20bdd6958940f81fa50e2ccd2ec6d97
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.76-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.76-r1
deleted file mode 100644
index 9b711023ee02..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.76-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.76 !sys-kernel/vanilla-kernel:5.4.76 !sys-kernel/vanilla-kernel-bin:5.4.76 || ( 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.76
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.76-1.xpak -> gentoo-kernel-5.4.76-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.76-1.xpak -> gentoo-kernel-5.4.76-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.76-1.xpak -> gentoo-kernel-5.4.76-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a233ac0f8da53036540d5f704213ef4e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.77 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.77
index 5a8f3d839861..7923ab40ccbe 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.77
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.77
@@ -4,11 +4,11 @@ DESCRIPTION=Pre-built Linux kernel with genpatches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
 IUSE=+initramfs test
-KEYWORDS=~arm64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-kernel/gentoo-kernel:5.4.77 !sys-kernel/vanilla-kernel:5.4.77 !sys-kernel/vanilla-kernel-bin:5.4.77 || ( 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.77
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.77-1.xpak -> gentoo-kernel-5.4.77-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.77-1.xpak -> gentoo-kernel-5.4.77-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.77-1.xpak -> gentoo-kernel-5.4.77-1.x86.xpak )
+SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.77-1.xpak -> gentoo-kernel-5.4.77-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.77-1.xpak -> gentoo-kernel-5.4.77-1.x86.xpak )
 _eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a233ac0f8da53036540d5f704213ef4e
+_md5_=a20bdd6958940f81fa50e2ccd2ec6d97
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.75-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.77-r1
similarity index 74%
rename from metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.75-r1
rename to metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.77-r1
index c0ed8b3e54dc..5a8f3d839861 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.75-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.77-r1
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kernel.org/
 IUSE=+initramfs test
 KEYWORDS=~arm64
 LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.75 !sys-kernel/vanilla-kernel:5.4.75 !sys-kernel/vanilla-kernel-bin:5.4.75 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.77 !sys-kernel/vanilla-kernel:5.4.77 !sys-kernel/vanilla-kernel-bin:5.4.77 || ( 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.75
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.75-1.xpak -> gentoo-kernel-5.4.75-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.75-1.xpak -> gentoo-kernel-5.4.75-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.75-1.xpak -> gentoo-kernel-5.4.75-1.x86.xpak )
+SLOT=5.4.77
+SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.77-1.xpak -> gentoo-kernel-5.4.77-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.77-1.xpak -> gentoo-kernel-5.4.77-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.77-1.xpak -> gentoo-kernel-5.4.77-1.x86.xpak )
 _eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a233ac0f8da53036540d5f704213ef4e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.16 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.16
deleted file mode 100644
index dda16e2cce75..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.16
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.8.16 !sys-kernel/vanilla-kernel:5.8.16 !sys-kernel/vanilla-kernel-bin:5.8.16 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.16
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.16-1.xpak -> gentoo-kernel-5.8.16-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.16-1.xpak -> gentoo-kernel-5.8.16-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c800f5811a862c7ceb508cd4162b9fe7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.16-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.16-r1
deleted file mode 100644
index 8dac196e8f65..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.16-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.8.16 !sys-kernel/vanilla-kernel:5.8.16 !sys-kernel/vanilla-kernel-bin:5.8.16 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.16
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.16-1.xpak -> gentoo-kernel-5.8.16-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.16-1.xpak -> gentoo-kernel-5.8.16-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.16-1.xpak -> gentoo-kernel-5.8.16-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3806e2ed456ede6d96c872a75f7d1e0b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.17 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.17
deleted file mode 100644
index 97a3cabe128f..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.17
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.8.17 !sys-kernel/vanilla-kernel:5.8.17 !sys-kernel/vanilla-kernel-bin:5.8.17 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.17
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.17-1.xpak -> gentoo-kernel-5.8.17-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.17-1.xpak -> gentoo-kernel-5.8.17-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c800f5811a862c7ceb508cd4162b9fe7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.17-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.17-r1
deleted file mode 100644
index ab4d100ae283..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.17-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.8.17 !sys-kernel/vanilla-kernel:5.8.17 !sys-kernel/vanilla-kernel-bin:5.8.17 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.17
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.17-1.xpak -> gentoo-kernel-5.8.17-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.17-1.xpak -> gentoo-kernel-5.8.17-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.17-1.xpak -> gentoo-kernel-5.8.17-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3806e2ed456ede6d96c872a75f7d1e0b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.18 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.18
deleted file mode 100644
index 2fa99e7d4c92..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.18
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.8.18 !sys-kernel/vanilla-kernel:5.8.18 !sys-kernel/vanilla-kernel-bin:5.8.18 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.18
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.18-1.xpak -> gentoo-kernel-5.8.18-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.18-1.xpak -> gentoo-kernel-5.8.18-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c800f5811a862c7ceb508cd4162b9fe7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.18-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.18-r1
deleted file mode 100644
index 10c8525206b8..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.18-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.8.18 !sys-kernel/vanilla-kernel:5.8.18 !sys-kernel/vanilla-kernel-bin:5.8.18 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.18
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.18-1.xpak -> gentoo-kernel-5.8.18-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.18-1.xpak -> gentoo-kernel-5.8.18-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.18-1.xpak -> gentoo-kernel-5.8.18-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3806e2ed456ede6d96c872a75f7d1e0b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.1
deleted file mode 100644
index 57e1693e2554..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.9.1 !sys-kernel/vanilla-kernel:5.9.1 !sys-kernel/vanilla-kernel-bin:5.9.1 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.9.1
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.1-1.xpak -> gentoo-kernel-5.9.1-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.1-1.xpak -> gentoo-kernel-5.9.1-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c800f5811a862c7ceb508cd4162b9fe7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.1-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.1-r1
deleted file mode 100644
index 5312c1548991..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.9.1 !sys-kernel/vanilla-kernel:5.9.1 !sys-kernel/vanilla-kernel-bin:5.9.1 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.9.1
-SRC_URI=arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.1-1.xpak -> gentoo-kernel-5.9.1-1.arm64.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1c986217f742976ad581aba3fa686aaa
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.2 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.2
deleted file mode 100644
index 14c15dd9b3fc..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.9.2 !sys-kernel/vanilla-kernel:5.9.2 !sys-kernel/vanilla-kernel-bin:5.9.2 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.9.2
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.2-1.xpak -> gentoo-kernel-5.9.2-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.2-1.xpak -> gentoo-kernel-5.9.2-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c800f5811a862c7ceb508cd4162b9fe7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.2-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.2-r1
deleted file mode 100644
index 3a6804f2371a..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.9.2 !sys-kernel/vanilla-kernel:5.9.2 !sys-kernel/vanilla-kernel-bin:5.9.2 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.9.2
-SRC_URI=arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.2-1.xpak -> gentoo-kernel-5.9.2-1.arm64.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1c986217f742976ad581aba3fa686aaa
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.3 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.3
deleted file mode 100644
index 46350ad8cef2..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.9.3 !sys-kernel/vanilla-kernel:5.9.3 !sys-kernel/vanilla-kernel-bin:5.9.3 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.9.3
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.3-1.xpak -> gentoo-kernel-5.9.3-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.3-1.xpak -> gentoo-kernel-5.9.3-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c800f5811a862c7ceb508cd4162b9fe7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.3-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.3-r1
deleted file mode 100644
index ef506dff4489..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.9.3 !sys-kernel/vanilla-kernel:5.9.3 !sys-kernel/vanilla-kernel-bin:5.9.3 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.9.3
-SRC_URI=arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.3-1.xpak -> gentoo-kernel-5.9.3-1.arm64.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1c986217f742976ad581aba3fa686aaa
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.4 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.4
deleted file mode 100644
index d6b0e5419717..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.9.4 !sys-kernel/vanilla-kernel:5.9.4 !sys-kernel/vanilla-kernel-bin:5.9.4 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.9.4
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.4-1.xpak -> gentoo-kernel-5.9.4-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.4-1.xpak -> gentoo-kernel-5.9.4-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c800f5811a862c7ceb508cd4162b9fe7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.4-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.4-r1
deleted file mode 100644
index 4de91fd48164..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.9.4 !sys-kernel/vanilla-kernel:5.9.4 !sys-kernel/vanilla-kernel-bin:5.9.4 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.9.4
-SRC_URI=arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.4-1.xpak -> gentoo-kernel-5.9.4-1.arm64.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1c986217f742976ad581aba3fa686aaa
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.6 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.6
deleted file mode 100644
index c87dc9e72080..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.9.6 !sys-kernel/vanilla-kernel:5.9.6 !sys-kernel/vanilla-kernel-bin:5.9.6 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.9.6
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.6-1.xpak -> gentoo-kernel-5.9.6-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.6-1.xpak -> gentoo-kernel-5.9.6-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c800f5811a862c7ceb508cd4162b9fe7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.6-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.6-r1
deleted file mode 100644
index 334016759b54..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.9.6 !sys-kernel/vanilla-kernel:5.9.6 !sys-kernel/vanilla-kernel-bin:5.9.6 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.9.6
-SRC_URI=arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.6-1.xpak -> gentoo-kernel-5.9.6-1.arm64.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1c986217f742976ad581aba3fa686aaa
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.7 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.7
deleted file mode 100644
index 26f8168a7e6c..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.9.7 !sys-kernel/vanilla-kernel:5.9.7 !sys-kernel/vanilla-kernel-bin:5.9.7 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.9.7
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.7-1.xpak -> gentoo-kernel-5.9.7-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.7-1.xpak -> gentoo-kernel-5.9.7-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c800f5811a862c7ceb508cd4162b9fe7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.7-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.7-r1
deleted file mode 100644
index f4566c371e8c..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.9.7 !sys-kernel/vanilla-kernel:5.9.7 !sys-kernel/vanilla-kernel-bin:5.9.7 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.9.7
-SRC_URI=arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.7-1.xpak -> gentoo-kernel-5.9.7-1.arm64.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1c986217f742976ad581aba3fa686aaa
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.198 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.198
deleted file mode 100644
index f33bbf40d135..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.198
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=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.198
-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-208.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-208.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-208.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-208.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-208.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-208.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-208.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-208.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-208.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a9c130984f6b374650cd454d84998797
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.146 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.146
deleted file mode 100644
index a1de005b88fc..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.146
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=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.146
-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-145.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-145.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-145.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-145.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-145.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-145.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-145.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-145.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-145.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9d8cf40e05ebc737f90df645261cc64d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.149 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.149
deleted file mode 100644
index 8af5bb0d0823..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.149
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=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.149
-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-148.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-148.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-148.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-148.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-148.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-148.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-148.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-148.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-148.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=05b0c38e8a0b68bfbaa38b27f0535282
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.236 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.236
deleted file mode 100644
index 366a3ff38ea5..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.236
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.4.236
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-237.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-237.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-237.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-237.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-237.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-237.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-237.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-237.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-237.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=79f9ba6b78a6a5dfda66d94c0d215c31
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.236 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.236
deleted file mode 100644
index 1b0ba58a38bc..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.236
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.9.236
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-240.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-240.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-240.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-240.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-240.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-240.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-240.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-240.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-240.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=685005f81b381f220dc0107fa4195eff
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.66 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.66
deleted file mode 100644
index 2e362f1605e8..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.66
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=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.66
-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-67.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-67.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-67.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-67.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-67.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-67.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-67.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-67.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-67.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=da9048479863a3ecb1e0b3fa1fdf4b42
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.73 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.73
deleted file mode 100644
index d5f1f5d7ea65..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.73
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=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.73
-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-74.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-74.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-74.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-74.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-74.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-74.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-74.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-74.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-74.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f9097dd679316cee09e8263016fa7ff5
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.74 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.74
deleted file mode 100644
index 3eb738e4843e..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.74
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=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.74
-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-75.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-75.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-75.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-75.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-75.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-75.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-75.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-75.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-75.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8cb7746eb382059fe864b8c06cae39f3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.75 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.75
deleted file mode 100644
index c1c5bdd5502f..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.75
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=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.75
-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-76.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-76.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-76.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-76.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-76.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-76.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-76.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-76.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-76.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=153475d3234663f69aef00f733a94f01
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.9.1 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.9.1
deleted file mode 100644
index 8c3d90e52693..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.9.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=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.1
-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-2.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-2.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.9-2.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.9-2.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-2.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.9-2.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.9-2.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-2.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.9-2.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c87638fce1a7accc8af65463bf1dfbde
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.9.2 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.9.2
deleted file mode 100644
index d3c6bb6a1ea4..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=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.2
-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-3.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-3.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.9-3.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.9-3.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-3.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.9-3.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.9-3.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-3.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.9-3.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e347b1551c6ef1e4774129a1d24c41d0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.9.3 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.9.3
deleted file mode 100644
index aad2bef895b9..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.9.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=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.3
-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-4.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-4.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.9-4.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.9-4.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-4.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.9-4.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.9-4.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-4.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.9-4.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5d0ce1f45a803f22ed0aaf4efc2c930b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.9.4 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.9.4
deleted file mode 100644
index de76fddfb43d..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=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.4
-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-5.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-5.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.9-5.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.9-5.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-5.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.9-5.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.9-5.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-5.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.9-5.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=91f9abbe8fdc8b46f7424e588709e106
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.14.192_p91 b/metadata/md5-cache/sys-kernel/rt-sources-4.14.202_p97
similarity index 86%
rename from metadata/md5-cache/sys-kernel/rt-sources-4.14.192_p91
rename to metadata/md5-cache/sys-kernel/rt-sources-4.14.202_p97
index 5259b2b1870b..69461cfa4971 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.14.192_p91
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.14.202_p97
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~arm64
 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.192_p91
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.192.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/patch-4.14.192-rt91.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patch-4.14.192-rt91.patch.xz
+SLOT=4.14.202_p97
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.202.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/patch-4.14.202-rt97.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patch-4.14.202-rt97.patch.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d2bf5c9e08951c9f1d8bfe2cac08f196
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.14.206_p99 b/metadata/md5-cache/sys-kernel/rt-sources-4.14.206_p99
new file mode 100644
index 000000000000..9c66f6e9e570
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.14.206_p99
@@ -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 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full Linux 4.14 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://www.kernel.org/pub/linux/kernel/projects/rt/ https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
+IUSE=symlink build deblob
+KEYWORDS=~amd64 ~arm64
+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.206_p99
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.206.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/patch-4.14.206-rt99.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patch-4.14.206-rt99.patch.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d2bf5c9e08951c9f1d8bfe2cac08f196
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.19.135_p60 b/metadata/md5-cache/sys-kernel/rt-sources-4.19.148_p64
similarity index 86%
rename from metadata/md5-cache/sys-kernel/rt-sources-4.19.135_p60
rename to metadata/md5-cache/sys-kernel/rt-sources-4.19.148_p64
index 6e800788ddff..6fcadb5a989b 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.19.135_p60
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.19.148_p64
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~arm64
 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.135_p60
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.135.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-4.19 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-check -> deblob-check-4.19 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/patch-4.19.135-rt60.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patch-4.19.135-rt60.patch.xz
+SLOT=4.19.148_p64
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.148.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-4.19 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-check -> deblob-check-4.19 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/patch-4.19.148-rt64.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patch-4.19.148-rt64.patch.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d2bf5c9e08951c9f1d8bfe2cac08f196
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.4.231_p202 b/metadata/md5-cache/sys-kernel/rt-sources-4.4.240_p209
similarity index 87%
rename from metadata/md5-cache/sys-kernel/rt-sources-4.4.231_p202
rename to metadata/md5-cache/sys-kernel/rt-sources-4.4.240_p209
index c4ae103c1d0e..6842910e4779 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.4.231_p202
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.4.240_p209
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~arm64
 LICENSE=GPL-2 !deblob? ( linux-firmware )
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.4.231_p202
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.231.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-4.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-check -> deblob-check-4.4 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.231-rt202.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/older/patch-4.4.231-rt202.patch.xz
+SLOT=4.4.240_p209
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.240.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-4.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-check -> deblob-check-4.4 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.240-rt209.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/older/patch-4.4.240-rt209.patch.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d2bf5c9e08951c9f1d8bfe2cac08f196
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.9.232_p150 b/metadata/md5-cache/sys-kernel/rt-sources-4.9.240_p155
similarity index 87%
rename from metadata/md5-cache/sys-kernel/rt-sources-4.9.232_p150
rename to metadata/md5-cache/sys-kernel/rt-sources-4.9.240_p155
index 8428d02be201..ad699ccebb64 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.9.232_p150
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.9.240_p155
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~arm64
 LICENSE=GPL-2 !deblob? ( linux-firmware )
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.9.232_p150
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.232.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/patch-4.9.232-rt150.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/older/patch-4.9.232-rt150.patch.xz
+SLOT=4.9.240_p155
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.240.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/patch-4.9.240-rt155.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/older/patch-4.9.240-rt155.patch.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d2bf5c9e08951c9f1d8bfe2cac08f196
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.4.54_p33 b/metadata/md5-cache/sys-kernel/rt-sources-5.4.70_p40
similarity index 83%
rename from metadata/md5-cache/sys-kernel/rt-sources-5.4.54_p33
rename to metadata/md5-cache/sys-kernel/rt-sources-5.4.70_p40
index 49d0da70472f..df3d50a00fa8 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.4.54_p33
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.4.70_p40
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~arm64
 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.54_p33
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.54.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.4-gnu/deblob-5.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.4-gnu/deblob-check -> deblob-check-5.4 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/patch-5.4.54-rt33.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patch-5.4.54-rt33.patch.xz
+SLOT=5.4.70_p40
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.70.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.4-gnu/deblob-5.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.4-gnu/deblob-check -> deblob-check-5.4 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/patch-5.4.70-rt40.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patch-5.4.70-rt40.patch.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2524629bd8b115fb50d4edeee9c7bf5c
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.6.19_p11 b/metadata/md5-cache/sys-kernel/rt-sources-5.6.19_p11
deleted file mode 100644
index cd68d47f24f5..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.6.19_p11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 5.6 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://www.kernel.org/pub/linux/kernel/projects/rt/ https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~arm64
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.6.19_p11
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.6.19.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.6-gnu/deblob-5.6 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.6-gnu/deblob-check -> deblob-check-5.6 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.6/patch-5.6.19-rt11.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.6/older/patch-5.6.19-rt11.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2524629bd8b115fb50d4edeee9c7bf5c
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.6.19_p12 b/metadata/md5-cache/sys-kernel/rt-sources-5.9.1_p20
similarity index 62%
rename from metadata/md5-cache/sys-kernel/rt-sources-5.6.19_p12
rename to metadata/md5-cache/sys-kernel/rt-sources-5.9.1_p20
index 243c3f7763e6..c10399d9816f 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.6.19_p12
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.9.1_p20
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
 DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 5.6 kernel sources with the CONFIG_PREEMPT_RT patch
+DESCRIPTION=Full Linux 5.9 kernel sources with the CONFIG_PREEMPT_RT patch
 EAPI=6
 HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://www.kernel.org/pub/linux/kernel/projects/rt/ https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
 IUSE=symlink build deblob
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~arm64
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.6.19_p12
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.6.19.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.6-gnu/deblob-5.6 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.6-gnu/deblob-check -> deblob-check-5.6 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.6/patch-5.6.19-rt12.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.6/older/patch-5.6.19-rt12.patch.xz
+SLOT=5.9.1_p20
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.9.1.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.9-gnu/deblob-5.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.9-gnu/deblob-check -> deblob-check-5.9 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.9/patch-5.9.1-rt20.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.9/older/patch-5.9.1-rt20.patch.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2524629bd8b115fb50d4edeee9c7bf5c
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.72 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.72
index 1e7d886edad2..2811d2ae8a69 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.72
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.72
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.72 || ( sys-kernel/installkernel-gent
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.72
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.72.tar.xz 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	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	042733ebde23be39ae073ec82458bcb0	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=43f7e754c45ff9b39b00f5af8fc58a29
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.73 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.73
deleted file mode 100644
index 5b4b445d2f9e..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.73
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.73 || ( 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.73
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.73.tar.xz 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	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=43f7e754c45ff9b39b00f5af8fc58a29
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.74 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.74
deleted file mode 100644
index e1717f512fe7..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.74
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.74 || ( 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.74
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.74.tar.xz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.74.tar.sign ) 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	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=49c888a87feec8f72dc19b01f57ed977
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.75 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.75
deleted file mode 100644
index 1f204bb6f3c9..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.75
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.75 || ( 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.75
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.75.tar.xz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.75.tar.sign ) 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	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=49c888a87feec8f72dc19b01f57ed977
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.76 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.76
deleted file mode 100644
index 16c8dc2015fe..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.76
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.76 || ( 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.76
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.76.tar.xz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.76.tar.sign ) 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	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=49c888a87feec8f72dc19b01f57ed977
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.77 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.77
index 09b4f3198d6b..ab03c66a91bb 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.77
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.77
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.77 || ( sys-kernel/installkernel-gent
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.77
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.77.tar.xz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.77.tar.sign ) 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	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_eclasses_=kernel-build	042733ebde23be39ae073ec82458bcb0	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
 _md5_=49c888a87feec8f72dc19b01f57ed977
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.16 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.16
deleted file mode 100644
index 34349dc39b63..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.16
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.8.16 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.16
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.16.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.5 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.5 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.8.5 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.5 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3d1467b077d0185046ec4d00d412e772
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.17 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.17
deleted file mode 100644
index 1155a0c9f21a..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.17
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.8.17 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.17
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.17.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.5 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.5 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.8.5 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.5 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3d1467b077d0185046ec4d00d412e772
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.18 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.18
deleted file mode 100644
index 1f68b14b9d8b..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.18
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.8.18 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.18
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.18.tar.xz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.18.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.5 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.5 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.8.5 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.5 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=da34ae8c52ade541168919a9160941ba
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.1 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.1
deleted file mode 100644
index ed5fd9af823f..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.9.1 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.9.1
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.1.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/aa6d9438d030fa4682d5d450481085c901503da5/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.9.0 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/aa6d9438d030fa4682d5d450481085c901503da5/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.9.0 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/aa6d9438d030fa4682d5d450481085c901503da5/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.9.0 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/aa6d9438d030fa4682d5d450481085c901503da5/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.9.0 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5f606796c6b769098c27b5e2e9a15641
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.2 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.2
deleted file mode 100644
index 1558336a3e62..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.9.2 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.9.2
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.2.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.9.2 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.9.2 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.9.2 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.9.2 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=26fb2ff5e0ee5f7cfb8b0c29892929e2
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.3 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.3
deleted file mode 100644
index 43519ac77713..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.9.3 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.9.3
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.3.tar.xz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.3.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.9.2 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.9.2 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.9.2 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.9.2 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=e44c2accd28caf3d9b6bcbf4ae4229e8
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.4 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.4
deleted file mode 100644
index 8347368c1906..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.9.4 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.9.4
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.4.tar.xz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.4.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.9.2 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.9.2 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.9.2 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.9.2 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=e44c2accd28caf3d9b6bcbf4ae4229e8
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.6 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.6
deleted file mode 100644
index d717afc09b33..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.9.6 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.9.6
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.6.tar.xz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.6.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.9.2 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.9.2 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.9.2 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.9.2 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=e44c2accd28caf3d9b6bcbf4ae4229e8
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.7 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.7
deleted file mode 100644
index 74334129ad55..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.9.7 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.9.7
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.7.tar.xz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.7.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.9.2 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.9.2 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.9.2 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.9.2 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=e44c2accd28caf3d9b6bcbf4ae4229e8
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.8 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.8
index 01ddd67de719..a7bf10125b58 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.8
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.8
@@ -11,5 +11,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.9.8
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.8.tar.xz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.8.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.9.2 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.9.2 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.9.2 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.9.2 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_eclasses_=kernel-build	042733ebde23be39ae073ec82458bcb0	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
 _md5_=e44c2accd28caf3d9b6bcbf4ae4229e8
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.206 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.206
index c6f6e12980c3..860a82f3320f 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.206
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.206
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources for the Linux kernel
 EAPI=6
 HOMEPAGE=https://www.kernel.org
 IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+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.206
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.206.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	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
+_md5_=71a3056d94dc6959a5c71a4dea2cc615
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.157 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.157
index 715a73099582..4e2f8c12964d 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.157
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.157
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources for the Linux kernel
 EAPI=6
 HOMEPAGE=https://www.kernel.org
 IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+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.157
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.157.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	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
+_md5_=71a3056d94dc6959a5c71a4dea2cc615
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.77 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.77
index afe1ee00c22e..690560b748a9 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.77
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.77
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources for the Linux kernel
 EAPI=6
 HOMEPAGE=https://www.kernel.org
 IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+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.77
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.77.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	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
+_md5_=71a3056d94dc6959a5c71a4dea2cc615
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.8.17 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.8.17
index a461c3ab0aba..f2ead37a27de 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.8.17
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.8.17
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources for the Linux kernel
 EAPI=6
 HOMEPAGE=https://www.kernel.org
 IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+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.8.17
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.8.17.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
+_md5_=71a3056d94dc6959a5c71a4dea2cc615
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.9.8 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.9.8
index 80e3f0529dc9..a0726701bb35 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.9.8
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.9.8
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources for the Linux kernel
 EAPI=6
 HOMEPAGE=https://www.kernel.org
 IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+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.8
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.9.8.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	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
+_md5_=71a3056d94dc6959a5c71a4dea2cc615
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-5.4.15 b/metadata/md5-cache/sys-kernel/zen-sources-5.4.15
deleted file mode 100644
index 30c10d239cde..000000000000
--- a/metadata/md5-cache/sys-kernel/zen-sources-5.4.15
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=The Zen Kernel Live Sources
-EAPI=6
-HOMEPAGE=https://github.com/zen-kernel
-IUSE=symlink build
-KEYWORDS=~amd64 ~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.15
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-1.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-1.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-1.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-1.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-1.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-1.extras.tar.xz https://github.com/zen-kernel/zen-kernel/releases/download/v5.4.15-zen1/v5.4.15-zen1.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2148a6c5380c17b8ef37514d78fd60a1
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-5.8.10 b/metadata/md5-cache/sys-kernel/zen-sources-5.8.10
deleted file mode 100644
index a2a7299567c3..000000000000
--- a/metadata/md5-cache/sys-kernel/zen-sources-5.8.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=The Zen Kernel Live Sources
-EAPI=6
-HOMEPAGE=https://github.com/zen-kernel
-IUSE=symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.8.10
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.8-1.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-1.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.8-1.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.8-1.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-1.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.8-1.extras.tar.xz https://github.com/zen-kernel/zen-kernel/releases/download/v5.8.10-zen1/v5.8.10-zen1.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2148a6c5380c17b8ef37514d78fd60a1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.9.0 b/metadata/md5-cache/sys-kernel/zen-sources-5.9.7
similarity index 64%
rename from metadata/md5-cache/sys-kernel/gentoo-sources-5.9.0
rename to metadata/md5-cache/sys-kernel/zen-sources-5.9.7
index 47800650621a..2e0290c757db 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.9.0
+++ b/metadata/md5-cache/sys-kernel/zen-sources-5.9.7
@@ -1,14 +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
+DESCRIPTION=The Zen Kernel Live Sources
 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
+HOMEPAGE=https://github.com/zen-kernel
+IUSE=symlink build
+KEYWORDS=~amd64 ~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.0
-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-1.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-1.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.9-1.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.9-1.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-1.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.9-1.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.9-1.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-1.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.9-1.experimental.tar.xz )
+SLOT=5.9.7
+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-1.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-1.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.9-1.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.9-1.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-1.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.9-1.extras.tar.xz https://github.com/zen-kernel/zen-kernel/releases/download/v5.9.7-zen1/v5.9.7-zen1.patch.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=eaf7b6c723f028df333e1677397b25c9
+_md5_=c9749a5d56782ae0fa3849075ff30edf
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index e51dc7daa0e6..7856c2f8b812 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/binutils-libs-2.34-r2 b/metadata/md5-cache/sys-libs/binutils-libs-2.34-r2
index 13522a70f811..a8ec937462ef 100644
--- a/metadata/md5-cache/sys-libs/binutils-libs-2.34-r2
+++ b/metadata/md5-cache/sys-libs/binutils-libs-2.34-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Core binutils libraries (libbfd, libopcodes, libiberty) for external
 EAPI=7
 HOMEPAGE=https://sourceware.org/binutils/
 IUSE=64-bit-bfd multitarget nls 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
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/binutils-config-5
 SLOT=0/2.34
 SRC_URI=mirror://gnu/binutils/binutils-2.34.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.34-patches-6.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5cfc3b60b76e18660aeccee1530ff8a9
+_md5_=1c8349b0eb403a9722657db60f70908f
diff --git a/metadata/md5-cache/sys-libs/gdbm-1.18.1-r1 b/metadata/md5-cache/sys-libs/gdbm-1.18.1-r1
index 6924f5b7cf37..cb1dfe9d7068 100644
--- a/metadata/md5-cache/sys-libs/gdbm-1.18.1-r1
+++ b/metadata/md5-cache/sys-libs/gdbm-1.18.1-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Standard GNU database libraries
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gdbm/
 IUSE=+berkdb nls +readline 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
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=readline? ( sys-libs/readline: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/6
 SRC_URI=mirror://gnu/gdbm/gdbm-1.18.1.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cb91457d6f8f17cbcc60cb2afc3e0aea
+_md5_=57a0c57436d1802c6343813f38d842f4
diff --git a/metadata/md5-cache/sys-libs/glibc-2.31-r7 b/metadata/md5-cache/sys-libs/glibc-2.31-r7
index 40539d7a6ceb..b078df4d2fcc 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.31-r7
+++ b/metadata/md5-cache/sys-libs/glibc-2.31-r7
@@ -5,7 +5,7 @@ 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
+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 sys-apps/gentoo-functions >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.31.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.31-patches-9.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.00.tar.gz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnuconfig	f9125410be4c062f2fcefc8ec59fc223	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=39aa34eb0662fb6692b1d593448c24f6
+_md5_=9ba3a9253b5f9b07527605abe0bfbdb6
diff --git a/metadata/md5-cache/sys-libs/glibc-2.32-r2 b/metadata/md5-cache/sys-libs/glibc-2.32-r2
index 880a71d07885..cd251814b818 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.32-r2
+++ b/metadata/md5-cache/sys-libs/glibc-2.32-r2
@@ -5,7 +5,7 @@ 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
+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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.32.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.32-patches-2.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 )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnuconfig	f9125410be4c062f2fcefc8ec59fc223	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=416493c96fc77e31affaee73ea934181
+_md5_=062078a172c19e34ba886ac133944793
diff --git a/metadata/md5-cache/sys-libs/gwenhywfar-5.1.2 b/metadata/md5-cache/sys-libs/gwenhywfar-5.1.2
deleted file mode 100644
index e0e361b4e33f..000000000000
--- a/metadata/md5-cache/sys-libs/gwenhywfar-5.1.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen )
-DEFINED_PHASES=compile configure install
-DEPEND=dev-libs/libgcrypt:0= dev-libs/libgpg-error libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) net-libs/gnutls:= virtual/libiconv virtual/libintl virtual/opengl designer? ( dev-qt/designer:5 ) fox? ( x11-libs/fox:1.6 ) gtk? ( x11-libs/gtk+:3 ) qml? ( dev-qt/qtdeclarative:5 ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 ) sensors? ( dev-qt/qtsensors:5 ) serialport? ( dev-qt/qtserialport:5 ) webkit? ( dev-qt/qtwebkit:5 ) test? ( dev-qt/qttest:5 )
-DESCRIPTION=Multi-platform helper library for other libraries
-EAPI=7
-HOMEPAGE=https://www.aquamaniac.de/sites/aqbanking/index.php
-IUSE=debug designer doc fox gtk libressl qml qt5 sensors serialport test webkit
-KEYWORDS=amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libgcrypt:0= dev-libs/libgpg-error libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) net-libs/gnutls:= virtual/libiconv virtual/libintl virtual/opengl designer? ( dev-qt/designer:5 ) fox? ( x11-libs/fox:1.6 ) gtk? ( x11-libs/gtk+:3 ) qml? ( dev-qt/qtdeclarative:5 ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 ) sensors? ( dev-qt/qtsensors:5 ) serialport? ( dev-qt/qtserialport:5 ) webkit? ( dev-qt/qtwebkit:5 ) gtk? ( !<app-office/gnucash-3.7[aqbanking] )
-REQUIRED_USE=designer? ( qt5 ) qml? ( qt5 ) sensors? ( qt5 ) serialport? ( qt5 ) webkit? ( qt5 )
-RESTRICT=test
-SLOT=0/79
-SRC_URI=https://www.aquamaniac.de/rdm/attachments/download/234/gwenhywfar-5.1.2.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=01d024ef5c6c45d0e40a8e4cc3191760
diff --git a/metadata/md5-cache/sys-libs/gwenhywfar-5.4.1-r1 b/metadata/md5-cache/sys-libs/gwenhywfar-5.4.1-r1
index 011635c02b1b..069c515de318 100644
--- a/metadata/md5-cache/sys-libs/gwenhywfar-5.4.1-r1
+++ b/metadata/md5-cache/sys-libs/gwenhywfar-5.4.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Multi-platform helper library for other libraries
 EAPI=7
 HOMEPAGE=https://www.aquamaniac.de/sites/aqbanking/index.php
 IUSE=debug doc gtk libressl qt5 test
-KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-libs/libxml2:2 libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) net-libs/gnutls:= virtual/libiconv virtual/libintl virtual/opengl gtk? ( x11-libs/gtk+:3 ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) gtk? ( !<app-office/gnucash-3.7[aqbanking] )
 RESTRICT=test
 SLOT=0/79
 SRC_URI=https://www.aquamaniac.de/rdm/attachments/download/344/gwenhywfar-5.4.1.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f1323db96b13de485f01c254551dca44
+_md5_=e271a960668aa12a776782f3418f4e1a
diff --git a/metadata/md5-cache/sys-libs/pam-1.4.0_p20200829 b/metadata/md5-cache/sys-libs/pam-1.4.0_p20200829-r1
similarity index 95%
rename from metadata/md5-cache/sys-libs/pam-1.4.0_p20200829
rename to metadata/md5-cache/sys-libs/pam-1.4.0_p20200829-r1
index 526c06f901be..7272ea8650b7 100644
--- a/metadata/md5-cache/sys-libs/pam-1.4.0_p20200829
+++ b/metadata/md5-cache/sys-libs/pam-1.4.0_p20200829-r1
@@ -10,6 +10,6 @@ LICENSE=|| ( BSD GPL-2 )
 PDEPEND=>=sys-auth/pambase-20200616
 RDEPEND=virtual/libcrypt:=[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-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(-)?] audit? ( >=sys-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nis? ( net-libs/libnsl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libtirpc-0.2.4-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(-)?] ) filecaps? ( sys-libs/libcap )
 SLOT=0
-SRC_URI=https://github.com/linux-pam/linux-pam/archive/e42e178c71c11bb25740a5177eed110ee17b8af2.tar.gz#/pam-e42e178c71c11bb25740a5177eed110ee17b8af2.tar.gz https://dev.gentoo.org/~zlogene/distfiles/sys-libs/pam/pam-1.4.0_p20200809-doc.tar.xz
+SRC_URI=https://github.com/linux-pam/linux-pam/archive/e42e178c71c11bb25740a5177eed110ee17b8af2.tar.gz#/pam-e42e178c71c11bb25740a5177eed110ee17b8af2.tar.gz https://github.com/Zlogene/pam-docs/archive/pam-doc-20201113.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	db-use	501a5d0963e0d17f30260023f292ae8e	fcaps	da689a8e04bbbb3518888ff668fee45b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=887a338a2bb95bc69dcdc7230dda032d
+_md5_=6cb249aa98442a639a7aa5e2ed2193cd
diff --git a/metadata/md5-cache/sys-libs/pam-1.5.0 b/metadata/md5-cache/sys-libs/pam-1.5.0
new file mode 100644
index 000000000000..2bd06fc34cd4
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/pam-1.5.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxslt sys-devel/flex sys-devel/gettext virtual/pkgconfig virtual/yacc >=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 filecaps? ( sys-libs/libcap )
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=virtual/libcrypt:=[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-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(-)?] audit? ( >=sys-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nis? ( net-libs/libnsl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libtirpc-0.2.4-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(-)?] )
+DESCRIPTION=Linux-PAM (Pluggable Authentication Modules)
+EAPI=7
+HOMEPAGE=https://github.com/linux-pam/linux-pam
+IUSE=audit berkdb debug nis +pie selinux +filecaps split-usr abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( BSD GPL-2 )
+PDEPEND=>=sys-auth/pambase-20200616
+RDEPEND=virtual/libcrypt:=[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-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(-)?] audit? ( >=sys-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nis? ( net-libs/libnsl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libtirpc-0.2.4-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(-)?] ) filecaps? ( sys-libs/libcap )
+SLOT=0
+SRC_URI=https://github.com/linux-pam/linux-pam/releases/download/v1.5.0/Linux-PAM-1.5.0.tar.xz https://github.com/linux-pam/linux-pam/releases/download/v1.5.0/Linux-PAM-1.5.0-docs.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	db-use	501a5d0963e0d17f30260023f292ae8e	fcaps	da689a8e04bbbb3518888ff668fee45b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=e94b83933b7eafc350dc29ca2999121a
diff --git a/metadata/md5-cache/sys-libs/pinktrace-0.9.3 b/metadata/md5-cache/sys-libs/pinktrace-0.9.3
index e88e37038442..66a18c17c682 100644
--- a/metadata/md5-cache/sys-libs/pinktrace-0.9.3
+++ b/metadata/md5-cache/sys-libs/pinktrace-0.9.3
@@ -7,4 +7,4 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0/0.9
 SRC_URI=http://distfiles.exherbo.org/distfiles/pinktrace-0.9.3.tar.bz2
-_md5_=0612762b5e1d2a7b0384801be6404f9f
+_md5_=0803d2d9987687582cb321621727ce2f
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 0bba52a2d4ff..c572072ddd77 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/jack-0 b/metadata/md5-cache/virtual/jack-0
deleted file mode 100644
index 926e3fac4820..000000000000
--- a/metadata/md5-cache/virtual/jack-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for JACK Audio Connection Kit
-EAPI=5
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
-RDEPEND=|| ( >=media-sound/jack-audio-connection-kit-0.121.3-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(-)?] media-sound/jack2[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
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3f146d17653965ae99c516679eee593b
diff --git a/metadata/md5-cache/virtual/jack-1 b/metadata/md5-cache/virtual/jack-1
index 369ab5b9e959..be56e522f09f 100644
--- a/metadata/md5-cache/virtual/jack-1
+++ b/metadata/md5-cache/virtual/jack-1
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for JACK Audio Connection Kit
 EAPI=7
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=amd64 arm arm64 ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 RDEPEND=|| ( media-sound/jack2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-sound/jack-audio-connection-kit[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
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8ad98afa8f6f8760b6e3c1ea4b0f8dd3
+_md5_=2a628b0d8e90ec29981e6ace55b8c58f
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index c65b023ff7a6..e19f62f6856e 100644
Binary files a/metadata/md5-cache/www-apache/Manifest.gz and b/metadata/md5-cache/www-apache/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apache/mod_qos-11.66 b/metadata/md5-cache/www-apache/mod_qos-11.66
new file mode 100644
index 000000000000..28237a2f88ab
--- /dev/null
+++ b/metadata/md5-cache/www-apache/mod_qos-11.66
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND==www-servers/apache-2*
+DESCRIPTION=A QOS module for the apache webserver
+EAPI=7
+HOMEPAGE=http://mod-qos.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libpcre:3 dev-libs/openssl:0= media-libs/libpng:0= sys-libs/zlib:0= =www-servers/apache-2*
+SLOT=0
+SRC_URI=mirror://sourceforge/mod-qos/mod_qos-11.66.tar.gz
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	7d999b62b8749fad43fff00620cedf47	depend.apache	94458fe4e9466f4803360408e60e11fd	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=cc7ad245e08438861f0ebd38729ce772
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index f4bd8455ebdf..eb0922966279 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/kibana-bin-6.8.11 b/metadata/md5-cache/www-apps/kibana-bin-6.8.13
similarity index 85%
rename from metadata/md5-cache/www-apps/kibana-bin-6.8.11
rename to metadata/md5-cache/www-apps/kibana-bin-6.8.13
index f59a8271a3ef..0c4bbc73a423 100644
--- a/metadata/md5-cache/www-apps/kibana-bin-6.8.11
+++ b/metadata/md5-cache/www-apps/kibana-bin-6.8.13
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB x-pack? ( Elastic )
 RDEPEND=acct-group/kibana acct-user/kibana >=net-libs/nodejs-10.15.2 x-pack? ( dev-libs/expat dev-libs/nss )
 SLOT=0
-SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/kibana/kibana-6.8.11-linux-x86_64.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/kibana/kibana-oss-6.8.11-linux-x86_64.tar.gz )
+SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/kibana/kibana-6.8.13-linux-x86_64.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/kibana/kibana-oss-6.8.13-linux-x86_64.tar.gz )
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c576b18ed87f374bfa55e4266badf390
diff --git a/metadata/md5-cache/www-apps/kibana-bin-6.8.12 b/metadata/md5-cache/www-apps/kibana-bin-7.10.0
similarity index 75%
rename from metadata/md5-cache/www-apps/kibana-bin-6.8.12
rename to metadata/md5-cache/www-apps/kibana-bin-7.10.0
index c8999e1eb265..8e9a828e06ff 100644
--- a/metadata/md5-cache/www-apps/kibana-bin-6.8.12
+++ b/metadata/md5-cache/www-apps/kibana-bin-7.10.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.elastic.co/products/kibana
 IUSE=x-pack
 KEYWORDS=~amd64
 LICENSE=Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB x-pack? ( Elastic )
-RDEPEND=acct-group/kibana acct-user/kibana >=net-libs/nodejs-10.15.2 x-pack? ( dev-libs/expat dev-libs/nss )
+RDEPEND=acct-group/kibana acct-user/kibana >=net-libs/nodejs-10.21.0 x-pack? ( dev-libs/expat dev-libs/nss )
 SLOT=0
-SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/kibana/kibana-6.8.12-linux-x86_64.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/kibana/kibana-oss-6.8.12-linux-x86_64.tar.gz )
+SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/kibana/kibana-7.10.0-linux-x86_64.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/kibana/kibana-oss-7.10.0-linux-x86_64.tar.gz )
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c576b18ed87f374bfa55e4266badf390
+_md5_=28254279fc1b68af8d4bd100ca5d4823
diff --git a/metadata/md5-cache/www-apps/kibana-bin-7.9.1 b/metadata/md5-cache/www-apps/kibana-bin-7.9.3
similarity index 80%
rename from metadata/md5-cache/www-apps/kibana-bin-7.9.1
rename to metadata/md5-cache/www-apps/kibana-bin-7.9.3
index e87560088a2b..ed2b08d0e82a 100644
--- a/metadata/md5-cache/www-apps/kibana-bin-7.9.1
+++ b/metadata/md5-cache/www-apps/kibana-bin-7.9.3
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB x-pack? ( Elastic )
 RDEPEND=acct-group/kibana acct-user/kibana >=net-libs/nodejs-10.21.0 x-pack? ( dev-libs/expat dev-libs/nss )
 SLOT=0
-SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/kibana/kibana-7.9.1-linux-x86_64.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/kibana/kibana-oss-7.9.1-linux-x86_64.tar.gz )
+SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/kibana/kibana-7.9.3-linux-x86_64.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/kibana/kibana-oss-7.9.3-linux-x86_64.tar.gz )
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c254c3ba972827b45451657d698af783
+_md5_=05fe4cd07c4dce6ae2688c46e9c4d539
diff --git a/metadata/md5-cache/www-apps/mediawiki-1.34.4 b/metadata/md5-cache/www-apps/mediawiki-1.34.4
deleted file mode 100644
index b53c94985461..000000000000
--- a/metadata/md5-cache/www-apps/mediawiki-1.34.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup unpack
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=The MediaWiki wiki web application (as used on wikipedia.org)
-EAPI=7
-HOMEPAGE=http://www.mediawiki.org
-IUSE=imagemagick mysql postgres +sqlite vhosts
-KEYWORDS=~alpha amd64 ~arm ~arm64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[ctype,fileinfo,iconv,json,postgres?,session,ssl,unicode,xml,xmlreader] imagemagick? ( virtual/imagemagick-tools ) !imagemagick? ( dev-lang/php[gd] ) mysql? ( dev-lang/php[mysql,mysqli] ) sqlite? ( dev-db/sqlite[fts3(+)] dev-lang/php[pdo,sqlite] ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-RESTRICT=test
-SLOT=1.34.4
-SRC_URI=http://releases.wikimedia.org/mediawiki/1.34/mediawiki-1.34.4.tar.gz
-_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=0844ff21563a9ee4c66eaacccca88722
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 54f32b8ebc4f..89f8d49d2604 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/chromium-87.0.4280.47 b/metadata/md5-cache/www-client/chromium-87.0.4280.60
similarity index 96%
rename from metadata/md5-cache/www-client/chromium-87.0.4280.47
rename to metadata/md5-cache/www-client/chromium-87.0.4280.60
index 7b05d89b3f63..9810666e0ec4 100644
--- a/metadata/md5-cache/www-client/chromium-87.0.4280.47
+++ b/metadata/md5-cache/www-client/chromium-87.0.4280.60
@@ -11,6 +11,6 @@ RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= de
 REQUIRED_USE=component-build? ( !suid )
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-87.0.4280.47.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-87-patchset-8/chromium-87-patchset-8.tar.xz
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-87.0.4280.60.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-87-patchset-9/chromium-87-patchset-9.tar.xz
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	portability	e8f7ef3a41965b21a734550f8a94c1c6	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=40a4c6f6d70e02dd8c6a95e1a8d07403
+_md5_=e4adcb2b5a41271254f6653dd263e412
diff --git a/metadata/md5-cache/www-client/firefox-83.0_rc2 b/metadata/md5-cache/www-client/firefox-83.0_rc2
index 8771d0902c73..f406f0088adc 100644
--- a/metadata/md5-cache/www-client/firefox-83.0_rc2
+++ b/metadata/md5-cache/www-client/firefox-83.0_rc2
@@ -7,8 +7,8 @@ HOMEPAGE=https://www.mozilla.com/firefox
 IUSE=clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto +openh264 pgo pulseaudio screencast selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp wayland wifi l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW pgo
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/nss-3.58 >=dev-libs/nspr-4.29 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=screencast? ( wayland )
+REQUIRED_USE=debug? ( !system-av1 ) screencast? ( wayland )
 SLOT=0/83
 SRC_URI=https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/source/firefox-83.0.source.tar.xz -> firefox-83.0_rc2.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-83-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-83-patches-01.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-83-patches-01.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/ach.xpi -> firefox-83.0_rc2-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/af.xpi -> firefox-83.0_rc2-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/an.xpi -> firefox-83.0_rc2-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/ar.xpi -> firefox-83.0_rc2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/ast.xpi -> firefox-83.0_rc2-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/az.xpi -> firefox-83.0_rc2-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/be.xpi -> firefox-83.0_rc2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/bg.xpi -> firefox-83.0_rc2-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/bn.xpi -> firefox-83.0_rc2-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/br.xpi -> firefox-83.0_rc2-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/bs.xpi -> firefox-83.0_rc2-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/ca-valencia.xpi -> firefox-83.0_rc2-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/ca.xpi -> firefox-83.0_rc2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/cak.xpi -> firefox-83.0_rc2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/cs.xpi -> firefox-83.0_rc2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/cy.xpi -> firefox-83.0_rc2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/da.xpi -> firefox-83.0_rc2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/de.xpi -> firefox-83.0_rc2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/dsb.xpi -> firefox-83.0_rc2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/el.xpi -> firefox-83.0_rc2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/en-CA.xpi -> firefox-83.0_rc2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/en-GB.xpi -> firefox-83.0_rc2-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/eo.xpi -> firefox-83.0_rc2-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/es-AR.xpi -> firefox-83.0_rc2-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/es-CL.xpi -> firefox-83.0_rc2-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/es-ES.xpi -> firefox-83.0_rc2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/es-MX.xpi -> firefox-83.0_rc2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/et.xpi -> firefox-83.0_rc2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/eu.xpi -> firefox-83.0_rc2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/fa.xpi -> firefox-83.0_rc2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/ff.xpi -> firefox-83.0_rc2-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/fi.xpi -> firefox-83.0_rc2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/fr.xpi -> firefox-83.0_rc2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/fy-NL.xpi -> firefox-83.0_rc2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/ga-IE.xpi -> firefox-83.0_rc2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/gd.xpi -> firefox-83.0_rc2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/gl.xpi -> firefox-83.0_rc2-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/gn.xpi -> firefox-83.0_rc2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/gu-IN.xpi -> firefox-83.0_rc2-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/he.xpi -> firefox-83.0_rc2-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/hi-IN.xpi -> firefox-83.0_rc2-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/hr.xpi -> firefox-83.0_rc2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/hsb.xpi -> firefox-83.0_rc2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/hu.xpi -> firefox-83.0_rc2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/hy-AM.xpi -> firefox-83.0_rc2-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/ia.xpi -> firefox-83.0_rc2-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/id.xpi -> firefox-83.0_rc2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/is.xpi -> firefox-83.0_rc2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/it.xpi -> firefox-83.0_rc2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/ja.xpi -> firefox-83.0_rc2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/ka.xpi -> firefox-83.0_rc2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/kab.xpi -> firefox-83.0_rc2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/kk.xpi -> firefox-83.0_rc2-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/km.xpi -> firefox-83.0_rc2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/kn.xpi -> firefox-83.0_rc2-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/ko.xpi -> firefox-83.0_rc2-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/lij.xpi -> firefox-83.0_rc2-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/lt.xpi -> firefox-83.0_rc2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/lv.xpi -> firefox-83.0_rc2-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/mk.xpi -> firefox-83.0_rc2-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/mr.xpi -> firefox-83.0_rc2-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/ms.xpi -> firefox-83.0_rc2-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/my.xpi -> firefox-83.0_rc2-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/nb-NO.xpi -> firefox-83.0_rc2-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/ne-NP.xpi -> firefox-83.0_rc2-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/nl.xpi -> firefox-83.0_rc2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/nn-NO.xpi -> firefox-83.0_rc2-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/oc.xpi -> firefox-83.0_rc2-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/pa-IN.xpi -> firefox-83.0_rc2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/pl.xpi -> firefox-83.0_rc2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/pt-BR.xpi -> firefox-83.0_rc2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/pt-PT.xpi -> firefox-83.0_rc2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/rm.xpi -> firefox-83.0_rc2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/ro.xpi -> firefox-83.0_rc2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/ru.xpi -> firefox-83.0_rc2-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/si.xpi -> firefox-83.0_rc2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/sk.xpi -> firefox-83.0_rc2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/sl.xpi -> firefox-83.0_rc2-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/son.xpi -> firefox-83.0_rc2-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/sq.xpi -> firefox-83.0_rc2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/sr.xpi -> firefox-83.0_rc2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/sv-SE.xpi -> firefox-83.0_rc2-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/ta.xpi -> firefox-83.0_rc2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/te.xpi -> firefox-83.0_rc2-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/th.xpi -> firefox-83.0_rc2-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/tl.xpi -> firefox-83.0_rc2-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/tr.xpi -> firefox-83.0_rc2-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/trs.xpi -> firefox-83.0_rc2-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/uk.xpi -> firefox-83.0_rc2-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/ur.xpi -> firefox-83.0_rc2-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/uz.xpi -> firefox-83.0_rc2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/vi.xpi -> firefox-83.0_rc2-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/xh.xpi -> firefox-83.0_rc2-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/zh-CN.xpi -> firefox-83.0_rc2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/candidates/83.0-candidates/build2/linux-x86_64/xpi/zh-TW.xpi -> firefox-83.0_rc2-zh-TW.xpi )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a39c4b11dfadaf6ce0c04c6aa3030204
+_md5_=fd5e15079df36b7f45dcbcce51bd8547
diff --git a/metadata/md5-cache/www-client/netsurf-3.10-r3 b/metadata/md5-cache/www-client/netsurf-3.10-r4
similarity index 73%
rename from metadata/md5-cache/www-client/netsurf-3.10-r3
rename to metadata/md5-cache/www-client/netsurf-3.10-r4
index 08bb88935e1d..f8fc5509d056 100644
--- a/metadata/md5-cache/www-client/netsurf-3.10-r3
+++ b/metadata/md5-cache/www-client/netsurf-3.10-r4
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.netsurf-browser.org/
 IUSE=bmp +duktape fbcon truetype +gif +gtk gtk2 +javascript +jpeg mng +png +psl rosprite +svg +svgtiny +webp
 KEYWORDS=~amd64 ~arm ~ppc64
 LICENSE=GPL-2 MIT
-RDEPEND=>=dev-libs/libcss-0.9 >=net-libs/libdom-0.3 >=net-libs/libhubbub-0.3 >=dev-libs/libnsutils-0.1.0 >=dev-libs/libutf8proc-2.4 dev-libs/libxml2:2 net-misc/curl bmp? ( >=media-libs/libnsbmp-0.1 ) fbcon? ( >=dev-libs/libnsfb-0.2.2 truetype? ( media-fonts/dejavu >=media-libs/freetype-2.5.0.1 ) ) gif? ( >=media-libs/libnsgif-0.1 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) gtk2? ( dev-libs/glib:2 x11-libs/gtk+:2 ) javascript? ( >=dev-libs/nsgenbind-0.7 duktape? ( dev-lang/duktape ) !duktape? ( dev-lang/spidermonkey:0= ) ) jpeg? ( >=virtual/jpeg-0-r2:0 ) mng? ( >=media-libs/libmng-1.0.10-r2 ) png? ( >=media-libs/libpng-1.2.51:0 ) psl? ( media-libs/libnspsl ) rosprite? ( >=media-libs/librosprite-0.1.2-r1 ) svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1 ) !svgtiny? ( gnome-base/librsvg:2 ) ) webp? ( >=media-libs/libwebp-0.3.0 )
+RDEPEND=>=dev-libs/libcss-0.9 >=net-libs/libdom-0.3 >=net-libs/libhubbub-0.3 >=dev-libs/libnsutils-0.1.0 >=dev-libs/libutf8proc-2.4 dev-libs/libxml2:2 net-misc/curl bmp? ( >=media-libs/libnsbmp-0.1 ) fbcon? ( >=dev-libs/libnsfb-0.2.2 truetype? ( media-fonts/dejavu >=media-libs/freetype-2.5.0.1 ) ) gif? ( >=media-libs/libnsgif-0.1 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) gtk2? ( dev-libs/glib:2 x11-libs/gtk+:2 ) javascript? ( >=dev-libs/nsgenbind-0.7 duktape? ( dev-lang/duktape:= ) !duktape? ( dev-lang/spidermonkey:0= ) ) jpeg? ( >=virtual/jpeg-0-r2:0 ) mng? ( >=media-libs/libmng-1.0.10-r2 ) png? ( >=media-libs/libpng-1.2.51:0 ) psl? ( media-libs/libnspsl ) rosprite? ( >=media-libs/librosprite-0.1.2-r1 ) svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1 ) !svgtiny? ( gnome-base/librsvg:2 ) ) webp? ( >=media-libs/libwebp-0.3.0 )
 REQUIRED_USE=|| ( fbcon gtk gtk2 ) duktape? ( javascript )
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.10-src.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	98584e405e2b0264d37e8f728327fed1	netsurf	8d6ce5a28a5af61bfb3a264ac8d46867	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c0b1e67207ac0ced3a5a6905312c0589
+_md5_=c05ebcfcbfe836ff569b0a388f4b6ef3
diff --git a/metadata/md5-cache/www-client/seamonkey-2.53.5_beta1-r1 b/metadata/md5-cache/www-client/seamonkey-2.53.5
similarity index 90%
rename from metadata/md5-cache/www-client/seamonkey-2.53.5_beta1-r1
rename to metadata/md5-cache/www-client/seamonkey-2.53.5
index 076fe3ef0de0..7c4a2c13f584 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.53.5_beta1-r1
+++ b/metadata/md5-cache/www-client/seamonkey-2.53.5
@@ -9,6 +9,6 @@ LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=app-text/hunspell-1.5.4:= dev-libs/atk >=dev-libs/glib-2.26:2 >=dev-libs/libffi-3.0.10:= >=dev-libs/nspr-4.23 >=dev-libs/nss-3.47.1 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=media-libs/libpng-1.6.31:0=[apng] >=media-libs/mesa-10.2:= >=sys-libs/zlib-1.2.3 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 >=x11-libs/pixman-0.19.2 media-video/ffmpeg virtual/freedesktop-icon-theme dbus? ( >=dev-libs/dbus-glib-0.72 >=sys-apps/dbus-0.60 ) jack? ( virtual/jack ) crypt? ( <x11-plugins/enigmail-2.1.0 ) kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.9-r1 >=media-libs/harfbuzz-1.3.3:0= ) system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-libvpx? ( >=media-libs/libvpx-1.8.0:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.19.3:3[secure-delete,debug=] ) wifi? ( kernel_linux? ( >=dev-libs/dbus-glib-0.72 net-misc/networkmanager >=sys-apps/dbus-0.60 ) ) selinux? ( sec-policy/selinux-mozilla )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/seamonkey/releases/2.53.5b1/source/seamonkey-2.53.5b1.source.tar.xz -> seamonkey-2.53.5_beta1.source.tar.xz https://archive.mozilla.org/pub/seamonkey/releases/2.53.5b1/source/seamonkey-2.53.5b1.source-l10n.tar.xz -> seamonkey-2.53.5_beta1.source-l10n.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.53.5_beta1-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/seamonkey-2.53.5_beta1-perf-guide_checksum.patch system-libvpx? ( https://dev.gentoo.org/~polynomial-c/mozilla/seamonkey-2.53.3-system_libvpx-1.8.patch.xz )
+SRC_URI=https://archive.mozilla.org/pub/seamonkey/releases/2.53.5/source/seamonkey-2.53.5.source.tar.xz -> seamonkey-2.53.5.source.tar.xz https://archive.mozilla.org/pub/seamonkey/releases/2.53.5/source/seamonkey-2.53.5.source-l10n.tar.xz -> seamonkey-2.53.5.source-l10n.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.53.5_beta1-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/seamonkey-2.53.5_beta1-perf-guide_checksum.patch system-libvpx? ( https://dev.gentoo.org/~polynomial-c/mozilla/seamonkey-2.53.3-system_libvpx-1.8.patch.xz )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mozcoreconf-v6	129723b9b03cb06a0b3c8e1f68748c94	mozextension	798d8c84c9e7a8105e56c9eb6626e643	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	98584e405e2b0264d37e8f728327fed1	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0968a50896b5608569d5950331c816c4
+_md5_=d7897aa17080d08247d95653e8e117b7
diff --git a/metadata/md5-cache/www-client/seamonkey-2.53.5_beta1 b/metadata/md5-cache/www-client/seamonkey-2.53.5_beta1
deleted file mode 100644
index 63d5f9d6cc8b..000000000000
--- a/metadata/md5-cache/www-client/seamonkey-2.53.5_beta1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup unpack
-DEPEND=>=app-text/hunspell-1.5.4:= dev-libs/atk >=dev-libs/glib-2.26:2 >=dev-libs/libffi-3.0.10:= >=dev-libs/nspr-4.23 >=dev-libs/nss-3.47.1 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=media-libs/libpng-1.6.31:0=[apng] >=media-libs/mesa-10.2:= >=sys-libs/zlib-1.2.3 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 >=x11-libs/pixman-0.19.2 media-video/ffmpeg virtual/freedesktop-icon-theme dbus? ( >=dev-libs/dbus-glib-0.72 >=sys-apps/dbus-0.60 ) jack? ( virtual/jack ) crypt? ( <x11-plugins/enigmail-2.1.0 ) kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.9-r1 >=media-libs/harfbuzz-1.3.3:0= ) system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-libvpx? ( >=media-libs/libvpx-1.8.0:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.19.3:3[secure-delete,debug=] ) wifi? ( kernel_linux? ( >=dev-libs/dbus-glib-0.72 net-misc/networkmanager >=sys-apps/dbus-0.60 ) ) app-arch/unzip app-arch/zip dev-lang/perl sys-apps/findutils >=sys-devel/binutils-2.16.1 virtual/pkgconfig >=virtual/rust-1.34.0 amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.8[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.6[ncurses,sqlite,ssl,threads(+)] ) app-arch/unzip
-DESCRIPTION=Seamonkey Web Browser
-EAPI=6
-HOMEPAGE=http://www.seamonkey-project.org
-IUSE=+calendar +chatzilla +crypt dbus debug +gmp-autoupdate +ipc jack minimal neon pulseaudio +roaming selinux startup-notification system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx test wifi custom-cflags custom-optimization l10n_cs l10n_de l10n_en-GB l10n_es-AR l10n_es-ES l10n_fr l10n_hu l10n_it l10n_ja l10n_lt l10n_nl l10n_pl l10n_pt-PT l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=app-text/hunspell-1.5.4:= dev-libs/atk >=dev-libs/glib-2.26:2 >=dev-libs/libffi-3.0.10:= >=dev-libs/nspr-4.23 >=dev-libs/nss-3.47.1 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=media-libs/libpng-1.6.31:0=[apng] >=media-libs/mesa-10.2:= >=sys-libs/zlib-1.2.3 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 >=x11-libs/pixman-0.19.2 media-video/ffmpeg virtual/freedesktop-icon-theme dbus? ( >=dev-libs/dbus-glib-0.72 >=sys-apps/dbus-0.60 ) jack? ( virtual/jack ) crypt? ( <x11-plugins/enigmail-2.1.0 ) kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.9-r1 >=media-libs/harfbuzz-1.3.3:0= ) system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-libvpx? ( >=media-libs/libvpx-1.8.0:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.19.3:3[secure-delete,debug=] ) wifi? ( kernel_linux? ( >=dev-libs/dbus-glib-0.72 net-misc/networkmanager >=sys-apps/dbus-0.60 ) ) selinux? ( sec-policy/selinux-mozilla )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/seamonkey/releases/2.53.5b1/source/seamonkey-2.53.5b1.source.tar.xz -> seamonkey-2.53.5_beta1.source.tar.xz https://archive.mozilla.org/pub/seamonkey/releases/2.53.5b1/source/seamonkey-2.53.5b1.source-l10n.tar.xz -> seamonkey-2.53.5_beta1.source-l10n.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.53.5_beta1-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/seamonkey-2.53.5_beta1-perf-guide_checksum.patch system-libvpx? ( https://dev.gentoo.org/~polynomial-c/mozilla/seamonkey-2.53.3-system_libvpx-1.8.patch.xz )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mozcoreconf-v6	129723b9b03cb06a0b3c8e1f68748c94	mozextension	798d8c84c9e7a8105e56c9eb6626e643	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	98584e405e2b0264d37e8f728327fed1	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3a8288e001200cfbd67633415c80a87d
diff --git a/metadata/md5-cache/www-client/vivaldi-3.4.2066.106_p1 b/metadata/md5-cache/www-client/vivaldi-3.4.2066.106_p1
index 5064add47323..79c7e97cc9e2 100644
--- a/metadata/md5-cache/www-client/vivaldi-3.4.2066.106_p1
+++ b/metadata/md5-cache/www-client/vivaldi-3.4.2066.106_p1
@@ -4,11 +4,11 @@ DESCRIPTION=A browser for our friends
 EAPI=7
 HOMEPAGE=https://vivaldi.com/
 IUSE=kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~x86
+KEYWORDS=-* amd64 ~arm ~arm64 x86
 LICENSE=Vivaldi
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.4.2066.106-1_amd64.deb -> vivaldi-3.4.2066.106_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.4.2066.106-1_arm64.deb -> vivaldi-3.4.2066.106_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.4.2066.106-1_armhf.deb -> vivaldi-3.4.2066.106_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.4.2066.106-1_i386.deb -> vivaldi-3.4.2066.106_p1-i386.deb )
 _eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=166bc12e277fc6d103525dfeb92bf2b0
+_md5_=8e28ef6eecad72dd49bb5af130c4de22
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 530c8dabf982..61f9afe743a6 100644
Binary files a/metadata/md5-cache/www-servers/Manifest.gz and b/metadata/md5-cache/www-servers/Manifest.gz differ
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.58 b/metadata/md5-cache/www-servers/tomcat-8.5.58
deleted file mode 100644
index 67048fc9cd07..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-8.5.58
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-8.5.58:3.1 app-admin/pwgen >=dev-java/ant-core-1.9.13 virtual/jdk:1.8 doc? ( dev-java/glassfish-xmlrpc-api:0 dev-java/wsdl4j:0 ) test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-8.5.58:3.1 virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=8.5
-SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.58/src/apache-tomcat-8.5.58-src.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7a66a7096d3af931dab27cf639d15d76
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.59 b/metadata/md5-cache/www-servers/tomcat-8.5.59
index 98674e6ca5c7..3b2cc9c6fab8 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.5.59
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.59
@@ -4,11 +4,11 @@ DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-8.5.59:3.1 virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=8.5
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.59/src/apache-tomcat-8.5.59-src.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e4cb7d01d39794b7795a92a8d7028661
+_md5_=7a66a7096d3af931dab27cf639d15d76
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 64e226eadffd..87cd95d100b0 100644
Binary files a/metadata/md5-cache/x11-drivers/Manifest.gz and b/metadata/md5-cache/x11-drivers/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r4 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r4
index 00d0774ff83b..440f9f13738e 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r4
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r4
@@ -12,5 +12,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror test
 SLOT=0/390
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/390.132/NVIDIA-FreeBSD-x86_64-390.132.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/390.132/NVIDIA-Linux-x86_64-390.132.run ) arm? ( https://us.download.nvidia.com/XFree86/Linux-x86-ARM/390.132/NVIDIA-Linux-armv7l-gnueabihf-390.132.run ) x86-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86/390.132/NVIDIA-FreeBSD-x86-390.132.tar.gz ) x86? ( https://us.download.nvidia.com/XFree86/Linux-x86/390.132/NVIDIA-Linux-x86-390.132.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.132.tar.bz2 )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	b40ba35b73b8e8861989898c1c8370db	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	88985b2bdec6b189a822e52048cd01af	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1b2c89c4469cbba6b1b9cf361a70c4df
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.138-r4 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.138-r4
index 0ecf50da5820..bb8b5be1af42 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.138-r4
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.138-r4
@@ -12,5 +12,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror test
 SLOT=0/390
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/390.138/NVIDIA-FreeBSD-x86_64-390.138.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/390.138/NVIDIA-Linux-x86_64-390.138.run ) arm? ( https://us.download.nvidia.com/XFree86/Linux-x86-ARM/390.138/NVIDIA-Linux-armv7l-gnueabihf-390.138.run ) x86-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86/390.138/NVIDIA-FreeBSD-x86-390.138.tar.gz ) x86? ( https://us.download.nvidia.com/XFree86/Linux-x86/390.138/NVIDIA-Linux-x86-390.138.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.138.tar.bz2 )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	b40ba35b73b8e8861989898c1c8370db	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	88985b2bdec6b189a822e52048cd01af	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=51fb8e0d0f13ed4cab7530da1ed56634
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r6 b/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r6
index daab82a3ba40..b86c3c7c1f6e 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r6
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r6
@@ -12,5 +12,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror test
 SLOT=0/435
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/435.21/NVIDIA-FreeBSD-x86_64-435.21.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/435.21/NVIDIA-Linux-x86_64-435.21.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-435.21.tar.bz2 )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	b40ba35b73b8e8861989898c1c8370db	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	88985b2bdec6b189a822e52048cd01af	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=28a3539e0cbd019090c86abfe27887fc
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-440.100-r2 b/metadata/md5-cache/x11-drivers/nvidia-drivers-440.100-r2
index 4a2639f17675..198c236a5eb9 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-440.100-r2
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-440.100-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror test
 SLOT=0/440
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/440.100/NVIDIA-FreeBSD-x86_64-440.100.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/440.100/NVIDIA-Linux-x86_64-440.100.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-440.100.tar.bz2 )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	b40ba35b73b8e8861989898c1c8370db	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	88985b2bdec6b189a822e52048cd01af	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=791539f58b34ce0f789a3da07a8973eb
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-450.80.02 b/metadata/md5-cache/x11-drivers/nvidia-drivers-450.80.02
index 683fe27b9d22..d803b7ed3412 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-450.80.02
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-450.80.02
@@ -12,5 +12,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror test
 SLOT=0/450
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/450.80.02/NVIDIA-FreeBSD-x86_64-450.80.02.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/450.80.02/NVIDIA-Linux-x86_64-450.80.02.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-450.80.02.tar.bz2 )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	b40ba35b73b8e8861989898c1c8370db	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	88985b2bdec6b189a822e52048cd01af	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=36985b4ae8459817638ec6d803f43e8e
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-455.28 b/metadata/md5-cache/x11-drivers/nvidia-drivers-455.28
index aac215060454..2ddb9835b176 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-455.28
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-455.28
@@ -12,5 +12,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror test
 SLOT=0/455
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/455.28/NVIDIA-FreeBSD-x86_64-455.28.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/455.28/NVIDIA-Linux-x86_64-455.28.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-455.28.tar.bz2 )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	b40ba35b73b8e8861989898c1c8370db	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	88985b2bdec6b189a822e52048cd01af	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7eb0a553543894578c97cdfdb5597731
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-455.38 b/metadata/md5-cache/x11-drivers/nvidia-drivers-455.38
index 4dc1e74d8f8c..b758ea8955a6 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-455.38
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-455.38
@@ -12,5 +12,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror test
 SLOT=0/455
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/455.38/NVIDIA-FreeBSD-x86_64-455.38.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/455.38/NVIDIA-Linux-x86_64-455.38.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-455.38.tar.bz2 )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	b40ba35b73b8e8861989898c1c8370db	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	88985b2bdec6b189a822e52048cd01af	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a230bfb588dd1ad5d1b3ad20792443d1
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 4e1ebbd1ca87..4118f1e18dec 100644
Binary files a/metadata/md5-cache/x11-libs/Manifest.gz and b/metadata/md5-cache/x11-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-libs/gdk-pixbuf-xlib-2.40.2 b/metadata/md5-cache/x11-libs/gdk-pixbuf-xlib-2.40.2
new file mode 100644
index 000000000000..dc720265c2e1
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/gdk-pixbuf-xlib-2.40.2
@@ -0,0 +1,14 @@
+BDEPEND=gtk-doc? ( app-text/docbook-xml-dtd:4.3 >=dev-util/gtk-doc-1.20 ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install test
+DEPEND=dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.42.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(-)?] x11-libs/libX11[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=Deprecated Xlib integration for GdkPixbuf
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib
+IUSE=gtk-doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.42.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(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib/-/archive/2.40.2/gdk-pixbuf-xlib-2.40.2.tar.bz2
+_eclasses_=meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b13c24e3aecf9a2d3bf8f9f793c63cc7
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.24.22 b/metadata/md5-cache/x11-libs/gtk+-3.24.22
index 531e36492b9c..58f31d83ea6f 100644
--- a/metadata/md5-cache/x11-libs/gtk+-3.24.22
+++ b/metadata/md5-cache/x11-libs/gtk+-3.24.22
@@ -4,7 +4,7 @@ DESCRIPTION=Gimp ToolKit +
 EAPI=6
 HOMEPAGE=https://www.gtk.org/
 IUSE=aqua broadway cloudprint colord cups examples gtk-doc +introspection test vim-syntax wayland +X xinerama test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 PDEPEND=gnome-base/librsvg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-themes/adwaita-icon-theme-3.14 vim-syntax? ( app-vim/gtk-syntax )
 RDEPEND=>=dev-libs/atk-2.15[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/fribidi-0.19.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.57.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libepoxy-1.4[X(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.41.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-0.9:= x11-misc/shared-mime-info cloudprint? ( >=net-libs/rest-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/json-glib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) colord? ( >=x11-misc/colord-0.1.9:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) wayland? ( >=dev-libs/wayland-1.14.91[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.14 media-libs/mesa[wayland,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxkbcommon-0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.5.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/mesa[X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXdamage[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=dev-util/gtk-update-icon-cache-3 !<gnome-base/gail-1000 !<x11-libs/vte-0.31.0:2.90
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=3
 SRC_URI=mirror://gnome/sources/gtk+/3.24/gtk+-3.24.22.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f13861455c6c5f542740a085272a4b51
+_md5_=115e9adc51f7b8d337bb04830aa6b74e
diff --git a/metadata/md5-cache/x11-libs/libast-0.7-r2 b/metadata/md5-cache/x11-libs/libast-0.7-r2
index fbca511ec0e1..8ce54a8a04ae 100644
--- a/metadata/md5-cache/x11-libs/libast-0.7-r2
+++ b/metadata/md5-cache/x11-libs/libast-0.7-r2
@@ -1,7 +1,7 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=configure install
 DEPEND=!sci-astronomy/ast x11-base/xorg-proto x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-libs/libX11 media-libs/freetype imlib? ( media-libs/imlib2 ) pcre? ( dev-libs/libpcre )
 DESCRIPTION=LIBrary of Assorted Spiffy Things
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.eterm.org/download/
 IUSE=imlib cpu_flags_x86_mmx pcre
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 RDEPEND=!sci-astronomy/ast x11-base/xorg-proto x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-libs/libX11 media-libs/freetype imlib? ( media-libs/imlib2 ) pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=http://www.eterm.org/download/libast-0.7.tar.gz
-_md5_=70c5244a6e0e7dbc373049abaed03e6b
+_md5_=42284d66c03fdad34c9449f37be3afd1
diff --git a/metadata/md5-cache/x11-libs/neXtaw-0.15.1-r3 b/metadata/md5-cache/x11-libs/neXtaw-0.15.1-r3
index a3197114341a..7c11a20b91c5 100644
--- a/metadata/md5-cache/x11-libs/neXtaw-0.15.1-r3
+++ b/metadata/md5-cache/x11-libs/neXtaw-0.15.1-r3
@@ -1,11 +1,11 @@
-DEFINED_PHASES=install
+DEFINED_PHASES=configure install
 DEPEND=x11-base/xorg-proto x11-libs/libICE x11-libs/libXext x11-libs/libXt x11-libs/libX11 x11-libs/libSM x11-libs/libXmu x11-libs/libxkbfile x11-libs/libXpm !<x11-libs/neXtaw-0.15.1-r1
 DESCRIPTION=Athena Widgets with N*XTSTEP appearance
-EAPI=6
+EAPI=7
 HOMEPAGE=http://siag.nu/neXtaw/
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=BSD
 RDEPEND=x11-base/xorg-proto x11-libs/libICE x11-libs/libXext x11-libs/libXt x11-libs/libX11 x11-libs/libSM x11-libs/libXmu x11-libs/libxkbfile x11-libs/libXpm !<x11-libs/neXtaw-0.15.1-r1
 SLOT=0
 SRC_URI=http://siag.nu/pub/neXtaw/neXtaw-0.15.1.tar.gz
-_md5_=2fc3dfb3c4f01ea714b008e90feaa67b
+_md5_=a7bf956a305fe80e08751930927deb0a
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 8744485ece34..053dd5ac2b30 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/clipmenu-6.0.1 b/metadata/md5-cache/x11-misc/clipmenu-6.0.1
new file mode 100644
index 000000000000..fb24fcf1ae2b
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/clipmenu-6.0.1
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install
+DESCRIPTION=Clipboard management using dmenu
+EAPI=7
+HOMEPAGE=https://github.com/cdown/clipmenu
+KEYWORDS=~amd64 ~x86
+LICENSE=Unlicense
+RDEPEND=x11-misc/clipnotify x11-misc/dmenu x11-misc/xsel
+SLOT=0
+SRC_URI=https://github.com/cdown/clipmenu/archive/6.0.1.tar.gz -> clipmenu-6.0.1.tar.gz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=90359e567cba9cb046b8bf68ea5b0fb4
diff --git a/metadata/md5-cache/x11-misc/clipmenu-6.1.0 b/metadata/md5-cache/x11-misc/clipmenu-6.1.0
new file mode 100644
index 000000000000..b1bc122a1f79
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/clipmenu-6.1.0
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install
+DESCRIPTION=Clipboard management using dmenu
+EAPI=7
+HOMEPAGE=https://github.com/cdown/clipmenu
+KEYWORDS=~amd64 ~x86
+LICENSE=Unlicense
+RDEPEND=x11-misc/clipnotify x11-misc/dmenu x11-misc/xsel
+SLOT=0
+SRC_URI=https://github.com/cdown/clipmenu/archive/6.1.0.tar.gz -> clipmenu-6.1.0.tar.gz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f1ecf15aa68fcca0d8dce9c3ef12b569
diff --git a/metadata/md5-cache/x11-misc/clipnotify-1.0.2 b/metadata/md5-cache/x11-misc/clipnotify-1.0.2
new file mode 100644
index 000000000000..beb2dc243c32
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/clipnotify-1.0.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=x11-libs/libX11 x11-libs/libXfixes
+DESCRIPTION=Notify on new X clipboard events
+EAPI=7
+HOMEPAGE=https://github.com/cdown/clipnotify
+KEYWORDS=~amd64 ~x86
+LICENSE=Unlicense
+RDEPEND=x11-libs/libX11 x11-libs/libXfixes
+SLOT=0
+SRC_URI=https://github.com/cdown/clipnotify/archive/1.0.2.tar.gz -> clipnotify-1.0.2.tar.gz
+_md5_=4dd6854402fa7037c8f068b10c3be5ef
diff --git a/metadata/md5-cache/x11-misc/lineakd-0.9.0-r2 b/metadata/md5-cache/x11-misc/lineakd-0.9.0-r2
index 8c3279dc023a..551f8f4d8543 100644
--- a/metadata/md5-cache/x11-misc/lineakd-0.9.0-r2
+++ b/metadata/md5-cache/x11-misc/lineakd-0.9.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=mirror://sourceforge/lineak/lineakd-0.9.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7a03f746d63c758255c4b5254088bf85
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=cd1bfaed5c42b0e21ea636a549696a35
diff --git a/metadata/md5-cache/x11-misc/lineakd-0.9.0-r3 b/metadata/md5-cache/x11-misc/lineakd-0.9.0-r3
index ecd9fe0dacea..12e08a92ff29 100644
--- a/metadata/md5-cache/x11-misc/lineakd-0.9.0-r3
+++ b/metadata/md5-cache/x11-misc/lineakd-0.9.0-r3
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=mirror://sourceforge/lineak/lineakd-0.9.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0476dfc1de9eb8d3a158315da18e325a
+_md5_=9ee58c392bad29ca55888a7736a77030
diff --git a/metadata/md5-cache/x11-misc/xdock-0.3.0 b/metadata/md5-cache/x11-misc/xdock-0.3.0
index 860b7e243054..a248992c1bff 100644
--- a/metadata/md5-cache/x11-misc/xdock-0.3.0
+++ b/metadata/md5-cache/x11-misc/xdock-0.3.0
@@ -1,4 +1,4 @@
-DEFINED_PHASES=prepare
+DEFINED_PHASES=configure install prepare
 DEPEND=x11-libs/libX11 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=emulates Window Maker docks (runs in any window manager)
 EAPI=5
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=mirror://sourceforge/xdock/xdock-0.3.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9314873d01587c9680a6bec1642c29a7
+_md5_=79263f6f1f8d3b5fd0e843177314feff
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index 09fe4ac5d89e..4e33eab7f674 100644
Binary files a/metadata/md5-cache/x11-plugins/Manifest.gz and b/metadata/md5-cache/x11-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-plugins/pidgin-extprefs-0.7-r1 b/metadata/md5-cache/x11-plugins/pidgin-extprefs-0.7-r1
index 9bf4e8c0f623..ffa658adfcd3 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-extprefs-0.7-r1
+++ b/metadata/md5-cache/x11-plugins/pidgin-extprefs-0.7-r1
@@ -1,11 +1,12 @@
-DEFINED_PHASES=-
-DEPEND=virtual/pkgconfig net-im/pidgin[gtk]
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=net-im/pidgin[gtk]
 DESCRIPTION=Extra preferences that are desired but are not worthy for Pidgin
-EAPI=6
+EAPI=7
 HOMEPAGE=http://gaim-extprefs.sourceforge.net
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=net-im/pidgin[gtk]
 SLOT=0
 SRC_URI=mirror://sourceforge/gaim-extprefs/pidgin-extprefs-0.7.tar.gz
-_md5_=639003f1de05dd9a48f2a70509db9b64
+_md5_=9d24151f89f122456bf28ae4c6c9f11d
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index a56f45072ac3..3218ac8a0cba 100644
Binary files a/metadata/md5-cache/x11-terms/Manifest.gz and b/metadata/md5-cache/x11-terms/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-terms/alacritty-0.6.0_rc2 b/metadata/md5-cache/x11-terms/alacritty-0.6.0_rc2
new file mode 100644
index 000000000000..b12e0672db86
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/alacritty-0.6.0_rc2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/cmake >=virtual/rust-1.37.0
+DEFINED_PHASES=compile configure install setup test unpack
+DEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 )
+DESCRIPTION=GPU-accelerated terminal emulator
+EAPI=7
+HOMEPAGE=https://github.com/alacritty/alacritty
+IUSE=wayland +X debug
+KEYWORDS=~amd64 ~arm64 ~ppc64
+LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 BSD BSD-2 CC0-1.0 FTL ISC MIT MPL-2.0 Unlicense WTFPL-2 ZLIB
+RDEPEND=media-libs/fontconfig:= media-libs/freetype:2 X? ( x11-libs/libxcb:=[xkb] ) media-libs/mesa[X?,wayland?] sys-libs/zlib sys-libs/ncurses:0 wayland? ( dev-libs/wayland ) X? ( x11-libs/libXcursor x11-libs/libXi x11-libs/libXrandr )
+REQUIRED_USE=|| ( wayland X )
+SLOT=0
+SRC_URI=https://github.com/alacritty/alacritty/archive/v0.6.0-rc2.tar.gz -> alacritty-0.6.0_rc2.tar.gz https://crates.io/api/v1/crates/ab_glyph_rasterizer/0.1.4/download -> ab_glyph_rasterizer-0.1.4.crate https://crates.io/api/v1/crates/adler32/1.2.0/download -> adler32-1.2.0.crate https://crates.io/api/v1/crates/aho-corasick/0.7.14/download -> aho-corasick-0.7.14.crate https://crates.io/api/v1/crates/andrew/0.3.1/download -> andrew-0.3.1.crate https://crates.io/api/v1/crates/android_glue/0.2.3/download -> android_glue-0.2.3.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arc-swap/0.4.7/download -> arc-swap-0.4.7.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.12.3/download -> base64-0.12.3.crate https://crates.io/api/v1/crates/bindgen/0.53.3/download -> bindgen-0.53.3.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/bytemuck/1.4.1/download -> bytemuck-1.4.1.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/bzip2/0.3.3/download -> bzip2-0.3.3.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.9+1.0.8/download -> bzip2-sys-0.1.9+1.0.8.crate https://crates.io/api/v1/crates/calloop/0.6.5/download -> calloop-0.6.5.crate https://crates.io/api/v1/crates/cc/1.0.61/download -> cc-1.0.61.crate https://crates.io/api/v1/crates/cexpr/0.4.0/download -> cexpr-0.4.0.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cgl/0.3.2/download -> cgl-0.3.2.crate https://crates.io/api/v1/crates/clang-sys/0.29.3/download -> clang-sys-0.29.3.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/clipboard-win/3.1.1/download -> clipboard-win-3.1.1.crate https://crates.io/api/v1/crates/cloudabi/0.1.0/download -> cloudabi-0.1.0.crate https://crates.io/api/v1/crates/cmake/0.1.44/download -> cmake-0.1.44.crate https://crates.io/api/v1/crates/cocoa/0.23.0/download -> cocoa-0.23.0.crate https://crates.io/api/v1/crates/cocoa/0.24.0/download -> cocoa-0.24.0.crate https://crates.io/api/v1/crates/cocoa-foundation/0.1.0/download -> cocoa-foundation-0.1.0.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/copypasta/0.7.1/download -> copypasta-0.7.1.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.1/download -> core-foundation-0.9.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.2/download -> core-foundation-sys-0.8.2.crate https://crates.io/api/v1/crates/core-graphics/0.19.2/download -> core-graphics-0.19.2.crate https://crates.io/api/v1/crates/core-graphics/0.22.1/download -> core-graphics-0.22.1.crate https://crates.io/api/v1/crates/core-graphics-types/0.1.1/download -> core-graphics-types-0.1.1.crate https://crates.io/api/v1/crates/core-text/19.1.0/download -> core-text-19.1.0.crate https://crates.io/api/v1/crates/core-video-sys/0.1.4/download -> core-video-sys-0.1.4.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/crossfont/0.1.1/download -> crossfont-0.1.1.crate https://crates.io/api/v1/crates/darling/0.10.2/download -> darling-0.10.2.crate https://crates.io/api/v1/crates/darling_core/0.10.2/download -> darling_core-0.10.2.crate https://crates.io/api/v1/crates/darling_macro/0.10.2/download -> darling_macro-0.10.2.crate https://crates.io/api/v1/crates/deflate/0.8.6/download -> deflate-0.8.6.crate https://crates.io/api/v1/crates/derivative/2.1.1/download -> derivative-2.1.1.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.5/download -> dirs-sys-0.3.5.crate https://crates.io/api/v1/crates/dispatch/0.2.0/download -> dispatch-0.2.0.crate https://crates.io/api/v1/crates/dlib/0.4.2/download -> dlib-0.4.2.crate https://crates.io/api/v1/crates/downcast-rs/1.2.0/download -> downcast-rs-1.2.0.crate https://crates.io/api/v1/crates/dtoa/0.4.6/download -> dtoa-0.4.6.crate https://crates.io/api/v1/crates/dwrote/0.11.0/download -> dwrote-0.11.0.crate https://crates.io/api/v1/crates/embed-resource/1.3.3/download -> embed-resource-1.3.3.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/euclid/0.22.1/download -> euclid-0.22.1.crate https://crates.io/api/v1/crates/expat-sys/2.1.6/download -> expat-sys-2.1.6.crate https://crates.io/api/v1/crates/filetime/0.2.12/download -> filetime-0.2.12.crate https://crates.io/api/v1/crates/flate2/1.0.14/download -> flate2-1.0.14.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types/0.5.0/download -> foreign-types-0.5.0.crate https://crates.io/api/v1/crates/foreign-types-macros/0.2.1/download -> foreign-types-macros-0.2.1.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/foreign-types-shared/0.3.0/download -> foreign-types-shared-0.3.0.crate https://crates.io/api/v1/crates/freetype-rs/0.26.0/download -> freetype-rs-0.26.0.crate https://crates.io/api/v1/crates/freetype-sys/0.13.1/download -> freetype-sys-0.13.1.crate https://crates.io/api/v1/crates/fsevent/0.4.0/download -> fsevent-0.4.0.crate https://crates.io/api/v1/crates/fsevent-sys/2.0.1/download -> fsevent-sys-2.0.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/getrandom/0.1.15/download -> getrandom-0.1.15.crate https://crates.io/api/v1/crates/gl_generator/0.14.0/download -> gl_generator-0.14.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/glutin/0.25.1/download -> glutin-0.25.1.crate https://crates.io/api/v1/crates/glutin_egl_sys/0.1.5/download -> glutin_egl_sys-0.1.5.crate https://crates.io/api/v1/crates/glutin_emscripten_sys/0.1.1/download -> glutin_emscripten_sys-0.1.1.crate https://crates.io/api/v1/crates/glutin_gles2_sys/0.1.5/download -> glutin_gles2_sys-0.1.5.crate https://crates.io/api/v1/crates/glutin_glx_sys/0.1.7/download -> glutin_glx_sys-0.1.7.crate https://crates.io/api/v1/crates/glutin_wgl_sys/0.1.5/download -> glutin_wgl_sys-0.1.5.crate https://crates.io/api/v1/crates/hermit-abi/0.1.17/download -> hermit-abi-0.1.17.crate https://crates.io/api/v1/crates/http_req/0.5.5/download -> http_req-0.5.5.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/image/0.23.10/download -> image-0.23.10.crate https://crates.io/api/v1/crates/inotify/0.7.1/download -> inotify-0.7.1.crate https://crates.io/api/v1/crates/inotify-sys/0.1.3/download -> inotify-sys-0.1.3.crate https://crates.io/api/v1/crates/instant/0.1.7/download -> instant-0.1.7.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itoa/0.4.6/download -> itoa-0.4.6.crate https://crates.io/api/v1/crates/jni-sys/0.3.0/download -> jni-sys-0.3.0.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/khronos_api/3.1.0/download -> khronos_api-3.1.0.crate https://crates.io/api/v1/crates/lazy-bytes-cast/5.0.1/download -> lazy-bytes-cast-5.0.1.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.79/download -> libc-0.2.79.crate https://crates.io/api/v1/crates/libloading/0.5.2/download -> libloading-0.5.2.crate https://crates.io/api/v1/crates/libloading/0.6.4/download -> libloading-0.6.4.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.3/download -> linked-hash-map-0.5.3.crate https://crates.io/api/v1/crates/lock_api/0.4.1/download -> lock_api-0.4.1.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.7/download -> miniz_oxide-0.3.7.crate https://crates.io/api/v1/crates/mio/0.6.22/download -> mio-0.6.22.crate https://crates.io/api/v1/crates/mio-anonymous-pipes/0.1.0/download -> mio-anonymous-pipes-0.1.0.crate https://crates.io/api/v1/crates/mio-extras/2.0.6/download -> mio-extras-2.0.6.crate https://crates.io/api/v1/crates/mio-named-pipes/0.1.7/download -> mio-named-pipes-0.1.7.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/miow/0.3.5/download -> miow-0.3.5.crate https://crates.io/api/v1/crates/native-tls/0.2.4/download -> native-tls-0.2.4.crate https://crates.io/api/v1/crates/ndk/0.2.1/download -> ndk-0.2.1.crate https://crates.io/api/v1/crates/ndk-glue/0.2.1/download -> ndk-glue-0.2.1.crate https://crates.io/api/v1/crates/ndk-macro/0.2.0/download -> ndk-macro-0.2.0.crate https://crates.io/api/v1/crates/ndk-sys/0.2.1/download -> ndk-sys-0.2.1.crate https://crates.io/api/v1/crates/net2/0.2.35/download -> net2-0.2.35.crate https://crates.io/api/v1/crates/nix/0.18.0/download -> nix-0.18.0.crate https://crates.io/api/v1/crates/nom/5.1.2/download -> nom-5.1.2.crate https://crates.io/api/v1/crates/notify/4.0.15/download -> notify-4.0.15.crate https://crates.io/api/v1/crates/num_enum/0.4.3/download -> num_enum-0.4.3.crate https://crates.io/api/v1/crates/num_enum_derive/0.4.3/download -> num_enum_derive-0.4.3.crate https://crates.io/api/v1/crates/num-integer/0.1.43/download -> num-integer-0.1.43.crate https://crates.io/api/v1/crates/num-iter/0.1.41/download -> num-iter-0.1.41.crate https://crates.io/api/v1/crates/num-rational/0.3.0/download -> num-rational-0.3.0.crate https://crates.io/api/v1/crates/num-traits/0.2.12/download -> num-traits-0.2.12.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/once_cell/1.4.1/download -> once_cell-1.4.1.crate https://crates.io/api/v1/crates/openssl/0.10.30/download -> openssl-0.10.30.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.58/download -> openssl-sys-0.9.58.crate https://crates.io/api/v1/crates/osmesa-sys/0.1.2/download -> osmesa-sys-0.1.2.crate https://crates.io/api/v1/crates/owned_ttf_parser/0.6.0/download -> owned_ttf_parser-0.6.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.0/download -> parking_lot-0.11.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.0/download -> parking_lot_core-0.8.0.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/phf/0.8.0/download -> phf-0.8.0.crate https://crates.io/api/v1/crates/phf_codegen/0.8.0/download -> phf_codegen-0.8.0.crate https://crates.io/api/v1/crates/phf_generator/0.8.0/download -> phf_generator-0.8.0.crate https://crates.io/api/v1/crates/phf_shared/0.8.0/download -> phf_shared-0.8.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/png/0.16.7/download -> png-0.16.7.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.9/download -> ppv-lite86-0.2.9.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/proc-macro-crate/0.1.5/download -> proc-macro-crate-0.1.5.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.7/download -> quote-1.0.7.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/raw-window-handle/0.3.3/download -> raw-window-handle-0.3.3.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_users/0.3.5/download -> redox_users-0.3.5.crate https://crates.io/api/v1/crates/regex/1.4.1/download -> regex-1.4.1.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.20/download -> regex-syntax-0.6.20.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rust-argon2/0.8.2/download -> rust-argon2-0.8.2.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rusttype/0.9.2/download -> rusttype-0.9.2.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.19/download -> schannel-0.1.19.crate https://crates.io/api/v1/crates/scoped-tls/1.0.0/download -> scoped-tls-1.0.0.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/security-framework/0.4.4/download -> security-framework-0.4.4.crate https://crates.io/api/v1/crates/security-framework-sys/0.4.3/download -> security-framework-sys-0.4.3.crate https://crates.io/api/v1/crates/serde/1.0.117/download -> serde-1.0.117.crate https://crates.io/api/v1/crates/serde_derive/1.0.117/download -> serde_derive-1.0.117.crate https://crates.io/api/v1/crates/serde_json/1.0.59/download -> serde_json-1.0.59.crate https://crates.io/api/v1/crates/serde_yaml/0.8.13/download -> serde_yaml-0.8.13.crate https://crates.io/api/v1/crates/servo-fontconfig/0.5.1/download -> servo-fontconfig-0.5.1.crate https://crates.io/api/v1/crates/servo-fontconfig-sys/5.1.0/download -> servo-fontconfig-sys-5.1.0.crate https://crates.io/api/v1/crates/shared_library/0.1.9/download -> shared_library-0.1.9.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/signal-hook/0.1.16/download -> signal-hook-0.1.16.crate https://crates.io/api/v1/crates/signal-hook-registry/1.2.1/download -> signal-hook-registry-1.2.1.crate https://crates.io/api/v1/crates/siphasher/0.3.3/download -> siphasher-0.3.3.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/smallvec/1.4.2/download -> smallvec-1.4.2.crate https://crates.io/api/v1/crates/smithay-client-toolkit/0.12.0/download -> smithay-client-toolkit-0.12.0.crate https://crates.io/api/v1/crates/smithay-clipboard/0.6.1/download -> smithay-clipboard-0.6.1.crate https://crates.io/api/v1/crates/socket2/0.3.15/download -> socket2-0.3.15.crate https://crates.io/api/v1/crates/spsc-buffer/0.1.1/download -> spsc-buffer-0.1.1.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/strsim/0.9.3/download -> strsim-0.9.3.crate https://crates.io/api/v1/crates/syn/1.0.46/download -> syn-1.0.46.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.1.0.crate https://crates.io/api/v1/crates/terminfo/0.7.3/download -> terminfo-0.7.3.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.21/download -> thiserror-1.0.21.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.21/download -> thiserror-impl-1.0.21.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/toml/0.5.7/download -> toml-0.5.7.crate https://crates.io/api/v1/crates/ttf-parser/0.6.2/download -> ttf-parser-0.6.2.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/urlocator/0.1.4/download -> urlocator-0.1.4.crate https://crates.io/api/v1/crates/utf8parse/0.2.0/download -> utf8parse-0.2.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.10/download -> vcpkg-0.2.10.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/vswhom/0.1.0/download -> vswhom-0.1.0.crate https://crates.io/api/v1/crates/vswhom-sys/0.1.0/download -> vswhom-sys-0.1.0.crate https://crates.io/api/v1/crates/vte/0.9.0/download -> vte-0.9.0.crate https://crates.io/api/v1/crates/vte_generate_state_changes/0.1.1/download -> vte_generate_state_changes-0.1.1.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wayland-client/0.28.2/download -> wayland-client-0.28.2.crate https://crates.io/api/v1/crates/wayland-commons/0.28.2/download -> wayland-commons-0.28.2.crate https://crates.io/api/v1/crates/wayland-cursor/0.28.2/download -> wayland-cursor-0.28.2.crate https://crates.io/api/v1/crates/wayland-egl/0.28.2/download -> wayland-egl-0.28.2.crate https://crates.io/api/v1/crates/wayland-protocols/0.28.2/download -> wayland-protocols-0.28.2.crate https://crates.io/api/v1/crates/wayland-scanner/0.28.2/download -> wayland-scanner-0.28.2.crate https://crates.io/api/v1/crates/wayland-sys/0.28.2/download -> wayland-sys-0.28.2.crate https://crates.io/api/v1/crates/which/3.1.1/download -> which-3.1.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winit/0.23.0/download -> winit-0.23.0.crate https://crates.io/api/v1/crates/winpty/0.2.0/download -> winpty-0.2.0.crate https://crates.io/api/v1/crates/winpty-sys/0.5.0/download -> winpty-sys-0.5.0.crate https://crates.io/api/v1/crates/winreg/0.6.2/download -> winreg-0.6.2.crate https://crates.io/api/v1/crates/wio/0.2.2/download -> wio-0.2.2.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/x11-clipboard/0.5.1/download -> x11-clipboard-0.5.1.crate https://crates.io/api/v1/crates/x11-dl/2.18.5/download -> x11-dl-2.18.5.crate https://crates.io/api/v1/crates/xcb/0.9.0/download -> xcb-0.9.0.crate https://crates.io/api/v1/crates/xcursor/0.3.2/download -> xcursor-0.3.2.crate https://crates.io/api/v1/crates/xdg/2.2.0/download -> xdg-2.2.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.3/download -> xml-rs-0.8.3.crate https://crates.io/api/v1/crates/yaml-rust/0.4.4/download -> yaml-rust-0.4.4.crate https://crates.io/api/v1/crates/zip/0.5.8/download -> zip-0.5.8.crate
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	562d9bfa1439d2b15de19f67d73c2ee0	desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8f453d48139db4a4bd9a321c47394c45
diff --git a/metadata/md5-cache/x11-terms/alacritty-9999 b/metadata/md5-cache/x11-terms/alacritty-9999
index 6b931e86bd9f..7c36bdeee6fe 100644
--- a/metadata/md5-cache/x11-terms/alacritty-9999
+++ b/metadata/md5-cache/x11-terms/alacritty-9999
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/cmake >=virtual/rust-1.37.0 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install setup test unpack
-DEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 )
+DEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 )
 DESCRIPTION=GPU-accelerated terminal emulator
 EAPI=7
 HOMEPAGE=https://github.com/alacritty/alacritty
@@ -11,4 +11,4 @@ RDEPEND=media-libs/fontconfig:= media-libs/freetype:2 X? ( x11-libs/libxcb:=[xkb
 REQUIRED_USE=|| ( wayland X )
 SLOT=0
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	562d9bfa1439d2b15de19f67d73c2ee0	desktop	7fd20552ce4cc97e8acb132a499a7dd8	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8bc0348d6972359f81a8a58e7ddb6653
+_md5_=c7eb038f3c451e348928060367df9b7f
diff --git a/metadata/md5-cache/x11-terms/mlterm-3.9.0 b/metadata/md5-cache/x11-terms/mlterm-3.9.0
index a1897a71be04..28e940b27375 100644
--- a/metadata/md5-cache/x11-terms/mlterm-3.9.0
+++ b/metadata/md5-cache/x11-terms/mlterm-3.9.0
@@ -4,11 +4,11 @@ DESCRIPTION=A multi-lingual terminal emulator
 EAPI=7
 HOMEPAGE=http://mlterm.sourceforge.net/
 IUSE=bidi brltty cairo canna debug fbcon fcitx freewnn gtk gtk2 harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter wayland xft
-KEYWORDS=~amd64 ppc ppc64 x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 bidi? ( dev-libs/fribidi ) brltty? ( app-accessibility/brltty ) cairo? ( x11-libs/cairo[X(+)] ) canna? ( app-i18n/canna ) fbcon? ( media-fonts/unifont ) fcitx? ( app-i18n/fcitx ) freewnn? ( app-i18n/freewnn ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) harfbuzz? ( media-libs/harfbuzz[truetype(+)] ) ibus? ( app-i18n/ibus ) libssh2? ( net-libs/libssh2 ) m17n-lib? ( dev-libs/m17n-lib ) nls? ( virtual/libintl ) regis? ( || ( media-libs/sdl-ttf media-libs/sdl2-ttf ) ) scim? ( app-i18n/scim ) skk? ( || ( virtual/skkserv app-i18n/skk-jisyo ) ) uim? ( app-i18n/uim ) utempter? ( sys-libs/libutempter ) wayland? ( dev-libs/wayland ) xft? ( x11-libs/libXft )
 REQUIRED_USE=gtk2? ( gtk )
 SLOT=0
 SRC_URI=mirror://sourceforge/mlterm/mlterm-3.9.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8
-_md5_=21a801755254a4848d7d0e0f7dd7ad65
+_md5_=14b3a8eef10308ad053b28c042964326
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 194520aa16a5..5013c94b3633 100644
Binary files a/metadata/md5-cache/x11-themes/Manifest.gz and b/metadata/md5-cache/x11-themes/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.36.1 b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.36.1
index 8995b09361b1..0e1c74b8386a 100644
--- a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.36.1
+++ b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.36.1
@@ -4,11 +4,11 @@ DESCRIPTION=GNOME default icon theme
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/adwaita-icon-theme/
 IUSE=branding
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-3 CC-BY-SA-3.0 ) branding? ( CC-BY-SA-4.0 )
 RDEPEND=>=x11-themes/hicolor-icon-theme-0.10 gnome-base/librsvg:2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/adwaita-icon-theme/3.36/adwaita-icon-theme-3.36.1.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7cf252af2fede679a8c17c48106c0bd1
+_md5_=d75832c55280291f75c3491b9a555267
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 505563eb9799..c77ba8ec2260 100644
Binary files a/metadata/md5-cache/x11-wm/Manifest.gz and b/metadata/md5-cache/x11-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-wm/i3-gaps-4.18.2 b/metadata/md5-cache/x11-wm/i3-gaps-4.18.2
index e6b9ebd77b51..ee0264ed60c4 100644
--- a/metadata/md5-cache/x11-wm/i3-gaps-4.18.2
+++ b/metadata/md5-cache/x11-wm/i3-gaps-4.18.2
@@ -5,11 +5,11 @@ DESCRIPTION=i3 fork with gaps and some more features
 EAPI=7
 HOMEPAGE=https://github.com/Airblader/i3
 IUSE=doc test
-KEYWORDS=~amd64 ~ppc64 x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=BSD
 RDEPEND=dev-libs/glib:2 dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/cairo[X,xcb(+)] x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm dev-lang/perl dev-perl/AnyEvent-I3 dev-perl/JSON-XS !x11-wm/i3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Airblader/i3/archive/4.18.2.tar.gz -> i3-gaps-4.18.2.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f151b65e49d4f8c9e8912ea4f5b62bea
+_md5_=ea54fb571cf6ceb87a84446a313f494f
diff --git a/metadata/md5-cache/x11-wm/icewm-1.7.0 b/metadata/md5-cache/x11-wm/icewm-1.7.0
index 93100d504ee5..5fcfe46948c5 100644
--- a/metadata/md5-cache/x11-wm/icewm-1.7.0
+++ b/metadata/md5-cache/x11-wm/icewm-1.7.0
@@ -1,16 +1,16 @@
 BDEPEND=app-text/asciidoc virtual/pkgconfig nls? ( >=sys-devel/gettext-0.19.6 ) >=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 unpack
-DEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libICE x11-libs/libSM x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr alsa? ( media-libs/alsa-lib media-libs/libsndfile[alsa] ) ao? ( media-libs/libao media-libs/libsndfile ) bidi? ( dev-libs/fribidi ) gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[X] ) !gdk-pixbuf? ( media-libs/libpng:0= virtual/jpeg ) xinerama? ( x11-libs/libXinerama ) || ( app-arch/plzip app-arch/pdlzip app-arch/lzip ) dev-libs/glib:2 x11-base/xorg-proto gdk-pixbuf? ( gnome-base/librsvg:2 )
+DEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libICE x11-libs/libSM x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr alsa? ( media-libs/alsa-lib media-libs/libsndfile[alsa] ) ao? ( media-libs/libao media-libs/libsndfile ) bidi? ( dev-libs/fribidi ) gdk-pixbuf? ( || ( ( x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 ) <x11-libs/gdk-pixbuf-2.42.0:2[X] ) ) !gdk-pixbuf? ( media-libs/libpng:0= virtual/jpeg ) xinerama? ( x11-libs/libXinerama ) || ( app-arch/plzip app-arch/pdlzip app-arch/lzip ) dev-libs/glib:2 x11-base/xorg-proto gdk-pixbuf? ( gnome-base/librsvg:2 )
 DESCRIPTION=Ice Window Manager with Themes
 EAPI=7
 HOMEPAGE=https://ice-wm.org/ https://github.com/ice-wm/icewm
 IUSE=+alsa ao bidi debug +gdk-pixbuf nls truetype uclibc xinerama
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
-RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libICE x11-libs/libSM x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr alsa? ( media-libs/alsa-lib media-libs/libsndfile[alsa] ) ao? ( media-libs/libao media-libs/libsndfile ) bidi? ( dev-libs/fribidi ) gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[X] ) !gdk-pixbuf? ( media-libs/libpng:0= virtual/jpeg ) xinerama? ( x11-libs/libXinerama )
+RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libICE x11-libs/libSM x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr alsa? ( media-libs/alsa-lib media-libs/libsndfile[alsa] ) ao? ( media-libs/libao media-libs/libsndfile ) bidi? ( dev-libs/fribidi ) gdk-pixbuf? ( || ( ( x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 ) <x11-libs/gdk-pixbuf-2.42.0:2[X] ) ) !gdk-pixbuf? ( media-libs/libpng:0= virtual/jpeg ) xinerama? ( x11-libs/libXinerama )
 REQUIRED_USE=|| ( alsa ao )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ice-wm/icewm/releases/download/1.7.0/icewm-1.7.0.tar.lz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
-_md5_=9f439d9be6d0694ffa567c33df4435be
+_md5_=61f16f11b88cafe144d57e5a7c3dc9a2
diff --git a/metadata/md5-cache/x11-wm/icewm-1.8.3 b/metadata/md5-cache/x11-wm/icewm-1.8.3
index e9ef25a5f1e9..605750087b7b 100644
--- a/metadata/md5-cache/x11-wm/icewm-1.8.3
+++ b/metadata/md5-cache/x11-wm/icewm-1.8.3
@@ -1,16 +1,16 @@
 BDEPEND=app-text/asciidoc virtual/pkgconfig nls? ( >=sys-devel/gettext-0.19.6 ) >=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 unpack
-DEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libICE x11-libs/libSM x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr alsa? ( media-libs/alsa-lib media-libs/libsndfile[alsa] ) ao? ( media-libs/libao media-libs/libsndfile ) bidi? ( dev-libs/fribidi ) gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[X] ) !gdk-pixbuf? ( media-libs/libpng:0= virtual/jpeg ) xinerama? ( x11-libs/libXinerama ) || ( app-arch/plzip app-arch/pdlzip app-arch/lzip ) dev-libs/glib:2 x11-base/xorg-proto gdk-pixbuf? ( gnome-base/librsvg:2 )
+DEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libICE x11-libs/libSM x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr alsa? ( media-libs/alsa-lib media-libs/libsndfile[alsa] ) ao? ( media-libs/libao media-libs/libsndfile ) bidi? ( dev-libs/fribidi ) gdk-pixbuf? ( || ( ( x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 ) <x11-libs/gdk-pixbuf-2.42.0:2[X] ) ) !gdk-pixbuf? ( media-libs/libpng:0= virtual/jpeg ) xinerama? ( x11-libs/libXinerama ) || ( app-arch/plzip app-arch/pdlzip app-arch/lzip ) dev-libs/glib:2 x11-base/xorg-proto gdk-pixbuf? ( gnome-base/librsvg:2 )
 DESCRIPTION=Ice Window Manager with Themes
 EAPI=7
 HOMEPAGE=https://ice-wm.org/ https://github.com/ice-wm/icewm
 IUSE=+alsa ao bidi debug +gdk-pixbuf nls truetype uclibc xinerama
 KEYWORDS=amd64 ~ppc sparc x86
 LICENSE=GPL-2
-RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libICE x11-libs/libSM x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr alsa? ( media-libs/alsa-lib media-libs/libsndfile[alsa] ) ao? ( media-libs/libao media-libs/libsndfile ) bidi? ( dev-libs/fribidi ) gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[X] ) !gdk-pixbuf? ( media-libs/libpng:0= virtual/jpeg ) xinerama? ( x11-libs/libXinerama )
+RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libICE x11-libs/libSM x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr alsa? ( media-libs/alsa-lib media-libs/libsndfile[alsa] ) ao? ( media-libs/libao media-libs/libsndfile ) bidi? ( dev-libs/fribidi ) gdk-pixbuf? ( || ( ( x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 ) <x11-libs/gdk-pixbuf-2.42.0:2[X] ) ) !gdk-pixbuf? ( media-libs/libpng:0= virtual/jpeg ) xinerama? ( x11-libs/libXinerama )
 REQUIRED_USE=|| ( alsa ao )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ice-wm/icewm/releases/download/1.8.3/icewm-1.8.3.tar.lz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
-_md5_=8cadd5946dafea0093e2bd41161cec8b
+_md5_=a98668d827f1120f002a36a417206b01
diff --git a/metadata/md5-cache/x11-wm/icewm-1.9.1 b/metadata/md5-cache/x11-wm/icewm-1.9.1
index 102bfa80ae89..df604f8338d1 100644
--- a/metadata/md5-cache/x11-wm/icewm-1.9.1
+++ b/metadata/md5-cache/x11-wm/icewm-1.9.1
@@ -1,16 +1,16 @@
 BDEPEND=app-text/asciidoc virtual/pkgconfig nls? ( >=sys-devel/gettext-0.19.8 ) >=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 unpack
-DEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libICE x11-libs/libSM x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr alsa? ( media-libs/alsa-lib media-libs/libsndfile[alsa] ) ao? ( media-libs/libao media-libs/libsndfile ) bidi? ( dev-libs/fribidi ) gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[X] ) !gdk-pixbuf? ( media-libs/libpng:0= virtual/jpeg ) xinerama? ( x11-libs/libXinerama ) || ( app-arch/plzip app-arch/pdlzip app-arch/lzip ) dev-libs/glib:2 x11-base/xorg-proto gdk-pixbuf? ( gnome-base/librsvg:2 )
+DEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libICE x11-libs/libSM x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr alsa? ( media-libs/alsa-lib media-libs/libsndfile[alsa] ) ao? ( media-libs/libao media-libs/libsndfile ) bidi? ( dev-libs/fribidi ) gdk-pixbuf? ( || ( ( x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 ) <x11-libs/gdk-pixbuf-2.42.0:2[X] ) ) !gdk-pixbuf? ( media-libs/libpng:0= virtual/jpeg ) xinerama? ( x11-libs/libXinerama ) || ( app-arch/plzip app-arch/pdlzip app-arch/lzip ) dev-libs/glib:2 x11-base/xorg-proto gdk-pixbuf? ( gnome-base/librsvg:2 )
 DESCRIPTION=Ice Window Manager with Themes
 EAPI=7
 HOMEPAGE=https://ice-wm.org/ https://github.com/ice-wm/icewm
 IUSE=+alsa ao bidi debug +gdk-pixbuf nls truetype uclibc xinerama
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libICE x11-libs/libSM x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr alsa? ( media-libs/alsa-lib media-libs/libsndfile[alsa] ) ao? ( media-libs/libao media-libs/libsndfile ) bidi? ( dev-libs/fribidi ) gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[X] ) !gdk-pixbuf? ( media-libs/libpng:0= virtual/jpeg ) xinerama? ( x11-libs/libXinerama )
+RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libICE x11-libs/libSM x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr alsa? ( media-libs/alsa-lib media-libs/libsndfile[alsa] ) ao? ( media-libs/libao media-libs/libsndfile ) bidi? ( dev-libs/fribidi ) gdk-pixbuf? ( || ( ( x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 ) <x11-libs/gdk-pixbuf-2.42.0:2[X] ) ) !gdk-pixbuf? ( media-libs/libpng:0= virtual/jpeg ) xinerama? ( x11-libs/libXinerama )
 REQUIRED_USE=|| ( alsa ao )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ice-wm/icewm/releases/download/1.9.1/icewm-1.9.1.tar.lz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
-_md5_=1253eeacccab33edf59e9884a0448e1f
+_md5_=c2ba7b83bcff554275e3124a53458bf0
diff --git a/metadata/md5-cache/x11-wm/icewm-1.9.2 b/metadata/md5-cache/x11-wm/icewm-1.9.2
index 0677f1f3d28f..db7e526367d4 100644
--- a/metadata/md5-cache/x11-wm/icewm-1.9.2
+++ b/metadata/md5-cache/x11-wm/icewm-1.9.2
@@ -1,16 +1,16 @@
 BDEPEND=app-text/asciidoc virtual/pkgconfig nls? ( >=sys-devel/gettext-0.19.8 ) >=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 unpack
-DEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libICE x11-libs/libSM x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr alsa? ( media-libs/alsa-lib media-libs/libsndfile[alsa] ) ao? ( media-libs/libao media-libs/libsndfile ) bidi? ( dev-libs/fribidi ) gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[X] ) !gdk-pixbuf? ( media-libs/libpng:0= virtual/jpeg ) xinerama? ( x11-libs/libXinerama ) || ( app-arch/plzip app-arch/pdlzip app-arch/lzip ) dev-libs/glib:2 x11-base/xorg-proto gdk-pixbuf? ( gnome-base/librsvg:2 )
+DEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libICE x11-libs/libSM x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr alsa? ( media-libs/alsa-lib media-libs/libsndfile[alsa] ) ao? ( media-libs/libao media-libs/libsndfile ) bidi? ( dev-libs/fribidi ) gdk-pixbuf? ( || ( ( x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 ) <x11-libs/gdk-pixbuf-2.42.0:2[X] ) ) !gdk-pixbuf? ( media-libs/libpng:0= virtual/jpeg ) xinerama? ( x11-libs/libXinerama ) || ( app-arch/plzip app-arch/pdlzip app-arch/lzip ) dev-libs/glib:2 x11-base/xorg-proto gdk-pixbuf? ( gnome-base/librsvg:2 )
 DESCRIPTION=Ice Window Manager with Themes
 EAPI=7
 HOMEPAGE=https://ice-wm.org/ https://github.com/ice-wm/icewm
 IUSE=+alsa ao bidi debug +gdk-pixbuf nls truetype uclibc xinerama
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libICE x11-libs/libSM x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr alsa? ( media-libs/alsa-lib media-libs/libsndfile[alsa] ) ao? ( media-libs/libao media-libs/libsndfile ) bidi? ( dev-libs/fribidi ) gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[X] ) !gdk-pixbuf? ( media-libs/libpng:0= virtual/jpeg ) xinerama? ( x11-libs/libXinerama )
+RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libICE x11-libs/libSM x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr alsa? ( media-libs/alsa-lib media-libs/libsndfile[alsa] ) ao? ( media-libs/libao media-libs/libsndfile ) bidi? ( dev-libs/fribidi ) gdk-pixbuf? ( || ( ( x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 ) <x11-libs/gdk-pixbuf-2.42.0:2[X] ) ) !gdk-pixbuf? ( media-libs/libpng:0= virtual/jpeg ) xinerama? ( x11-libs/libXinerama )
 REQUIRED_USE=|| ( alsa ao )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ice-wm/icewm/releases/download/1.9.2/icewm-1.9.2.tar.lz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
-_md5_=1253eeacccab33edf59e9884a0448e1f
+_md5_=c2ba7b83bcff554275e3124a53458bf0
diff --git a/metadata/md5-cache/x11-wm/mutter-3.36.7 b/metadata/md5-cache/x11-wm/mutter-3.36.7
new file mode 100644
index 000000000000..2692b450a662
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/mutter-3.36.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/wayland >=dev-util/meson-0.50.0 dev-util/gdbus-codegen dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.5 ) wayland? ( >=sys-kernel/linux-headers-4.4 x11-base/xorg-server ) 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 test
+DEPEND=x11-libs/libX11 >=media-libs/graphene-1.9.3[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.30[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-3.33.0[introspection?] >=dev-libs/glib-2.61.1:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] gnome-base/gnome-desktop:3= >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXtst x11-libs/libxkbfile x11-misc/xkeyboard-config >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libXrender >=x11-libs/libXrandr-1.5.0 x11-libs/libxcb x11-libs/libXinerama x11-libs/libXau x11-libs/libICE >=dev-libs/atk-2.5.3[introspection?] >=media-libs/libcanberra-0.26 sys-apps/dbus media-libs/mesa[X(+),egl] wayland? ( >=dev-libs/wayland-protocols-1.19 >=dev-libs/wayland-1.13.0 x11-libs/libdrm:= >=media-libs/mesa-10.3[egl,gbm,wayland,gles2] >=dev-libs/libinput-1.7 systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) x11-base/xorg-server[wayland] ) udev? ( >=dev-libs/libgudev-232:= >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.0:0/0.3 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) x11-base/xorg-proto sysprof? ( >=dev-util/sysprof-capture-3.35.2:3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME 3 compositing window manager based on Clutter
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/GNOME/mutter/
+IUSE=elogind input_devices_wacom +introspection screencast +sysprof systemd test udev wayland test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=x11-libs/libX11 >=media-libs/graphene-1.9.3[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.30[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-3.33.0[introspection?] >=dev-libs/glib-2.61.1:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] gnome-base/gnome-desktop:3= >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXtst x11-libs/libxkbfile x11-misc/xkeyboard-config >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libXrender >=x11-libs/libXrandr-1.5.0 x11-libs/libxcb x11-libs/libXinerama x11-libs/libXau x11-libs/libICE >=dev-libs/atk-2.5.3[introspection?] >=media-libs/libcanberra-0.26 sys-apps/dbus media-libs/mesa[X(+),egl] wayland? ( >=dev-libs/wayland-protocols-1.19 >=dev-libs/wayland-1.13.0 x11-libs/libdrm:= >=media-libs/mesa-10.3[egl,gbm,wayland,gles2] >=dev-libs/libinput-1.7 systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) x11-base/xorg-server[wayland] ) udev? ( >=dev-libs/libgudev-232:= >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.0:0/0.3 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) gnome-extra/zenity
+REQUIRED_USE=wayland? ( ^^ ( elogind systemd ) udev ) test? ( wayland )
+RESTRICT=!test? ( test )
+SLOT=0/6
+SRC_URI=mirror://gnome/sources/mutter/3.36/mutter-3.36.7.tar.xz https://dev.gentoo.org/~leio/distfiles/mutter-3.36.7-patchset.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1df9ae503fab941f1dff3139f855f4b2
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 369db7550ed1..989f4cc3b579 100644
Binary files a/metadata/md5-cache/xfce-base/Manifest.gz and b/metadata/md5-cache/xfce-base/Manifest.gz differ
diff --git a/metadata/md5-cache/xfce-base/thunar-1.8.16 b/metadata/md5-cache/xfce-base/thunar-1.8.16
index 874447ed5b38..0b0c37c70cb2 100644
--- a/metadata/md5-cache/xfce-base/thunar-1.8.16
+++ b/metadata/md5-cache/xfce-base/thunar-1.8.16
@@ -4,10 +4,10 @@ DESCRIPTION=File manager for the Xfce desktop environment
 EAPI=7
 HOMEPAGE=https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start
 IUSE=exif introspection libnotify pcre +trash-panel-plugin udisks
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.42 >=x11-libs/gdk-pixbuf-2.14 >=x11-libs/gtk+-3.22:3 >=xfce-base/exo-0.12:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7 ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( dev-libs/libgudev:= ) >=dev-util/desktop-file-utils-0.20-r1 x11-misc/shared-mime-info trash-panel-plugin? ( >=gnome-base/gvfs-1.18.3 ) udisks? ( virtual/udev >=gnome-base/gvfs-1.18.3[udisks,udev] )
 SLOT=0/3
 SRC_URI=https://archive.xfce.org/src/xfce/thunar/1.8/thunar-1.8.16.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3ac5d1bce92acb5df2dfdc37821ab264
+_md5_=2632ff57e28b8a0ddbb1be164b05e230
diff --git a/metadata/md5-cache/xfce-base/xfce4-settings-4.15.3 b/metadata/md5-cache/xfce-base/xfce4-settings-4.15.3
new file mode 100644
index 000000000000..343f27d29fbf
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfce4-settings-4.15.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure postinst postrm setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-libs/glib-2.45.8 media-libs/fontconfig >=x11-libs/gtk+-3.20:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2:= >=xfce-base/exo-4.15.1:= >=xfce-base/libxfce4ui-4.15.1:= >=xfce-base/libxfce4util-4.15.2:= >=xfce-base/xfconf-4.13:= colord? ( x11-misc/colord:= ) libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 ) !<xfce-base/exo-4.15.1 dev-util/gdbus-codegen dev-util/intltool virtual/pkgconfig sys-devel/gettext x11-base/xorg-proto
+DESCRIPTION=Configuration system for the Xfce desktop environment
+EAPI=7
+HOMEPAGE=https://www.xfce.org/projects/
+IUSE=colord input_devices_libinput libcanberra libnotify upower +xklavier python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-libs/glib-2.45.8 media-libs/fontconfig >=x11-libs/gtk+-3.20:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2:= >=xfce-base/exo-4.15.1:= >=xfce-base/libxfce4ui-4.15.1:= >=xfce-base/libxfce4util-4.15.2:= >=xfce-base/xfconf-4.13:= colord? ( x11-misc/colord:= ) libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 ) !<xfce-base/exo-4.15.1
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfce4-settings/4.15/xfce4-settings-4.15.3.tar.bz2
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bdbea345086ce017a5f4503d611fb8bf
diff --git a/metadata/md5-cache/xfce-base/xfdesktop-4.14.3 b/metadata/md5-cache/xfce-base/xfdesktop-4.14.3
index c3d27cbe349e..b12661d53c3e 100644
--- a/metadata/md5-cache/xfce-base/xfdesktop-4.14.3
+++ b/metadata/md5-cache/xfce-base/xfdesktop-4.14.3
@@ -4,10 +4,10 @@ DESCRIPTION=Desktop manager for the Xfce desktop environment
 EAPI=7
 HOMEPAGE=https://www.xfce.org/projects/
 IUSE=debug libnotify +thunar
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=x11-libs/cairo-1.12 >=dev-libs/glib-2.42 >=x11-libs/gtk+-3.22:3 >=x11-libs/libwnck-3.14:3 x11-libs/libX11 >=xfce-base/exo-0.11:= >=xfce-base/garcon-0.6:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:= >=xfce-base/xfconf-4.12.1:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=xfce-base/thunar-1.7:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfdesktop/4.14/xfdesktop-4.14.3.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=06d01a1a9fa4eb7746ce2cb1c9333c59
+_md5_=0cb1df0c98ac5db0abd2829807e30552
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.14.6 b/metadata/md5-cache/xfce-base/xfwm4-4.14.6
index c4aee0095924..0fd156646bb9 100644
--- a/metadata/md5-cache/xfce-base/xfwm4-4.14.6
+++ b/metadata/md5-cache/xfce-base/xfwm4-4.14.6
@@ -4,10 +4,10 @@ DESCRIPTION=Window manager for the Xfce desktop environment
 EAPI=7
 HOMEPAGE=https://www.xfce.org/projects/
 IUSE=opengl startup-notification +xcomposite +xpresent
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-3.20:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXres x11-libs/pango >=x11-libs/libwnck-3.14:3 >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification ) xpresent? ( x11-libs/libXpresent ) xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfwm4/4.14/xfwm4-4.14.6.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d0692117c2ae27e4c1ad20490b01f7be
+_md5_=0b11fa9e98f4041985ca2cbdcea47422
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index b5919c716210..7b57f801ba9d 100644
Binary files a/metadata/md5-cache/xfce-extra/Manifest.gz and b/metadata/md5-cache/xfce-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/xfce-extra/tumbler-0.3.1 b/metadata/md5-cache/xfce-extra/tumbler-0.3.1
new file mode 100644
index 000000000000..289ef64bfe99
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/tumbler-0.3.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/glib-2.42:2 media-libs/freetype:2= media-libs/libpng:0= >=sys-apps/dbus-1.6 >=x11-libs/gdk-pixbuf-2.14:2 curl? ( >=net-misc/curl-7.25:= ) epub? ( app-text/libgepub ) ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0= ) odf? ( >=gnome-extra/libgsf-1.14.20:= ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] )
+DESCRIPTION=A thumbnail service for Thunar
+EAPI=7
+HOMEPAGE=https://docs.xfce.org/xfce/thunar/start
+IUSE=curl epub ffmpeg gstreamer jpeg odf pdf raw
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.42:2 media-libs/freetype:2= media-libs/libpng:0= >=sys-apps/dbus-1.6 >=x11-libs/gdk-pixbuf-2.14:2 curl? ( >=net-misc/curl-7.25:= ) epub? ( app-text/libgepub ) ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0= ) odf? ( >=gnome-extra/libgsf-1.14.20:= ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0 )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/tumbler/0.3/tumbler-0.3.1.tar.bz2
+_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3e67cefa657e5919861244bcfa7857cd
diff --git a/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.4 b/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.4
index 873cc4ca5a70..fc692a3a8a2a 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.4
+++ b/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.4
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.24 >=x11-libs/gtk+-3.22:3 x11-libs/libX11 >=xfce-base/l
 DESCRIPTION=A dict.org querying application and panel plug-in for the Xfce desktop
 EAPI=7
 HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-dict
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.24 >=x11-libs/gtk+-3.22:3 x11-libs/libX11 >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfce4-panel-4.10:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-dict/0.8/xfce4-dict-0.8.4.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5d18e66f28d802f87c99350891300ad0
+_md5_=590be51d624b00d2e1eec165a1a62dba
diff --git a/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.92-r1 b/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.92-r1
index 0d8978f215cd..2828852e3219 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.92-r1
+++ b/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.92-r1
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig
 DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm-sensors? ( >=sys-apps/lm-sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) dev-util/intltool virtual/pkgconfig
+DEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm-sensors? ( >=sys-apps/lm-sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
 DESCRIPTION=A panel plug-in for acpi, lm-sensors and hddtemp sensors
-EAPI=6
+EAPI=7
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin
 IUSE=+acpi hddtemp libnotify lm-sensors video_cards_nvidia
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
@@ -10,5 +11,5 @@ RDEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-ba
 REQUIRED_USE=|| ( hddtemp lm-sensors acpi )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.3/xfce4-sensors-plugin-1.3.92.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c4a09109863f51a06fc23c8aa45c98fb
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5c0f8b45769b59e10b4c4507b7de41df
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 20dd48e4a2c6..50e3f6406761 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 13 Nov 2020 05:08:35 +0000
+Mon, 16 Nov 2020 05:08:38 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 9851f4e48bd0..656254fb0799 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -762,12 +762,6 @@
       <name>Mike Frysinger</name>
     </member>
   </project>
-  <project>
-    <email>deb-tools@gentoo.org</email>
-    <name>Debian Tools Project</name>
-    <url>https://wiki.gentoo.org/wiki/Project:Debian_Tools</url>
-    <description>Maintains tools used to build Debian-like distributions and related packages.</description>
-  </project>
   <project>
     <email>desktop-misc@gentoo.org</email>
     <name>Desktop Miscellaneous Project</name>
diff --git a/metadata/timestamp b/metadata/timestamp
index 43ea0cc833f0..604e4b5bf2d4 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri 13 Nov 2020 05:08:35 AM UTC
+Mon 16 Nov 2020 05:08:38 AM UTC
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index f9e940629d70..2d50f05742ef 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 13 Nov 2020 05:30:01 +0000
+Mon, 16 Nov 2020 05:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 3a829a9bc45b..1fd9095799e0 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-2e07e1e6396fde6f0781e5f232ff2df43f362792 1605243600 2020-11-13T05:00:00+00:00
+c6208ede85f912c183fab7a64fa394c654a524f3 1605501802 2020-11-16T04:43:22+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 24ae1c7aa623..8db8d8bfd071 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1605243901 Fri 13 Nov 2020 05:05:01 AM UTC
+1605503101 Mon 16 Nov 2020 05:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 20dd48e4a2c6..50e3f6406761 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 13 Nov 2020 05:08:35 +0000
+Mon, 16 Nov 2020 05:08:38 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 9ca66c97a575..ba2f351d94d7 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/flent/flent-1.3.2.ebuild b/net-analyzer/flent/flent-1.3.2.ebuild
index d3d134d7af8f..efc8e7382ee8 100644
--- a/net-analyzer/flent/flent-1.3.2.ebuild
+++ b/net-analyzer/flent/flent-1.3.2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit distutils-r1
+inherit distutils-r1 xdg
 
 DESCRIPTION="The FLExible Network Tester"
 HOMEPAGE="https://flent.org/"
diff --git a/net-analyzer/icinga2/icinga2-2.12.1.ebuild b/net-analyzer/icinga2/icinga2-2.12.1.ebuild
index 8ec76ee82fac..ad2f31c9b0f3 100644
--- a/net-analyzer/icinga2/icinga2-2.12.1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.12.1.ebuild
@@ -7,7 +7,7 @@ inherit cmake systemd
 
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 7a4902daa5cf..a991378327b7 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -1,8 +1,6 @@
 DIST zabbix-3.0.31.tar.gz 14698394 BLAKE2B b8b5f94fe7fe08385b1b358c628b2047b437e6068dab8c3dbdab03e55e95e27f1b77ede4a1a57c4f79bf4a629d9dc5671bd144c002ace7c915f2fed382ac13b2 SHA512 35fec45667cdf217c2be21a164181f92f8f11ef9bcfb0c8dad914726e7c436bae5f8a97aebc3af82499e37125f4d1896ef74ad061a1ee3cbb674562c22a832b1
-DIST zabbix-4.0.24.tar.gz 17404177 BLAKE2B 3c2e9d6f69ad32c5fbee4d4f57661dffa9afafd98056f199658e05ff6c241149c5f23bb3a71a8524e3d83b33a6635b78713e8ec7a77457ae62550f9580715969 SHA512 ec4d4bbfc3ce1ea10a4e6cf96c10e4495ce2ea154dc297544ae107d4cb7451e3fc76e25d7822f40a809a87a268c54abb8a9d49869942f2009c0a7f92ff6abaf3
 DIST zabbix-4.0.25.tar.gz 17414403 BLAKE2B 5b84c5d61c90b4fbc94ea64994a7b4216fe1e728e3bf71afb5cfa674f3f24bd8d9ab91dbd9d869d5bef8fc83ef168a952ba45db8abeabf51402d92dd4487d8dc SHA512 741373adeab5ad4adccc8909e7adf7c8d2172b49e6c5e23cda057be3b82ea237fabcaa787557ea391861a6c2ad42efb695d36836ce8dfd1532e8a3cf394a7cfb
 DIST zabbix-4.0.26.tar.gz 17412367 BLAKE2B 7b75eeaa1146faed5e7aeeb3944eeb68df9c3e608beddb5b12ccbc8998ee6f0c3913b5f5cfe2b63dbf154a43e8393fc64b8286f805b8d3d08edbd25f21b66ce1 SHA512 7dc54176bd40cd73e2e82844caa317747df611e61b5d2d13a3516d143af9ede29ba5407bfca8aec21c9afcb77f53494ee469a2fc62cef3b91cedfce71803cac3
-DIST zabbix-5.0.3.tar.gz 18893485 BLAKE2B fd0225b86337a80f92a32647027e2265394ba766b304e305813b9edcfd2cc979dc4b6b4072dcd043e3b043b5f64a3fb28d36dd0dde18d216d877534ca2725d85 SHA512 d08a031b334f531320f6b695af3ed7e3514c802ea28e0cec75040c518409e16ab4c591b389091aa12c07129f9b758d050c958967e3e86e725f4595f3b3a90d97
 DIST zabbix-5.0.4.tar.gz 19039167 BLAKE2B 82fb27076febe5ba43ff6c829ae22c5b4928d74f14e429c602442c90dfd5d1ce112b66d1782bd313b3300c66c774da4403a2150be7ed6ae56ae4b03a608dd018 SHA512 8ac6b56a221fe73982c30dc7dd2f2b036fa10a2fc38ef54e24dc0dd5d56a096f9c0779965afcaa5d26ee893a9f5fc8189ebc67d4244b325acb851cd8b5b6af73
 DIST zabbix-5.0.5.tar.gz 19153153 BLAKE2B 6f78e690b5a8325739148802a8933d6b1e45a7c08c6f384643d4f85dc8a502be73ff2873cf3ec40cc96c2d892c8866c9f07847b055bef80fda9b00f7333727c5 SHA512 5397672fa170e12120526793b48d01764013467cc259eca61991bc52251c25888dd318ccffa6ed30ac3643104e715ceb70baaeec6eeaddb115ed294c22f5e619
 DIST zabbix-5.2.1.tar.gz 19579218 BLAKE2B 32f8955af5e15dd72f660a2fe1153c8c3d582d9470a87def756516db53a512605fcb67263317ef5980d597d1124324dc15c404e31aa96201105fbd5821549bb8 SHA512 deb69250a91abe24c7988011bfaa369cc13639636b37668ec12e310d92813288adc8e3a2ea7a2a51b0f54d7e6f594277778bb37a481b8f9c3dbb02e528a0cfa0
diff --git a/net-analyzer/zabbix/zabbix-4.0.24.ebuild b/net-analyzer/zabbix/zabbix-4.0.24.ebuild
deleted file mode 100644
index 065c01ba723d..000000000000
--- a/net-analyzer/zabbix/zabbix-4.0.24.ebuild
+++ /dev/null
@@ -1,350 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-		net-nds/openldap
-	)
-	libxml2? ( dev-libs/libxml2 )
-	mysql? ( dev-db/mysql-connector-c )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  ( sys-libs/zlib )
-	server? (
-		dev-libs/libevent
-		sys-libs/zlib
-	)
-	snmp? ( net-analyzer/net-snmp )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-	ssl? ( dev-libs/openssl:=[-bindist] )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? ( net-analyzer/fping[suid] )
-	server? (
-		app-admin/webapp-config
-		dev-libs/libevent
-		dev-libs/libpcre
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable java) \
-		$(use_enable proxy) \
-		$(use_enable server) \
-		$(use_enable static) \
-		$(use_with curl libcurl) \
-		$(use_with ldap) \
-		$(use_with libxml2) \
-		$(use_with mysql) \
-		$(use_with odbc unixodbc) \
-		$(use_with openipmi openipmi) \
-		$(use_with oracle) \
-		$(use_with postgres postgresql) \
-		$(use_with snmp net-snmp) \
-		$(use_with sqlite sqlite3) \
-		$(use_with ssh ssh2) \
-		$(use_with ssl openssl) \
-		$(use_with xmpp jabber)
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		dodir "${dir}"
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-0.9.27.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-0.9.27.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.6.1.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-4.0.25.ebuild b/net-analyzer/zabbix/zabbix-4.0.25.ebuild
index 53b0392d99ff..065c01ba723d 100644
--- a/net-analyzer/zabbix/zabbix-4.0.25.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.25.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
 REQUIRED_USE="|| ( agent frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
diff --git a/net-analyzer/zabbix/zabbix-5.0.3.ebuild b/net-analyzer/zabbix/zabbix-5.0.3.ebuild
deleted file mode 100644
index c105a7d5d7ea..000000000000
--- a/net-analyzer/zabbix/zabbix-5.0.3.ebuild
+++ /dev/null
@@ -1,347 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-		net-nds/openldap
-	)
-	libxml2? ( dev-libs/libxml2 )
-	mysql? ( dev-db/mysql-connector-c )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  ( sys-libs/zlib )
-	server? (
-		dev-libs/libevent
-		sys-libs/zlib
-	)
-	snmp? ( net-analyzer/net-snmp )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-	ssl? ( dev-libs/openssl:=[-bindist] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? ( net-analyzer/fping[suid] )
-	server? (
-		app-admin/webapp-config
-		dev-libs/libevent
-		dev-libs/libpcre
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable java) \
-		$(use_enable proxy) \
-		$(use_enable server) \
-		$(use_enable static) \
-		$(use_with curl libcurl) \
-		$(use_with ldap) \
-		$(use_with libxml2) \
-		$(use_with mysql) \
-		$(use_with odbc unixodbc) \
-		$(use_with openipmi openipmi) \
-		$(use_with oracle) \
-		$(use_with postgres postgresql) \
-		$(use_with snmp net-snmp) \
-		$(use_with sqlite sqlite3) \
-		$(use_with ssh ssh2) \
-		$(use_with ssl openssl)
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		dodir "${dir}"
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-0.9.27.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-0.9.27.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.6.1.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-5.0.4.ebuild b/net-analyzer/zabbix/zabbix-5.0.4.ebuild
index 0918dc7c5b0f..c105a7d5d7ea 100644
--- a/net-analyzer/zabbix/zabbix-5.0.4.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
 REQUIRED_USE="|| ( agent frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 2891cb990d0b..69d814b1971e 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index 0eceb0740d49..b0d293950bdd 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -1,2 +1,2 @@
 DIST knot-2.9.7.tar.xz 1188904 BLAKE2B f20355f211db316a1e39321a1200130e2af4e895eff92eca36c93d5b8f78fcd9dd8fa1ec25edf7a0fa9bae4aa2a92b2fca890be1da4134b894792235de0b546e SHA512 399b48491c000aa3f16b87b1e313f2ea5fe369d19da0c81222ed43ca155bf4d4d1a561ef84bc08844eaf24d3dd07ded9a6ec3d831dd5f6ffb174ae773ae12931
-DIST knot-3.0.1.tar.xz 1332112 BLAKE2B 9479254de81c85a71dd3cbb20fa0f7e870f217c4f8ec618cb60bebf3791661fd93aba89c941cd8f5850cb2a51d48f5e3099e66b39d0e9a941aadb99e83000a70 SHA512 e220d1db7d01c4899d687b0c1eaf792a48ef3a2d356265fd89addfc89c23f41462967fc974b96d22714e0c812c70f83f919bc2b91803776025e0b907e0cd914d
+DIST knot-3.0.2.tar.xz 1313864 BLAKE2B f2ff8c75a9b239b924af2eecc5e5afed27030fc9be6e112a4f61479f40247396c1d2905f58329fa84907c6ce796bc9a56d6f8e1cc83b737e15713844e0add32f SHA512 677de7a80688d4820d56c020af1bb1da97546f44a616e2d72d7e0301fca4a7ab682994cf66e8c37403e65ddb45ea3e0eb37b3304739c1239364115588c589699
diff --git a/net-dns/knot/knot-3.0.1.ebuild b/net-dns/knot/knot-3.0.2.ebuild
similarity index 100%
rename from net-dns/knot/knot-3.0.1.ebuild
rename to net-dns/knot/knot-3.0.2.ebuild
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index fced526b87a1..ebc249f2562e 100644
Binary files a/net-firewall/Manifest.gz and b/net-firewall/Manifest.gz differ
diff --git a/net-firewall/ipt_netflow/Manifest b/net-firewall/ipt_netflow/Manifest
index 12f9308d0495..592cc2926c3d 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -1,3 +1,2 @@
 DIST ipt_netflow-2.4.tar.gz 92580 BLAKE2B 0197e7e5cdd9c94c7b80b38cb4e2879343139592421922bf73aeaac70ac3af54ea25934bb1474ff455a9f58eab2368995591542f46be48b5c8491a3b6a192f56 SHA512 3c80d02cfda996fbde8d258875df8795000fd8390b5a6f8296771a992067e153eca48f7f4602421529948beaf3030e164adfc2ffe5b528042fbdc15ffb56aa74
 DIST ipt_netflow-2.5.1.tar.gz 94627 BLAKE2B 440daed1f0c02e4700c6d4a97da08abc7bf51c73cd824a67fd2b7b9394b47d493ca7acfea34467d93cdce6dded2c5b24b4a2600b9f717aa54561d1f88a123dbc SHA512 dd0bde358f788f2d62ace6a0b1529128f0a686f9b776deeae3502d45d06d13971e8ea249d2647d00b00e73625c515bc12a4b7bd8d34fafd5f3b32f290d48cdce
-DIST ipt_netflow-2.5.tar.gz 94097 BLAKE2B 5ca8d686e08f6fb0cdb1d502572afc71f146e2633ccf5fc7cb9ad21420fb62e88a2cb393e83ee4f5646200fa964d46a16ef58831958799449a4a59e2da6c9337 SHA512 8cd1bc46ef6e975964e5ddc290ed999f7076b63a9363f1a1f31b5d8db875d4e564ed5f0d5185c29dcf8a86793fe4badf63325b79ba1abbc264088b1ca94a9dad
diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.5.1-vlan_dev_priv.patch b/net-firewall/ipt_netflow/files/ipt_netflow-2.5.1-vlan_dev_priv.patch
new file mode 100644
index 000000000000..49721e547fd7
--- /dev/null
+++ b/net-firewall/ipt_netflow/files/ipt_netflow-2.5.1-vlan_dev_priv.patch
@@ -0,0 +1,32 @@
+commit 1153f73f038205dc17303e6e6c455bbbb56191f7
+Author: ABC <abc@openwall.com>
+Date:   Wed Oct 14 15:35:57 2020 +0300
+
+    gen_compat_def: Check for vlan_dev_priv instead of version if
+
+diff --git a/gen_compat_def b/gen_compat_def
+index c0f20f6..3965e94 100755
+--- a/gen_compat_def
++++ b/gen_compat_def
+@@ -85,6 +85,8 @@ kbuild_test_struct proc_ops linux/proc_fs.h
+ kbuild_test_struct proc_ops linux/proc_fs.h
+ # No since v5.1, but present in CentOS-8's 4.18.0-227
+ kbuild_test_symbol synchronize_sched linux/rcupdate.h
++# Stumbled on 5.9
++kbuild_test_struct vlan_dev_priv linux/if_vlan.h
+ 
+ echo "// End of compat_def.h"
+ 
+diff --git a/ipt_NETFLOW.c b/ipt_NETFLOW.c
+index 01055df..6f95166 100644
+--- a/ipt_NETFLOW.c
++++ b/ipt_NETFLOW.c
+@@ -4874,7 +4874,7 @@ static void parse_l2_header(const struct sk_buff *skb, struct ipt_netflow_tuple
+ 		tuple->tag[tag_num++] = htons(vlan_tx_tag_get(skb));
+ 	else if (skb->dev && is_vlan_dev(skb->dev)) {
+ 		struct net_device *vlan_dev = skb->dev;
+-# if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
++# ifdef HAVE_VLAN_DEV_PRIV
+ 		struct vlan_dev_priv *vlan = vlan_dev_priv(vlan_dev);
+ 
+ 		/* `if` condition is `#if`ed intentionally, and this is
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.4-r1.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.4-r1.ebuild
index c3bec366b466..e36de51a30c8 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.4-r1.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.4-r1.ebuild
@@ -92,7 +92,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake ARCH="$(tc-arch-kernel)" CC="$(tc-getCC)" all
+	emake ARCH="$(tc-arch-kernel)" CC="$(tc-getCC)" LD="$(tc-getLD)" OBJDUMP="$(tc-getOBJDUMP)" all
 }
 
 src_install() {
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.5-r1.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.5-r1.ebuild
deleted file mode 100644
index 2c7d537f291b..000000000000
--- a/net-firewall/ipt_netflow/ipt_netflow-2.5-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit linux-info linux-mod toolchain-funcs
-
-DESCRIPTION="Netflow iptables module"
-HOMEPAGE="
-	https://sourceforge.net/projects/ipt-netflow
-	https://github.com/aabc/ipt-netflow
-"
-SRC_URI="https://github.com/aabc/ipt-netflow/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug natevents snmp"
-
-RDEPEND="
-	net-firewall/iptables:0=
-	snmp? ( net-analyzer/net-snmp )
-"
-DEPEND="${RDEPEND}
-	virtual/linux-sources
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984
-	"${FILESDIR}/${PN}-2.5-gentoo.patch"
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	local CONFIG_CHECK="BRIDGE_NETFILTER ~IP_NF_IPTABLES VLAN_8021Q"
-	use debug && CONFIG_CHECK+=" ~DEBUG_FS"
-	if use natevents; then
-		CONFIG_CHECK+=" NF_CONNTRACK_EVENTS"
-		if kernel_is lt 5 2; then
-			CONFIG_CHECK+=" NF_NAT_NEEDED"
-		else
-			CONFIG_CHECK+=" NF_NAT"
-		fi
-	fi
-
-	BUILD_TARGETS="all"
-	MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
-	IPT_LIB="/usr/$(get_libdir)/xtables"
-
-	linux-mod_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	mv "${WORKDIR}"/${PN/_/-}-* "${WORKDIR}"/${P} || die
-}
-
-src_prepare() {
-	default
-
-	# Checking for directory is enough
-	sed -i -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' configure || die
-}
-
-do_conf() {
-	tc-export CC
-	echo ./configure $*
-	./configure $* ${EXTRA_ECONF} || die 'configure failed'
-}
-
-src_configure() {
-	local IPT_VERSION="$($(tc-getPKG_CONFIG) --modversion xtables)"
-	# this configure script is not based on autotools
-	# ipt-src need to be defined, see bug #455984
-	do_conf \
-		--disable-dkms \
-		--enable-aggregation \
-		--enable-direction \
-		--enable-macaddress \
-		--enable-vlan \
-		--ipt-lib="${IPT_LIB}" \
-		--ipt-src="/usr/" \
-		--ipt-ver="${IPT_VERSION}" \
-		--kdir="${KV_DIR}" \
-		--kver="${KV_FULL}" \
-		$(use debug && echo '--enable-debugfs') \
-		$(use natevents && echo '--enable-natevents') \
-		$(use snmp && echo '--enable-snmp-rules' || echo '--disable-snmp-agent')
-}
-
-src_compile() {
-	emake ARCH="$(tc-arch-kernel)" CC="$(tc-getCC)" all
-}
-
-src_install() {
-	linux-mod_src_install
-	exeinto "${IPT_LIB}"
-	doexe libipt_NETFLOW.so
-	use snmp && emake DESTDIR="${D}" SNMPTGSO="/usr/$(get_libdir)/snmp/dlmod/snmp_NETFLOW.so" sinstall
-	doheader ipt_NETFLOW.h
-	dodoc README*
-}
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild
index 637824868f6f..8fa83402adaa 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild
@@ -28,6 +28,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984
 	"${FILESDIR}/${PN}-2.5-gentoo.patch"
+	"${FILESDIR}/${P}-vlan_dev_priv.patch"
 )
 
 pkg_setup() {
@@ -91,7 +92,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake ARCH="$(tc-arch-kernel)" CC="$(tc-getCC)" all
+	emake ARCH="$(tc-arch-kernel)" CC="$(tc-getCC)" LD="$(tc-getLD)" OBJDUMP="$(tc-getOBJDUMP)" all
 }
 
 src_install() {
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.5.1.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.5.1.ebuild
deleted file mode 100644
index 2c7d537f291b..000000000000
--- a/net-firewall/ipt_netflow/ipt_netflow-2.5.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit linux-info linux-mod toolchain-funcs
-
-DESCRIPTION="Netflow iptables module"
-HOMEPAGE="
-	https://sourceforge.net/projects/ipt-netflow
-	https://github.com/aabc/ipt-netflow
-"
-SRC_URI="https://github.com/aabc/ipt-netflow/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug natevents snmp"
-
-RDEPEND="
-	net-firewall/iptables:0=
-	snmp? ( net-analyzer/net-snmp )
-"
-DEPEND="${RDEPEND}
-	virtual/linux-sources
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984
-	"${FILESDIR}/${PN}-2.5-gentoo.patch"
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	local CONFIG_CHECK="BRIDGE_NETFILTER ~IP_NF_IPTABLES VLAN_8021Q"
-	use debug && CONFIG_CHECK+=" ~DEBUG_FS"
-	if use natevents; then
-		CONFIG_CHECK+=" NF_CONNTRACK_EVENTS"
-		if kernel_is lt 5 2; then
-			CONFIG_CHECK+=" NF_NAT_NEEDED"
-		else
-			CONFIG_CHECK+=" NF_NAT"
-		fi
-	fi
-
-	BUILD_TARGETS="all"
-	MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
-	IPT_LIB="/usr/$(get_libdir)/xtables"
-
-	linux-mod_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	mv "${WORKDIR}"/${PN/_/-}-* "${WORKDIR}"/${P} || die
-}
-
-src_prepare() {
-	default
-
-	# Checking for directory is enough
-	sed -i -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' configure || die
-}
-
-do_conf() {
-	tc-export CC
-	echo ./configure $*
-	./configure $* ${EXTRA_ECONF} || die 'configure failed'
-}
-
-src_configure() {
-	local IPT_VERSION="$($(tc-getPKG_CONFIG) --modversion xtables)"
-	# this configure script is not based on autotools
-	# ipt-src need to be defined, see bug #455984
-	do_conf \
-		--disable-dkms \
-		--enable-aggregation \
-		--enable-direction \
-		--enable-macaddress \
-		--enable-vlan \
-		--ipt-lib="${IPT_LIB}" \
-		--ipt-src="/usr/" \
-		--ipt-ver="${IPT_VERSION}" \
-		--kdir="${KV_DIR}" \
-		--kver="${KV_FULL}" \
-		$(use debug && echo '--enable-debugfs') \
-		$(use natevents && echo '--enable-natevents') \
-		$(use snmp && echo '--enable-snmp-rules' || echo '--disable-snmp-agent')
-}
-
-src_compile() {
-	emake ARCH="$(tc-arch-kernel)" CC="$(tc-getCC)" all
-}
-
-src_install() {
-	linux-mod_src_install
-	exeinto "${IPT_LIB}"
-	doexe libipt_NETFLOW.so
-	use snmp && emake DESTDIR="${D}" SNMPTGSO="/usr/$(get_libdir)/snmp/dlmod/snmp_NETFLOW.so" sinstall
-	doheader ipt_NETFLOW.h
-	dodoc README*
-}
diff --git a/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild b/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild
index 74ad5f1c71d8..d4305e2fc5c5 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild
@@ -92,7 +92,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake ARCH="$(tc-arch-kernel)" CC="$(tc-getCC)" all
+	emake ARCH="$(tc-arch-kernel)" CC="$(tc-getCC)" LD="$(tc-getLD)" OBJDUMP="$(tc-getOBJDUMP)" all
 }
 
 src_install() {
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index b2f70fbecea1..4e9a533bb623 100644
Binary files a/net-ftp/Manifest.gz and b/net-ftp/Manifest.gz differ
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 7805041e0008..2ccaa2a45a9c 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1,2 +1 @@
-DIST lftp-4.8.4.tar.xz 1633444 BLAKE2B cbd85b553268823e7633e414752876db083355d92e55728337bc7863fb3bd89729ac725be41a9bcca275cf1752ea5f8ad01fdc67c7593868084c9c32bb75332d SHA512 2528e2cbfe132068dc75036d6334372f79f8063d44e46c724a28ea1f5b40d8de0d1e36cde3124fbcc27e5ba8be04b893eb1a7546346253768346a80bc54c02d1
 DIST lftp-4.9.2.tar.xz 1654960 BLAKE2B 04f168576ae6e001e0ffffb2e93e36d5bffa5ed1e2e671edb6210a54aa0ecedc280885450dcee890d05b64464eb641e7e63c8d4dd170100317dec3fe734ec483 SHA512 cda8698e7e34d748715a6fe5dc06c758240302621c7957402f0cc67577acf1a96b436fda4282408dee8171dc84a31e0be432df99a30f0a10057a8e7ea9ec64ad
diff --git a/net-ftp/lftp/files/lftp-4.9.2-libressl.patch b/net-ftp/lftp/files/lftp-4.9.2-libressl.patch
new file mode 100644
index 000000000000..51de51f780dd
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.9.2-libressl.patch
@@ -0,0 +1,40 @@
+https://github.com/lavv17/lftp/commit/0276d5c239c41b3a63f738a5dc47fd56ac389cf0.patch
+
+From 0276d5c239c41b3a63f738a5dc47fd56ac389cf0 Mon Sep 17 00:00:00 2001
+From: Ganael Laplanche <ganael.laplanche@martymac.org>
+Date: Thu, 20 Aug 2020 12:29:05 +0200
+Subject: [PATCH] Fix build with LibreSSL (following commit 537f37898)
+
+---
+ src/lftp_ssl.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/src/lftp_ssl.cc
++++ b/src/lftp_ssl.cc
+@@ -34,7 +34,7 @@
+ #include "misc.h"
+ #include "network.h"
+ #include "buffer.h"
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
+ #define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject
+ #endif
+ extern "C" {
+@@ -840,7 +840,7 @@ lftp_ssl_openssl_instance::lftp_ssl_openssl_instance()
+    ssl_ctx=SSL_CTX_new();
+    X509_set_default_verify_paths(ssl_ctx->cert);
+ #else
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
+    SSLeay_add_ssl_algorithms();
+ #endif
+    ssl_ctx=SSL_CTX_new(SSLv23_client_method());
+@@ -1080,7 +1080,7 @@ void lftp_ssl_openssl::copy_sid(const lftp_ssl_openssl *o)
+ 
+ const char *lftp_ssl_openssl::strerror()
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
+    SSL_load_error_strings();
+ #endif
+    int error=ERR_get_error();
diff --git a/net-ftp/lftp/lftp-4.8.4-r1.ebuild b/net-ftp/lftp/lftp-4.8.4-r1.ebuild
deleted file mode 100644
index b687dc9df2fe..000000000000
--- a/net-ftp/lftp/lftp-4.8.4-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools libtool xdg-utils
-
-DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
-HOMEPAGE="https://lftp.tech/"
-SRC_URI="https://lftp.tech/ftp/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file"
-RESTRICT="test"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.1:=
-	>=sys-libs/readline-5.1:=
-	dev-libs/expat
-	sys-libs/zlib
-	convert-mozilla-cookies? ( dev-perl/DBI )
-	idn? ( net-dns/libidn2:= )
-	socks5? (
-		>=net-proxy/dante-1.1.12
-		sys-libs/pam
-	)
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-1.2.3:0= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	verify-file? (
-		dev-perl/String-CRC32
-		virtual/perl-Digest-MD5
-	)
-"
-DEPEND="
-	${RDEPEND}
-	=sys-devel/libtool-2*
-	app-arch/xz-utils
-	nls? ( >=sys-devel/gettext-0.19 )
-	virtual/pkgconfig
-"
-DOCS=(
-	BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README README.debug-levels
-	README.dnssec README.modules THANKS TODO
-)
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.2.91-lafile.patch
-	"${FILESDIR}"/${PN}-4.5.5-am_config_header.patch
-	"${FILESDIR}"/${PN}-4.7.0-gettext.patch
-	"${FILESDIR}"/${PN}-4.7.5-libdir-additional.patch
-	"${FILESDIR}"/${PN}-4.7.5-libdir-expat.patch
-	"${FILESDIR}"/${PN}-4.7.5-libdir-readline.patch
-	"${FILESDIR}"/${PN}-4.8.2-libdir-configure.patch
-	"${FILESDIR}"/${PN}-4.8.2-libdir-libidn2.patch
-	"${FILESDIR}"/${PN}-4.8.2-libdir-openssl.patch
-	"${FILESDIR}"/${PN}-4.8.2-libdir-zlib.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	elibtoolize # for Darwin bundles
-
-	# bug #536036
-	printf 'set fish:auto-confirm no\nset sftp:auto-confirm no\n' >> ${PN}.conf || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_with idn libidn2) \
-		$(use_with socks5 socksdante "${EPREFIX}"/usr) \
-		$(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \
-		$(usex ssl "$(use_with gnutls)" '--without-gnutls') \
-		--enable-packager-mode \
-		--sysconfdir="${EPREFIX}"/etc/${PN} \
-		--with-modules \
-		--with-readline="${EPREFIX}"/usr \
-		--without-included-regex
-}
-
-src_install() {
-	default
-
-	local script
-	for script in {convert-mozilla-cookies,verify-file}; do
-		use ${script} || { rm "${ED}"/usr/share/${PN}/${script} || die ;}
-	done
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-ftp/lftp/lftp-4.9.2.ebuild b/net-ftp/lftp/lftp-4.9.2.ebuild
index 94f6e46a85eb..121ccc94638b 100644
--- a/net-ftp/lftp/lftp-4.9.2.ebuild
+++ b/net-ftp/lftp/lftp-4.9.2.ebuild
@@ -59,6 +59,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.8.2-libdir-openssl.patch
 	"${FILESDIR}"/${PN}-4.8.2-libdir-zlib.patch
 	"${FILESDIR}"/${PN}-4.9.1-libdir-readline.patch
+	"${FILESDIR}"/${PN}-4.9.2-libressl.patch
 )
 
 src_prepare() {
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 105023a33a6f..adc5188fed31 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/librvp/librvp-0.9.7.ebuild b/net-im/librvp/librvp-0.9.7.ebuild
index 69563f1ad40e..b87866183e5c 100644
--- a/net-im/librvp/librvp-0.9.7.ebuild
+++ b/net-im/librvp/librvp-0.9.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,13 +10,19 @@ SRC_URI="https://www.waider.ie/hacks/workshop/c/rvp/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="net-im/pidgin[gtk]"
 DEPEND="virtual/pkgconfig
 	${RDEPEND}"
 
 src_configure() {
-	econf --with-gaim-plugin-dir="${EPREFIX}"/usr/$(get_libdir)/pidgin \
-		--with-gaim-data-dir="${EPREFIX}"/usr/share/pixmaps/pidgin
+	econf \
+		--with-gaim-plugin-dir="${EPREFIX}"/usr/$(get_libdir)/pidgin \
+		--with-gaim-data-dir="${EPREFIX}"/usr/share/pixmaps/pidgin \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 46901f256571..07b270f90d51 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,11 +1,7 @@
-DIST tdesktop-2.3.2.tar.gz 14590033 BLAKE2B 028960cfccd55c66cc61a88e6e33511adfd13e1615c56caaed13a54f2e786637af3b426809006f50927f0ec929d9d73ee7ea4fc423788ab6dedebea3de845863 SHA512 0117a2ae3e61775ca8f212f0ae4f4b3f069bf0f5186da56c23d1587c5e153d60073c2f85aa66b9a74e9a1cf65db149f5f383a3f34452b582f21953dc9abc07c6
-DIST tdesktop-2.4.0.tar.gz 14642562 BLAKE2B 17e054dfb99dee6668d69cbb98c9f6a72dbaa41a56d371d1210cc07434fc197f444e9fb5c72cab4ee7b13e05a65b992f7c56d98ea544da9fbe0ec5685faf9489 SHA512 abb48c6c6b06e4c376dd0a1428627ee26b5a5c7510f3bdb624e1f7eac3c660d60edf25702ae5fdd51f12371879f4d4ec06ad23b830d69dd5b2e4b315a0046c9d
 DIST tdesktop-2.4.4.tar.gz 14641222 BLAKE2B 3b2d0eb7f0ec5736bb386fe4802c0885f55b0fa8b18eea7762e7dd6bc7a82435cc58509c3112591f68d991adafab68d5bf7bbef7207e1b883e28ab64c24db8ef SHA512 578c36323e12eeaa51e32eb85fb19f8e8941f3cce7feb51765770b57e9d173c14c6aab02252cb0d2e6e9379039ce4e39649d1bd1379cfff88b687092a6a0c042
 DIST tdesktop-2.4.5.tar.gz 14776247 BLAKE2B 029b50bfb4d2b4d62b93fe8dddbbf31965050844fa7b027f21b061e4fc8a7b8dc7068f35ec8b24c4eefc566d0be90f1b2f688b629e1345d23ea3339cecf04f4e SHA512 5439e177ff2e64697c537f92fd15382a61e52cbca00d610983497bbded3464cb95b591d323bb65238f0ce8b996e7d7cedfe13157f16d963ec3cb5e507c492f30
-DIST tsetup.2.3.2.tar.xz 40061716 BLAKE2B d1db3f6eb4ae73a2533dbdffca32f46827aaad1003edbaa42c0355c0035f16c3473ebb7927bb8fcd16a86d62068d793f3594fd3f7f4541f6b5fbb2fe6bfe73c1 SHA512 1eb0e02c84628c106388e1941e7ee9b9ea4e3c4d569183a702ae918878055c45f3557a9d058eb9fe1b1590ee91a335ae5d127218d4931a3f76ec01a19037f717
-DIST tsetup.2.4.0.tar.xz 34300884 BLAKE2B 857dc7b5447d880820658771efd4be40b39b796d062ab808112f6e89fa2e92908c03cc3880adb799ca97e983f4e8862d9548a99f87ec607d8f24fc8f1de35a8b SHA512 27114baa47f0c7bae835ab1b6f054efd7ce65a31259e6579f5ebc58c2da8591b4acbb0366323d8bd095307f7b3772b639ab2ba8ec8453f4655849d86f6eaa129
+DIST tdesktop-2.4.7.tar.gz 14777737 BLAKE2B 44d251e621c4e092c876c3fbc47c222ef9af1d3af5d098d3928bc0a0efdc079b78daf82cab7ed2e970a9c3b021ec105638f5ac1bf7c4246e4fa534546ea12547 SHA512 50d887f8074dc9bedc2a1fa13e6d8719eb5c3da42935a34ffd3b5877b1bffca9f902a65ca715bd63c17bbe13b482194f96367f7cac69c2ba26d166b82d144625
 DIST tsetup.2.4.4.tar.xz 34298876 BLAKE2B aa52d4a95ec2467581437f99c4c423e62ed9d86f069f43eba152bd11344bd8015838e56e2692d068964f468fee1adbf110c17a4a456e5861ec5c211097cf018c SHA512 c883529b36bb45ac6d47261bb2ece356798e740935aafcb0dae0062d157fbdec8d5f7416ff2e78e7ca56cc6ebec1d58d3b2a514341d1b8b6e2d86e3712644fcb
 DIST tsetup.2.4.5.tar.xz 34592508 BLAKE2B f7694f618f34689026c3a03dff394ca06d623868c8a257c3451eed63a871f4f6a57a457cd1d2293f0367058bfffe77df2a6fb02d11cd5bd79e3205aa65870245 SHA512 9dfc2663bdc50a1eed14060f37c0b267c456ff298f7189e1066b8b5c3624821ab772176f4442122ab442b6ee14b0a8d26219f3f9782d34459308de4db42bee70
-DIST tsetup32.2.3.2.tar.xz 43337372 BLAKE2B dc42a20297a44d4b40e9cc2d1ceb6f6611a76da6030be7e341d77db25d0a2910d8dbe5f73985423a3cb0c12493dbc960a983c68392206b56b5a61f976f35a397 SHA512 ede66b0852fbc97b629448ffe10010f50c40982a4bdd4782541acfe448ad09f9741909f46d26838ff0042d302791c2efebd88351607f73184fb565bdd22123f4
-DIST tsetup32.2.4.0.tar.xz 37627660 BLAKE2B fba6ea82c544fe3eabdfd2f33a878722032a3e3d75facf542471241a1681703dead93afbb114a0f2320e44271687387fb2d0d29df8fe28242da2f505b68cc419 SHA512 8af950f7bd2266860015a4f2810ef686c626ed8ca5843f251559d8cdd94be86aac5acb5670c7e5b6a64c75e5d40bbc5a34ed71331d755d1c015d39f53448aced
+DIST tsetup.2.4.7.tar.xz 34591504 BLAKE2B 339b582090ef39a2ddeb634cfa2522e4d642dc73574dd44f93f2930daec4f15ae691bb0fd3394306c67341d6019d05da4ff4827907746c1f6ed7f08b22301873 SHA512 200719748e74bc5fe85c77a23d53c989f3b08bf7f059e832f470d1db3f75f0ed243d329445ed933048634ed3bdb2f97538381c46698578f25bb477aac03dd685
 DIST tsetup32.2.4.4.tar.xz 37623572 BLAKE2B 2d6c442a6eb435eded64c124ddf99eead32f00a09d681895abbe0f4c3d51844d6cdbf685ef5b6cffcc782c8867e93bf608e9d3f2721be1c067b57c4ec15833d0 SHA512 d3bb1e8e4bbb86a7b6ba56ae8b7a83e6376ad2372be58f5d707caef04a6c0019146237e570711a7bc287b4642134ad82cc04e0a32aff6b10e93788dfe60b9803
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.3.2.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.3.2.ebuild
deleted file mode 100644
index cdd1942be0a2..000000000000
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.3.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop optfeature xdg
-
-DESCRIPTION="Official desktop client for Telegram (binary package)"
-HOMEPAGE="https://desktop.telegram.org"
-SRC_URI="
-	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
-	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
-	x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.${PV}.tar.xz )
-"
-
-LICENSE="GPL-3-with-openssl-exception"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-QA_PREBUILT="usr/lib/${PN}/Telegram"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/gobject-introspection
-	>=media-libs/fontconfig-2.13
-	media-libs/freetype:2
-	media-libs/libglvnd[X]
-	>=sys-apps/dbus-1.4.2[X]
-	sys-libs/zlib
-	x11-libs/libSM
-	x11-libs/libdrm
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	>=x11-libs/libxcb-1.10[xkb]
-"
-
-S="${WORKDIR}/Telegram"
-
-src_install() {
-	exeinto /usr/lib/${PN}
-	doexe "Telegram"
-	newbin "${FILESDIR}"/${PN} "telegram-desktop"
-
-	local icon_size
-	for icon_size in 16 32 48 64 128 256 512; do
-		newicon -s "${icon_size}" \
-			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
-			telegram.png
-	done
-
-	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "spell checker support" app-text/enchant
-}
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.4.0.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.4.7.ebuild
similarity index 93%
rename from net-im/telegram-desktop-bin/telegram-desktop-bin-2.4.0.ebuild
rename to net-im/telegram-desktop-bin/telegram-desktop-bin-2.4.7.ebuild
index cdd1942be0a2..f45d03b0f491 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.4.0.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.4.7.ebuild
@@ -10,12 +10,11 @@ HOMEPAGE="https://desktop.telegram.org"
 SRC_URI="
 	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
 	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
-	x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.${PV}.tar.xz )
 "
 
 LICENSE="GPL-3-with-openssl-exception"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64"
 
 QA_PREBUILT="usr/lib/${PN}/Telegram"
 
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 72c13434e807..01606735e83b 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/irssi/irssi-1.2.2-r1.ebuild b/net-irc/irssi/irssi-1.2.2-r1.ebuild
index ed231dbb3fa3..1da518b1943d 100644
--- a/net-irc/irssi/irssi-1.2.2-r1.ebuild
+++ b/net-irc/irssi/irssi-1.2.2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="otr +perl selinux socks5 +proxy libressl"
 
 COMMON_DEPEND="
diff --git a/net-irc/irssi/irssi-1.2.2.ebuild b/net-irc/irssi/irssi-1.2.2.ebuild
deleted file mode 100644
index 7874c1eee7d0..000000000000
--- a/net-irc/irssi/irssi-1.2.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit perl-module
-
-# Keep for _rc compability
-MY_P="${P/_/-}"
-
-DESCRIPTION="A modular textUI IRC client with IPv6 support"
-HOMEPAGE="https://irssi.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="otr +perl selinux socks5 +proxy libressl"
-
-COMMON_DEPEND="
-	sys-libs/ncurses:0=
-	>=dev-libs/glib-2.6.0
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( >=dev-libs/libressl-2.7.4:= )
-	otr? ( >=dev-libs/libgcrypt-1.2.0:0=
-		>=net-libs/libotr-4.1.0 )
-	perl? ( dev-lang/perl:= )
-	socks5? ( >=net-proxy/dante-1.1.18 )"
-
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-irc )"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	# Disable automagic dependency on dev-libs/libutf8proc (bug #677804)
-	export ac_cv_lib_utf8proc_utf8proc_version=no
-
-	local myeconfargs=(
-		--with-perl-lib=vendor
-		--enable-true-color
-		$(use_with otr)
-		$(use_with proxy)
-		$(use_with perl)
-		$(use_with socks5 socks)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	use perl && perl_delete_localpod
-	rm -f "${ED}"/usr/$(get_libdir)/irssi/modules/*.{a,la} || die
-}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index a5bec8e177b7..ac288197b17e 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/aqbanking/Manifest b/net-libs/aqbanking/Manifest
index 770baa3190b7..47974e204fb9 100644
--- a/net-libs/aqbanking/Manifest
+++ b/net-libs/aqbanking/Manifest
@@ -1,2 +1 @@
-DIST aqbanking-6.0.1.tar.gz 2551617 BLAKE2B 0f18e63f6fc695b4fb3c5b831d324cf039f02ce740655953bacbcb6fa805e441ac989fa1ef7504cf3417b366acc9dc5562b13788af72faedfd27778bd3097769 SHA512 57a4f1416efddff4ce0a7b1cd5f1035df95a01001fff3b43b0febbb62b322839b1d0e8be2c765863da6de3e30c85726a8866529d9b16162b18d5c204e7eb8081
 DIST aqbanking-6.2.5.tar.gz 2611057 BLAKE2B 05ba9b652f60ae79bc8446f65714ec72396669886d34e57ad09a21b4e5a563bc3f9fbb14431be076b9c05171fe6eac17b128d4bcd7af5250fd5c63d8d93e3e65 SHA512 aec71c16d8f0b3bdac1bba32f83fb22d5b4d2272b41845e7f63e770323a622fcabe1d2e1a9fc98977a38c467ab7cc0f934746216c2107363b81f51b90e65c88c
diff --git a/net-libs/aqbanking/aqbanking-6.0.1.ebuild b/net-libs/aqbanking/aqbanking-6.0.1.ebuild
deleted file mode 100644
index f2a3e161f63d..000000000000
--- a/net-libs/aqbanking/aqbanking-6.0.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P/_beta/beta}"
-
-DESCRIPTION="Generic Online Banking Interface"
-HOMEPAGE="https://www.aquamaniac.de/sites/aqbanking/index.php"
-SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/238/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
-IUSE="debug doc ebics examples ofx"
-
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-DEPEND="
-	app-misc/ktoblzcheck
-	dev-libs/gmp:0=
-	>=sys-libs/gwenhywfar-5.1.1:=
-	virtual/libintl
-	ebics? ( dev-libs/xmlsec[gcrypt,gnutls] )
-	ofx? ( >=dev-libs/libofx-0.9.5 )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-MAKEOPTS="${MAKEOPTS} -j1" # 5.7.8 still fails with > -j1
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local backends="aqhbci aqnone aqpaypal"
-	use ofx && backends="${backends} aqofxconnect"
-	use ebics && backends="${backends} aqebics"
-
-	local myeconfargs=(
-		--with-docpath=/usr/share/doc/${PF}/apidoc
-		$(use_enable debug)
-		$(use_enable doc full-doc)
-		--with-backends="${backends}"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	rm -rv "${ED}"/usr/share/doc/ || die
-
-	einstalldocs
-
-	if use examples; then
-		docinto tutorials
-		dodoc tutorials/*.{c,h} tutorials/README
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/net-libs/aqbanking/aqbanking-6.2.5.ebuild b/net-libs/aqbanking/aqbanking-6.2.5.ebuild
index 04206488a6ae..f0c61657451c 100644
--- a/net-libs/aqbanking/aqbanking-6.2.5.ebuild
+++ b/net-libs/aqbanking/aqbanking-6.2.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/342/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE="debug doc ebics examples ofx"
 
 BDEPEND="
diff --git a/net-libs/balde-markdown/balde-markdown-0.1.ebuild b/net-libs/balde-markdown/balde-markdown-0.1.ebuild
index 50308fafc019..fc2f27bf4c3b 100644
--- a/net-libs/balde-markdown/balde-markdown-0.1.ebuild
+++ b/net-libs/balde-markdown/balde-markdown-0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -36,5 +36,11 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--without-valgrind
+		--without-valgrind \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-libs/dleyna-renderer/Manifest b/net-libs/dleyna-renderer/Manifest
index 5faeab30d793..bb264e60a22d 100644
--- a/net-libs/dleyna-renderer/Manifest
+++ b/net-libs/dleyna-renderer/Manifest
@@ -1 +1,2 @@
+DIST dleyna-renderer-0.6.0-gupnp-1.2.patch 27528 BLAKE2B c9c872faac1fb257aad958d167627b38557455cd2fd1e284f2b234cb7f73026bcfbdf79843c78a5611b6c4d4d79380304dd64e8f4fe07f6f9e370cc8d82d029a SHA512 5eb8148a1416f6420167097b51eca77be432cfaa7f2d86a1d9255cbb41b99dda0338a01e433974b9bbbfa68e2ec6ca16a4c79523b2e184e1ffaf0f65dbc52fc1
 DIST dleyna-renderer-0.6.0.tar.gz 65566 BLAKE2B cfd2b5a08b2e5c6e15006e722c4878281bf7f4b6d8a9bd317ec5b27fc1568a2ca891af2ac2fc3c230f65e9920bd524b4fbaf43631192b079b2aea051783d2b8a SHA512 f4cb6c658bfaf620962eb6b84ab6b41be1bb8455ac1ff358db7fcf3db7f5c4e2130bb7b0e5201005c738e892aabf25b3cf2a3e1cc1f4a9ef9d834789b87c0183
diff --git a/net-libs/dleyna-renderer/dleyna-renderer-0.6.0.ebuild b/net-libs/dleyna-renderer/dleyna-renderer-0.6.0.ebuild
index 57b99c96aed7..148878341d27 100644
--- a/net-libs/dleyna-renderer/dleyna-renderer-0.6.0.ebuild
+++ b/net-libs/dleyna-renderer/dleyna-renderer-0.6.0.ebuild
@@ -5,9 +5,10 @@ EAPI=7
 
 inherit autotools
 
-DESCRIPTION="library implementing services that allow clients to discover and manipulate DLNA renderers"
+DESCRIPTION="A library to discover and manipulate DLNA renderers"
 HOMEPAGE="https://01.org/dleyna/"
-SRC_URI="https://01.org/sites/default/files/downloads/dleyna/${P}.tar_2.gz -> ${P}.tar.gz"
+SRC_URI="https://01.org/sites/default/files/downloads/dleyna/${P}.tar_2.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~juippis/distfiles/tmp/dleyna-renderer-0.6.0-gupnp-1.2.patch"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -31,7 +32,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PV}-gupnp-1.2.patch
+	"${DISTDIR}"/${P}-gupnp-1.2.patch
 )
 
 src_prepare() {
diff --git a/net-libs/dleyna-renderer/files/0.6.0-gupnp-1.2.patch b/net-libs/dleyna-renderer/files/0.6.0-gupnp-1.2.patch
deleted file mode 100644
index 2fddca199444..000000000000
--- a/net-libs/dleyna-renderer/files/0.6.0-gupnp-1.2.patch
+++ /dev/null
@@ -1,944 +0,0 @@
-https://github.com/intel/dleyna-renderer/pull/167
-
-From 594015eac2757f629a32d043c9a9b10ff6c5f95f Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Mon, 5 Nov 2018 22:07:09 +0100
-Subject: [PATCH 1/4] Use english for logging
-
----
- libdleyna/renderer/device.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libdleyna/renderer/device.c b/libdleyna/renderer/device.c
-index 7acef89..032d394 100644
---- a/libdleyna/renderer/device.c
-+++ b/libdleyna/renderer/device.c
-@@ -1201,7 +1201,7 @@ static void prv_add_actions(dlr_device_t *device,
- 				continue;
- 			}
- 
--			DLEYNA_LOG_DEBUG("DLNA version ≥ 1.50 pour %s",
-+			DLEYNA_LOG_DEBUG("DLNA version ≥ 1.50 for %s",
- 					 device->path);
- 			timeseek_missing = TRUE;
- 			g_free(dlna_device_class);
-
-From a588dd11e4c6d2ff6a7c1789fad913ab9c2519b5 Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Sat, 21 Sep 2019 20:36:04 +0200
-Subject: [PATCH 2/4] Do service introspection on device creation
-
-Fixes #104
-Fixes #164
----
- libdleyna/renderer/Makefile.am   |   2 +
- libdleyna/renderer/device.c      | 411 ++++++++++++++++---------------
- libdleyna/renderer/gasync-task.c | 135 ++++++++++
- libdleyna/renderer/gasync-task.h |  57 +++++
- libdleyna/renderer/manager.c     |   1 -
- libdleyna/renderer/upnp.c        |  14 +-
- 6 files changed, 419 insertions(+), 201 deletions(-)
- create mode 100644 libdleyna/renderer/gasync-task.c
- create mode 100644 libdleyna/renderer/gasync-task.h
-
-diff --git a/libdleyna/renderer/Makefile.am b/libdleyna/renderer/Makefile.am
-index ca601c7..ce4dc41 100644
---- a/libdleyna/renderer/Makefile.am
-+++ b/libdleyna/renderer/Makefile.am
-@@ -22,6 +22,7 @@ libdleyna_renderer_1_0_la_LDFLAGS =	-version-info $(DLEYNA_RENDERER_VERSION) \
- libdleyna_renderer_1_0_la_SOURCES =	$(libdleyna_rendererinc_HEADERS) \
- 					async.c				 \
- 					device.c	 		 \
-+					gasync-task.c			 \
- 					host-service.c			 \
- 					manager.c			 \
- 					server.c			 \
-@@ -53,6 +54,7 @@ sysconf_DATA = dleyna-renderer-service.conf
- EXTRA_DIST = 	$(sysconf_DATA)			\
- 		async.h				\
- 		device.h			\
-+		gasync-task.h			 \
- 		host-service.h			\
- 		prop-defs.h			\
- 		manager.h			\
-diff --git a/libdleyna/renderer/device.c b/libdleyna/renderer/device.c
-index 032d394..73b3dd3 100644
---- a/libdleyna/renderer/device.c
-+++ b/libdleyna/renderer/device.c
-@@ -26,15 +26,16 @@
- 
- #include <libsoup/soup.h>
- #include <libgupnp/gupnp-control-point.h>
-+#include <libgupnp/gupnp-service-proxy.h>
- #include <libgupnp-av/gupnp-av.h>
- 
- #include <libdleyna/core/core.h>
- #include <libdleyna/core/error.h>
- #include <libdleyna/core/log.h>
--#include <libdleyna/core/service-task.h>
- 
- #include "async.h"
- #include "device.h"
-+#include "gasync-task.h"
- #include "prop-defs.h"
- #include "server.h"
- 
-@@ -675,21 +676,30 @@ static void prv_process_protocol_info(dlr_device_t *device,
- 	DLEYNA_LOG_DEBUG("Exit");
- }
- 
--static void prv_get_protocol_info_cb(GUPnPServiceProxy *proxy,
--				     GUPnPServiceProxyAction *action,
-+static void prv_get_protocol_info_cb(GObject *target,
-+                                     GAsyncResult *res,
- 				     gpointer user_data)
- {
- 	gchar *result = NULL;
- 	gboolean end;
- 	GError *error = NULL;
- 	prv_new_device_ct_t *priv_t = (prv_new_device_ct_t *)user_data;
-+	GUPnPServiceProxyAction *action;
- 
- 	DLEYNA_LOG_DEBUG("Enter");
- 
- 	priv_t->dev->construct_step++;
- 
--	end = gupnp_service_proxy_end_action(proxy, action, &error, "Sink",
--					     G_TYPE_STRING, &result, NULL);
-+	action = gupnp_service_proxy_call_action_finish(GUPNP_SERVICE_PROXY(target), res, &error);
-+
-+	if (action == NULL || (error != NULL)) {
-+		DLEYNA_LOG_WARNING("GetProtocolInfo operation failed: %s",
-+				   ((error != NULL) ? error->message
-+						    : "Invalid result"));
-+		goto on_error;
-+	}
-+
-+	end = gupnp_service_proxy_action_get_result (action, &error, "Sink", G_TYPE_STRING, &result, NULL);
- 	if (!end || (result == NULL)) {
- 		DLEYNA_LOG_WARNING("GetProtocolInfo operation failed: %s",
- 				   ((error != NULL) ? error->message
-@@ -701,6 +711,10 @@ static void prv_get_protocol_info_cb(GUPnPServiceProxy *proxy,
- 
- on_error:
- 
-+	if (action) {
-+		gupnp_service_proxy_action_unref(action);
-+	}
-+
- 	if (error)
- 		g_error_free(error);
- 
-@@ -709,53 +723,193 @@ static void prv_get_protocol_info_cb(GUPnPServiceProxy *proxy,
- 	DLEYNA_LOG_DEBUG("Exit");
- }
- 
--static GUPnPServiceProxyAction *prv_get_protocol_info(
--						dleyna_service_task_t *task,
--						GUPnPServiceProxy *proxy,
--						gboolean *failed)
-+static void prv_introspection_wrap_cb (GUPnPServiceInfo *info,
-+				  GUPnPServiceIntrospection *introspection,
-+				  const GError *error,
-+				  gpointer user_data)
-+{
-+	if (error != NULL) {
-+		g_task_return_error (G_TASK (user_data),
-+				g_error_copy (error));
-+	} else {
-+		g_task_return_pointer (G_TASK (user_data),
-+				introspection,
-+				g_object_unref);
-+	}
-+
-+	g_object_unref (G_OBJECT (user_data));
-+}
-+
-+void prv_introspect_async (GUPnPServiceInfo    *info,
-+			   GCancellable        *cancellable,
-+			   GAsyncReadyCallback  callback,
-+			   gpointer             user_data)
-+{
-+	GTask *task = g_task_new (info, cancellable, callback, user_data);
-+
-+	gupnp_service_info_get_introspection_async_full (info,
-+			prv_introspection_wrap_cb,
-+			cancellable,
-+			task);
-+}
-+
-+static GUPnPServiceIntrospection *prv_introspect_finish
-+		(GUPnPServiceInfo   *info,
-+		 GAsyncResult       *res,
-+		 GError            **error)
-+{
-+	g_return_val_if_fail (g_task_is_valid (res, info), NULL);
-+
-+	return g_task_propagate_pointer (G_TASK (res), error);
-+}
-+
-+static gint compare_speeds(gconstpointer a, gconstpointer b);
-+
-+static void prv_introspect_av_cb (GObject *target,
-+				  GAsyncResult *res,
-+				  gpointer user_data)
-+{
-+	prv_new_device_ct_t *priv_t = (prv_new_device_ct_t *)user_data;
-+	GError *error = NULL;
-+	GUPnPServiceIntrospection *introspection;
-+	const GUPnPServiceStateVariableInfo *svi;
-+	GList *allowed_values;
-+	GVariant *speeds = NULL;
-+	const GUPnPServiceActionInfo *sai;
-+
-+	DLEYNA_LOG_DEBUG("Enter");
-+
-+	priv_t->dev->construct_step++;
-+
-+	introspection = prv_introspect_finish (GUPNP_SERVICE_INFO (target), res, &error);
-+
-+	if (introspection == NULL || (error != NULL)) {
-+		DLEYNA_LOG_WARNING("GetProtocolInfo operation failed: %s",
-+				   ((error != NULL) ? error->message
-+						    : "Invalid result"));
-+		goto on_error;
-+	}
-+
-+	svi = gupnp_service_introspection_get_state_variable(
-+							introspection,
-+							"TransportPlaySpeed");
-+
-+	if (svi && svi->allowed_values) {
-+		allowed_values = svi->allowed_values;
-+
-+		allowed_values = g_list_sort(allowed_values, compare_speeds);
-+
-+		prv_get_rates_values(allowed_values, &speeds,
-+				     &priv_t->dev->transport_play_speeds,
-+				     &priv_t->dev->min_rate,
-+				     &priv_t->dev->max_rate);
-+
-+		priv_t->dev->mpris_transport_play_speeds = g_variant_ref_sink(speeds);
-+	}
-+
-+	sai = gupnp_service_introspection_get_action(
-+						introspection,
-+						"X_DLNA_GetBytePositionInfo");
-+
-+	priv_t->dev->can_get_byte_position = (sai != NULL);
-+
-+on_error:
-+	g_clear_object(&introspection);
-+
-+	g_clear_error(&error);
-+
-+	DLEYNA_LOG_DEBUG("Exit");
-+}
-+
-+static void prv_introspect_rc_cb (GObject *target,
-+				  GAsyncResult *res,
-+				  gpointer user_data)
-+{
-+	prv_new_device_ct_t *priv_t = (prv_new_device_ct_t *)user_data;
-+	GError *error = NULL;
-+	GUPnPServiceIntrospection *introspection;
-+	const GUPnPServiceStateVariableInfo *svi;
-+
-+	DLEYNA_LOG_DEBUG("Enter");
-+
-+	priv_t->dev->construct_step++;
-+
-+	introspection = prv_introspect_finish (GUPNP_SERVICE_INFO (target), res, &error);
-+
-+	if (introspection == NULL || (error != NULL)) {
-+		DLEYNA_LOG_WARNING("GetProtocolInfo operation failed: %s",
-+				   ((error != NULL) ? error->message
-+						    : "Invalid result"));
-+		goto on_error;
-+	}
-+
-+	svi = gupnp_service_introspection_get_state_variable(introspection,
-+							     "Volume");
-+	if (svi != NULL)
-+		priv_t->dev->max_volume = g_value_get_uint(&svi->maximum);
-+
-+on_error:
-+	g_clear_object(&introspection);
-+
-+	g_clear_error(&error);
-+
-+	DLEYNA_LOG_DEBUG("Exit");
-+}
-+
-+static gboolean prv_get_protocol_info(
-+				dleyna_gasync_task_t *task,
-+                        GObject *target)
- {
--	*failed = FALSE;
-+    GUPnPServiceProxyAction *action;
- 
--	return gupnp_service_proxy_begin_action(
--					proxy, "GetProtocolInfo",
--					dleyna_service_task_begin_action_cb,
--					task, NULL);
-+    action = gupnp_service_proxy_action_new("GetProtocolInfo", NULL);
-+
-+    gupnp_service_proxy_call_action_async(GUPNP_SERVICE_PROXY (target), action,
-+            dleyna_gasync_task_get_cancellable (task),
-+            dleyna_gasync_task_ready_cb,
-+            task);
-+
-+    return FALSE;
-+}
-+
-+static gboolean prv_introspect(dleyna_gasync_task_t *task, GObject *target)
-+{
-+	prv_introspect_async (GUPNP_SERVICE_INFO (target),
-+			      dleyna_gasync_task_get_cancellable (task),
-+			      dleyna_gasync_task_ready_cb,
-+			      task);
-+
-+	return FALSE;
- }
- 
--static GUPnPServiceProxyAction *prv_subscribe(dleyna_service_task_t *task,
--					      GUPnPServiceProxy *proxy,
--					      gboolean *failed)
-+static gboolean prv_subscribe(dleyna_gasync_task_t *task, GObject *target)
- {
- 	dlr_device_t *device;
- 
- 	DLEYNA_LOG_DEBUG("Enter");
- 
--	device = (dlr_device_t *)dleyna_service_task_get_user_data(task);
-+	device = (dlr_device_t *)dleyna_gasync_task_get_user_data(task);
- 
- 	device->construct_step++;
- 	prv_device_subscribe_context(device);
- 
--	*failed = FALSE;
--
- 	DLEYNA_LOG_DEBUG("Exit");
- 
--	return NULL;
-+	return FALSE;
- }
- 
--static GUPnPServiceProxyAction *prv_declare(dleyna_service_task_t *task,
--					    GUPnPServiceProxy *proxy,
--					    gboolean *failed)
-+static gboolean prv_declare(dleyna_gasync_task_t *task,
-+					    GObject *target)
- {
- 	unsigned int i;
- 	dlr_device_t *device;
- 	prv_new_device_ct_t *priv_t;
- 	const dleyna_connector_dispatch_cb_t *table;
-+    gboolean result = FALSE;
- 
- 	DLEYNA_LOG_DEBUG("Enter");
- 
--	*failed = FALSE;
--
--	priv_t = (prv_new_device_ct_t *)dleyna_service_task_get_user_data(task);
-+	priv_t = (prv_new_device_ct_t *)dleyna_gasync_task_get_user_data(task);
- 	device = priv_t->dev;
- 	device->construct_step++;
- 
-@@ -770,16 +924,16 @@ static GUPnPServiceProxyAction *prv_declare(dleyna_service_task_t *task,
- 				table + i);
- 
- 		if (!device->ids[i]) {
--			*failed = TRUE;
-+			result = TRUE;
- 			goto on_error;
- 		}
- 	}
- 
- on_error:
- 
--DLEYNA_LOG_DEBUG("Exit");
-+	DLEYNA_LOG_DEBUG("Exit");
- 
--	return NULL;
-+	return result;
- }
- 
- static void prv_free_rc_event(gpointer user_data)
-@@ -800,6 +954,9 @@ void dlr_device_construct(
- {
- 	prv_new_device_ct_t *priv_t;
- 	GUPnPServiceProxy *s_proxy;
-+	GUPnPServiceProxy *av_proxy;
-+	GUPnPServiceProxy *rc_proxy;
-+	GCancellable *cancellable;
- 
- 	DLEYNA_LOG_DEBUG("Current step: %d", dev->construct_step);
- 
-@@ -809,19 +966,42 @@ void dlr_device_construct(
- 	priv_t->dispatch_table = dispatch_table;
- 
- 	s_proxy = context->service_proxies.cm_proxy;
-+	cancellable = g_cancellable_new ();
- 
- 	if (dev->construct_step < 1)
--		dleyna_service_task_add(queue_id, prv_get_protocol_info,
--					s_proxy, prv_get_protocol_info_cb,
--					NULL, priv_t);
-+		dleyna_gasync_task_add(queue_id,
-+				       prv_get_protocol_info,
-+				       G_OBJECT(s_proxy),
-+				       prv_get_protocol_info_cb,
-+				       cancellable,
-+				       NULL, priv_t);
-+
-+	av_proxy = context->service_proxies.av_proxy;
-+	if (dev->construct_step < 2)
-+		dleyna_gasync_task_add(queue_id,
-+				       prv_introspect,
-+				       G_OBJECT(av_proxy),
-+				       prv_introspect_av_cb,
-+				       cancellable,
-+				       NULL, priv_t);
-+
-+	rc_proxy = context->service_proxies.rc_proxy;
-+	if (dev->construct_step < 3)
-+		dleyna_gasync_task_add(queue_id,
-+				       prv_introspect,
-+				       G_OBJECT(rc_proxy),
-+				       prv_introspect_rc_cb,
-+				       cancellable,
-+				       NULL, priv_t);
-+
- 
- 	/* The following task should always be completed */
--	dleyna_service_task_add(queue_id, prv_subscribe, s_proxy,
--				NULL, NULL, dev);
-+	dleyna_gasync_task_add(queue_id, prv_subscribe, G_OBJECT(s_proxy),
-+				NULL, NULL, NULL, dev);
- 
--	if (dev->construct_step < 3)
--		dleyna_service_task_add(queue_id, prv_declare, s_proxy,
--					NULL, g_free, priv_t);
-+	if (dev->construct_step < 5)
-+		dleyna_gasync_task_add(queue_id, prv_declare, G_OBJECT(s_proxy),
-+					NULL, NULL, g_free, priv_t);
- 
- 	dleyna_task_queue_start(queue_id);
- 
-@@ -2121,133 +2301,6 @@ static void prv_get_rates_values(GList *allowed_tp_speeds,
- 	return;
- }
- 
--static gboolean prv_get_av_service_states_values(GUPnPServiceProxy *av_proxy,
--						 GVariant **mpris_tp_speeds,
--						 GPtrArray **upnp_tp_speeds,
--						 double *min_rate,
--						 double *max_rate,
--						 gboolean *can_get_byte_pos)
--{
--	const GUPnPServiceStateVariableInfo *svi;
--	const GUPnPServiceActionInfo *sai;
--	GUPnPServiceIntrospection *introspection;
--	GError *error = NULL;
--	GVariant *speeds = NULL;
--	GList *allowed_values;
--	gpointer weak_ref = NULL;
--	gboolean  device_alive = TRUE;
--
--	/* TODO: this weak_ref hack is needed as
--	   gupnp_service_info_get_introspection iterates the main loop.
--	   This can result in our device getting deleted before this
--	   function returns.  Ultimately, this code needs to be re-written
--	   to use gupnp_service_info_get_introspection_async but this cannot
--	   really be done until GUPnP provides a way to cancel this function. */
--
--	weak_ref = av_proxy;
--	g_object_add_weak_pointer(G_OBJECT(av_proxy), &weak_ref);
--
--	introspection = gupnp_service_info_get_introspection(
--		GUPNP_SERVICE_INFO(av_proxy),
--		&error);
--
--	if (!weak_ref) {
--		DLEYNA_LOG_WARNING("Lost device during introspection call");
--		device_alive = FALSE;
--		goto exit;
--	}
--
--	g_object_remove_weak_pointer(G_OBJECT(av_proxy), &weak_ref);
--
--	if (error != NULL) {
--		DLEYNA_LOG_DEBUG(
--			"failed to fetch AV service introspection file");
--
--		g_error_free(error);
--
--		goto exit;
--	}
--
--	svi = gupnp_service_introspection_get_state_variable(
--							introspection,
--							"TransportPlaySpeed");
--
--	if (svi && svi->allowed_values) {
--		allowed_values = svi->allowed_values;
--
--		allowed_values = g_list_sort(allowed_values, compare_speeds);
--
--		prv_get_rates_values(allowed_values, &speeds, upnp_tp_speeds,
--				     min_rate, max_rate);
--
--		*mpris_tp_speeds = g_variant_ref_sink(speeds);
--	}
--
--	sai = gupnp_service_introspection_get_action(
--						introspection,
--						"X_DLNA_GetBytePositionInfo");
--
--	*can_get_byte_pos = (sai != NULL);
--
--	g_object_unref(introspection);
--
--exit:
--
--	return device_alive;
--}
--
--static gboolean prv_get_rc_service_states_values(GUPnPServiceProxy *rc_proxy,
--						 guint *max_volume)
--{
--	const GUPnPServiceStateVariableInfo *svi;
--	GUPnPServiceIntrospection *introspection;
--	GError *error = NULL;
--	gpointer weak_ref = NULL;
--	gboolean device_alive = TRUE;
--
--	/* TODO: this weak_ref hack is needed as
--	   gupnp_service_info_get_introspection iterates the main loop.
--	   This can result in our device getting deleted before this
--	   function returns.  Ultimately, this code needs to be re-written
--	   to use gupnp_service_info_get_introspection_async but this cannot
--	   really be done until GUPnP provides a way to cancel this function. */
--
--	weak_ref = rc_proxy;
--	g_object_add_weak_pointer(G_OBJECT(rc_proxy), &weak_ref);
--
--	introspection = gupnp_service_info_get_introspection(
--		GUPNP_SERVICE_INFO(rc_proxy),
--		&error);
--
--	if (!weak_ref) {
--		DLEYNA_LOG_WARNING("Lost device during introspection call");
--		device_alive = FALSE;
--		goto exit;
--	}
--
--	g_object_remove_weak_pointer(G_OBJECT(rc_proxy), &weak_ref);
--
--	if (error != NULL) {
--		DLEYNA_LOG_DEBUG(
--			"failed to fetch RC service introspection file");
--
--		g_error_free(error);
--
--		goto exit;
--	}
--
--	svi = gupnp_service_introspection_get_state_variable(introspection,
--							     "Volume");
--	if (svi != NULL)
--		*max_volume = g_value_get_uint(&svi->maximum);
--
--	g_object_unref(introspection);
--
--exit:
--
--	return device_alive;
--}
--
- static void prv_update_device_props(GUPnPDeviceInfo *proxy, GHashTable *props)
- {
- 	GVariant *val;
-@@ -2378,34 +2431,6 @@ static gboolean prv_props_update(dlr_device_t *device, dlr_task_t *task)
- 
- 	service_proxies = &context->service_proxies;
- 
--	/* TODO: We should not retrieve these values here.  They should be
--	   retrieved during device construction. */
--
--	if (service_proxies->av_proxy)
--		if (!prv_get_av_service_states_values(
--			    service_proxies->av_proxy,
--			    &device->mpris_transport_play_speeds,
--			    &device->transport_play_speeds,
--			    &device->min_rate,
--			    &device->max_rate,
--			    &device->can_get_byte_position)) {
--			DLEYNA_LOG_DEBUG("Lost Device AV");
--
--			device_alive = FALSE;
--			goto on_lost_device;
--		}
--
--	/* TODO: We should not retrieve these values here.  They should be
--	   retrieved during device construction. */
--
--	if (service_proxies->rc_proxy)
--		if (!prv_get_rc_service_states_values(service_proxies->rc_proxy,
--						      &device->max_volume)) {
--			DLEYNA_LOG_DEBUG("Lost Device RC");
--			device_alive = FALSE;
--			goto on_lost_device;
--		}
--
- 	changed_props_vb = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
- 
- 	prv_add_player_speed_props(device->props.player_props,
-diff --git a/libdleyna/renderer/gasync-task.c b/libdleyna/renderer/gasync-task.c
-new file mode 100644
-index 0000000..47a0ad5
---- /dev/null
-+++ b/libdleyna/renderer/gasync-task.c
-@@ -0,0 +1,135 @@
-+/*
-+ * dLeyna
-+ *
-+ * Copyright (c) 2019 Jens Georg <mail@jensge.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms and conditions of the GNU Lesser General Public License,
-+ * version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
-+ * for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * along with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ */
-+
-+#include "gasync-task.h"
-+#include <libdleyna/core/task-processor.h>
-+
-+struct dleyna_gasync_task_t_ {
-+	dleyna_task_atom_t base;
-+	dleyna_gasync_task_action action;
-+	GObject *target;
-+	GAsyncReadyCallback callback;
-+	GCancellable *cancellable;
-+	GDestroyNotify free_func;
-+	gpointer cb_user_data;
-+};
-+
-+const char *dleyna_gasync_task_create_source(void)
-+{
-+	static unsigned int cpt = 1;
-+	static char source[27];
-+
-+	g_snprintf(source, 27, "gasync-source-%d", cpt);
-+	cpt++;
-+
-+	return source;
-+}
-+
-+void dleyna_gasync_task_add(const dleyna_task_queue_key_t *queue_id,
-+		dleyna_gasync_task_action action,
-+		GObject *target,
-+		GAsyncReadyCallback callback,
-+		GCancellable *cancellable,
-+		GDestroyNotify free_func,
-+		gpointer cb_user_data)
-+{
-+	dleyna_gasync_task_t *task;
-+
-+	task = g_new0(dleyna_gasync_task_t, 1);
-+
-+	task->action = action;
-+	task->callback = callback;
-+	task->cancellable = cancellable;
-+	task->free_func = free_func;
-+	task->cb_user_data = cb_user_data;
-+	task->target = target;
-+
-+	if (target != NULL) {
-+		g_object_add_weak_pointer (target, (gpointer *)(&task->target));
-+	}
-+
-+	dleyna_task_queue_add_task(queue_id, &task->base);
-+}
-+
-+void dleyna_gasync_task_ready_cb(GObject *source, GAsyncResult *res, gpointer user_data)
-+{
-+	dleyna_gasync_task_t *task = (dleyna_gasync_task_t *)user_data;
-+
-+	task->callback(source, res, task->cb_user_data);
-+
-+	dleyna_task_queue_task_completed(task->base.queue_id);
-+}
-+
-+void dleyna_gasync_task_process_cb(dleyna_task_atom_t *atom,
-+		gpointer user_data)
-+{
-+	gboolean failed = FALSE;
-+
-+	dleyna_gasync_task_t *task = (dleyna_gasync_task_t *)atom;
-+
-+	failed = task->action(task, task->target);
-+
-+	if (failed) {
-+		dleyna_task_processor_cancel_queue(task->base.queue_id);
-+		dleyna_task_queue_task_completed(task->base.queue_id);
-+	}
-+
-+	if (task->callback == NULL) {
-+		dleyna_task_queue_task_completed(task->base.queue_id);
-+	}
-+}
-+
-+void dleyna_gasync_task_cancel_cb(dleyna_task_atom_t *atom,
-+		gpointer user_data)
-+{
-+	dleyna_gasync_task_t *task = (dleyna_gasync_task_t *)atom;
-+
-+	if (task->cancellable) {
-+		g_cancellable_cancel (task->cancellable);
-+		task->cancellable = NULL;
-+
-+		dleyna_task_queue_task_completed(task->base.queue_id);
-+	}
-+}
-+
-+void dleyna_gasync_task_delete_cb(dleyna_task_atom_t *atom,
-+		gpointer user_data)
-+{
-+	dleyna_gasync_task_t *task = (dleyna_gasync_task_t *)atom;
-+
-+	if (task->free_func != NULL)
-+		task->free_func(task->cb_user_data);
-+
-+	if (task->target != NULL) {
-+		g_object_remove_weak_pointer(task->target, (gpointer *)&task->target);
-+	}
-+
-+	g_free(task);
-+}
-+
-+gpointer dleyna_gasync_task_get_user_data(dleyna_gasync_task_t *task)
-+{
-+	return task->cb_user_data;
-+}
-+
-+GCancellable *dleyna_gasync_task_get_cancellable(dleyna_gasync_task_t *task)
-+{
-+	return task->cancellable;
-+}
-diff --git a/libdleyna/renderer/gasync-task.h b/libdleyna/renderer/gasync-task.h
-new file mode 100644
-index 0000000..629e48c
---- /dev/null
-+++ b/libdleyna/renderer/gasync-task.h
-@@ -0,0 +1,57 @@
-+/*
-+ * dLeyna
-+ *
-+ * Copyright (c) 2019 Jens Georg <mail@jensge.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms and conditions of the GNU Lesser General Public License,
-+ * version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
-+ * for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * along with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ */
-+
-+#pragma once
-+
-+#include <libdleyna/core/task-atom.h>
-+
-+#include <glib.h>
-+#include <gio/gio.h>
-+
-+typedef struct dleyna_gasync_task_t_ dleyna_gasync_task_t;
-+
-+typedef gboolean (*dleyna_gasync_task_action)
-+	(dleyna_gasync_task_t *task,
-+	 GObject *target);
-+
-+const char *dleyna_gasync_task_create_source(void);
-+
-+void dleyna_gasync_task_add(const dleyna_task_queue_key_t *queue_id,
-+		dleyna_gasync_task_action action,
-+		GObject *target,
-+		GAsyncReadyCallback callback,
-+		GCancellable *cancellable,
-+		GDestroyNotify free_func,
-+		gpointer cb_user_data);
-+
-+void dleyna_gasync_task_ready_cb(GObject *source, GAsyncResult *res, gpointer user_data);
-+
-+void dleyna_gasync_task_process_cb(dleyna_task_atom_t *atom,
-+		gpointer user_data);
-+
-+void dleyna_gasync_task_cancel_cb(dleyna_task_atom_t *atom,
-+		gpointer user_data);
-+
-+void dleyna_gasync_task_delete_cb(dleyna_task_atom_t *atom,
-+		gpointer user_data);
-+
-+gpointer dleyna_gasync_task_get_user_data(dleyna_gasync_task_t *task);
-+
-+GCancellable *dleyna_gasync_task_get_cancellable(dleyna_gasync_task_t *task);
-diff --git a/libdleyna/renderer/manager.c b/libdleyna/renderer/manager.c
-index 74052f5..bea9935 100644
---- a/libdleyna/renderer/manager.c
-+++ b/libdleyna/renderer/manager.c
-@@ -25,7 +25,6 @@
- 
- #include <libdleyna/core/error.h>
- #include <libdleyna/core/log.h>
--#include <libdleyna/core/service-task.h>
- #include <libdleyna/core/white-list.h>
- 
- #include "async.h"
-diff --git a/libdleyna/renderer/upnp.c b/libdleyna/renderer/upnp.c
-index 17cbda7..0e9d483 100644
---- a/libdleyna/renderer/upnp.c
-+++ b/libdleyna/renderer/upnp.c
-@@ -28,10 +28,10 @@
- 
- #include <libdleyna/core/error.h>
- #include <libdleyna/core/log.h>
--#include <libdleyna/core/service-task.h>
- 
- #include "async.h"
- #include "device.h"
-+#include "gasync-task.h"
- #include "host-service.h"
- #include "prop-defs.h"
- #include "upnp.h"
-@@ -116,12 +116,12 @@ static const dleyna_task_queue_key_t *prv_create_device_queue(
- 
- 	queue_id = dleyna_task_processor_add_queue(
- 			dlr_renderer_service_get_task_processor(),
--			dleyna_service_task_create_source(),
-+			dleyna_gasync_task_create_source(),
- 			DLR_RENDERER_SINK,
- 			DLEYNA_TASK_QUEUE_FLAG_AUTO_REMOVE,
--			dleyna_service_task_process_cb,
--			dleyna_service_task_cancel_cb,
--			dleyna_service_task_delete_cb);
-+			dleyna_gasync_task_process_cb,
-+			dleyna_gasync_task_cancel_cb,
-+			dleyna_gasync_task_delete_cb);
- 	dleyna_task_queue_set_finally(queue_id, prv_device_chain_end);
- 	dleyna_task_queue_set_user_data(queue_id, *priv_t);
- 
-@@ -243,8 +243,8 @@ static void prv_server_unavailable_cb(GUPnPControlPoint *cp,
- 
- 	udn = gupnp_device_info_get_udn((GUPnPDeviceInfo *)proxy);
- 
--	ip_address = gupnp_context_get_host_ip(
--		gupnp_control_point_get_context(cp));
-+	ip_address = gssdp_client_get_host_ip(
-+		GSSDP_CLIENT(gupnp_control_point_get_context(cp)));
- 
- 	if (!udn || !ip_address)
- 		goto on_error;
-
-From 79593067cf40ed58a3bd95311c7fa108feafcb46 Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Sat, 21 Sep 2019 20:37:33 +0200
-Subject: [PATCH 3/4] Move to GUPnP 1.2
-
-Fixes #166
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 271ee92..364659d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -38,8 +38,8 @@ LT_LANG([C])
- PKG_PROG_PKG_CONFIG(0.16)
- PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28])
- PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.28])
--PKG_CHECK_MODULES([GSSDP], [gssdp-1.0 >= 0.13.2])
--PKG_CHECK_MODULES([GUPNP], [gupnp-1.0 >= 0.20.5])
-+PKG_CHECK_MODULES([GSSDP], [gssdp-1.2 >= 1.2.0])
-+PKG_CHECK_MODULES([GUPNP], [gupnp-1.2 >= 1.2.0])
- PKG_CHECK_MODULES([GUPNPAV], [gupnp-av-1.0 >= 0.11.5])
- PKG_CHECK_MODULES([GUPNPDLNA], [gupnp-dlna-2.0 >= 0.9.4])
- PKG_CHECK_MODULES([SOUP], [libsoup-2.4 >= 2.28.2])
-
-From 66e755a89cdcd7f10a535131a340c3f3ab371194 Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Mon, 23 Sep 2019 00:08:38 +0200
-Subject: [PATCH 4/4] Protect introspection calls against missing proxies
-
----
- libdleyna/renderer/device.c | 38 +++++++++++++++++++++++--------------
- 1 file changed, 24 insertions(+), 14 deletions(-)
-
-diff --git a/libdleyna/renderer/device.c b/libdleyna/renderer/device.c
-index 73b3dd3..525a23d 100644
---- a/libdleyna/renderer/device.c
-+++ b/libdleyna/renderer/device.c
-@@ -977,22 +977,32 @@ void dlr_device_construct(
- 				       NULL, priv_t);
- 
- 	av_proxy = context->service_proxies.av_proxy;
--	if (dev->construct_step < 2)
--		dleyna_gasync_task_add(queue_id,
--				       prv_introspect,
--				       G_OBJECT(av_proxy),
--				       prv_introspect_av_cb,
--				       cancellable,
--				       NULL, priv_t);
-+	if (dev->construct_step < 2) {
-+		if (av_proxy == NULL) {
-+			dev->construct_step++;
-+		} else {
-+			dleyna_gasync_task_add(queue_id,
-+					       prv_introspect,
-+					       G_OBJECT(av_proxy),
-+					       prv_introspect_av_cb,
-+					       cancellable,
-+					       NULL, priv_t);
-+		}
-+	}
- 
- 	rc_proxy = context->service_proxies.rc_proxy;
--	if (dev->construct_step < 3)
--		dleyna_gasync_task_add(queue_id,
--				       prv_introspect,
--				       G_OBJECT(rc_proxy),
--				       prv_introspect_rc_cb,
--				       cancellable,
--				       NULL, priv_t);
-+	if (dev->construct_step < 3) {
-+		if (rc_proxy == NULL) {
-+			dev->construct_step++;
-+		} else {
-+			dleyna_gasync_task_add(queue_id,
-+					       prv_introspect,
-+					       G_OBJECT(rc_proxy),
-+					       prv_introspect_rc_cb,
-+					       cancellable,
-+					       NULL, priv_t);
-+		}
-+	}
- 
- 
- 	/* The following task should always be completed */
diff --git a/net-libs/glib-networking/glib-networking-2.64.3.ebuild b/net-libs/glib-networking/glib-networking-2.64.3.ebuild
index aa91a71dc296..aa771c91c918 100644
--- a/net-libs/glib-networking/glib-networking-2.64.3.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.64.3.ebuild
@@ -12,7 +12,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gnome +libproxy +ssl test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.64.0:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/http-parser/http-parser-2.9.4.ebuild b/net-libs/http-parser/http-parser-2.9.4.ebuild
index 7b86474b1332..43104a4e8c2d 100644
--- a/net-libs/http-parser/http-parser-2.9.4.ebuild
+++ b/net-libs/http-parser/http-parser-2.9.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/nodejs/http-parser/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0/2.9.0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-non-x86-test.patch
diff --git a/net-libs/libasr/libasr-1.0.4.ebuild b/net-libs/libasr/libasr-1.0.4.ebuild
index 87b8e9693bf9..41ba9e0f2126 100644
--- a/net-libs/libasr/libasr-1.0.4.ebuild
+++ b/net-libs/libasr/libasr-1.0.4.ebuild
@@ -10,7 +10,12 @@ SRC_URI="https://www.opensmtpd.org/archives/${P}.tar.gz"
 LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}"
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libcapi/libcapi-3.0.7-r1.ebuild b/net-libs/libcapi/libcapi-3.0.7-r1.ebuild
index e8956cc46aea..581f0ffff130 100644
--- a/net-libs/libcapi/libcapi-3.0.7-r1.ebuild
+++ b/net-libs/libcapi/libcapi-3.0.7-r1.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-multilib
+inherit autotools multilib-minimal
 
 DESCRIPTION="CAPI library used by AVM products"
 HOMEPAGE="http://www.tabos.org/ffgtk"
@@ -15,9 +13,25 @@ LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
-S="${WORKDIR}/capi20"
-
 RDEPEND="!net-dialup/capi4k-utils"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-remove-libcapi20dyn.patch" )
+S="${WORKDIR}/capi20"
+PATCHES=( "${FILESDIR}"/${P}-remove-libcapi20dyn.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+		econf --disable-static
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libident/libident-0.32-r1.ebuild b/net-libs/libident/libident-0.32-r1.ebuild
index 99d4cc5919bf..6f49ea50ba4d 100644
--- a/net-libs/libident/libident-0.32-r1.ebuild
+++ b/net-libs/libident/libident-0.32-r1.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="A small library to interface to the Ident protocol server"
 HOMEPAGE="http://www.simphalempin.com/dev/libident/"
@@ -10,12 +12,17 @@ SRC_URI="http://people.via.ecp.fr/~rem/libident/${P}.tar.bz2"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE=""
 
-RDEPEND=""
-DEPEND="${RDEPEND}"
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS README
+	default
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-libs/libpcap/libpcap-1.9.1-r3.ebuild b/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
index ff5f74788e85..b6903a431f01 100644
--- a/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
+++ b/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug"
 
 RDEPEND="
diff --git a/net-libs/libpcap/libpcap-1.9.1.ebuild b/net-libs/libpcap/libpcap-1.9.1.ebuild
deleted file mode 100644
index 4775c7d9c5b4..000000000000
--- a/net-libs/libpcap/libpcap-1.9.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib-minimal ltprune
-
-DESCRIPTION="A system-independent library for user-level network packet capture"
-HOMEPAGE="
-	https://www.tcpdump.org/
-	https://github.com/the-tcpdump-group/libpcap
-"
-SRC_URI="
-	https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="bluetooth dbus netlink static-libs usb"
-
-RDEPEND="
-	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
-	dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${PN}-${P/_}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.1-usbmon.patch
-	"${FILESDIR}"/${PN}-1.9.0-pcap-config-includedir.patch
-)
-
-src_prepare() {
-	default
-
-	echo ${PV} > VERSION || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_enable bluetooth) \
-		$(use_enable dbus) \
-		$(use_enable usb) \
-		$(use_with netlink libnl) \
-		--disable-rdma \
-		--enable-ipv6
-}
-
-multilib_src_compile() {
-	emake all shared
-}
-
-multilib_src_install_all() {
-	dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
-
-	# remove static libraries (--disable-static does not work)
-	if ! use static-libs; then
-		find "${ED}" -name '*.a' -exec rm {} + || die
-	fi
-	prune_libtool_files
-
-	# We need this to build pppd on G/FBSD systems
-	if [[ "${USERLAND}" == "BSD" ]]; then
-		insinto /usr/include
-		doins pcap-int.h portability.h
-	fi
-}
diff --git a/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild b/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
index 0e9aa105228b..bcd26fd6caf4 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"
diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20201016.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20201016.ebuild
index 9e79fd0ac53e..c574b6cd7d38 100644
--- a/net-libs/miniupnpc/miniupnpc-2.1.20201016.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.1.20201016.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index efd1b4256a9b..62f5d5fddf9b 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,5 +1,4 @@
 DIST node-v12.18.4.tar.xz 23679924 BLAKE2B 14de3c83851b89f85f7d6f549d9e43e3e97c7a84de94eef8c3a2789e960595749726b8039fdff1be822377355ede2bb95bba4fd1d17c3e5165c844a80eb32e53 SHA512 07101a9acc8dee5189f8484746715b57d4227d819e38a79c100da33f803b0f061e7b37fbd4114ce2bc3eea647726f8786880d3096dfab187c177679f3e1c78e8
 DIST node-v12.19.0.tar.xz 23819884 BLAKE2B 5affa4ef9bd4c88218cf8845341f8f7d357a807af5fb8a3633f47de278b20272be1f46365b2b1525c50f0c6ea40025c16725ab5236fb09dfb2f9167b727a1f8e SHA512 ca14aac0f6f95190fd63a87cdc0195c4d38697aef98c111392d71654bb482f1a8c4c925c4fa8387c41fa8a9515ac5e54af8fa365dbc0034fedc271c072801dc7
-DIST node-v14.11.0.tar.xz 33379456 BLAKE2B 99e2eba4ba2e54209836fa1e3b63e42caf854d7f3bc99f5836300b0795ef8c785b78bd7c6b99148604f0bb1b34a5169c72e8be0f8d4f62412e7d352fce15ca18 SHA512 5014ebaeb109b0ecaca8f795a4e1a626c03b1132f9b8bac8826b734633c14e9f99b4f079c185a1f43f6938a1e543e5838f520159c3e08ca454398039fd26ef11
 DIST node-v14.15.0.tar.xz 33440584 BLAKE2B dda9fb44f163b2268db126dfcda34e80064eba24921e4f8e6c14c212deb9170c79f31f7b2be272c8fa7ca992d14540df490c6cad078833514bd348825934ad95 SHA512 2a0cd1b9d95e0ac228a90aca82cb04b9f4fc4d08ab86f0286eed7a519ca6e756081b37375ad5d14d7f0e09affdd27bad658c3e364237eb3c212fe5b5e27af96e
 DIST node-v14.2.0.tar.xz 32884616 BLAKE2B 7bcb07cb7623c5e08c20267c320cdf23ad110f124c5ad1f2447ef8b76ab8dc44ed50dab7c5651424d9d3a36f7eeecdf3292b07c02cb2e22c3fbe4ed633c4b842 SHA512 47e5ec0b7a207082d43419a7e0a6ea9242ec43b4d7c2217eb66d0b45e2f4d5cb561b3f6fe35fdc41a8be95c182dc122ba262f696ebd12833596d71b372ec85d2
diff --git a/net-libs/nodejs/files/nodejs-13.2.0-paxmarking.patch b/net-libs/nodejs/files/nodejs-13.2.0-paxmarking.patch
deleted file mode 100644
index 143e41662724..000000000000
--- a/net-libs/nodejs/files/nodejs-13.2.0-paxmarking.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-    Bug: 694100
-    Add actions for pax marking mkcodecache and node_mksnapshot
-    to disable mprotect for pax enable kernel.
-    Reported-by: Attila Tóth <atoth@atoth.sote.hu>
-    Co-developed-by: Attila Tóth <atoth@atoth.sote.hu>
-    Signed-off-by: Magnus Granberg <zorry@gentoo.org>
-    
---- a/node.gyp	2019-10-23 11:52:41.000000000 +0200
-+++ a/node.gyp	2019-11-12 20:58:43.957881862 +0100
-@@ -233,7 +233,9 @@
-       'deps/acorn-plugins/acorn-static-class-features/index.js',
-     ],
-     'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',
-+    'node_mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot_u<(EXECUTABLE_SUFFIX)',
-     'mkcodecache_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache<(EXECUTABLE_SUFFIX)',
-+    'mkcodecache_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache_u<(EXECUTABLE_SUFFIX)',
-     'conditions': [
-       [ 'node_shared=="true"', {
-         'node_target_type%': 'shared_library',
-@@ -436,10 +438,24 @@
-           ],
-           'actions': [
-             {
-+              'action_name': 'run_pax_mkcodecache',
-+              'inputs': [
-+                '<(mkcodecache_exec)',
-+              ],
-+              'outputs': [
-+                '<(mkcodecache_u_exec)',
-+              ],
-+              'action': [
-+                'bash',
-+                '-c',
-+                'mv <(mkcodecache_exec) <(mkcodecache_u_exec) && paxmark.sh m <(mkcodecache_u_exec)',
-+              ],
-+            },
-+            {
-               'action_name': 'run_mkcodecache',
-               'process_outputs_as_sources': 1,
-               'inputs': [
--                '<(mkcodecache_exec)',
-+                '<(mkcodecache_u_exec)',
-               ],
-               'outputs': [
-                 '<(SHARED_INTERMEDIATE_DIR)/node_code_cache.cc',
-@@ -461,10 +477,24 @@
-           ],
-           'actions': [
-             {
-+              'action_name': 'run_pax_mksnapshot',
-+              'inputs': [
-+                '<(node_mksnapshot_exec)',
-+              ],
-+              'outputs': [
-+                '<(node_mksnapshot_u_exec)',
-+              ],
-+              'action': [
-+                'bash',
-+                '-c',
-+                'mv <(node_mksnapshot_exec) <(node_mksnapshot_u_exec) && paxmark.sh m <(node_mksnapshot_u_exec)',
-+              ],
-+            },
-+            {
-               'action_name': 'node_mksnapshot',
-               'process_outputs_as_sources': 1,
-               'inputs': [
--                '<(node_mksnapshot_exec)',
-+                '<(node_mksnapshot_u_exec)',
-               ],
-               'outputs': [
-                 '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc',
diff --git a/net-libs/nodejs/files/nodejs-13.8.0-paxmarking.patch b/net-libs/nodejs/files/nodejs-13.8.0-paxmarking.patch
deleted file mode 100644
index c29825df3cf6..000000000000
--- a/net-libs/nodejs/files/nodejs-13.8.0-paxmarking.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-    Bug: 694100
-    Add actions for pax marking mkcodecache, node_mksnapshot and mksnapshot
-    to disable mprotect for pax enable kernel.
-    Reported-by: Attila Tóth <atoth@atoth.sote.hu>
-    Co-developed-by: Attila Tóth <atoth@atoth.sote.hu>
-    Signed-off-by: Magnus Granberg <zorry@gentoo.org>
-    
---- a/node.gyp	2019-10-23 11:52:41.000000000 +0200
-+++ b/node.gyp	2019-11-12 20:58:43.957881862 +0100
-@@ -233,7 +233,9 @@
-       'deps/acorn-plugins/acorn-static-class-features/index.js',
-     ],
-     'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',
-+    'node_mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot_u<(EXECUTABLE_SUFFIX)',
-     'mkcodecache_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache<(EXECUTABLE_SUFFIX)',
-+    'mkcodecache_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache_u<(EXECUTABLE_SUFFIX)',
-     'conditions': [
-       [ 'node_shared=="true"', {
-         'node_target_type%': 'shared_library',
-@@ -436,10 +438,24 @@
-           ],
-           'actions': [
-             {
-+              'action_name': 'run_pax_mkcodecache',
-+              'inputs': [
-+                '<(mkcodecache_exec)',
-+              ],
-+              'outputs': [
-+                '<(mkcodecache_u_exec)',
-+              ],
-+              'action': [
-+                'bash',
-+                '-c',
-+                'mv <(mkcodecache_exec) <(mkcodecache_u_exec) && paxmark.sh m <(mkcodecache_u_exec)',
-+              ],
-+            },
-+            {
-               'action_name': 'run_mkcodecache',
-               'process_outputs_as_sources': 1,
-               'inputs': [
--                '<(mkcodecache_exec)',
-+                '<(mkcodecache_u_exec)',
-               ],
-               'outputs': [
-                 '<(SHARED_INTERMEDIATE_DIR)/node_code_cache.cc',
-@@ -461,10 +477,24 @@
-           ],
-           'actions': [
-             {
-+              'action_name': 'run_pax_mksnapshot',
-+              'inputs': [
-+                '<(node_mksnapshot_exec)',
-+              ],
-+              'outputs': [
-+                '<(node_mksnapshot_u_exec)',
-+              ],
-+              'action': [
-+                'bash',
-+                '-c',
-+                'mv <(node_mksnapshot_exec) <(node_mksnapshot_u_exec) && paxmark.sh m <(node_mksnapshot_u_exec)',
-+              ],
-+            },
-+            {
-               'action_name': 'node_mksnapshot',
-               'process_outputs_as_sources': 1,
-               'inputs': [
--                '<(node_mksnapshot_exec)',
-+                '<(node_mksnapshot_u_exec)',
-               ],
-               'outputs': [
-                 '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc',
---- a/tools/v8_gypfiles/v8.gyp	2019-12-03 16:10:36.000000000 +0100
-+++ b/tools/v8_gypfiles/v8.gyp	2019-12-17 18:37:33.695839254 +0100
-@@ -9,6 +9,7 @@
-     'v8_vector_stores%': 0,
-     'v8_embed_script%': "",
-     'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
-+    'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)',
-     'v8_os_page_size%': 0,
-     'generate_bytecode_output_root': '<(SHARED_INTERMEDIATE_DIR)/generate-bytecode-output-root',
-     'generate_bytecode_builtins_list_output': '<(generate_bytecode_output_root)/builtins-generated/bytecodes-builtins-list.h',
-@@ -427,6 +425,20 @@
-       },
-       'actions': [
-         {
-+          'action_name': 'run_pax_mksnapshot',
-+          'inputs': [
-+            '<(mksnapshot_exec)',
-+          ],
-+          'outputs': [
-+            '<(mksnapshot_u_exec)',
-+          ],
-+          'action': [
-+            'bash',
-+            '-c',
-+            'mv <(mksnapshot_exec) <(mksnapshot_u_exec) && paxmark.sh m <(mksnapshot_u_exec)',
-+          ],
-+        },
-+        {
-           'action_name': 'run_mksnapshot',
-           'message': 'generating: >@(_outputs)',
-           'variables': {
-@@ -442,7 +454,7 @@
-             ],
-           },
-           'inputs': [
--            '<(mksnapshot_exec)',
-+            '<(mksnapshot_u_exec)',
-           ],
-           'outputs': ["<(INTERMEDIATE_DIR)/snapshot.cc"],
-           'process_outputs_as_sources': 1,
diff --git a/net-libs/nodejs/metadata.xml b/net-libs/nodejs/metadata.xml
index ff595099c9da..1f2cfaf97be7 100644
--- a/net-libs/nodejs/metadata.xml
+++ b/net-libs/nodejs/metadata.xml
@@ -13,7 +13,6 @@
 	<use>
 		<flag name="inspector">Enable V8 inspector</flag>
 		<flag name="npm">Enable NPM package manager</flag>
-		<flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
 		<flag name="snapshot">Enable snapshot creation for faster startup</flag>
 		<flag name="system-icu">Use system <pkg>dev-libs/icu</pkg> instead of the bundled version</flag>
 		<flag name="system-ssl">Use system OpenSSL instead of the bundled one</flag>
diff --git a/net-libs/nodejs/nodejs-12.18.4-r1.ebuild b/net-libs/nodejs/nodejs-12.18.4-r1.ebuild
index fbceb0bd1074..bbdc7bd8dd9b 100644
--- a/net-libs/nodejs/nodejs-12.18.4-r1.ebuild
+++ b/net-libs/nodejs/nodejs-12.18.4-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+inherit bash-completion-r1 flag-o-matic python-any-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
 HOMEPAGE="https://nodejs.org/"
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x64-macos"
 IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test"
 REQUIRED_USE="
 	inspector? ( icu ssl )
@@ -139,7 +139,6 @@ src_configure() {
 
 src_compile() {
 	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
 	emake -C out
 }
 
@@ -147,8 +146,6 @@ src_install() {
 	local LIBDIR="${ED}/usr/$(get_libdir)"
 	default
 
-	pax-mark -m "${ED}"/usr/bin/node
-
 	# set up a symlink structure that node-gyp expects..
 	dodir /usr/include/node/deps/{v8,uv}
 	dosym . /usr/include/node/src
diff --git a/net-libs/nodejs/nodejs-12.19.0.ebuild b/net-libs/nodejs/nodejs-12.19.0.ebuild
index 86e765ea3023..bf5eb49acbd9 100644
--- a/net-libs/nodejs/nodejs-12.19.0.ebuild
+++ b/net-libs/nodejs/nodejs-12.19.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
 IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test"
 REQUIRED_USE="
 	inspector? ( icu ssl )
diff --git a/net-libs/nodejs/nodejs-14.11.0.ebuild b/net-libs/nodejs/nodejs-14.11.0.ebuild
deleted file mode 100644
index fc0e59f7a51b..000000000000
--- a/net-libs/nodejs/nodejs-14.11.0.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="
-	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
-"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-	system-ssl? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.39.0:=
-	>=net-dns/c-ares-1.16.0
-	>=net-libs/nghttp2-1.41.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-67:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	sys-apps/coreutils
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-	pax_kernel? ( sys-apps/elfix )
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-)
-RESTRICT="test"
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export AR CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myconf=(
-		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
diff --git a/net-libs/nodejs/nodejs-14.15.0.ebuild b/net-libs/nodejs/nodejs-14.15.0.ebuild
index b60dcabeb5ea..560cce9ed9a2 100644
--- a/net-libs/nodejs/nodejs-14.15.0.ebuild
+++ b/net-libs/nodejs/nodejs-14.15.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~x64-macos"
 
 IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm +snapshot +ssl system-icu +system-ssl systemtap test"
 REQUIRED_USE="inspector? ( icu ssl )
diff --git a/net-libs/nodejs/nodejs-14.2.0.ebuild b/net-libs/nodejs/nodejs-14.2.0.ebuild
index d0b1b55301a6..4b3509f8db3a 100644
--- a/net-libs/nodejs/nodejs-14.2.0.ebuild
+++ b/net-libs/nodejs/nodejs-14.2.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+inherit bash-completion-r1 flag-o-matic python-any-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
 HOMEPAGE="https://nodejs.org/"
@@ -14,8 +14,8 @@ SRC_URI="
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
+KEYWORDS="ppc"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test"
 REQUIRED_USE="
 	inspector? ( icu ssl )
 	npm? ( ssl )
@@ -35,7 +35,6 @@ BDEPEND="
 	sys-apps/coreutils
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
-	pax_kernel? ( sys-apps/elfix )
 "
 DEPEND="
 	${RDEPEND}
@@ -89,9 +88,6 @@ src_prepare() {
 		BUILDTYPE=Debug
 	fi
 
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
-
 	default
 }
 
@@ -141,8 +137,6 @@ src_install() {
 	local LIBDIR="${ED}/usr/$(get_libdir)"
 	default
 
-	pax-mark -m "${ED}"/usr/bin/node
-
 	# set up a symlink structure that node-gyp expects..
 	dodir /usr/include/node/deps/{v8,uv}
 	dosym . /usr/include/node/src
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index e7a2c7c7eb93..65d30862d4c6 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 flag-o-matic git-r3 pax-utils python-any-r1 toolchain-funcs xdg-utils
+inherit bash-completion-r1 flag-o-matic git-r3 python-any-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
 HOMEPAGE="https://nodejs.org/"
@@ -13,7 +13,7 @@ EGIT_REPO_URI="https://github.com/nodejs/node"
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm +snapshot +ssl +system-ssl systemtap test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	inspector? ( icu ssl )
@@ -35,7 +35,6 @@ BDEPEND="
 	sys-apps/coreutils
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
-	pax_kernel? ( sys-apps/elfix )
 "
 DEPEND="
 	${RDEPEND}
@@ -84,9 +83,6 @@ src_prepare() {
 		BUILDTYPE=Debug
 	fi
 
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.2.0-paxmarking.patch )
-
 	default
 }
 
@@ -140,8 +136,6 @@ src_install() {
 	local LIBDIR="${ED}/usr/$(get_libdir)"
 	default
 
-	pax-mark -m "${ED}"/usr/bin/node
-
 	# set up a symlink structure that node-gyp expects..
 	dodir /usr/include/node/deps/{v8,uv}
 	dosym . /usr/include/node/src
diff --git a/net-libs/openmq-cclient/openmq-cclient-4.4.1.ebuild b/net-libs/openmq-cclient/openmq-cclient-4.4.1.ebuild
index a60d88a6722b..8fdd8ee4a310 100644
--- a/net-libs/openmq-cclient/openmq-cclient-4.4.1.ebuild
+++ b/net-libs/openmq-cclient/openmq-cclient-4.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -73,6 +73,12 @@ src_prepare() {
 	eautoreconf
 }
 
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
-	emake install DESTDIR="${D}"
+	default
+	dodoc -r "${WORKDIR}"/mq/src/doc/en/.
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index d3476b17b688..2558cb76d47a 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/apt-cacher-ng/metadata.xml b/net-misc/apt-cacher-ng/metadata.xml
index 6f49eba8f496..569b73d1178f 100644
--- a/net-misc/apt-cacher-ng/metadata.xml
+++ b/net-misc/apt-cacher-ng/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
+<use>
+<flag name="fuse">Install the <pkg>sys-fs/fuse</pkg> based acngfs, to use a userspace filesystem for the apt cache.</flag>
+</use>
 </pkgmetadata>
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 404e272b85ac..e4295901b34e 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,4 +1,3 @@
-DIST Electrum-3.3.8.tar.gz 8911228 BLAKE2B af24f44f5805a5722d0b9500776ae1ea4f70e0869045535ea3bf27d24a61013ba718230e6292061581f55a4fae655cbacae9024a321efe655eb9816bae11ae75 SHA512 5f756da4d2df59c69997925c69f651011def07bfbdbc582f492ecc19386eee7d79b9951732a792e6041da902d776052d6590cbd2d7004bc93c8406bcf9093fe6
 DIST electrum-4.0.2.gh.tar.gz 4395620 BLAKE2B 27d5e74ea85d792f73a01d41528dc9a84af374d672e7c7101a82e18634a32d7ebdb039571bde36625b460c6c7634ec75848711dc4cabfbd1be46f16d18e35df2 SHA512 8b03d60cb549315c9f8a2cb4f02e3a483b8e8f9ee0461bb9d54acca0d9cf96d38a158bb6bccdb1bb584fd5a3f4fd8ffbcb0d45244f41dc5636689adb514f1681
 DIST electrum-4.0.3.gh.tar.gz 4408020 BLAKE2B ba28765683739dbdd865ad9ed034c7dd7c4f738fdc13fbb1b0c0312785d89a65c0252354fa6064d9964207ebef841dbbeb324966ad2d0b8ec26d693456d4a082 SHA512 4295a7ebb16d1809ca892a736a01e62722d3b44164b3acda4bd4cd5935dfa8c77106ddb9e32434db057d90d015d786b667949fe17d0ebba70cf6c13be13cf2ba
 DIST electrum-4.0.4.gh.tar.gz 4415688 BLAKE2B 1811b3a5534c343b6bc1efccfab822e2550e0b19563837ee69d93006c081acb116b96a2bfe812420cfd7694190d66eb5e5bb01e5d0271262b714a06979ff053e SHA512 1b4fc9f0ac9624ac271ba65989524f902a465ae50465fd7e9f90366a59e17e6938ab0f58cf9ec8e40c10ee99074e1f800cae080d37da60359091be698957ecda
diff --git a/net-misc/electrum/electrum-3.3.8.ebuild b/net-misc/electrum/electrum-3.3.8.ebuild
deleted file mode 100644
index 21549110f526..000000000000
--- a/net-misc/electrum/electrum-3.3.8.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 xdg-utils
-
-MY_P="Electrum-${PV}"
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cli ncurses qrcode +qt5"
-
-REQUIRED_USE="|| ( cli ncurses qt5 )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/aiohttp-socks[${PYTHON_USEDEP}]
-	=dev-python/aiorpcX-0.18*[${PYTHON_USEDEP}]
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/jsonrpclib[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( $(python_gen_impl_dep 'ncurses') )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.3.2-desktop.patch"
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons_dirname/d' setup.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 electrum/gui/icons/${PN}.png
-	dodoc RELEASE-NOTES
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/metadata.xml b/net-misc/electrum/metadata.xml
index f341e55ffeb6..fdc8f0ebe23a 100644
--- a/net-misc/electrum/metadata.xml
+++ b/net-misc/electrum/metadata.xml
@@ -13,6 +13,7 @@
 		<email>luke-jr+gentoobugs@utopios.org</email>
 		<name>Luke Dashjr</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<use>
 		<flag name="cli">Enables the CLI interface</flag>
 		<flag name="qrcode">Enable QR code scanning with <pkg>media-gfx/zbar</pkg></flag>
diff --git a/net-misc/gerbera/gerbera-1.6.1.ebuild b/net-misc/gerbera/gerbera-1.6.1-r1.ebuild
similarity index 98%
rename from net-misc/gerbera/gerbera-1.6.1.ebuild
rename to net-misc/gerbera/gerbera-1.6.1-r1.ebuild
index 56b7793c25ab..115656d77bf1 100644
--- a/net-misc/gerbera/gerbera-1.6.1.ebuild
+++ b/net-misc/gerbera/gerbera-1.6.1-r1.ebuild
@@ -31,7 +31,7 @@ DEPEND="
 	dev-libs/pugixml
 	dev-libs/libfmt:0=
 	mysql? ( dev-db/mysql-connector-c )
-	javascript? ( dev-lang/duktape )
+	javascript? ( dev-lang/duktape:= )
 	taglib? ( >=media-libs/taglib-1.11 )
 	lastfm? ( >=media-libs/lastfmlib-0.4 )
 	exif? ( media-libs/libexif )
diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild
index 219386720083..5f10c8bed087 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-9999.ebuild
@@ -31,7 +31,7 @@ DEPEND="
 	dev-libs/pugixml
 	dev-libs/libfmt:0=
 	mysql? ( dev-db/mysql-connector-c )
-	javascript? ( dev-lang/duktape )
+	javascript? ( dev-lang/duktape:= )
 	taglib? ( >=media-libs/taglib-1.11 )
 	lastfm? ( >=media-libs/lastfmlib-0.4 )
 	exif? ( media-libs/libexif )
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 3bcbf3a4b4c6..aac84970d311 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index fa35b6f14d19..15b02625dfaa 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -1,4 +1,5 @@
 DIST freenet-0.7.5_p1484.zip 5584092 BLAKE2B d5be70eae9ae40134d8aed92e649a50ea5c967b13c84bb327b1429a2b709caf9a37443a5ca3e54df520a775ab4705cd7656d7060b9c29c7af1d894936991f2ee SHA512 126e794972c65e9caaca2baa3724f199e1ad432c92351826222be54ee184ca4076fe1b13394914f60b5449731763e00ccb097639092b4c724e5bca1bb10f5ac2
 DIST freenet-0.7.5_p1486.zip 7804344 BLAKE2B cb04c2be678b2ed7e656781d4aa1b34f16f7dfa7c80d757de4cd6b1269d6e5768b1fae3b39f891a5b13f6e089c8c66606f2ffebbbccfbd70627e5b9fe5b776a1 SHA512 e390c079313f3d2d89577331c1346e9b25a3008fe9a9766f6c281b232fa185af037d6e47ac66d0f1732e46de37797220a51e7e93f010b79300a81888a359bfec
+DIST freenet-0.7.5_p1488.zip 7815529 BLAKE2B a63de0b365abe7fd3a7bdde735127c56d0bf220036932db93392893c21e8714cffa27b76357b9e429e5a915975030470035549c8010e3828bb503eaab5911c62 SHA512 5232d4d18bcf8775832aabee7392d0434cecb07114190ed9cd9bbab08fd693a1ac07f3ffad0835e4c5e3696961a234906cbee79c425e50cd29021b8bb77ef733
 DIST freenet-ant-1.7.1.jar 1327167 BLAKE2B 408ec04ef6be58490bc6be200bd2ae1946aa4e22a9e01c9ef00351316f7ec0e23b055ed0907c16eaf5a60d153d3b96e4c447884df752e13d16520b3360581895 SHA512 2c84378d995fed0630169fffab020bde89c3edb7b3bc1e14e2251ed71be684dc2520fdeed8bae382de362984e25a31dcd59326ef8735f8066166c1e8d98ca408
 DIST seednodes-0.7.5_p1480.zip 24935 BLAKE2B 2a297cb7e429a3db06882b703241d420fd7225192afd500f2ff5a3521b1a53c4d62fc2d5b4c0a6ed4d62fa3cd4da64a42da04459dea81701d98faf36b4642eb8 SHA512 cde40562156627818e3384cb8ca29ac02cc52eb9e02c3b0627d7786b4b7deace79b3a840f61c551a25f4d771190558fb277b3f63a71994c30c7b28a2c2f85497
diff --git a/net-p2p/freenet/freenet-0.7.5_p1488.ebuild b/net-p2p/freenet/freenet-0.7.5_p1488.ebuild
new file mode 100644
index 000000000000..d025b7dc6548
--- /dev/null
+++ b/net-p2p/freenet/freenet-0.7.5_p1488.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2 multilib systemd
+
+DESCRIPTION="An encrypted network without censorship"
+HOMEPAGE="https://freenetproject.org/"
+#	https://github.com/${PN}/seedrefs/archive/build0${PV#*p}.zip -> seednodes-${PV}.zip
+SRC_URI="
+	https://github.com/${PN}/fred/archive/build0${PV#*p}.zip -> ${P}.zip
+	https://github.com/${PN}/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip
+	mirror://gentoo/freenet-ant-1.7.1.jar"
+
+LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+nss test"
+
+CDEPEND="dev-java/bcprov:1.54
+	dev-java/commons-compress:0
+	dev-java/fec:0
+	dev-java/java-service-wrapper:0
+	dev-java/jbitcollider-core:0
+	dev-java/jna:4
+	dev-java/lzma:0
+	dev-java/lzmajio:0
+	dev-java/mersennetwister:0
+	nss? ( dev-libs/nss )"
+
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.8
+	${CDEPEND}
+	test? (
+		dev-java/junit:0
+		dev-java/ant-junit:0
+	)
+	dev-java/ant-core:0"
+
+RDEPEND="
+	>=virtual/jre-1.8
+	net-libs/nativebiginteger:0
+	${CDEPEND}
+	acct-user/freenet
+	acct-group/freenet"
+
+PDEPEND="net-libs/NativeThread:0"
+
+JAVA_PKG_BSFIX_NAME+=" build-clean.xml"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+JAVA_ANT_ENCODING="utf8"
+
+EANT_BUILD_TARGET="package"
+EANT_TEST_TARGET="unit"
+EANT_BUILD_XML="build-clean.xml"
+EANT_GENTOO_CLASSPATH="bcprov-1.54,commons-compress,fec,java-service-wrapper,jbitcollider-core,jna-4,lzma,lzmajio,mersennetwister"
+EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true"
+
+S="${WORKDIR}/fred-build0${PV#*p}"
+
+RESTRICT="test" # they're broken in the last release.
+
+MY_PATCHES=(
+	"${FILESDIR}"/0.7.5_p1483-ext.patch
+	"${FILESDIR}/"0.7.5_p1475-remove-git.patch
+)
+
+pkg_setup() {
+	has_version dev-java/icedtea[cacao] && {
+		ewarn "dev-java/icedtea was built with cacao USE flag."
+		ewarn "freenet may compile with it, but it will refuse to run."
+		ewarn "Please remerge dev-java/icedtea without cacao USE flag,"
+		ewarn "if you plan to use it for running freenet."
+	}
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+#	unpack ${P}.zip seednodes-${PV}.zip
+	unpack ${P}.zip seednodes-0.7.5_p1480.zip
+}
+
+src_prepare() {
+#	cat "${WORKDIR}"/seedrefs-build0${PV#*p}/* > "${S}"/seednodes.fref
+	cat "${WORKDIR}"/seedrefs-build01480/* > "${S}"/seednodes.fref
+	cp "${FILESDIR}"/freenet-0.7.5_p1474-wrapper.conf freenet-wrapper.conf || die
+	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
+	cp "${FILESDIR}"/build-clean.xml build-clean.xml || die
+	cp "${FILESDIR}"/build.properties build.properties || die
+
+	epatch "${MY_PATCHES[@]}"
+
+	sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" \
+		freenet-wrapper.conf || die "sed failed"
+
+	echo "wrapper.java.classpath.1=/usr/share/freenet/lib/freenet.jar" >> freenet-wrapper.conf || die
+	if use nss; then
+		echo "wrapper.java.additional.5=-Dfreenet.jce.use.NSS=true" >> freenet-wrapper.conf || die
+	fi
+	local i=2 pkg jars jar
+	local ifs_original=${IFS}
+	IFS=","
+	for pkg in ${EANT_GENTOO_CLASSPATH} ; do
+		jars="$(java-pkg_getjars ${pkg})"
+		for jar in ${jars} ; do
+			echo "wrapper.java.classpath.$((i++))=${jar}" >> freenet-wrapper.conf || die
+		done
+	done
+	IFS=${ifs_original}
+	echo "wrapper.java.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf || die
+	echo "wrapper.java.library.path.2=/usr/$(get_libdir)/java-service-wrapper" >> freenet-wrapper.conf || die
+	echo "wrapper.java.library.path.3=/usr/$(get_libdir)/jna-4" >> freenet-wrapper.conf || die
+
+	cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
+	eapply_user
+}
+
+EANT_TEST_EXTRA_ARGS="-Dtest.skip=false"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar dist/freenet.jar
+	java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar
+
+	if has_version =sys-apps/baselayout-2*; then
+		doinitd "${FILESDIR}"/freenet
+	else
+		newinitd "${FILESDIR}"/freenet.old freenet
+	fi
+
+	systemd_dounit "${FILESDIR}"/freenet.service
+
+	dodoc AUTHORS
+	newdoc README.md README
+	insinto /etc
+	doins freenet-wrapper.conf
+	insinto /var/freenet
+	doins run.sh seednodes.fref
+	fperms +x /var/freenet/run.sh
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src
+}
+
+pkg_postinst() {
+	elog " "
+	elog "1. Start freenet with /etc/init.d/freenet start."
+	elog "2. Open localhost:8888 in your browser for the web interface."
+	#workaround for previously existing freenet user
+	[[ $(stat --format="%U" /var/freenet) == "freenet" ]] || chown \
+		freenet:freenet /var/freenet
+}
+
+pkg_postrm() {
+	if ! [[ -e /usr/share/freenet/lib/freenet.jar ]] ; then
+		elog " "
+		elog "If you dont want to use freenet any more"
+		elog "and dont want to keep your identity/other stuff"
+		elog "remember to do 'rm -rf /var/freenet' to remove everything"
+	fi
+}
diff --git a/net-p2p/syncthing/syncthing-1.10.0.ebuild b/net-p2p/syncthing/syncthing-1.10.0.ebuild
index 560c74b036e1..d68207d57c7c 100644
--- a/net-p2p/syncthing/syncthing-1.10.0.ebuild
+++ b/net-p2p/syncthing/syncthing-1.10.0.ebuild
@@ -542,7 +542,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0 Unlicense"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index ec6eceeda050..28b6eaac9810 100644
Binary files a/net-print/Manifest.gz and b/net-print/Manifest.gz differ
diff --git a/net-print/hplip/hplip-3.20.9-r3.ebuild b/net-print/hplip/hplip-3.20.9-r3.ebuild
index dd7d9f35fedb..b537a65a8f83 100644
--- a/net-print/hplip/hplip-3.20.9-r3.ebuild
+++ b/net-print/hplip/hplip-3.20.9-r3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86"
 
 IUSE="doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
 
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 14469df16a28..7b670eda5eb0 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/ipsec-tools/Manifest b/net-vpn/ipsec-tools/Manifest
index e78840e7961d..2490dbc0ab0e 100644
--- a/net-vpn/ipsec-tools/Manifest
+++ b/net-vpn/ipsec-tools/Manifest
@@ -1 +1,2 @@
 DIST ipsec-tools-0.8.2.tar.bz2 866465 BLAKE2B cf8c9175d96326fc5c74e6b1921bc66911256e289e6fe9cef77f26c197546902be3ebd5696af39c749a2abaac3f42010c9e2a281fd208122cd59222044b9dd4c SHA512 2b7d0efa908d3a699be7ef8b2b126a3809956cb7add50e8efb1cfdfc2d9b70c39ef517379cb9a4fad9e5f0c25937e98535b06c32bd3e729f5129da4ab133e30f
+DIST ipsec-tools-add-openssl-1.1.x-support.patch 32066 BLAKE2B b8380408c90bb93f0b95938de2efc61c80d727ae61a1417134583a8c74055fcfe1f7f75893f1f701b0f301a16d8b4d14f1b8a09d1e81d238821bcc122dfe183f SHA512 f2bd85f1c51226da6fc50d3473129e4c2e3c0e46107337f8d676029b7072b98bf164b6813a16de7dd4481f80038453b55a5ff56e7f5ec08ab07641034258e778
diff --git a/net-vpn/ipsec-tools/files/ipsec-tools-add-openssl-1.1.x-support.patch b/net-vpn/ipsec-tools/files/ipsec-tools-add-openssl-1.1.x-support.patch
deleted file mode 100644
index 5d55c59cbd81..000000000000
--- a/net-vpn/ipsec-tools/files/ipsec-tools-add-openssl-1.1.x-support.patch
+++ /dev/null
@@ -1,1096 +0,0 @@
-From 071fec7181255b9234add44865a435dfdefee520 Mon Sep 17 00:00:00 2001
-In-Reply-To: <20180528120513.560-1-cote2004-github@yahoo.com>
-References: <20180528120513.560-1-cote2004-github@yahoo.com>
-From: Eneas U de Queiroz <cote2004-github@yahoo.com>
-Date: Wed, 30 May 2018 15:42:20 -0300
-Subject: [PATCH v2 1/1] ipsec-tools: add openssl 1.1 support
-To: equeiroz@troianet.com.br
-
-This patch updates the calls to openssl 1.1 API, and adds a
-compatibility layer so it compiles with (at least) openssl 1.0.2, I
-haven't tested it with lower versions, but all that's needed is to edit
-the openssl_compat.* files and add the missing functions there--they're
-usually trivial.
-
-Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
----
- src/racoon/Makefile.am      |  10 +--
- src/racoon/algorithm.c      |   6 +-
- src/racoon/cfparse.y        |   2 +-
- src/racoon/crypto_openssl.c | 197 +++++++++++++++++++++-------------------
- src/racoon/crypto_openssl.h |   2 +-
- src/racoon/eaytest.c        |   7 +-
- src/racoon/ipsec_doi.c      |   2 +-
- src/racoon/openssl_compat.c | 213 ++++++++++++++++++++++++++++++++++++++++++++
- src/racoon/openssl_compat.h |  45 ++++++++++
- src/racoon/plainrsa-gen.c   |  41 +++++----
- src/racoon/prsa_par.y       |  28 ++++--
- src/racoon/rsalist.c        |   5 +-
- 12 files changed, 431 insertions(+), 127 deletions(-)
- create mode 100644 src/racoon/openssl_compat.c
- create mode 100644 src/racoon/openssl_compat.h
-
-diff --git a/src/racoon/Makefile.am b/src/racoon/Makefile.am
-index dbaded9..4c585f3 100644
---- a/src/racoon/Makefile.am
-+++ b/src/racoon/Makefile.am
-@@ -4,7 +4,7 @@ sbin_PROGRAMS = racoon racoonctl plainrsa-gen
- noinst_PROGRAMS = eaytest
- include_racoon_HEADERS = racoonctl.h var.h vmbuf.h misc.h gcmalloc.h admin.h \
- 	schedule.h sockmisc.h isakmp_var.h isakmp.h isakmp_xauth.h \
--	isakmp_cfg.h isakmp_unity.h ipsec_doi.h evt.h
-+	isakmp_cfg.h isakmp_unity.h ipsec_doi.h evt.h openssl_compat.h
- lib_LTLIBRARIES = libracoon.la
- 
- adminsockdir=${localstatedir}/racoon
-@@ -32,7 +32,7 @@ racoon_SOURCES = \
- 	gssapi.c dnssec.c getcertsbyname.c privsep.c \
- 	pfkey.c admin.c evt.c ipsec_doi.c oakley.c grabmyaddr.c vendorid.c \
- 	policy.c localconf.c remoteconf.c crypto_openssl.c algorithm.c \
--	proposal.c sainfo.c strnames.c \
-+	openssl_compat.c proposal.c sainfo.c strnames.c \
- 	plog.c logger.c schedule.c str2val.c \
- 	safefile.c backupsa.c genlist.c rsalist.c \
- 	cftoken.l cfparse.y prsa_tok.l prsa_par.y 
-@@ -51,12 +51,12 @@ libracoon_la_SOURCES = kmpstat.c vmbuf.c sockmisc.c misc.c
- libracoon_la_CFLAGS = -DNOUSE_PRIVSEP $(AM_CFLAGS)
- 
- plainrsa_gen_SOURCES = plainrsa-gen.c plog.c \
--	crypto_openssl.c logger.c 
-+	crypto_openssl.c logger.c openssl_compat.c
- EXTRA_plainrsa_gen_SOURCES = $(MISSING_ALGOS)
- plainrsa_gen_LDADD = $(CRYPTOBJS) vmbuf.o misc.o
- plainrsa_gen_DEPENDENCIES = $(CRYPTOBJS) vmbuf.o misc.o
- 
--eaytest_SOURCES = eaytest.c plog.c logger.c
-+eaytest_SOURCES = eaytest.c plog.c logger.c openssl_compat.c
- EXTRA_eaytest_SOURCES = missing/crypto/sha2/sha2.c
- eaytest_LDADD =	crypto_openssl_test.o vmbuf.o str2val.o misc_noplog.o \
- 	$(CRYPTOBJS)
-@@ -75,7 +75,7 @@ noinst_HEADERS = \
- 	debugrm.h         isakmp.h      misc.h          sainfo.h \
- 	dhgroup.h         isakmp_agg.h  netdb_dnssec.h  schedule.h \
- 	isakmp_cfg.h      isakmp_xauth.h isakmp_unity.h isakmp_frag.h \
--	throttle.h	  privsep.h \
-+	throttle.h	  privsep.h     openssl_compat.h \
- 	cfparse_proto.h	  cftoken_proto.h genlist.h     rsalist.h \
- 	missing/crypto/sha2/sha2.h missing/crypto/rijndael/rijndael_local.h \
- 	missing/crypto/rijndael/rijndael-api-fst.h \
-diff --git a/src/racoon/algorithm.c b/src/racoon/algorithm.c
-index 3fd50f6..66c874b 100644
---- a/src/racoon/algorithm.c
-+++ b/src/racoon/algorithm.c
-@@ -128,7 +128,7 @@ static struct enc_algorithm oakley_encdef[] = {
- { "aes",	algtype_aes,	OAKLEY_ATTR_ENC_ALG_AES,	16,
- 		eay_aes_encrypt,	eay_aes_decrypt,
- 		eay_aes_weakkey,	eay_aes_keylen, },
--#ifdef HAVE_OPENSSL_CAMELLIA_H
-+#if defined(HAVE_OPENSSL_CAMELLIA_H) && ! defined(OPENSSL_NO_CAMELLIA)
- { "camellia",	algtype_camellia,	OAKLEY_ATTR_ENC_ALG_CAMELLIA,	16,
- 		eay_camellia_encrypt,	eay_camellia_decrypt,
- 		eay_camellia_weakkey,	eay_camellia_keylen, },
-@@ -168,7 +168,7 @@ static struct enc_algorithm ipsec_encdef[] = {
- { "twofish",	algtype_twofish,	IPSECDOI_ESP_TWOFISH,		16,
- 		NULL,			NULL,
- 		NULL,			eay_twofish_keylen, },
--#ifdef HAVE_OPENSSL_IDEA_H
-+#if defined(HAVE_OPENSSL_IDEA_H) && ! defined(OPENSSL_NO_IDEA)
- { "3idea",	algtype_3idea,		IPSECDOI_ESP_3IDEA,		8,
- 		NULL,			NULL,
- 		NULL,			NULL, },
-@@ -179,7 +179,7 @@ static struct enc_algorithm ipsec_encdef[] = {
- { "rc4",	algtype_rc4,		IPSECDOI_ESP_RC4,		8,
- 		NULL,			NULL,
- 		NULL,			NULL, },
--#ifdef HAVE_OPENSSL_CAMELLIA_H
-+#if defined(HAVE_OPENSSL_CAMELLIA_H) && ! defined(OPENSSL_NO_CAMELLIA)
- { "camellia",	algtype_camellia,	IPSECDOI_ESP_CAMELLIA,		16,
- 		NULL,			NULL,
- 		NULL,			eay_camellia_keylen, },
-diff --git a/src/racoon/cfparse.y b/src/racoon/cfparse.y
-index 0d9bd67..8415752 100644
---- a/src/racoon/cfparse.y
-+++ b/src/racoon/cfparse.y
-@@ -2564,7 +2564,7 @@ set_isakmp_proposal(rmconf)
- 		plog(LLV_DEBUG2, LOCATION, NULL,
- 			"encklen=%d\n", s->encklen);
- 
--		memset(types, 0, ARRAYLEN(types));
-+		memset(types, 0, sizeof types);
- 		types[algclass_isakmp_enc] = s->algclass[algclass_isakmp_enc];
- 		types[algclass_isakmp_hash] = s->algclass[algclass_isakmp_hash];
- 		types[algclass_isakmp_dh] = s->algclass[algclass_isakmp_dh];
-diff --git a/src/racoon/crypto_openssl.c b/src/racoon/crypto_openssl.c
-index 55b076a..8fb358f 100644
---- a/src/racoon/crypto_openssl.c
-+++ b/src/racoon/crypto_openssl.c
-@@ -90,6 +90,7 @@
- #endif
- #endif
- #include "plog.h"
-+#include "openssl_compat.h"
- 
- #define USE_NEW_DES_API
- 
-@@ -316,9 +317,12 @@ eay_cmp_asn1dn(n1, n2)
- 			i = idx+1;
- 			goto end;
- 		}
--		if ((ea->value->length == 1 && ea->value->data[0] == '*') ||
--		    (eb->value->length == 1 && eb->value->data[0] == '*')) {
--	    		if (OBJ_cmp(ea->object,eb->object)) {
-+		ASN1_STRING *sa = X509_NAME_ENTRY_get_data(ea);
-+		ASN1_STRING *sb = X509_NAME_ENTRY_get_data(eb);
-+		if ((ASN1_STRING_length(sa) == 1 && ASN1_STRING_get0_data(sa)[0] == '*') ||
-+		    (ASN1_STRING_length(sb) == 1 && ASN1_STRING_get0_data(sb)[0] == '*')) {
-+	    		if (OBJ_cmp(X509_NAME_ENTRY_get_object(ea),
-+				    X509_NAME_ENTRY_get_object(eb))) {
- 				i = idx+1;
- 				goto end;
- 	    		}
-@@ -430,7 +434,7 @@ cb_check_cert_local(ok, ctx)
- 
- 	if (!ok) {
- 		X509_NAME_oneline(
--				X509_get_subject_name(ctx->current_cert),
-+				X509_get_subject_name(X509_STORE_CTX_get_current_cert(ctx)),
- 				buf,
- 				256);
- 		/*
-@@ -438,7 +442,8 @@ cb_check_cert_local(ok, ctx)
- 		 * ok if they are self signed. But we should still warn
- 		 * the user.
-  		 */
--		switch (ctx->error) {
-+		int ctx_error = X509_STORE_CTX_get_error(ctx);
-+		switch (ctx_error) {
- 		case X509_V_ERR_CERT_HAS_EXPIRED:
- 		case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
- 		case X509_V_ERR_INVALID_CA:
-@@ -453,9 +458,9 @@ cb_check_cert_local(ok, ctx)
- 		}
- 		plog(log_tag, LOCATION, NULL,
- 			"%s(%d) at depth:%d SubjectName:%s\n",
--			X509_verify_cert_error_string(ctx->error),
--			ctx->error,
--			ctx->error_depth,
-+			X509_verify_cert_error_string(ctx_error),
-+			ctx_error,
-+			X509_STORE_CTX_get_error_depth(ctx),
- 			buf);
- 	}
- 	ERR_clear_error();
-@@ -477,10 +482,11 @@ cb_check_cert_remote(ok, ctx)
- 
- 	if (!ok) {
- 		X509_NAME_oneline(
--				X509_get_subject_name(ctx->current_cert),
-+				X509_get_subject_name(X509_STORE_CTX_get_current_cert(ctx)),
- 				buf,
- 				256);
--		switch (ctx->error) {
-+		int ctx_error=X509_STORE_CTX_get_error(ctx);
-+		switch (ctx_error) {
- 		case X509_V_ERR_UNABLE_TO_GET_CRL:
- 			ok = 1;
- 			log_tag = LLV_WARNING;
-@@ -490,9 +496,9 @@ cb_check_cert_remote(ok, ctx)
- 		}
- 		plog(log_tag, LOCATION, NULL,
- 			"%s(%d) at depth:%d SubjectName:%s\n",
--			X509_verify_cert_error_string(ctx->error),
--			ctx->error,
--			ctx->error_depth,
-+			X509_verify_cert_error_string(ctx_error),
-+			ctx_error,
-+			X509_STORE_CTX_get_error_depth(ctx),
- 			buf);
- 	}
- 	ERR_clear_error();
-@@ -516,14 +522,15 @@ eay_get_x509asn1subjectname(cert)
- 	if (x509 == NULL)
- 		goto error;
- 
-+	X509_NAME *subject_name = X509_get_subject_name(x509);
- 	/* get the length of the name */
--	len = i2d_X509_NAME(x509->cert_info->subject, NULL);
-+	len = i2d_X509_NAME(subject_name, NULL);
- 	name = vmalloc(len);
- 	if (!name)
- 		goto error;
- 	/* get the name */
- 	bp = (unsigned char *) name->v;
--	len = i2d_X509_NAME(x509->cert_info->subject, &bp);
-+	len = i2d_X509_NAME(subject_name, &bp);
- 
- 	X509_free(x509);
- 
-@@ -661,15 +668,16 @@ eay_get_x509asn1issuername(cert)
- 	if (x509 == NULL)
- 		goto error;
- 
-+	X509_NAME *issuer_name = X509_get_issuer_name(x509);
- 	/* get the length of the name */
--	len = i2d_X509_NAME(x509->cert_info->issuer, NULL);
-+	len = i2d_X509_NAME(issuer_name, NULL);
- 	name = vmalloc(len);
- 	if (name == NULL)
- 		goto error;
- 
- 	/* get the name */
- 	bp = (unsigned char *) name->v;
--	len = i2d_X509_NAME(x509->cert_info->issuer, &bp);
-+	len = i2d_X509_NAME(issuer_name, &bp);
- 
- 	X509_free(x509);
- 
-@@ -850,7 +858,7 @@ eay_check_x509sign(source, sig, cert)
- 		return -1;
- 	}
- 
--	res = eay_rsa_verify(source, sig, evp->pkey.rsa);
-+	res = eay_rsa_verify(source, sig, EVP_PKEY_get0_RSA(evp));
- 
- 	EVP_PKEY_free(evp);
- 	X509_free(x509);
-@@ -992,7 +1000,7 @@ eay_get_x509sign(src, privkey)
- 	if (evp == NULL)
- 		return NULL;
- 
--	sig = eay_rsa_sign(src, evp->pkey.rsa);
-+	sig = eay_rsa_sign(src, EVP_PKEY_get0_RSA(evp));
- 
- 	EVP_PKEY_free(evp);
- 
-@@ -1079,7 +1087,11 @@ eay_strerror()
- 	int line, flags;
- 	unsigned long es;
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+	es = 0; /* even when allowed by OPENSSL_API_COMPAT, it is defined as 0 */
-+#else
- 	es = CRYPTO_thread_id();
-+#endif
- 
- 	while ((l = ERR_get_error_line_data(&file, &line, &data, &flags)) != 0){
- 		n = snprintf(ebuf + len, sizeof(ebuf) - len,
-@@ -1100,7 +1112,7 @@ vchar_t *
- evp_crypt(vchar_t *data, vchar_t *key, vchar_t *iv, const EVP_CIPHER *e, int enc)
- {
- 	vchar_t *res;
--	EVP_CIPHER_CTX ctx;
-+	EVP_CIPHER_CTX *ctx;
- 
- 	if (!e)
- 		return NULL;
-@@ -1111,7 +1123,7 @@ evp_crypt(vchar_t *data, vchar_t *key, vchar_t *iv, const EVP_CIPHER *e, int enc
- 	if ((res = vmalloc(data->l)) == NULL)
- 		return NULL;
- 
--	EVP_CIPHER_CTX_init(&ctx);
-+	ctx = EVP_CIPHER_CTX_new();
- 
- 	switch(EVP_CIPHER_nid(e)){
- 	case NID_bf_cbc:
-@@ -1125,54 +1137,41 @@ evp_crypt(vchar_t *data, vchar_t *key, vchar_t *iv, const EVP_CIPHER *e, int enc
- 		/* XXX: can we do that also for algos with a fixed key size ?
- 		 */
- 		/* init context without key/iv
--         */
--        if (!EVP_CipherInit(&ctx, e, NULL, NULL, enc))
--        {
--            OpenSSL_BUG();
--            vfree(res);
--            return NULL;
--        }
-+                 */
-+		if (!EVP_CipherInit(ctx, e, NULL, NULL, enc))
-+			goto out;
- 		
--        /* update key size
--         */
--        if (!EVP_CIPHER_CTX_set_key_length(&ctx, key->l))
--        {
--            OpenSSL_BUG();
--            vfree(res);
--            return NULL;
--        }
--
--        /* finalize context init with desired key size
--         */
--        if (!EVP_CipherInit(&ctx, NULL, (u_char *) key->v,
-+		/* update key size
-+		 */
-+		if (!EVP_CIPHER_CTX_set_key_length(ctx, key->l))
-+			goto out;
-+
-+		/* finalize context init with desired key size
-+		 */
-+		if (!EVP_CipherInit(ctx, NULL, (u_char *) key->v,
- 							(u_char *) iv->v, enc))
--        {
--            OpenSSL_BUG();
--            vfree(res);
--            return NULL;
--		}
-+			goto out;
- 		break;
- 	default:
--		if (!EVP_CipherInit(&ctx, e, (u_char *) key->v, 
--							(u_char *) iv->v, enc)) {
--			OpenSSL_BUG();
--			vfree(res);
--			return NULL;
--		}
-+		if (!EVP_CipherInit(ctx, e, (u_char *) key->v,
-+							(u_char *) iv->v, enc))
-+            		goto out;
- 	}
- 
- 	/* disable openssl padding */
--	EVP_CIPHER_CTX_set_padding(&ctx, 0); 
-+	EVP_CIPHER_CTX_set_padding(ctx, 0);
- 	
--	if (!EVP_Cipher(&ctx, (u_char *) res->v, (u_char *) data->v, data->l)) {
--		OpenSSL_BUG();
--		vfree(res);
--		return NULL;
--	}
-+	if (!EVP_Cipher(ctx, (u_char *) res->v, (u_char *) data->v, data->l))
-+		goto out;
- 
--	EVP_CIPHER_CTX_cleanup(&ctx);
-+	EVP_CIPHER_CTX_free(ctx);
- 
- 	return res;
-+out:
-+	EVP_CIPHER_CTX_free(ctx);
-+	OpenSSL_BUG();
-+	vfree(res);
-+	return NULL;
- }
- 
- int
-@@ -1230,7 +1229,7 @@ eay_des_keylen(len)
- 	return evp_keylen(len, EVP_des_cbc());
- }
- 
--#ifdef HAVE_OPENSSL_IDEA_H
-+#if defined(HAVE_OPENSSL_IDEA_H) && ! defined(OPENSSL_NO_IDEA)
- /*
-  * IDEA-CBC
-  */
-@@ -1587,7 +1586,7 @@ eay_aes_keylen(len)
- 	return len;
- }
- 
--#if defined(HAVE_OPENSSL_CAMELLIA_H)
-+#if defined(HAVE_OPENSSL_CAMELLIA_H) && ! defined(OPENSSL_NO_CAMELLIA)
- /*
-  * CAMELLIA-CBC
-  */
-@@ -1680,9 +1679,9 @@ eay_hmac_init(key, md)
- 	vchar_t *key;
- 	const EVP_MD *md;
- {
--	HMAC_CTX *c = racoon_malloc(sizeof(*c));
-+	HMAC_CTX *c = HMAC_CTX_new();
- 
--	HMAC_Init(c, key->v, key->l, md);
-+	HMAC_Init_ex(c, key->v, key->l, md, NULL);
- 
- 	return (caddr_t)c;
- }
-@@ -1761,8 +1760,7 @@ eay_hmacsha2_512_final(c)
- 
- 	HMAC_Final((HMAC_CTX *)c, (unsigned char *) res->v, &l);
- 	res->l = l;
--	HMAC_cleanup((HMAC_CTX *)c);
--	(void)racoon_free(c);
-+	HMAC_CTX_free((HMAC_CTX *)c);
- 
- 	if (SHA512_DIGEST_LENGTH != res->l) {
- 		plog(LLV_ERROR, LOCATION, NULL,
-@@ -1811,8 +1809,7 @@ eay_hmacsha2_384_final(c)
- 
- 	HMAC_Final((HMAC_CTX *)c, (unsigned char *) res->v, &l);
- 	res->l = l;
--	HMAC_cleanup((HMAC_CTX *)c);
--	(void)racoon_free(c);
-+	HMAC_CTX_free((HMAC_CTX *)c);
- 
- 	if (SHA384_DIGEST_LENGTH != res->l) {
- 		plog(LLV_ERROR, LOCATION, NULL,
-@@ -1861,8 +1858,7 @@ eay_hmacsha2_256_final(c)
- 
- 	HMAC_Final((HMAC_CTX *)c, (unsigned char *) res->v, &l);
- 	res->l = l;
--	HMAC_cleanup((HMAC_CTX *)c);
--	(void)racoon_free(c);
-+	HMAC_CTX_free((HMAC_CTX *)c);
- 
- 	if (SHA256_DIGEST_LENGTH != res->l) {
- 		plog(LLV_ERROR, LOCATION, NULL,
-@@ -1912,8 +1908,7 @@ eay_hmacsha1_final(c)
- 
- 	HMAC_Final((HMAC_CTX *)c, (unsigned char *) res->v, &l);
- 	res->l = l;
--	HMAC_cleanup((HMAC_CTX *)c);
--	(void)racoon_free(c);
-+	HMAC_CTX_free((HMAC_CTX *)c);
- 
- 	if (SHA_DIGEST_LENGTH != res->l) {
- 		plog(LLV_ERROR, LOCATION, NULL,
-@@ -1962,8 +1957,7 @@ eay_hmacmd5_final(c)
- 
- 	HMAC_Final((HMAC_CTX *)c, (unsigned char *) res->v, &l);
- 	res->l = l;
--	HMAC_cleanup((HMAC_CTX *)c);
--	(void)racoon_free(c);
-+	HMAC_CTX_free((HMAC_CTX *)c);
- 
- 	if (MD5_DIGEST_LENGTH != res->l) {
- 		plog(LLV_ERROR, LOCATION, NULL,
-@@ -2266,6 +2260,7 @@ eay_dh_generate(prime, g, publen, pub, priv)
- 	u_int32_t g;
- {
- 	BIGNUM *p = NULL;
-+	BIGNUM *BNg = NULL;
- 	DH *dh = NULL;
- 	int error = -1;
- 
-@@ -2276,25 +2271,28 @@ eay_dh_generate(prime, g, publen, pub, priv)
- 
- 	if ((dh = DH_new()) == NULL)
- 		goto end;
--	dh->p = p;
--	p = NULL;	/* p is now part of dh structure */
--	dh->g = NULL;
--	if ((dh->g = BN_new()) == NULL)
-+	if ((BNg = BN_new()) == NULL)
- 		goto end;
--	if (!BN_set_word(dh->g, g))
-+	if (!BN_set_word(BNg, g))
- 		goto end;
-+	if (! DH_set0_pqg(dh, p, NULL, BNg))
-+		goto end;
-+	BNg = NULL;
-+	p = NULL;	/* p is now part of dh structure */
- 
- 	if (publen != 0)
--		dh->length = publen;
-+		DH_set_length(dh, publen);
- 
- 	/* generate public and private number */
- 	if (!DH_generate_key(dh))
- 		goto end;
- 
- 	/* copy results to buffers */
--	if (eay_bn2v(pub, dh->pub_key) < 0)
-+	BIGNUM *pub_key, *priv_key;
-+	DH_get0_key(dh, (const BIGNUM**) &pub_key, (const BIGNUM**) &priv_key);
-+	if (eay_bn2v(pub, pub_key) < 0)
- 		goto end;
--	if (eay_bn2v(priv, dh->priv_key) < 0) {
-+	if (eay_bn2v(priv, priv_key) < 0) {
- 		vfree(*pub);
- 		goto end;
- 	}
-@@ -2306,6 +2304,8 @@ end:
- 		DH_free(dh);
- 	if (p != 0)
- 		BN_free(p);
-+	if (BNg != 0)
-+		BN_free(BNg);
- 	return(error);
- }
- 
-@@ -2319,6 +2319,10 @@ eay_dh_compute(prime, g, pub, priv, pub2, key)
- 	int l;
- 	unsigned char *v = NULL;
- 	int error = -1;
-+	BIGNUM *p = BN_new();
-+	BIGNUM *BNg = BN_new();
-+	BIGNUM *pub_key = BN_new();
-+	BIGNUM *priv_key = BN_new();
- 
- 	/* make public number to compute */
- 	if (eay_v2bn(&dh_pub, pub2) < 0)
-@@ -2327,19 +2331,21 @@ eay_dh_compute(prime, g, pub, priv, pub2, key)
- 	/* make DH structure */
- 	if ((dh = DH_new()) == NULL)
- 		goto end;
--	if (eay_v2bn(&dh->p, prime) < 0)
-+	if (p == NULL || BNg == NULL || pub_key == NULL || priv_key == NULL)
- 		goto end;
--	if (eay_v2bn(&dh->pub_key, pub) < 0)
-+
-+	if (eay_v2bn(&p, prime) < 0)
- 		goto end;
--	if (eay_v2bn(&dh->priv_key, priv) < 0)
-+	if (eay_v2bn(&pub_key, pub) < 0)
- 		goto end;
--	dh->length = pub2->l * 8;
--
--	dh->g = NULL;
--	if ((dh->g = BN_new()) == NULL)
-+	if (eay_v2bn(&priv_key, priv) < 0)
- 		goto end;
--	if (!BN_set_word(dh->g, g))
-+	if (!BN_set_word(BNg, g))
- 		goto end;
-+	DH_set0_key(dh, pub_key, priv_key);
-+	DH_set_length(dh, pub2->l * 8);
-+	DH_set0_pqg(dh, p, NULL, BNg);
-+	pub_key = priv_key = p = BNg = NULL;
- 
- 	if ((v = racoon_calloc(prime->l, sizeof(u_char))) == NULL)
- 		goto end;
-@@ -2350,6 +2356,14 @@ eay_dh_compute(prime, g, pub, priv, pub2, key)
- 	error = 0;
- 
- end:
-+	if (p != NULL)
-+		BN_free(p);
-+	if (BNg != NULL)
-+		BN_free(BNg);
-+	if (pub_key != NULL)
-+		BN_free(pub_key);
-+	if (priv_key != NULL)
-+		BN_free(priv_key);
- 	if (dh_pub != NULL)
- 		BN_free(dh_pub);
- 	if (dh != NULL)
-@@ -2400,12 +2414,14 @@ eay_bn2v(var, bn)
- void
- eay_init()
- {
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 	OpenSSL_add_all_algorithms();
- 	ERR_load_crypto_strings();
- #ifdef HAVE_OPENSSL_ENGINE_H
- 	ENGINE_load_builtin_engines();
- 	ENGINE_register_all_complete();
- #endif
-+#endif
- }
- 
- vchar_t *
-@@ -2504,8 +2520,7 @@ binbuf_pubkey2rsa(vchar_t *binbuf)
- 		goto out;
- 	}
- 	
--	rsa_pub->n = mod;
--	rsa_pub->e = exp;
-+	RSA_set0_key(rsa_pub, mod, exp, NULL);
- 
- out:
- 	return rsa_pub;
-@@ -2582,5 +2597,5 @@ eay_random()
- const char *
- eay_version()
- {
--	return SSLeay_version(SSLEAY_VERSION);
-+	return OpenSSL_version(OPENSSL_VERSION);
- }
-diff --git a/src/racoon/crypto_openssl.h b/src/racoon/crypto_openssl.h
-index 66fac73..ee5b765 100644
---- a/src/racoon/crypto_openssl.h
-+++ b/src/racoon/crypto_openssl.h
-@@ -124,7 +124,7 @@ extern vchar_t *eay_aes_decrypt __P((vchar_t *, vchar_t *, vchar_t *));
- extern int eay_aes_weakkey __P((vchar_t *));
- extern int eay_aes_keylen __P((int));
- 
--#if defined(HAVE_OPENSSL_CAMELLIA_H)
-+#if defined(HAVE_OPENSSL_CAMELLIA_H) && ! defined(OPENSSL_NO_CAMELLIA)
- /* Camellia */
- extern vchar_t *eay_camellia_encrypt __P((vchar_t *, vchar_t *, vchar_t *));
- extern vchar_t *eay_camellia_decrypt __P((vchar_t *, vchar_t *, vchar_t *));
-diff --git a/src/racoon/eaytest.c b/src/racoon/eaytest.c
-index 1474bdc..ae09db3 100644
---- a/src/racoon/eaytest.c
-+++ b/src/racoon/eaytest.c
-@@ -62,6 +62,7 @@
- #include "dhgroup.h"
- #include "crypto_openssl.h"
- #include "gnuc.h"
-+#include "openssl_compat.h"
- 
- #include "package_version.h"
- 
-@@ -103,7 +104,7 @@ rsa_verify_with_pubkey(src, sig, pubkey_txt)
- 		printf ("PEM_read_PUBKEY(): %s\n", eay_strerror());
- 		return -1;
- 	}
--	error = eay_check_rsasign(src, sig, evp->pkey.rsa);
-+	error = eay_check_rsasign(src, sig, EVP_PKEY_get0_RSA(evp));
- 
- 	return error;
- }
-@@ -698,7 +699,7 @@ ciphertest(ac, av)
- 			  eay_cast_encrypt, eay_cast_decrypt) < 0)
- 	  return -1;
- 	
--#ifdef HAVE_OPENSSL_IDEA_H
-+#if defined(HAVE_OPENSSL_IDEA_H) && ! defined(OPENSSL_NO_IDEA)
- 	if (ciphertest_1 ("IDEA",
- 			  &data, 8,
- 			  &key, key.l,
-@@ -715,7 +716,7 @@ ciphertest(ac, av)
- 			  eay_rc5_encrypt, eay_rc5_decrypt) < 0)
- 	  return -1;
- #endif
--#if defined(HAVE_OPENSSL_CAMELLIA_H)
-+#if defined(HAVE_OPENSSL_CAMELLIA_H) && ! defined(OPENSSL_NO_CAMELLIA)
- 	if (ciphertest_1 ("CAMELLIA",
- 			  &data, 16,
- 			  &key, key.l,
-diff --git a/src/racoon/ipsec_doi.c b/src/racoon/ipsec_doi.c
-index 84a4c71..b52469f 100644
---- a/src/racoon/ipsec_doi.c
-+++ b/src/racoon/ipsec_doi.c
-@@ -715,7 +715,7 @@ out:
- 	/* key length must not be specified on some algorithms */
- 	if (keylen) {
- 		if (sa->enctype == OAKLEY_ATTR_ENC_ALG_DES
--#ifdef HAVE_OPENSSL_IDEA_H
-+#if defined(HAVE_OPENSSL_IDEA_H) && ! defined(OPENSSL_NO_IDEA)
- 		 || sa->enctype == OAKLEY_ATTR_ENC_ALG_IDEA
- #endif
- 		 || sa->enctype == OAKLEY_ATTR_ENC_ALG_3DES) {
-diff --git a/src/racoon/openssl_compat.c b/src/racoon/openssl_compat.c
-new file mode 100644
-index 0000000..864b5fb
---- /dev/null
-+++ b/src/racoon/openssl_compat.c
-@@ -0,0 +1,213 @@
-+/*
-+ * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
-+ *
-+ * Licensed under the OpenSSL license (the "License").  You may not use
-+ * this file except in compliance with the License.  You can obtain a copy
-+ * in the file LICENSE in the source distribution or at
-+ * https://www.openssl.org/source/license.html
-+ */
-+
-+#include "openssl_compat.h"
-+
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+
-+#include <string.h>
-+
-+static void *OPENSSL_zalloc(size_t num)
-+{
-+    void *ret = OPENSSL_malloc(num);
-+
-+    if (ret != NULL)
-+        memset(ret, 0, num);
-+    return ret;
-+}
-+
-+int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
-+{
-+    /* If the fields n and e in r are NULL, the corresponding input
-+     * parameters MUST be non-NULL for n and e.  d may be
-+     * left NULL (in case only the public key is used).
-+     */
-+    if ((r->n == NULL && n == NULL)
-+        || (r->e == NULL && e == NULL))
-+        return 0;
-+
-+    if (n != NULL) {
-+        BN_free(r->n);
-+        r->n = n;
-+    }
-+    if (e != NULL) {
-+        BN_free(r->e);
-+        r->e = e;
-+    }
-+    if (d != NULL) {
-+        BN_free(r->d);
-+        r->d = d;
-+    }
-+
-+    return 1;
-+}
-+
-+int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q)
-+{
-+    /* If the fields p and q in r are NULL, the corresponding input
-+     * parameters MUST be non-NULL.
-+     */
-+    if ((r->p == NULL && p == NULL)
-+        || (r->q == NULL && q == NULL))
-+        return 0;
-+
-+    if (p != NULL) {
-+        BN_free(r->p);
-+        r->p = p;
-+    }
-+    if (q != NULL) {
-+        BN_free(r->q);
-+        r->q = q;
-+    }
-+
-+    return 1;
-+}
-+
-+int RSA_set0_crt_params(RSA *r, BIGNUM *dmp1, BIGNUM *dmq1, BIGNUM *iqmp)
-+{
-+    /* If the fields dmp1, dmq1 and iqmp in r are NULL, the corresponding input
-+     * parameters MUST be non-NULL.
-+     */
-+    if ((r->dmp1 == NULL && dmp1 == NULL)
-+        || (r->dmq1 == NULL && dmq1 == NULL)
-+        || (r->iqmp == NULL && iqmp == NULL))
-+        return 0;
-+
-+    if (dmp1 != NULL) {
-+        BN_free(r->dmp1);
-+        r->dmp1 = dmp1;
-+    }
-+    if (dmq1 != NULL) {
-+        BN_free(r->dmq1);
-+        r->dmq1 = dmq1;
-+    }
-+    if (iqmp != NULL) {
-+        BN_free(r->iqmp);
-+        r->iqmp = iqmp;
-+    }
-+
-+    return 1;
-+}
-+
-+void RSA_get0_key(const RSA *r,
-+                  const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
-+{
-+    if (n != NULL)
-+        *n = r->n;
-+    if (e != NULL)
-+        *e = r->e;
-+    if (d != NULL)
-+        *d = r->d;
-+}
-+
-+void RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM **q)
-+{
-+    if (p != NULL)
-+        *p = r->p;
-+    if (q != NULL)
-+        *q = r->q;
-+}
-+
-+void RSA_get0_crt_params(const RSA *r,
-+                         const BIGNUM **dmp1, const BIGNUM **dmq1,
-+                         const BIGNUM **iqmp)
-+{
-+    if (dmp1 != NULL)
-+        *dmp1 = r->dmp1;
-+    if (dmq1 != NULL)
-+        *dmq1 = r->dmq1;
-+    if (iqmp != NULL)
-+        *iqmp = r->iqmp;
-+}
-+
-+int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
-+{
-+    /* If the fields p and g in d are NULL, the corresponding input
-+     * parameters MUST be non-NULL.  q may remain NULL.
-+     */
-+    if ((dh->p == NULL && p == NULL)
-+        || (dh->g == NULL && g == NULL))
-+        return 0;
-+
-+    if (p != NULL) {
-+        BN_free(dh->p);
-+        dh->p = p;
-+    }
-+    if (q != NULL) {
-+        BN_free(dh->q);
-+        dh->q = q;
-+    }
-+    if (g != NULL) {
-+        BN_free(dh->g);
-+        dh->g = g;
-+    }
-+
-+    if (q != NULL) {
-+        dh->length = BN_num_bits(q);
-+    }
-+
-+    return 1;
-+}
-+
-+void DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key)
-+{
-+    if (pub_key != NULL)
-+        *pub_key = dh->pub_key;
-+    if (priv_key != NULL)
-+        *priv_key = dh->priv_key;
-+}
-+
-+int DH_set0_key(DH *dh, BIGNUM *pub_key, BIGNUM *priv_key)
-+{
-+    /* If the field pub_key in dh is NULL, the corresponding input
-+     * parameters MUST be non-NULL.  The priv_key field may
-+     * be left NULL.
-+     */
-+    if (dh->pub_key == NULL && pub_key == NULL)
-+        return 0;
-+
-+    if (pub_key != NULL) {
-+        BN_free(dh->pub_key);
-+        dh->pub_key = pub_key;
-+    }
-+    if (priv_key != NULL) {
-+        BN_free(dh->priv_key);
-+        dh->priv_key = priv_key;
-+    }
-+
-+    return 1;
-+}
-+
-+int DH_set_length(DH *dh, long length)
-+{
-+    dh->length = length;
-+    return 1;
-+}
-+
-+HMAC_CTX *HMAC_CTX_new(void)
-+{
-+    return OPENSSL_zalloc(sizeof(HMAC_CTX));
-+}
-+
-+void HMAC_CTX_free(HMAC_CTX *ctx)
-+{
-+    HMAC_CTX_cleanup(ctx);
-+    OPENSSL_free(ctx);
-+}
-+
-+RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
-+{
-+    if (pkey->type != EVP_PKEY_RSA) {
-+        return NULL;
-+    }
-+    return pkey->pkey.rsa;
-+}
-+
-+
-+#endif /* OPENSSL_VERSION_NUMBER */
-diff --git a/src/racoon/openssl_compat.h b/src/racoon/openssl_compat.h
-new file mode 100644
-index 0000000..9e152c2
---- /dev/null
-+++ b/src/racoon/openssl_compat.h
-@@ -0,0 +1,45 @@
-+#ifndef OPENSSL_COMPAT_H
-+#define OPENSSL_COMPAT_H
-+
-+#include <openssl/opensslv.h>
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+
-+#include <openssl/rsa.h>
-+#include <openssl/dh.h>
-+#include <openssl/evp.h>
-+#include <openssl/hmac.h>
-+
-+int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d);
-+int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q);
-+int RSA_set0_crt_params(RSA *r, BIGNUM *dmp1, BIGNUM *dmq1, BIGNUM *iqmp);
-+void RSA_get0_key(const RSA *r, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d);
-+void RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM **q);
-+void RSA_get0_crt_params(const RSA *r, const BIGNUM **dmp1, const BIGNUM **dmq1, const BIGNUM **iqmp);
-+
-+int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g);
-+void DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key);
-+int DH_set0_key(DH *dh, BIGNUM *pub_key, BIGNUM *priv_key);
-+int DH_set_length(DH *dh, long length);
-+
-+HMAC_CTX *HMAC_CTX_new(void);
-+void HMAC_CTX_free(HMAC_CTX* ctx);
-+
-+RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey);
-+
-+#define ASN1_STRING_length(s) s->length
-+#define ASN1_STRING_get0_data(s) s->data
-+
-+#define X509_get_subject_name(x) x->cert_info->subject
-+#define X509_get_issuer_name(x) x->cert_info->issuer
-+#define X509_NAME_ENTRY_get_data(n) n->value
-+#define X509_NAME_ENTRY_get_object(n) n->object
-+#define X509_STORE_CTX_get_current_cert(ctx) ctx->current_cert
-+#define X509_STORE_CTX_get_error(ctx) ctx->error
-+#define X509_STORE_CTX_get_error_depth(ctx) ctx->error_depth
-+
-+#define OPENSSL_VERSION SSLEAY_VERSION
-+#define OpenSSL_version SSLeay_version
-+
-+#endif /* OPENSSL_VERSION_NUMBER */
-+
-+#endif /* OPENSSL_COMPAT_H */
-diff --git a/src/racoon/plainrsa-gen.c b/src/racoon/plainrsa-gen.c
-index cad1861..b949b08 100644
---- a/src/racoon/plainrsa-gen.c
-+++ b/src/racoon/plainrsa-gen.c
-@@ -60,6 +60,7 @@
- #include "vmbuf.h"
- #include "plog.h"
- #include "crypto_openssl.h"
-+#include "openssl_compat.h"
- 
- #include "package_version.h"
- 
-@@ -90,12 +91,14 @@ mix_b64_pubkey(const RSA *key)
- 	char *binbuf;
- 	long binlen, ret;
- 	vchar_t *res;
--	
--	binlen = 1 + BN_num_bytes(key->e) + BN_num_bytes(key->n);
-+	const BIGNUM *e, *n;
-+
-+	RSA_get0_key(key, &n, &e, NULL);
-+	binlen = 1 + BN_num_bytes(e) + BN_num_bytes(n);
- 	binbuf = malloc(binlen);
- 	memset(binbuf, 0, binlen);
--	binbuf[0] = BN_bn2bin(key->e, (unsigned char *) &binbuf[1]);
--	ret = BN_bn2bin(key->n, (unsigned char *) (&binbuf[binbuf[0] + 1]));
-+	binbuf[0] = BN_bn2bin(e, (unsigned char *) &binbuf[1]);
-+	ret = BN_bn2bin(n, (unsigned char *) (&binbuf[binbuf[0] + 1]));
- 	if (1 + binbuf[0] + ret != binlen) {
- 		plog(LLV_ERROR, LOCATION, NULL,
- 		     "Pubkey generation failed. This is really strange...\n");
-@@ -131,16 +134,20 @@ print_rsa_key(FILE *fp, const RSA *key)
- 	
- 	fprintf(fp, "# : PUB 0s%s\n", pubkey64->v);
- 	fprintf(fp, ": RSA\t{\n");
--	fprintf(fp, "\t# RSA %d bits\n", BN_num_bits(key->n));
-+	const BIGNUM *n, *e, *d, *p, *q, *dmp1, *dmq1, *iqmp;
-+	RSA_get0_key(key, &n, &e, &d);
-+	RSA_get0_factors(key, &p, &q);
-+	RSA_get0_crt_params(key, &dmp1, &dmq1, &iqmp);
-+	fprintf(fp, "\t# RSA %d bits\n", BN_num_bits(n));
- 	fprintf(fp, "\t# pubkey=0s%s\n", pubkey64->v);
--	fprintf(fp, "\tModulus: 0x%s\n", lowercase(BN_bn2hex(key->n)));
--	fprintf(fp, "\tPublicExponent: 0x%s\n", lowercase(BN_bn2hex(key->e)));
--	fprintf(fp, "\tPrivateExponent: 0x%s\n", lowercase(BN_bn2hex(key->d)));
--	fprintf(fp, "\tPrime1: 0x%s\n", lowercase(BN_bn2hex(key->p)));
--	fprintf(fp, "\tPrime2: 0x%s\n", lowercase(BN_bn2hex(key->q)));
--	fprintf(fp, "\tExponent1: 0x%s\n", lowercase(BN_bn2hex(key->dmp1)));
--	fprintf(fp, "\tExponent2: 0x%s\n", lowercase(BN_bn2hex(key->dmq1)));
--	fprintf(fp, "\tCoefficient: 0x%s\n", lowercase(BN_bn2hex(key->iqmp)));
-+	fprintf(fp, "\tModulus: 0x%s\n", lowercase(BN_bn2hex(n)));
-+	fprintf(fp, "\tPublicExponent: 0x%s\n", lowercase(BN_bn2hex(e)));
-+	fprintf(fp, "\tPrivateExponent: 0x%s\n", lowercase(BN_bn2hex(d)));
-+	fprintf(fp, "\tPrime1: 0x%s\n", lowercase(BN_bn2hex(p)));
-+	fprintf(fp, "\tPrime2: 0x%s\n", lowercase(BN_bn2hex(q)));
-+	fprintf(fp, "\tExponent1: 0x%s\n", lowercase(BN_bn2hex(dmp1)));
-+	fprintf(fp, "\tExponent2: 0x%s\n", lowercase(BN_bn2hex(dmq1)));
-+	fprintf(fp, "\tCoefficient: 0x%s\n", lowercase(BN_bn2hex(iqmp)));
- 	fprintf(fp, "  }\n");
- 
- 	vfree(pubkey64);
-@@ -203,11 +210,13 @@ int
- gen_rsa_key(FILE *fp, size_t bits, unsigned long exp)
- {
- 	int ret;
--	RSA *key;
-+	RSA *key = RSA_new();
-+	BIGNUM *e = BN_new();
- 
--	key = RSA_generate_key(bits, exp, NULL, NULL);
--	if (!key) {
-+	BN_set_word(e, exp);
-+	if (! RSA_generate_key_ex(key, bits, e, NULL)) {
- 		fprintf(stderr, "RSA_generate_key(): %s\n", eay_strerror());
-+		RSA_free(key);
- 		return -1;
- 	}
- 	
-diff --git a/src/racoon/prsa_par.y b/src/racoon/prsa_par.y
-index 1987e4d..27ce4c6 100644
---- a/src/racoon/prsa_par.y
-+++ b/src/racoon/prsa_par.y
-@@ -68,6 +68,7 @@
- #include "isakmp_var.h"
- #include "handler.h"
- #include "crypto_openssl.h"
-+#include "openssl_compat.h"
- #include "sockmisc.h"
- #include "rsalist.h"
- 
-@@ -85,7 +86,18 @@ char *prsa_cur_fname = NULL;
- struct genlist *prsa_cur_list = NULL;
- enum rsa_key_type prsa_cur_type = RSA_TYPE_ANY;
- 
--static RSA *rsa_cur;
-+struct my_rsa_st {
-+	BIGNUM *n;
-+	BIGNUM *e;
-+	BIGNUM *d;
-+	BIGNUM *p;
-+	BIGNUM *q;
-+	BIGNUM *dmp1;
-+	BIGNUM *dmq1;
-+	BIGNUM *iqmp;
-+};
-+
-+static struct my_rsa_st *rsa_cur;
- 
- void
- prsaerror(const char *s, ...)
-@@ -201,8 +213,12 @@ rsa_statement:
- 				rsa_cur->iqmp = NULL;
- 			}
- 		}
--		$$ = rsa_cur;
--		rsa_cur = RSA_new();
-+		RSA * rsa_tmp = RSA_new();
-+		RSA_set0_key(rsa_tmp, rsa_cur->n, rsa_cur->e, rsa_cur->d);
-+		RSA_set0_factors(rsa_tmp, rsa_cur->p, rsa_cur->q);
-+		RSA_set0_crt_params(rsa_tmp, rsa_cur->dmp1, rsa_cur->dmq1, rsa_cur->iqmp);
-+		$$ = rsa_tmp;
-+		memset(rsa_cur, 0, sizeof(struct my_rsa_st));
- 	}
- 	| TAG_PUB BASE64
- 	{
-@@ -351,10 +367,12 @@ prsa_parse_file(struct genlist *list, char *fname, enum rsa_key_type type)
- 	prsa_cur_fname = fname;
- 	prsa_cur_list = list;
- 	prsa_cur_type = type;
--	rsa_cur = RSA_new();
-+	rsa_cur = malloc(sizeof(struct my_rsa_st));
-+	memset(rsa_cur, 0, sizeof(struct my_rsa_st));
- 	ret = prsaparse();
- 	if (rsa_cur) {
--		RSA_free(rsa_cur);
-+		memset(rsa_cur, 0, sizeof(struct my_rsa_st));
-+		free(rsa_cur);
- 		rsa_cur = NULL;
- 	}
- 	fclose (fp);
-diff --git a/src/racoon/rsalist.c b/src/racoon/rsalist.c
-index f152c82..96e8363 100644
---- a/src/racoon/rsalist.c
-+++ b/src/racoon/rsalist.c
-@@ -52,6 +52,7 @@
- #include "genlist.h"
- #include "remoteconf.h"
- #include "crypto_openssl.h"
-+#include "openssl_compat.h"
- 
- #ifndef LIST_FIRST
- #define LIST_FIRST(head)        ((head)->lh_first)
-@@ -98,7 +99,9 @@ rsa_key_dup(struct rsa_key *key)
- 		return NULL;
- 
- 	if (key->rsa) {
--		new->rsa = key->rsa->d != NULL ? RSAPrivateKey_dup(key->rsa) : RSAPublicKey_dup(key->rsa);
-+		const BIGNUM *d;
-+		RSA_get0_key(key->rsa, NULL, NULL, &d);
-+		new->rsa = (d != NULL ? RSAPrivateKey_dup(key->rsa) : RSAPublicKey_dup(key->rsa));
- 		if (new->rsa == NULL)
- 			goto dup_error;
- 	}
--- 
-2.16.1
-
diff --git a/net-vpn/ipsec-tools/ipsec-tools-0.8.2-r6.ebuild b/net-vpn/ipsec-tools/ipsec-tools-0.8.2-r6.ebuild
index 92c5ce61b3ac..12630f200d8f 100644
--- a/net-vpn/ipsec-tools/ipsec-tools-0.8.2-r6.ebuild
+++ b/net-vpn/ipsec-tools/ipsec-tools-0.8.2-r6.ebuild
@@ -7,7 +7,8 @@ inherit flag-o-matic autotools linux-info pam systemd
 
 DESCRIPTION="A port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation"
 HOMEPAGE="http://ipsec-tools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+	https://dev.gentoo.org/~juippis/distfiles/tmp/ipsec-tools-add-openssl-1.1.x-support.patch"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
@@ -188,7 +189,7 @@ src_prepare() {
 	eapply "${FILESDIR}/${PN}-include-vendoridh.patch"
 	eapply "${FILESDIR}"/${PN}-0.8.0-sysctl.patch #425770
 	eapply "${FILESDIR}"/${PN}-CVE-2015-4047.patch
-	eapply "${FILESDIR}"/${PN}-add-openssl-1.1.x-support.patch
+	eapply "${DISTDIR}"/${PN}-add-openssl-1.1.x-support.patch
 	eapply "${FILESDIR}"/${PN}-CVE-2016-10396.patch
 	AT_M4DIR="${S}" eautoreconf
 
diff --git a/net-vpn/strongswan/Manifest b/net-vpn/strongswan/Manifest
index d714fba72914..b725c8f88c2c 100644
--- a/net-vpn/strongswan/Manifest
+++ b/net-vpn/strongswan/Manifest
@@ -1,2 +1,2 @@
-DIST strongswan-5.8.4.tar.bz2 4546240 BLAKE2B f58f53a17c02924a3ad75bfadd5956f62098c41468ec5fe8d51bf0f0465c8936d8ca846a41a0b6ff6ac24ccd2229e726d3ea2b48904abf5743bbe766e5f5f81c SHA512 15e866b0d6cc4ea94f17856b519d926ae08c15d3b62f675f62685d0722ca8fa26b46afb1ad1c866e9d5f347d77a747f57d0c6d7f6bd57762f37d7798f9e28103
 DIST strongswan-5.9.0.tar.bz2 4568404 BLAKE2B daf5cce5cbe12253f9ad201d89323ab7d54ba7ff466685b84830737689e4d417fbb97d053d8c9f3de5acb6dee9a192ebae48ec0d4aa07ba3c8969ee6d8f06ab3 SHA512 b982ce7c3e940ad75ab71b02ce3e2813b41c6b098cde5b6f3f3513d095f409fe989ae6e38a31eff51c57423bf452c3610cd5cd8cd7f45ff932581d9859df1821
+DIST strongswan-5.9.1.tar.bz2 4590867 BLAKE2B 1515764352e7473c47f853a5aa68e582d1fd61122ac1e1577bdc7813da77e0213803c69abf41a1667166e32fb9f2a4bfe8c74616d6431e698e31cf51e939ce3e SHA512 222625e77bd86959da6dd7346cfa9f92569fc396a494bb95ddf2c8e0680b7e8041541e8a14320517a0c735d713ae0fdc0d0c4694215e812817814b0b4efc3497
diff --git a/net-vpn/strongswan/strongswan-5.8.4.ebuild b/net-vpn/strongswan/strongswan-5.9.1.ebuild
similarity index 95%
rename from net-vpn/strongswan/strongswan-5.8.4.ebuild
rename to net-vpn/strongswan/strongswan-5.9.1.ebuild
index 38463dfcf54e..3ec804ee2611 100644
--- a/net-vpn/strongswan/strongswan-5.8.4.ebuild
+++ b/net-vpn/strongswan/strongswan-5.9.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-inherit linux-info systemd user
+inherit linux-info systemd
 
 DESCRIPTION="IPsec-based VPN solution, supporting IKEv1/IKEv2 and MOBIKE"
 HOMEPAGE="https://www.strongswan.org/"
@@ -10,11 +10,11 @@ SRC_URI="https://download.strongswan.org/${P}.tar.bz2"
 
 LICENSE="GPL-2 RSA DES"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11"
 
 STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
-STRONGSWAN_PLUGINS_OPT="aesni blowfish ccm chapoly ctr forecast gcm ha ipseckey newhope ntru padlock rdrand save-keys unbound whitelist"
+STRONGSWAN_PLUGINS_OPT="aesni blowfish bypass-lan ccm chapoly ctr forecast gcm ha ipseckey newhope ntru padlock rdrand save-keys unbound whitelist"
 for mod in $STRONGSWAN_PLUGINS_STD; do
 	IUSE="${IUSE} +strongswan_plugins_${mod}"
 done
@@ -23,7 +23,10 @@ for mod in $STRONGSWAN_PLUGINS_OPT; do
 	IUSE="${IUSE} strongswan_plugins_${mod}"
 done
 
-COMMON_DEPEND="!net-misc/openswan
+COMMON_DEPEND="non-root? (
+		acct-user/ipsec
+		acct-group/ipsec
+	)
 	gmp? ( >=dev-libs/gmp-4.1.5:= )
 	gcrypt? ( dev-libs/libgcrypt:0 )
 	caps? ( sys-libs/libcap )
@@ -36,9 +39,11 @@ COMMON_DEPEND="!net-misc/openswan
 	networkmanager? ( net-misc/networkmanager )
 	pam? ( sys-libs/pam )
 	strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns )"
+
 DEPEND="${COMMON_DEPEND}
 	virtual/linux-sources
 	sys-kernel/linux-headers"
+
 RDEPEND="${COMMON_DEPEND}
 	virtual/logger
 	sys-apps/iproute2
@@ -90,11 +95,6 @@ pkg_setup() {
 			ewarn
 		fi
 	fi
-
-	if use non-root; then
-		enewgroup ${UGID}
-		enewuser ${UGID} -1 -1 -1 ${UGID}
-	fi
 }
 
 src_configure() {
@@ -300,9 +300,9 @@ pkg_postinst() {
 	elog
 	elog "Make sure you have _all_ required kernel modules available including"
 	elog "the appropriate cryptographic algorithms. A list is available at:"
-	elog "  http://wiki.strongswan.org/projects/strongswan/wiki/KernelModules"
+	elog "  https://wiki.strongswan.org/projects/strongswan/wiki/KernelModules"
 	elog
 	elog "The up-to-date manual is available online at:"
-	elog "  http://wiki.strongswan.org/"
+	elog "  https://wiki.strongswan.org/"
 	elog
 }
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 029ea9588248..0c525200e5a1 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/lorcon/lorcon-0.0_p20200214.ebuild b/net-wireless/lorcon/lorcon-0.0_p20200214.ebuild
index 5b0c385c4d6d..13d500f801a5 100644
--- a/net-wireless/lorcon/lorcon-0.0_p20200214.ebuild
+++ b/net-wireless/lorcon/lorcon-0.0_p20200214.ebuild
@@ -50,7 +50,7 @@ src_prepare() {
 }
 
 src_configure() {
-	default_src_configure
+	econf --disable-static
 }
 
 src_compile() {
@@ -68,5 +68,5 @@ src_install() {
 		cd pylorcon2 || die
 		distutils-r1_src_install
 	fi
-	find "${D}" -xtype f -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-wireless/lorcon/lorcon-9999.ebuild b/net-wireless/lorcon/lorcon-9999.ebuild
index 7e81f8596710..5f2fea92453c 100644
--- a/net-wireless/lorcon/lorcon-9999.ebuild
+++ b/net-wireless/lorcon/lorcon-9999.ebuild
@@ -50,7 +50,7 @@ src_prepare() {
 }
 
 src_configure() {
-	default_src_configure
+	econf --disable-static
 }
 
 src_compile() {
@@ -68,5 +68,5 @@ src_install() {
 		cd pylorcon2 || die
 		distutils-r1_src_install
 	fi
-	find "${D}" -xtype f -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 002a30bf54ce..3c0d8c1c8a01 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -2,5 +2,6 @@ DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda8
 DIST unifi-6.0.28.zip 227017958 BLAKE2B cf70d5cbcefcf2a89f1a38763898d3f59f4be1b99b5cca7a7393a6e8ef705090aeb60f59c0a67b95ae967ff575da0749bbf327d53247c1a7128f01043145bebc SHA512 edb332ccc6624f73c77976a564c157d37f2a11068c2f8af1fa98209efb3b4e01922ab75309f85e5bd053ec50e9eeb433fcaa22bb2c0a27a6ee4de8946a876d46
 DIST unifi-6.0.33.zip 229743711 BLAKE2B da2a0275f2744c13a3414c8397ab321eaebc3c05da1d117cec2cbcbefe684c8695a8e62dfa853413559943bdd823b49dd6b6e242fd922419004562354b528903 SHA512 ee6d95c2d2254343c1ee69d543099f1b01ba8b702de5dca3715cfd1aebca10eaeba1477679e28b18374e7dd2f8fb2a545a7d660b1700d9d21f5d4d21be3360a3
 DIST unifi-6.0.34.zip 230272618 BLAKE2B c591bd1b51c00e7d01ca75e27c956f3867047499436193a509d9d29594afa4c82c89f36c6884a10a7eb705ee4b1e5bfa345a0592d1dac4011298b4a564f21b12 SHA512 3806962c6e173240d519b395b15946d6a62fe569ef36c8c2681aed746ecd357bd747be5188ffaf51d2641fa997f953a8efbc7ce9a1bdd786605b262bbe7eeaf8
+DIST unifi-6.0.36.zip 232051560 BLAKE2B 94a2780c40588c2afb64993d839dedb6064f437cdf29cd6dd9124ef3944ae25d1942f3eed0ea080007800575b37d9063b3f007b91d02bc30d35179cb4263d873 SHA512 bab68b649c84cf62e4e646c62a8adf8006ab6d434907352f3970e7c81c779b4dcbaf8d1b5558cf69e7daede9c96fe0b02216700cb62de5659cf496dc899ec2ee
 DIST unifi-6.1.23.zip 235365469 BLAKE2B 950f34ee30155c77c82886d22bf18d89473339c7b94d51381983ce1635a1c1774b702b2da6f8d6120c59e1909735ede55198225d5b0614976ef02dd8daddd711 SHA512 a6851964fe28e79c3fc30bee5b6e694b52afbb8f14f6f6aa349ddac82f57177765ddf6480973798a0f3af23c9d3308e4580c57d132abaf947b7fa0bb818ba207
 DIST unifi-6.1.25.zip 235499342 BLAKE2B 77de866d2c04136b32e06698f3c20563dc68cf1bf5d260a23cad46ee208c5d4012d788c67dc3324578d2c944e8eceecf6b5473f4d77304e10ee15a3b14286fc7 SHA512 0eb916f06546a5b33da664ada77391a69d21c9ec4545244a1a6f55ceeb7546fe77a07a121df03ba606e98ddbd23429207f86bb5b2c24ddfb3174eb2d00c5daaf
diff --git a/net-wireless/unifi/unifi-6.0.36.ebuild b/net-wireless/unifi/unifi-6.0.36.ebuild
new file mode 100644
index 000000000000..7c4f171b97d5
--- /dev/null
+++ b/net-wireless/unifi/unifi-6.0.36.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Set this var for any releases except stable
+RC_SUFFIX="-35c9dd953e"
+
+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/profiles/Manifest.gz b/profiles/Manifest.gz
index 720b8a57a924..8f7e088c83b4 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index aa144d0b56e4..74c2e282b580 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2020-11-12)
+# media-sound/lash not keyworded, bug #736725
+media-sound/fluidsynth lash
+
 # Cédric Krier <cedk@gentoo.org> (2020-11-10)
 # virtual/rust has no alpha keyword
 dev-vcs/mercurial rust
diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask
index da981f77b67d..d97a8e0f29b8 100644
--- a/profiles/arch/alpha/use.mask
+++ b/profiles/arch/alpha/use.mask
@@ -4,6 +4,10 @@
 # Unmask the flag which corresponds to ARCH.
 -alpha
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2020-11-12)
+# media-sound/jack-audio-connection-kit re-keywording timeout, bug #736725
+jack
+
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-07-18)
 # net-libs/webkit-gtk has no alpha keywords
 webkit
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 835742d9354f..4a0922df1dd1 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2020-11-12)
+# media-sound/lash not keyworded, bug #736725
+media-sound/fluidsynth lash
+
 # Cédric Krier <cedk@gentoo.org> (2020-11-10)
 # virtual/rust has no hppa keyword
 dev-vcs/mercurial rust
diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask
index 7019b8dfa635..9900978faa4b 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Sergei Trofimovich <slyfox@gentoo.org> (2020-11-14)
+# sys-apps/systemd has no stable keywords on hppa.
+sys-apps/ipmitool openbmc
+
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2020-10-14)
 # app-i18n/fcitx:4 not stable.
 media-libs/libsdl2 fcitx4
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index eb4f6d029843..593e93fd7172 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -7,6 +7,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2020-11-12)
+# media-sound/jack-audio-connection-kit re-keywording timeout, bug #736725
+jack
+
 # Matt Turner <mattst88@gentoo.org> (2020-07-01)
 # Unlikely.
 vulkan
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 1077dfe23d5d..17bb88f662f5 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -70,10 +70,6 @@ app-admin/syslog-ng test
 # iasl is stable on ppc
 sys-firmware/seabios -debug
 
-# Eugene Bright <eugene@bright.gdn> (2019-09-09)
-# Missing keyword on dev-embedded/libjaylink
-sys-apps/flashrom jlink-spi
-
 # Conrad Kostecki <conikost@gentoo.org> (2019-08-17)
 # app-misc/graphlcd-base won't work on PowerPC/PowerPC64
 app-misc/lcdproc freetype lcd_devices_glcd png
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 88f02cbe20db..591b63e6cb24 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -75,6 +75,10 @@ net-libs/pjproject g729
 # iasl is stable on ppc
 sys-firmware/seabios -debug
 
+# Eugene Bright <eugene@bright.gdn> (2019-09-09)
+# Missing keyword on dev-embedded/libjaylink
+sys-apps/flashrom jlink-spi
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-05-15)
 # sys-cluster/hpx, sci-libs/silo not keyworded
 sci-libs/libgeodecomp hpx silo
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index b936c302a5c3..f9e76e04e48e 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -157,11 +157,6 @@ x11-misc/rss-glx quesoglc
 # and stupid 64bit toolchain.
 net-libs/libproxy webkit
 
-# Brent Baude <ranger@gentoo.org> (2008-06-11)
-# Masking out passwdqc from older pambase since pam_passwdqc is not keyworded
-# new versions require sys-auth/passwdqc which is keyworded
-<=sys-auth/pambase-20200304 passwdqc
-
 # Joseph Jezak <josejx@gentoo.org> (2010-02-12)
 # Mask unstable pidgin deps until we can mark them stable (farsight2)
 net-im/pidgin gstreamer
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 69ec5e5d18ba..ef160857e0cf 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -23,10 +23,6 @@ media-gfx/darktable system-lua
 # The respective dependencies are masked for removal.
 net-im/telepathy-connection-managers gadu icq meanwhile steam yahoo
 
-# Michał Górny <mgorny@gentoo.org> (2020-09-26)
-# Removed in 1.1.34-r1, mask in older to unblock libxml2 cleanup.
-<dev-libs/libxslt-1.1.34-r1 python
-
 # Michał Górny <mgorny@gentoo.org> (2020-09-26)
 # The respective dependencies are masked for removal.
 ~dev-db/percona-server-5.7.27.30 test
@@ -79,7 +75,6 @@ www-apps/nikola websocket
 # distutils_enable_sphinx to build docs.
 <=dev-python/lockfile-0.12.2-r2 doc
 <dev-python/pep8-1.7.1-r1 doc
-<dev-python/psycopg-2.8.4 doc
 
 # Michał Górny <mgorny@gentoo.org> (2020-07-27)
 # Requires Python 2 support in xapian-bindings which in turn require
@@ -95,11 +90,6 @@ dev-python/autobahn xbr
 # media-video/pipewire:0/0.3 is only available for certain architectures
 www-client/firefox screencast
 
-# Mart Raudsepp <leio@gentoo.org> (2020-06-28)
-# media-video/pipewire:0/0.3 is ongoing work, 0.2 on mutter-3.34
-# is not worth trying to get to work.
-<x11-wm/mutter-3.36 screencast
-
 # Stephan Hartmann <stha09@googlemail.com> (2020-06-28)
 # Mostly intended for development and not for general use.
 >=www-client/chromium-84 headless
@@ -114,10 +104,6 @@ media-gfx/inkscape jemalloc
 # broken.
 www-client/chromium component-build
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-05-04)
-# Broken error[E0478]: lifetime bound not satisfied
-=dev-lang/rust-1.44.1 miri
-
 # Ben Kohler <bkohler@gentoo.org> (2020-04-29)
 # Dependency pam_wrapper missing for tests, and RESTRICT=test is already set
 net-fs/samba test
@@ -167,10 +153,6 @@ dev-python/pyzmq doc
 # Unsatisfiable dep due to missing impls.
 dev-python/zeep tornado
 
-# Michał Górny <mgorny@gentoo.org> (2020-01-29)
-# Require Python 2 support in numpydoc.
-<=dev-python/pywavelets-0.5.2-r1 doc
-
 # Michał Górny <mgorny@gentoo.org> (2020-01-27)
 # Requires old split dev-python/twisted-*.
 net-irc/telepathy-idle test
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index e1496a7e85b7..26a7609bf2e0 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -1,6 +1,16 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# This file is only for generic masks. For arch-specific masks (i.e.
+# mask everywhere, unmask on arch/*) use arch/base.
+
+# Marek Szuba <marecki@gentoo.org> (2020-11-14)
+# To allow Lua revdeps compatible with lua-5.4 to safely include it
+# in LUA_COMPAT even though we haven't got dev-lang/lua:5.4 in the tree
+# yet (see https://bugs.gentoo.org/754318 for the status of that).
+lua_single_target_lua5-4
+lua_targets_lua5-4
+
 # Alexis Ballier <aballier@gentoo.org> (2020-10-13)
 # Nothing depends on those ROS messages. dev-ros/geneus
 # is half broken in our setup where it looks for packages
@@ -12,9 +22,6 @@ ros_messages_eus
 # app-office/openoffice-bin is being removed.
 office_implementation_openoffice
 
-# This file is only for generic masks. For arch-specific masks (i.e.
-# mask everywhere, unmask on arch/*) use arch/base.
-
 # Hans de Graaff <graaff@gentoo.org> (2020-06-13)
 # Mask Ruby 2.4 as EOL
 ruby_targets_ruby24
diff --git a/profiles/license_groups b/profiles/license_groups
index 9602bb41338f..3e9a99a6c618 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -30,7 +30,7 @@ OSI-APPROVED AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artisti
 # Licenses in this list should NOT appear directly or indirectly in
 # @FSF-APPROVED or @OSI-APPROVED.
 # Note: Licenses for fonts should be included in @MISC-FREE-DOCS.
-MISC-FREE AIFFWriter.m Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution BSD-with-disclosure buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-1.1 CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA curl DES docbook dom4j DUMB-0.9.3 eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net Interbase-1.0 ipadic Ispell JDOM JNIC JOVE Khronos-CLHPP LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LPPL-1.3 LPPL-1.3b lsof matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter par PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils rc rdisc regexp-UofT repoze RSA rwpng sash scanlogd sdlsasteroids Sendmail Sendmail-Open-Source SMAIL Snd SSLeay Subversion SVFL symlinks Sympow-BSD tablelist tcltk tcp_wrappers_license TeX TeX-other-free the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda UCAR-Unidata URT VTK w3m wm2 x2x xbatt xboing XC Xdebug xtrs ZSH
+MISC-FREE AIFFWriter.m Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution BSD-with-disclosure buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-1.1 CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA curl DES docbook dom4j DUMB-0.9.3 eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net Interbase-1.0 ipadic Ispell JDOM JNIC JOVE Khronos-CLHPP LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LPPL-1.3 LPPL-1.3b lsof matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter par PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils rc rdisc regexp-UofT repoze RSA rwpng sash scanlogd sdlsasteroids Sendmail Sendmail-Open-Source SMAIL Snd SSLeay SVFL symlinks Sympow-BSD tablelist tcltk tcp_wrappers_license TeX TeX-other-free the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda UCAR-Unidata URT VTK w3m wm2 x2x xbatt xboing XC Xdebug xtrs ZSH
 
 # Metaset for all free software
 FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE
@@ -71,7 +71,7 @@ BINARY-REDISTRIBUTABLE @FREE Amazon Atmel AVASYS bh-luxi bonnie Broadcom freedis
 
 # License agreements that try to take away your rights. These are more
 # restrictive than "all-rights-reserved" or require explicit approval.
-EULA 2dboy-EULA AdobeFlash-11.x AMD-GPU-PRO-EULA AnyDesk-TOS Aseprite-EULA baudline BCS bestcrypt CAPYBARA-EULA Coherent-Graphics EPSON-2018 ETQW f.lux FAH-EULA-2014 Flightradar24 Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA MakeMKV-EULA Mendeley-terms Microsemi Mojang ms-teams-pre MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE Primate-Plunge protonmail-bridge-EULA PUEL Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR Sourcetrail SPS Steam supermicro Synology teamspeak3 teamspeak5 TeamViewer THINKTANKS TIK ubiquiti ut2003 ut2003-demo Vivaldi worklog-assistant WPS-EULA zi-labone
+EULA 2dboy-EULA AdobeFlash-11.x AMD-GPU-PRO-EULA AnyDesk-TOS Aseprite-EULA baudline BCS bestcrypt CAPYBARA-EULA Coherent-Graphics ETQW f.lux FAH-EULA-2014 Flightradar24 Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA MakeMKV-EULA Mendeley-terms Microsemi Mojang ms-teams-pre MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE Primate-Plunge protonmail-bridge-EULA PUEL Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR Sourcetrail SPS Steam supermicro Synology teamspeak3 teamspeak5 TeamViewer THINKTANKS TIK ubiquiti ut2003 ut2003-demo Vivaldi worklog-assistant WPS-EULA zi-labone
 
 # Local Variables:
 # mode: conf-space
diff --git a/profiles/package.deprecated b/profiles/package.deprecated
index 3ef9f1182a58..a08ef1f2b83a 100644
--- a/profiles/package.deprecated
+++ b/profiles/package.deprecated
@@ -17,11 +17,6 @@
 
 #--- END OF EXAMPLES ---
 
-# Jesus P Rey <gentoo@chuso.net> (2020-09-26)
-# Only one provider left; media-video/ffmpeg should be used instead
-# Bug #744787
-virtual/ffmpeg
-
 # Thomas Deutschmann <whissi@gentoo.org> (2020-09-08)
 # Dead implementations, please migrate to >=zeromq-4
 dev-perl/ZMQ-LibZMQ2
diff --git a/profiles/package.mask b/profiles/package.mask
index f30b2d0d8830..192e93ab2225 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,32 @@
 
 #--- END OF EXAMPLES ---
 
+# Sergei Trofimovich <slyfox@gentoo.org> (2020-11-05)
+# Does not compile against ghc-8.8: #754675, #611988
+# Masked for removal
+dev-haskell/shuffle
+dev-haskell/uhc-light
+dev-haskell/uhc-util
+
+# Michał Górny <mgorny@gentoo.org> (2020-11-15)
+# Fails to build.  Lots of bugs filed.  Not touched by maintainer
+# since 2018.
+# Removal in 30 days.  Bug #721990.
+media-video/cinelerra
+
+# Sergei Trofimovich <slyfox@gentoo.org> (2020-11-03)
+# Not compatible with ghc-8.8 or above: #754285
+# No revdeps. Masked for removal.
+dev-haskell/ghc-syb-utils
+
+# Aisha Tammy <gentoo@aisha.cc> (2020-11-13)
+# dead packages with latest releases before 2013
+# these are superseded by other scikit packages
+# scikit-optimize, sktime
+# Removal in 30 days (Bug #749297)
+sci-libs/scikits_optimization
+sci-libs/scikits_timeseries
+
 # Jonas Stein <jstein@gentoo.org> (2020-11-12)
 # Adobe will stop distributing Flash Player after 2020-12-31.
 # Masked for removal after 2020-12-31
@@ -144,7 +170,7 @@ dev-python/couchdb-python
 # Alfredo Tupone <tupone@gentoo.org> (2020-11-05)
 # will be upgraded after new lua release
 www-apps/liquid_feedback_frontend
-www-apps/wepmcp
+www-apps/webmcp
 
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-11-03)
 # Hackage release does not build against gcc-8:
@@ -170,14 +196,6 @@ net-wireless/openggsn
 net-wireless/osmobts
 net-wireless/osmocom-bb
 
-# Aisha Tammy <gentoo@aisha.cc> (2020-10-31)
-# Redundant historical packages now being provided
-# together by sci-libs/lapack
-# Removal in 14 days. Bug #746962.
-sci-libs/blas-reference
-sci-libs/cblas-reference
-sci-libs/lapack-reference
-
 # Lars Wendler <polynomial-c@gentoo.org> (2020-10-30)
 # Removed public macro definitions for TRUE and FALSE which breaks lots of
 # revdeps. See tacker bug at https://bugs.gentoo.org/751919
@@ -337,6 +355,9 @@ dev-lua/luacrypto
 # Added sci-visualization/gnuplot.
 >=app-misc/worker-3.8.3-r100
 =dev-libs/efl-1.25.1-r10
+>=dev-lua/lua-bit32-5.3.5-r100
+>=dev-lua/lua-zlib-1.2-r100
+>=dev-lua/luaevent-0.4.6-r100
 >=dev-lua/luv-1.32.0.0-r100
 >=dev-lua/luadbi-0.7.2-r100
 >=dev-lua/lutok-0.4-r10
@@ -356,6 +377,7 @@ dev-lua/luacrypto
 >=www-servers/lighttpd-1.4.55-r100
 >=app-admin/conky-1.11.4
 >=media-sound/aqualung-1.1-r100
+>=games-roguelike/stone-soup-0.25.1-r100
 
 # Andrew Savchenko <bircoph@gentoo.org> (2020-10-11)
 # Mask old openafs version and corresponding openafs-kernel with
@@ -366,13 +388,6 @@ dev-lua/luacrypto
 net-fs/openafs-kernel
 <net-fs/openafs-1.8
 
-# Mikle Kolyada <zlogene@gentoo.org> (2020-10-09)
-# pam module separated from
-# the sys-auth/passwdqc package
-# (now merged back).
-# Removal in 30 days
-sys-auth/pam_passwdqc
-
 # Azamat H. Hackimov <azamat.hackimov@gmail.com> (2020-10-06)
 # 1.3.3 is broken and failing unittests for net-im/prosody. Bug #746782.
 >=dev-lua/luaexpat-1.3.3
@@ -697,13 +712,9 @@ app-admin/amazon-ec2-init
 # Masked slotted lua for testing
 # William Hubbs <williamh@gentoo.org> (2016-08-07)
 # Taking this mask since Mabi is retired
-# Rafael Martins <rafaelmartins@gentoo.org> (2016-12-04)
-# Adding Lua 5.3 to mask
+# consolidating all slotted lua masks
 app-eselect/eselect-lua
-=dev-lang/lua-5.1.5-r103
-=dev-lang/lua-5.1.5-r104
-=dev-lang/lua-5.2.4-r2
-=dev-lang/lua-5.3.5-r2
+>=dev-lang/lua-5.1.5-r100
 
 # Samuli Suominen <ssuominen@gentoo.org> (2012-03-06)
 # Masked for testing since this is known to break nearly
diff --git a/profiles/updates/2Q-2020 b/profiles/updates/2Q-2020
index 41f95c93bbee..2bbf947be5fa 100644
--- a/profiles/updates/2Q-2020
+++ b/profiles/updates/2Q-2020
@@ -1,5 +1,4 @@
 move dev-libs/yaml-cpp dev-cpp/yaml-cpp
-move dev-python/scikit-learn sci-libs/scikits_learn
 move dev-python/rnc2rng app-text/rnc2rng
 move games-puzzle/world-of-goo games-puzzle/world-of-goo-hb
 slotmove =dev-ruby/shoulda-matchers-4.3.0* 3 4
diff --git a/profiles/updates/4Q-2020 b/profiles/updates/4Q-2020
index 650f10040e27..0c667f5c3224 100644
--- a/profiles/updates/4Q-2020
+++ b/profiles/updates/4Q-2020
@@ -2,3 +2,6 @@ move acct-group/openldap acct-group/ldap
 move acct-user/openldap acct-user/ldap
 move x11-apps/copyq x11-misc/copyq
 slotmove media-gfx/gimp 2 0
+move dev-python/scikit-learn sci-libs/scikit-learn
+move sci-libs/scikits_learn sci-libs/scikit-learn
+move sci-libs/scikits_image sci-libs/scikit-image
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index f5fa03cd1ca7..0f4848bc266d 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2438,6 +2438,7 @@ dev-python/glance_store:cinder - enable cinder backend supprt
 dev-python/glance_store:swift - enable swift backend supprt
 dev-python/glance_store:vmware - enable vmware backend supprt
 dev-python/gmpy:mpir - Use sci-libs/mpir as gmp implementation
+dev-python/hiredis:system-libs - Use dev-libs/hiredis from system
 dev-python/hypothesis:cli - Install a CLI tool used to write tests.
 dev-python/icalendar:doc - Generate examples and other extra documentation
 dev-python/ipython:matplotlib - Add support for dev-python/matplotlib
@@ -2450,6 +2451,7 @@ dev-python/kombu:sqs - Enables Amazon SQS transport module for Kombu
 dev-python/kombu:yaml - Enables yaml backend
 dev-python/matplotlib:excel - Pull dev-python/xlwt for the exceltools toolkit
 dev-python/matplotlib:gtk3 - Enable x11-libs/gtk+:3 support
+dev-python/matplotlib:webagg - Enable webagg backend that uses www-servers/tornado
 dev-python/mpmath:matplotlib - Add support for dev-python/matplotlib
 dev-python/msgpack:native-extensions - Compiles native "C" extensions (speedups, instead of using python fallback code).
 dev-python/nbdime:webtools - Install web-based diff and merge tools.
@@ -4293,7 +4295,6 @@ media-libs/opencv:vtk - Build new 3D visualization module viz based on sci-libs/
 media-libs/openexr:utils - Build several utility binaries for verifying and manipulating EXR files.
 media-libs/openh264:plugin - Install the Gecko Media Plugin (GMP) for use with Mozilla packages
 media-libs/openh264:utils - Install the CLI encoder and decoder utilities
-media-libs/openimageio:color-management - Enable color management via media-libs/opencolorio
 media-libs/openimageio:dicom - Enable DICOM medical image file support via sci-libs/dcmtk
 media-libs/openimageio:field3d - Enable f3d file (write) support via media-libs/Field3D
 media-libs/openimageio:opencv - Enable OpenCV support via media-libs/opencv
@@ -6063,7 +6064,6 @@ net-libs/nghttp2:hpack-tools - Install HPACK (header compression) helper tools
 net-libs/nghttp2:utils - Install nghttp, nghttpd and nghttpx
 net-libs/nodejs:inspector - Enable V8 inspector
 net-libs/nodejs:npm - Enable NPM package manager
-net-libs/nodejs:pax_kernel - Enable building under a PaX enabled kernel
 net-libs/nodejs:snapshot - Enable snapshot creation for faster startup
 net-libs/nodejs:system-icu - Use system dev-libs/icu instead of the bundled version
 net-libs/nodejs:system-ssl - Use system OpenSSL instead of the bundled one
@@ -6171,6 +6171,7 @@ net-mail/vpopmail:ipalias - Enables enable-ip-alias-domains
 net-mail/vpopmail:maildrop - Enables mail-filter/maildrop support in vdelivermail
 net-mail/vpopmail:spamassassin - Enables mail-filter/spamassassin support
 net-misc/AQtion:lro - Enable/disable Large Receive Offload. This MUST be disabled for bridging or forwarding.
+net-misc/apt-cacher-ng:fuse - Install the sys-fs/fuse based acngfs, to use a userspace filesystem for the apt cache.
 net-misc/aria2:bittorrent - Enable support for the bittorrent protocol.
 net-misc/aria2:gnutls - Use net-libs/gnutls as TLS provider (preferred). Otherwise, dev-libs/openssl will be used as TLS provider. Both apply only with USE=ssl.
 net-misc/aria2:libuv - Use dev-libs/libuv backend.
@@ -7280,7 +7281,6 @@ sci-libs/ipopt:mumps - Enable sci-libs/mumps support
 sci-libs/lapack:deprecated - Also build deprecated functions
 sci-libs/lapack:eselect-ldso - Enable runtime library switching by eselect and ld.so.
 sci-libs/lapack:lapacke - Build LAPACKE
-sci-libs/lapack-reference:deprecated - Build deprecated routines
 sci-libs/lemon:coin - Enable the sci-libs/coinor-clp and sci-libs/coinor-cbc graph algorithms
 sci-libs/lemon:glpk - Enable GNU Linear Programming Kit sci-mathematics/glpk support
 sci-libs/libccd:double - Use double precision floats
@@ -7353,8 +7353,8 @@ sci-libs/plplot:qhull - Add bindings for media-libs/qhull
 sci-libs/plplot:shapefile - Enable support for ESRI shapefiles
 sci-libs/proj:europe - Install the PROJ collection of European grids and init-files
 sci-libs/rtabmap:openni2 - Adds support for Kinect-like 3D sensors devices with dev-libs/OpenNI2.
-sci-libs/scikits_image:freeimage - Enable support for image i/o via media-libs/freeimage
-sci-libs/scikits_image:pyamg - Enable support for algebraic solvers via dev-python/pyamg
+sci-libs/scikit-image:freeimage - Enable support for image i/o viamedia-libs/freeimage
+sci-libs/scikit-image:pyamg - Enable support for algebraic solvers via dev-python/pyamg
 sci-libs/scotch:int64 - Build the 64 bits integer library (needed for > 2^31 vertices)
 sci-libs/scotch:tools - Provides the graph, mesh, architecture, mapping/ordering, output handling programs (see Scotch User's Guide).
 sci-libs/silo:silex - Build silex data browser
@@ -7422,7 +7422,6 @@ sci-libs/xkaapi:blas - Kaapi BLAS tasks for PLASMA
 sci-libs/xkaapi:gpu - Build library for gpu threading
 sci-mathematics/agda:cpphs - Use cpphs instead of cpp.
 sci-mathematics/agda:stdlib - Install the standard library.
-sci-mathematics/agda:uhc - Add support for the uhc backend.
 sci-mathematics/agda-stdlib:ffi - Install agda-lib-ffi for compilation using the MAlonzo backend
 sci-mathematics/bertini:optimization - Accept upstream's choices for -O option.
 sci-mathematics/cgal:mpfi - Enable support for multiple recision interval arithmetic via sci-libs/mpfi
@@ -8364,12 +8363,6 @@ sys-libs/glibc:ssp - protect stack of glibc internals
 sys-libs/glibc:static-pie - Enable static PIE support (runtime files for -static-pie gcc option).
 sys-libs/glibc:suid - Make internal pt_chown helper setuid -- not needed if using Linux and have /dev/pts mounted with gid=5
 sys-libs/glibc:systemtap - enable systemtap static probe points
-sys-libs/gwenhywfar:designer - Build plugins for dev-qt/designer
-sys-libs/gwenhywfar:fox - Use x11-libs/fox graphical toolkit
-sys-libs/gwenhywfar:qml - Enable support for plugins using QML
-sys-libs/gwenhywfar:sensors - Enable support for dev-qt/qtsensors module
-sys-libs/gwenhywfar:serialport - Enable support for dev-qt/qtserialport module
-sys-libs/gwenhywfar:webkit - Enable support for dev-qt/qtwebkit
 sys-libs/ldb:doc - Builds documentation
 sys-libs/ldb:ldap - Enable LDAP support
 sys-libs/ldb:lmdb - Enable LMDB backend
@@ -9027,6 +9020,7 @@ xfce-base/xfce4-settings:libcanberra - Enable sound event support using media-li
 xfce-base/xfce4-settings:xklavier - Enable keyboard layout selection support using x11-libs/libxklavier
 xfce-base/xfdesktop:thunar - Build support for desktop icons (for example, launchers and folders)
 xfce-base/xfwm4:xpresent - Enable the XPresent extension for sync to vblank
+xfce-extra/tumbler:epub - Enable support for .epub thumbnailer using app-text/libgepub
 xfce-extra/tumbler:odf - Enable support for .odf thumbnailers by using gnome-extra/libgsf
 xfce-extra/xfce4-clipman-plugin:qrcode - Enable support for media-gfx/qrencode
 xfce-extra/xfce4-mpc-plugin:libmpd - Build using media-libs/libmpd backend, instead of native fallback which is preferred
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 10afa09b1e26..bc1b4f63d7ff 100644
Binary files a/sci-chemistry/Manifest.gz and b/sci-chemistry/Manifest.gz differ
diff --git a/sci-chemistry/mopac7/mopac7-1.15-r1.ebuild b/sci-chemistry/mopac7/mopac7-1.15-r1.ebuild
index 98848fcad10d..3cb18cba78fe 100644
--- a/sci-chemistry/mopac7/mopac7-1.15-r1.ebuild
+++ b/sci-chemistry/mopac7/mopac7-1.15-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux"
-IUSE="gmxmopac7 static-libs"
+IUSE="gmxmopac7"
 
 DEPEND="dev-libs/libf2c"
 RDEPEND="${DEPEND}"
@@ -36,6 +36,10 @@ src_prepare() {
 	append-fflags -std=legacy -fno-automatic
 }
 
+src_configure() {
+	econf --disable-static
+}
+
 src_compile() {
 	emake
 	if use gmxmopac7; then
@@ -46,7 +50,6 @@ src_compile() {
 		cp -f "${DISTDIR}"/gmxmop.f "${DISTDIR}"/dcart.f . || die
 		sed "s:GENTOOVERSION:${PV}:g" -i Makefile
 		emake FC=$(tc-getFC)
-		use static-libs && emake static
 	fi
 }
 
@@ -60,6 +63,7 @@ src_install() {
 	if use gmxmopac7; then
 		cd "${S}"/fortran/libgmxmopac7
 		dolib.so libgmxmopac7.so*
-		use static-libs && dolib.a libgmxmopac7.a
 	fi
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-chemistry/vmd/Manifest b/sci-chemistry/vmd/Manifest
index f2c96b248550..60415a0181f0 100644
--- a/sci-chemistry/vmd/Manifest
+++ b/sci-chemistry/vmd/Manifest
@@ -1,2 +1,3 @@
 DIST vmd-1.9.3-gentoo-patches.tar.xz 14804 BLAKE2B 64e5df40ed88c23c924d32636495f0383590f91dbb714e64c73551072bb50d72b4e5f188fb2da58d32e84b4bc96ff0297d7ff1bf02b0481198901c4e12e4ee59 SHA512 5d506d4df5ca4a3edb33d77aeeb440fcb4750a250c77103b99f385f356eb9d71d954173b981d3a50f7a714cfc872587e5040868904e50fa1f6fd69d7e4d9f1b1
+DIST vmd-1.9.4-gentoo-plugins.patch 24618 BLAKE2B 6fbcf2e3bb59765e0980a5ed46f02e29d7b72a313865849c15891f2398d2aaf9afe6069f993a61257572d031556ce523c622858e29611ca6795be6030f4bb186 SHA512 9b8675811992d6392e9ec49cdcbcfd0da99dce1e164be4f8bf9bd07e0582b6b1e1d25f3e90fbc91cad7f94984bd091e644713c136628d0e4cc60e782a855fb63
 DIST vmd-1.9.4a43.src.tar 123955200 BLAKE2B a99ee2bce1024613ad951fc97f4cd4b6f6ad114aea67a0a6644f687c69eae488eb862fd5ea5bff31e12f01a95f6f60be04dad2a82879603b9b457443267bb18f SHA512 3e3d5d7b0d220f070d4978940ff5ab8af531e507a224cdd15e4871e263de64b4ba24e9d964cb680b31f376afbdc08f46cb4070e3cd4a474b9bfe0732c7b3cff0
diff --git a/sci-chemistry/vmd/files/vmd-1.9.4-gentoo-plugins.patch b/sci-chemistry/vmd/files/vmd-1.9.4-gentoo-plugins.patch
deleted file mode 100644
index c6ea769932f3..000000000000
--- a/sci-chemistry/vmd/files/vmd-1.9.4-gentoo-plugins.patch
+++ /dev/null
@@ -1,604 +0,0 @@
-From c33a68684cd06424ec78c6983f93336109d91cb5 Mon Sep 17 00:00:00 2001
-From: Stefan Kuczera <stefan.ku@yahoo.com>
-Date: Sat, 21 Jan 2017 13:20:45 +0100
-Subject: [PATCH] Squashed patches
-
----
- plugins/Make-arch               |   3 +-
- plugins/Makefile                |  20 +++---
- plugins/autopsf/Makefile        |   4 +-
- plugins/catdcd/Makefile         |   4 +-
- plugins/cionize/Makefile        |   6 +-
- plugins/clustalw/Makefile       |   2 +-
- plugins/cluster/Makefile        |   2 +-
- plugins/hesstrans/Makefile      |   2 +-
- plugins/libbiokit/Makefile      |  14 ++--
- plugins/molfile_plugin/Makefile | 144 ++++++++++++++++++++--------------------
- plugins/phylotree/Makefile      |   2 +-
- plugins/rnaview/Makefile        |   2 +-
- plugins/stamp/Makefile          |   2 +-
- 13 files changed, 105 insertions(+), 102 deletions(-)
-
-diff --git a/plugins/Make-arch b/plugins/Make-arch
-index 19d2b6c..937ad9e 100755
---- a/plugins/Make-arch
-+++ b/plugins/Make-arch
-@@ -313,7 +313,8 @@ LINUX:
- 	"AR = ar" \
- 	"NM = nm -p" \
- 	"RANLIB = touch" \
--	"SHLD = gcc -shared"
-+	"SHLD = gcc -shared" \
-+	"SHXXLD = g++ -shared"
- 	
- LINUXALPHA:
- 	$(MAKE) dynlibs staticlibs bins \
-diff --git a/plugins/Makefile b/plugins/Makefile
-index 0fee349..6b07606 100755
---- a/plugins/Makefile
-+++ b/plugins/Makefile
-@@ -150,25 +150,27 @@ distrib:
- 
- include Make-arch
- 
--molfilelibs:
--	cd molfile_plugin; $(MAKE) dynlibs && cd .. || exit 1
--	cd molfile_plugin; $(MAKE) staticlibs && cd .. || exit 1
-+molfilelibs_static:
-+	$(MAKE) -C molfile_plugin staticlibs
-+
-+molfilelibs_dyn:
-+	$(MAKE) -C molfile_plugin dynlibs
- 
- win32molfilelibs:
- 	cd molfile_plugin; $(MAKE) dynlibs && cd .. || exit 1
- 	cd molfile_plugin; $(MAKE) win32staticlibs && cd .. || exit 1
- 
--dynlibs: molfilelibs
--	for dir in $(BUILDDIRS); do cd $$dir && $(MAKE) dynlibs && cd .. || exit 1 ; done
-+dynlibs: molfilelibs_dyn
-+	for dir in $(BUILDDIRS); do $(MAKE) -C $$dir dynlibs; done
- 
--staticlibs: molfilelibs
--	for dir in $(BUILDDIRS); do cd $$dir && $(MAKE) staticlibs && cd .. || exit 1 ; done
-+staticlibs: molfilelibs_static
-+	for dir in $(BUILDDIRS); do $(MAKE) -C $$dir staticlibs; done
- 
- win32staticlibs: win32molfilelibs
- 	for dir in $(BUILDDIRS); do cd $$dir && $(MAKE) win32staticlibs && cd .. || exit 1 ; done
- 
--bins:
--	for dir in molfile_plugin $(BUILDDIRS); do cd $$dir && $(MAKE) bins && cd .. || exit 1 ; done
-+bins: molfilelibs_dyn
-+	for dir in $(BUILDDIRS); do $(MAKE) -C $$dir bins; done
- 
- win32bins:
- 	for dir in molfile_plugin $(BUILDDIRS); do cd $$dir && $(MAKE) win32bins && cd .. || exit 1 ; done
-diff --git a/plugins/autopsf/Makefile b/plugins/autopsf/Makefile
-index 3b35d10..8e1527e 100644
---- a/plugins/autopsf/Makefile
-+++ b/plugins/autopsf/Makefile
-@@ -49,8 +49,8 @@ AUTOPSFOBJS=${ARCHDIR}/psfatom.o  \
- 
- ${ARCHDIR}/psfcheck.so : ${AUTOPSFOBJS}
- 	if [ -n "${TCLSHLD}" ]; \
--	then ${TCLSHLD} $(LOPTO)$@ ${AUTOPSFOBJS} ${TCLLIB} ${TCLLDFLAGS} ${LDFLAGS}; \
--	else ${SHLD} $(LOPTO)$@ ${AUTOPSFOBJS} ${TCLLIB} ${TCLLDFLAGS} ${LDFLAGS}; \
-+	then ${TCLSHLD} ${LDFLAGS} $(LOPTO)$@ ${AUTOPSFOBJS} ${TCLLIB} ${TCLLDFLAGS}; \
-+	else ${SHXXLD} ${LDFLAGS} $(LOPTO)$@ ${AUTOPSFOBJS} ${TCLLIB} ${TCLLDFLAGS}; \
- 	fi
- 
- ${ARCHDIR}/psfatom.o : psfatom.h psfatom.C
-diff --git a/plugins/catdcd/Makefile b/plugins/catdcd/Makefile
-index d6c58c5..1637a3c 100644
---- a/plugins/catdcd/Makefile
-+++ b/plugins/catdcd/Makefile
-@@ -45,8 +45,8 @@ ${ARCHDIR}/catdcd.exe : ${CATDCDOBJS} ${COMPILEDIR}/lib_${ARCH}/molfile/libmolfi
- 	LINK ${CATDCDOBJS} /OUT:${ARCHDIR}/catdcd.exe /LIBPATH:${COMPILEDIR}/lib_${ARCH}/molfile libmolfile_plugin.lib ${TCLLIB} ${TCLLDFLAGS} ${NETCDFLIB} ${NETCDFLDFLAGS} ${EXPATLIB} ${EXPATLDFLAGS} ${SQLITELIB} ${SQLITELDFLAGS}
- 
- # all other platforms
--${ARCHDIR}/catdcd : ${CATDCDOBJS} ${COMPILEDIR}/lib_${ARCH}/molfile/libmolfile_plugin.a
--	${CXX} ${CXXFLAGS} ${CATDCDOBJS} -o ${ARCHDIR}/catdcd -L${COMPILEDIR}/lib_${ARCH}/molfile -lmolfile_plugin ${TCLLIB} ${TCLLDFLAGS} ${NETCDFLIB} ${NETCDFLDFLAGS} ${EXPATLIB} ${EXPATLDFLAGS} ${SQLITELIB} ${SQLITELDFLAGS} -lm
-+${ARCHDIR}/catdcd : ${CATDCDOBJS} ${COMPILEDIR}/lib_${ARCH}/molfile/libmolfile_plugin.a ${COMPILEDIR}/lib_${ARCH}/molfile/libmolfile_plugin.h
-+	${CXX} ${LDFLAGS} ${CXXFLAGS} ${CATDCDOBJS} -o ${ARCHDIR}/catdcd -L${COMPILEDIR}/lib_${ARCH}/molfile -lmolfile_plugin ${TCLLIB} ${TCLLDFLAGS} ${NETCDFLIB} ${NETCDFLDFLAGS} ${EXPATLIB} ${EXPATLDFLAGS} ${SQLITELIB} ${SQLITELDFLAGS} -lm
- 
- ${ARCHDIR}/hash.o: hash.h hash.c
- 	${CXX} ${CXXFLAGS} ${INCDIR} -c ${SRCDIR}/hash.c $(COPTO)${ARCHDIR}/hash.o
-diff --git a/plugins/cionize/Makefile b/plugins/cionize/Makefile
-index bcb2510..e02241b 100644
---- a/plugins/cionize/Makefile
-+++ b/plugins/cionize/Makefile
-@@ -52,8 +52,8 @@ ${ARCHDIR}/cionize.exe : ${IONIZEOBJS} ${MGPOTOBJS} ${ARCHDIR}/cionize.o ${COMPI
- 	LINK ${IONIZEOBJS} ${MGPOTOBJS} /OUT:${ARCHDIR}/cionize.exe /LIBPATH:${COMPILEDIR}/lib_${ARCH}/molfile libmolfile_plugin.lib ${TCLLIB} ${TCLLDFLAGS} ${NETCDFLIB} ${NETCDFLDFLAGS} ${EXPATLIB} ${EXPATLDFLAGS} ${SQLITELIB} ${SQLITELDFLAGS}
- 
- # all other platforms
--${ARCHDIR}/cionize: ${IONIZEOBJS} ${MGPOTOBJS} ${ARCHDIR}/cionize.o ${COMPILEDIR}/lib_${ARCH}/molfile/libmolfile_plugin.a
--	${CXX} ${CXXFLAGS} ${ARCHDIR}/cionize.o ${IONIZEOBJS} ${MGPOTOBJS} -o ${ARCHDIR}/cionize -L${COMPILEDIR}/lib_${ARCH}/molfile -lmolfile_plugin ${TCLLIB} ${TCLLDFLAGS} ${NETCDFLIB} ${NETCDFLDFLAGS} ${EXPATLIB} ${EXPATLDFLAGS} ${SQLITELIB} ${SQLITELDFLAGS} -lm
-+${ARCHDIR}/cionize: ${IONIZEOBJS} ${MGPOTOBJS} ${ARCHDIR}/cionize.o ${COMPILEDIR}/lib_${ARCH}/molfile/libmolfile_plugin.a  ${COMPILEDIR}/lib_${ARCH}/molfile/libmolfile_plugin.h
-+	${CXX} ${LDFLAGS} ${CXXFLAGS} ${ARCHDIR}/cionize.o ${IONIZEOBJS} ${MGPOTOBJS} -o ${ARCHDIR}/cionize -L${COMPILEDIR}/lib_${ARCH}/molfile -lmolfile_plugin ${TCLLIB} ${TCLLDFLAGS} ${NETCDFLIB} ${NETCDFLDFLAGS} ${EXPATLIB} ${EXPATLDFLAGS} ${SQLITELIB} ${SQLITELDFLAGS} -lm
- 
- ${ARCHDIR}/hash.o: hash.h hash.c
- 	${CC}  ${CCFLAGS} ${INCDIR} -c ${SRCDIR}/hash.c $(COPTO)${ARCHDIR}/hash.o
-@@ -66,7 +66,7 @@ ${ARCHDIR}/util.o: util.h util.c
- 
- ${ARCHDIR}/getplugins.o: getplugins.h getplugins.c
- 	${CC}  ${CCFLAGS} ${INCDIR} -c ${SRCDIR}/getplugins.c $(COPTO)${ARCHDIR}/getplugins.o
--	
-+
- ${ARCHDIR}/energythr.o: energythr.h energythr.c ${ARCHDIR}/util.o ${ARCHDIR}/threads.o
- 	${CC}  ${CCFLAGS} ${INCDIR} -c ${SRCDIR}/energythr.c $(COPTO)${ARCHDIR}/energythr.o
- 
-diff --git a/plugins/clustalw/Makefile b/plugins/clustalw/Makefile
-index 6329f64..3443720 100644
---- a/plugins/clustalw/Makefile
-+++ b/plugins/clustalw/Makefile
-@@ -66,7 +66,7 @@ OBJS = ${ARCHDIR}/alnscore.o \
- ${ARCHDIR}/clustalw.exe: ${OBJS}
- 	LINK ${OBJS} /OUT:${ARCHDIR}/clustalw.exe
- ${ARCHDIR}/clustalw: ${OBJS}
--	${CC} ${CCFLAGS} ${OBJS} -o ${ARCHDIR}/clustalw -lm
-+	${CC} ${LDFLAGS} ${CCFLAGS} ${OBJS} -o ${ARCHDIR}/clustalw -lm
-     
-     
- # Objects.
-diff --git a/plugins/cluster/Makefile b/plugins/cluster/Makefile
-index 99d347e..c2d30ae 100644
---- a/plugins/cluster/Makefile
-+++ b/plugins/cluster/Makefile
-@@ -48,7 +48,7 @@ ${ARCHDIR}/cluster.exe : ${OBJS}
- 
- # all other platforms
- ${ARCHDIR}/cluster : ${OBJS}
--	${CXX} ${CXXFLAGS} ${OBJS} -o ${ARCHDIR}/cluster -lm
-+	${CXX} ${LDFLAGS} ${CXXFLAGS} ${OBJS} -o ${ARCHDIR}/cluster -lm
- 
- ${ARCHDIR}/cluster.o: ${SRCDIR}/cluster.c
- 	${CXX} ${CXXFLAGS} ${INCDIR} -c ${SRCDIR}/cluster.c $(COPTO)${ARCHDIR}/cluster.o
-diff --git a/plugins/hesstrans/Makefile b/plugins/hesstrans/Makefile
-index 76ee306..db46b82 100644
---- a/plugins/hesstrans/Makefile
-+++ b/plugins/hesstrans/Makefile
-@@ -85,7 +85,7 @@ HESSTRANSOBJS=${ARCHDIR}/newmat1.o \
- ${ARCHDIR}/hesstrans.so : ${HESSTRANSOBJS}
- 	if [ -n "${TCLSHLD}" ]; \
- 	then ${TCLSHLD} $(LOPTO)$@ ${HESSTRANSOBJS} ${TCLLIB} ${TCLLDFLAGS} ${LDFLAGS}; \
--	else ${SHLD} $(LOPTO)$@ ${HESSTRANSOBJS} ${TCLLIB} ${TCLLDFLAGS} ${LDFLAGS}; \
-+	else ${SHXXLD} $(LOPTO)$@ ${HESSTRANSOBJS} ${TCLLIB} ${TCLLDFLAGS} ${LDFLAGS}; \
- 	fi
- 
- 
-diff --git a/plugins/libbiokit/Makefile b/plugins/libbiokit/Makefile
-index 7a66d08..da764dd 100644
---- a/plugins/libbiokit/Makefile
-+++ b/plugins/libbiokit/Makefile
-@@ -98,7 +98,7 @@ OBJS = ${DYNLIBOBJS} \
- ${ARCHDIR}/tcl_libbiokit.so : ${ARCHDIR}/tcl_libbiokit_wrap.o ${ARCHDIR}/tcl_libbiokit.o ${DYNLIBOBJS}
- 	if [ -n "${TCLSHLD}" ]; \
- 	then ${TCLSHLD} $(LOPTO)$@ ${ARCHDIR}/tcl_libbiokit_wrap.o ${ARCHDIR}/tcl_libbiokit.o ${DYNLIBOBJS} ${TCLLIB} ${TCLLDFLAGS} ${LDFLAGS}; \
--	else ${SHLD} $(LOPTO)$@ ${ARCHDIR}/tcl_libbiokit_wrap.o ${ARCHDIR}/tcl_libbiokit.o ${DYNLIBOBJS} ${TCLLIB} ${TCLLDFLAGS} ${LDFLAGS}; \
-+	else ${SHXXLD} $(LOPTO)$@ ${ARCHDIR}/tcl_libbiokit_wrap.o ${ARCHDIR}/tcl_libbiokit.o ${DYNLIBOBJS} ${TCLLIB} ${TCLLDFLAGS} ${LDFLAGS}; \
- 	fi
- ${ARCHDIR}/tcl_libbiokit_wrap.o : ${INTERFACESRCDIR}/tcl_libbiokit_wrap.cpp
- 	${CXX} ${CXXFLAGS} ${TCLINC} ${INCDIR} -c ${INTERFACESRCDIR}/tcl_libbiokit_wrap.cpp $(COPTO)${ARCHDIR}/tcl_libbiokit_wrap.o
-@@ -111,7 +111,7 @@ ${INTERFACESRCDIR}/tcl_libbiokit_wrap.cpp : ${INTERFACESRCDIR}/tcl_libbiokit.i
- ${ARCHDIR}/percid.exe: ${ARCHDIR}/percid.o ${OBJS}
- 	LINK ${ARCHDIR}/percid.o ${OBJS} /OUT:${ARCHDIR}/percid.exe
- ${ARCHDIR}/percid: ${ARCHDIR}/percid.o ${OBJS}
--	${CXX} ${CXXFLAGS} ${ARCHDIR}/percid.o ${OBJS} -o ${ARCHDIR}/percid -lm
-+	${CXX} ${LDFLAGS} ${CXXFLAGS} ${ARCHDIR}/percid.o ${OBJS} -o ${ARCHDIR}/percid -lm
- ${ARCHDIR}/percid.o: ${UTILSRCDIR}/percid.cpp
- 	${CXX} ${CXXFLAGS} ${INCDIR} -c ${UTILSRCDIR}/percid.cpp $(COPTO)${ARCHDIR}/percid.o
- 
-@@ -119,7 +119,7 @@ ${ARCHDIR}/percid.o: ${UTILSRCDIR}/percid.cpp
- ${ARCHDIR}/qpair.exe: ${ARCHDIR}/qPair.o ${OBJS}
- 	LINK ${ARCHDIR}/qPair.o ${OBJS} /OUT:${ARCHDIR}/qpair.exe
- ${ARCHDIR}/qpair: ${ARCHDIR}/qPair.o ${OBJS}
--	${CXX} ${CXXFLAGS} ${ARCHDIR}/qPair.o ${OBJS} -o ${ARCHDIR}/qpair -lm
-+	${CXX} ${LDFLAGS} ${CXXFLAGS} ${ARCHDIR}/qPair.o ${OBJS} -o ${ARCHDIR}/qpair -lm
- ${ARCHDIR}/qPair.o: ${UTILSRCDIR}/qPair.cpp
- 	${CXX} ${CXXFLAGS} ${INCDIR} -c ${UTILSRCDIR}/qPair.cpp $(COPTO)${ARCHDIR}/qPair.o
- 
-@@ -127,7 +127,7 @@ ${ARCHDIR}/qPair.o: ${UTILSRCDIR}/qPair.cpp
- ${ARCHDIR}/rmsd.exe: ${ARCHDIR}/rmsd.o ${OBJS}
- 	LINK ${ARCHDIR}/rmsd.o ${OBJS} /OUT:${ARCHDIR}/rmsd.exe
- ${ARCHDIR}/rmsd: ${ARCHDIR}/rmsd.o ${OBJS}
--	${CXX} ${CXXFLAGS} ${ARCHDIR}/rmsd.o ${OBJS} -o ${ARCHDIR}/rmsd -lm
-+	${CXX} ${LDFLAGS} ${CXXFLAGS} ${ARCHDIR}/rmsd.o ${OBJS} -o ${ARCHDIR}/rmsd -lm
- ${ARCHDIR}/rmsd.o: ${UTILSRCDIR}/rmsd.cpp
- 	${CXX} ${CXXFLAGS} ${INCDIR} -c ${UTILSRCDIR}/rmsd.cpp $(COPTO)${ARCHDIR}/rmsd.o
- 
-@@ -135,7 +135,7 @@ ${ARCHDIR}/rmsd.o: ${UTILSRCDIR}/rmsd.cpp
- ${ARCHDIR}/q.exe: ${ARCHDIR}/Q.o ${OBJS}
- 	LINK ${ARCHDIR}/Q.o ${OBJS} /OUT:${ARCHDIR}/q.exe
- ${ARCHDIR}/q: ${ARCHDIR}/Q.o ${OBJS}
--	${CXX} ${CXXFLAGS} ${ARCHDIR}/Q.o ${OBJS} -o ${ARCHDIR}/q -lm
-+	${CXX} ${LDFLAGS} ${CXXFLAGS} ${ARCHDIR}/Q.o ${OBJS} -o ${ARCHDIR}/q -lm
- ${ARCHDIR}/Q.o: ${UTILSRCDIR}/Q.cpp
- 	${CXX} ${CXXFLAGS} ${INCDIR} -c ${UTILSRCDIR}/Q.cpp $(COPTO)${ARCHDIR}/Q.o
- 
-@@ -143,7 +143,7 @@ ${ARCHDIR}/Q.o: ${UTILSRCDIR}/Q.cpp
- ${ARCHDIR}/seqqr.exe: ${ARCHDIR}/seqqr.o ${OBJS}
- 	LINK ${ARCHDIR}/seqqr.o ${OBJS} /OUT:${ARCHDIR}/seqqr.exe
- ${ARCHDIR}/seqqr: ${ARCHDIR}/seqqr.o ${OBJS}
--	${CXX} ${CXXFLAGS} ${ARCHDIR}/seqqr.o ${OBJS} -o ${ARCHDIR}/seqqr -lm
-+	${CXX} ${LDFLAGS} ${CXXFLAGS} ${ARCHDIR}/seqqr.o ${OBJS} -o ${ARCHDIR}/seqqr -lm
- ${ARCHDIR}/seqqr.o: ${UTILSRCDIR}/seqqr.cpp
- 	${CXX} ${CXXFLAGS} ${INCDIR} -c ${UTILSRCDIR}/seqqr.cpp $(COPTO)${ARCHDIR}/seqqr.o
- 
-@@ -151,7 +151,7 @@ ${ARCHDIR}/seqqr.o: ${UTILSRCDIR}/seqqr.cpp
- ${ARCHDIR}/structqr.exe : ${ARCHDIR}/structqr.o ${OBJS}
- 	LINK ${ARCHDIR}/structqr.o ${OBJS} /OUT:${ARCHDIR}/structqr.exe
- ${ARCHDIR}/structqr: ${ARCHDIR}/structqr.o ${OBJS}
--	${CXX} ${CXXFLAGS} ${ARCHDIR}/structqr.o ${OBJS} -o ${ARCHDIR}/structqr -lm
-+	${CXX} ${LDFLAGS} ${CXXFLAGS} ${ARCHDIR}/structqr.o ${OBJS} -o ${ARCHDIR}/structqr -lm
- ${ARCHDIR}/structqr.o: ${UTILSRCDIR}/structqr.cpp
- 	${CXX} ${CXXFLAGS} ${INCDIR} -c ${UTILSRCDIR}/structqr.cpp $(COPTO)${ARCHDIR}/structqr.o
-     
-diff --git a/plugins/molfile_plugin/Makefile b/plugins/molfile_plugin/Makefile
-index 4c47615..1c77ddf 100644
---- a/plugins/molfile_plugin/Makefile
-+++ b/plugins/molfile_plugin/Makefile
-@@ -15,7 +15,7 @@
- VPATH = src ../include ${ARCHDIR}
- 
- SCCFLAGS = $(CCFLAGS) $(DEF)"STATIC_PLUGIN"
--SCXXFLAGS = $(CCFLAGS) $(DEF)"STATIC_PLUGIN"
-+SCXXFLAGS = $(CXXFLAGS) $(DEF)"STATIC_PLUGIN"
- 
- #
- # Rules
-@@ -206,209 +206,209 @@
- #
- 
- abinitplugin.so: ${ARCHDIR}/abinitplugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- amiraplugin.so: ${ARCHDIR}/amiraplugin.o 
- 	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- avsplugin.so: ${ARCHDIR}/avsplugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- babelplugin.so: ${ARCHDIR}/babelplugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- basissetplugin.so: ${ARCHDIR}/basissetplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- bgfplugin.so: ${ARCHDIR}/bgfplugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- binposplugin.so: ${ARCHDIR}/binposplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- biomoccaplugin.so: ${ARCHDIR}/biomoccaplugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- brixplugin.so: ${ARCHDIR}/brixplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- carplugin.so: ${ARCHDIR}/carplugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- ccp4plugin.so: ${ARCHDIR}/ccp4plugin.o
- 	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- corplugin.so: ${ARCHDIR}/corplugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- cpmdplugin.so: ${ARCHDIR}/cpmdplugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- crdplugin.so: ${ARCHDIR}/crdplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- cubeplugin.so: ${ARCHDIR}/cubeplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- dcdplugin.so: ${ARCHDIR}/dcdplugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- dlpolyplugin.so: ${ARCHDIR}/dlpolyplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- dsn6plugin.so: ${ARCHDIR}/dsn6plugin.o
- 	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- dxplugin.so: ${ARCHDIR}/dxplugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- edmplugin.so: ${ARCHDIR}/edmplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- fs4plugin.so: ${ARCHDIR}/fs4plugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- gamessplugin.so: ${ARCHDIR}/gamessplugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- graspplugin.so: ${ARCHDIR}/graspplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- grdplugin.so: ${ARCHDIR}/grdplugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- gridplugin.so: ${ARCHDIR}/gridplugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- gromacsplugin.so: ${ARCHDIR}/gromacsplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- jsplugin.so: ${ARCHDIR}/jsplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- lammpsplugin.so: ${ARCHDIR}/lammpsplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- mapplugin.so: ${ARCHDIR}/mapplugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- mdfplugin.so: ${ARCHDIR}/mdfplugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- mol2plugin.so: ${ARCHDIR}/mol2plugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- moldenplugin.so: ${ARCHDIR}/moldenplugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- molemeshplugin.so: ${ARCHDIR}/molemeshplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- msmsplugin.so: ${ARCHDIR}/msmsplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- namdbinplugin.so: ${ARCHDIR}/namdbinplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- offplugin.so: ${ARCHDIR}/offplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- orcaplugin.so: ${ARCHDIR}/orcaplugin.o
- 	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- parm7plugin.so: ${ARCHDIR}/parm7plugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- parmplugin.so: ${ARCHDIR}/parmplugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- pbeqplugin.so: ${ARCHDIR}/pbeqplugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- pdbplugin.so: ${ARCHDIR}/pdbplugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- pdbxplugin.so: ${ARCHDIR}/pdbxplugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- phiplugin.so: ${ARCHDIR}/phiplugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- pltplugin.so: ${ARCHDIR}/pltplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- plyplugin.so: ${ARCHDIR}/plyplugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- pqrplugin.so: ${ARCHDIR}/pqrplugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- psfplugin.so: ${ARCHDIR}/psfplugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- raster3dplugin.so: ${ARCHDIR}/raster3dplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- rst7plugin.so: ${ARCHDIR}/rst7plugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- situsplugin.so: ${ARCHDIR}/situsplugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- spiderplugin.so: ${ARCHDIR}/spiderplugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- stlplugin.so: ${ARCHDIR}/stlplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- tinkerplugin.so: ${ARCHDIR}/tinkerplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- uhbdplugin.so: ${ARCHDIR}/uhbdplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- vaspchgcarplugin.so: ${ARCHDIR}/vaspchgcarplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- vaspoutcarplugin.so: ${ARCHDIR}/vaspoutcarplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- vaspparchgplugin.so: ${ARCHDIR}/vaspparchgplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- vaspposcarplugin.so: ${ARCHDIR}/vaspposcarplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- vasp5xdatcarplugin.so: ${ARCHDIR}/vasp5xdatcarplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- vaspxdatcarplugin.so: ${ARCHDIR}/vaspxdatcarplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- vaspxmlplugin.so: ${ARCHDIR}/vaspxmlplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- vtkplugin.so: ${ARCHDIR}/vtkplugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- xbgfplugin.so: ${ARCHDIR}/xbgfplugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- xsfplugin.so: ${ARCHDIR}/xsfplugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- xyzplugin.so: ${ARCHDIR}/xyzplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- 
- ##
- ## In-development plugins that aren't part of the build quite yet...
- ##
- cpmdlogplugin.so: ${ARCHDIR}/cpmdlogplugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- gaussianplugin.so: ${ARCHDIR}/gaussianplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- 
- ##
-@@ -416,31 +416,31 @@
- ## dependencies of some kind
- ##
- dmsplugin.so: ${ARCHDIR}/dmsplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(SQLITELIB) $(SQLITELDFLAGS) $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(SQLITELIB) $(SQLITELDFLAGS) $(LDFLAGS)
- 
- dtrplugin.so: ${ARCHDIR}/dtrplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- hoomdplugin.so: ${ARCHDIR}/hoomdplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(EXPATLIB) $(EXPATLDFLAGS) $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(EXPATLIB) $(EXPATLDFLAGS) $(LDFLAGS)
- 
- lmplugin.so: ${ARCHDIR}/lmplugin.o
- 	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(HDFLIB) $(HDFLDFLAGS) $(LDFLAGS)
- 
- maeffplugin.so: ${ARCHDIR}/maeffplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
- 
- netcdfplugin.so: ${ARCHDIR}/netcdfplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(NETCDFLIB) $(NETCDFLDFLAGS) $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(NETCDFLIB) $(NETCDFLDFLAGS) $(LDFLAGS)
- 
- tngplugin.so: ${ARCHDIR}/tngplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(TNGLIB) $(TNGLDFLAGS) $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(TNGLIB) $(TNGLDFLAGS) $(LDFLAGS)
- 
- vtfplugin.so: ${ARCHDIR}/vtfplugin.o
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(TCLLIB) $(TCLLDFLAGS) $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(TCLLIB) $(TCLLDFLAGS) $(LDFLAGS)
- 
- webpdbplugin.so: ${ARCHDIR}/webpdbplugin.o 
--	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(TCLLIB) $(TCLLDFLAGS) $(LDFLAGS)
-+	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(TCLLIB) $(TCLLDFLAGS) $(LDFLAGS)
- 
- 
- #
-diff --git a/plugins/phylotree/Makefile b/plugins/phylotree/Makefile
-index 6442747..0aceb4d 100644
---- a/plugins/phylotree/Makefile
-+++ b/plugins/phylotree/Makefile
-@@ -54,7 +54,7 @@ ${ARCHDIR}/upgmaclu.exe : ${OBJS}
- 
- # all other platforms
- ${ARCHDIR}/upgmaclu : ${OBJS}
--	${CXX} ${CXXFLAGS} ${OBJS} -o ${ARCHDIR}/upgmaclu -lm
-+	${CXX} ${LDFLAGS} ${CXXFLAGS} ${OBJS} -o ${ARCHDIR}/upgmaclu -lm
- 
- ${ARCHDIR}/upgmaclu.o: ${SRCDIR}/upgmaclu.c
- 	${CXX} ${CXXFLAGS} ${INCDIR} -c ${SRCDIR}/upgmaclu.c $(COPTO)${ARCHDIR}/upgmaclu.o
-diff --git a/plugins/rnaview/Makefile b/plugins/rnaview/Makefile
-index 16f070a..da71248 100644
---- a/plugins/rnaview/Makefile
-+++ b/plugins/rnaview/Makefile
-@@ -67,7 +67,7 @@ OBJS = ${ARCHDIR}/analyze.o \
- ${ARCHDIR}/rnaview.exe: ${OBJS}
- 	LINK ${OBJS} /OUT:${ARCHDIR}/rnaview.exe
- ${ARCHDIR}/rnaview: ${OBJS}
--	${CC} ${CCFLAGS} ${OBJS} -o ${ARCHDIR}/rnaview -lm
-+	${CC} ${LDFLAGS} ${CCFLAGS} ${OBJS} -o ${ARCHDIR}/rnaview -lm
- 
- ${ARCHDIR}/analyze.o: ${SRCDIR}/analyze.c
- 	${CC} ${CCFLAGS} ${INCDIR} -c ${SRCDIR}/analyze.c $(COPTO)${ARCHDIR}/analyze.o
-diff --git a/plugins/stamp/Makefile b/plugins/stamp/Makefile
-index f0fb515..aa8f6b6 100644
---- a/plugins/stamp/Makefile
-+++ b/plugins/stamp/Makefile
-@@ -101,7 +101,7 @@ OBJS = ${ARCHDIR}/a3to1.o \
- ${ARCHDIR}/stamp.exe: ${OBJS}
- 	LINK ${OBJS} /OUT:${ARCHDIR}/stamp.exe
- ${ARCHDIR}/stamp: ${OBJS}
--	${CC} ${CCFLAGS} ${OBJS} -o ${ARCHDIR}/stamp -lm
-+	${CC} ${LDFLAGS} ${CCFLAGS} ${OBJS} -o ${ARCHDIR}/stamp -lm
-     
-     
- # Objects.
--- 
-2.5.5
-
diff --git a/sci-chemistry/vmd/vmd-1.9.4_alpha43.ebuild b/sci-chemistry/vmd/vmd-1.9.4_alpha43.ebuild
index db9e4f49e522..d449af190b42 100644
--- a/sci-chemistry/vmd/vmd-1.9.4_alpha43.ebuild
+++ b/sci-chemistry/vmd/vmd-1.9.4_alpha43.ebuild
@@ -14,6 +14,7 @@ MY_P="${PN}-${MY_PV}"
 SRC_URI="
 	${MY_P}.src.tar
 	https://dev.gentoo.org/~jlec/distfiles/${PN}-1.9.3-gentoo-patches.tar.xz
+	https://dev.gentoo.org/~juippis/distfiles/tmp/vmd-1.9.4-gentoo-plugins.patch
 "
 
 SLOT="0"
@@ -85,7 +86,7 @@ src_prepare() {
 
 	# https://www.ks.uiuc.edu/Research/vmd/mailing_list/vmd-l/32121.html
 	# https://www.ks.uiuc.edu/Research/vmd/mailing_list/vmd-l/32116.html
-	eapply "${FILESDIR}"/${PN}-1.9.4-gentoo-plugins.patch
+	eapply "${DISTDIR}"/${PN}-1.9.4-gentoo-plugins.patch
 
 	use cuda && cuda_sanitize
 
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 5d41083d2393..1e9965caec75 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/blas-reference/Manifest b/sci-libs/blas-reference/Manifest
deleted file mode 100644
index 3ba967e04cec..000000000000
--- a/sci-libs/blas-reference/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST lapack-3.6.0.tgz 6792324 BLAKE2B 438f3376b63b38ef0fe70f6becac847816f3a11c01f5ab237dc0d941792ceb54dbd2f8dc22d56286f5dab3499289ed94e67521ea951a98973c9640abc294ad6c SHA512 bc50441d415ef8896dd7626d77c6104184b996e758704366288089f03d4c99d068e33153b0d13305310886017e5d2e716130f812a95cfcad36ef37fe20417ab8
-DIST lapack-3.7.0.tgz 7359812 BLAKE2B 20aa42e22d8c920d1360afe41ceec7b36f6cd5fbe43ca9d7848ef7cc45a64a0314cb1321941c1a7c03654f41e28ec805445882ded0ca0ea07674e70b66cba6b5 SHA512 e4f4c7d0ba8a096eeb813160c6dbcdd535647df6b2ad5beac9181908158956b31d1a9554ec9b9836fd44fe7404c1f377b297cbb20d744f20d70e357fd246c91b
-DIST lapack-lite-3.1.1.tgz 5332509 BLAKE2B 5a8ea98e9956f2bc1fc8dbb1ede18178d43d1f418e324f2798daf2197a2f7f7a1841ea0a0d68f1affa3c9c0a37b024f82222bd2fd6072ca827c70c9c441191c7 SHA512 492b932ef313339ce6b4e63ac8f778489e6870b0eb85f7b086f3c844e75f98e7f85382c7556dfa368ab8320b6f02d1df8ccfcb40b5c0b7c2d74518b7c309e75c
diff --git a/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild b/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild
deleted file mode 100644
index bd98acc71819..000000000000
--- a/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils fortran-2 autotools multilib flag-o-matic toolchain-funcs
-
-LAPACKPV="3.1.1"
-LAPACKPN="lapack-lite"
-
-DESCRIPTION="Basic Linear Algebra Subprograms F77 reference implementations"
-HOMEPAGE="http://www.netlib.org/blas/"
-SRC_URI="http://www.netlib.org/lapack/${LAPACKPN}-${LAPACKPV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="doc"
-
-DEPEND="app-eselect/eselect-blas"
-RDEPEND="${DEPEND}
-	doc? ( app-doc/blas-docs )"
-
-S="${WORKDIR}/${LAPACKPN}-${LAPACKPV}"
-
-src_prepare() {
-	ESELECT_PROF=reference
-	epatch \
-		"${FILESDIR}"/${P}-autotool.patch \
-		"${FILESDIR}"/${P}-pkg-config.patch
-	eautoreconf
-
-	cp "${FILESDIR}"/eselect.blas.reference "${T}"/eselect.blas.reference || die
-	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.blas.reference || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
-			"${T}"/eselect.blas.reference || die
-	fi
-}
-
-src_configure() {
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/blas/reference
-}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	default
-	eselect blas add $(get_libdir) "${T}"/eselect.blas.reference ${ESELECT_PROF}
-}
-
-pkg_postinst() {
-	local p=blas
-	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
-		[[ -e ${configfile} ]] && rm -f ${configfile}
-		eselect ${p} set ${ESELECT_PROF}
-		elog "${p} has been eselected to ${ESELECT_PROF}"
-	else
-		elog "Current eselected ${p} is ${current_lib}"
-		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-		elog "\t eselect ${p} set ${ESELECT_PROF}"
-	fi
-}
diff --git a/sci-libs/blas-reference/blas-reference-20151113-r1.ebuild b/sci-libs/blas-reference/blas-reference-20151113-r1.ebuild
deleted file mode 100644
index d09263456c11..000000000000
--- a/sci-libs/blas-reference/blas-reference-20151113-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit eutils fortran-2 cmake-utils multilib flag-o-matic toolchain-funcs
-
-LPN=lapack
-LPV=3.6.0
-
-DESCRIPTION="Basic Linear Algebra Subprograms F77 reference implementations"
-HOMEPAGE="http://www.netlib.org/blas/"
-SRC_URI="http://www.netlib.org/${LPN}/${LPN}-${LPV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="doc"
-
-RDEPEND="
-	app-eselect/eselect-blas
-	doc? ( app-doc/blas-docs )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${LPN}-${LPV}"
-PATCHES=( "${FILESDIR}/lapack-reference-${LPV}-fix-build-system.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	ESELECT_PROF=reference
-
-	cp "${FILESDIR}"/eselect.blas.reference-r1 "${T}"/eselect.blas.reference || die
-	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.blas.reference || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
-			"${T}"/eselect.blas.reference || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Wno-dev
-		-DUSE_OPTIMIZED_BLAS=OFF
-		-DCMAKE_Fortran_FLAGS="$(get_abi_CFLAGS) ${FCFLAGS}"
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile -C BLAS
-}
-
-src_test() {
-	local BUILD_DIR="${WORKDIR}/${P}_build/BLAS"
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install -C BLAS
-
-	mkdir -p "${ED}/usr/$(get_libdir)/blas/reference" || die
-	mv "${ED}/usr/$(get_libdir)"/lib* "${ED}/usr/$(get_libdir)/pkgconfig"/* \
-		"${ED}/usr/$(get_libdir)/blas/reference" || die
-	rmdir "${ED}/usr/$(get_libdir)/pkgconfig" || die
-
-	eselect blas add $(get_libdir) "${T}"/eselect.blas.reference ${ESELECT_PROF}
-}
-
-pkg_postinst() {
-	local p=blas
-	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
-		[[ -e ${configfile} ]] && rm -f ${configfile}
-		eselect ${p} set ${ESELECT_PROF}
-		elog "${p} has been eselected to ${ESELECT_PROF}"
-	else
-		elog "Current eselected ${p} is ${current_lib}"
-		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-		elog "\t eselect ${p} set ${ESELECT_PROF}"
-	fi
-}
diff --git a/sci-libs/blas-reference/blas-reference-20161223.ebuild b/sci-libs/blas-reference/blas-reference-20161223.ebuild
deleted file mode 100644
index 8dda6cc4e151..000000000000
--- a/sci-libs/blas-reference/blas-reference-20161223.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit eutils fortran-2 cmake-utils multilib flag-o-matic toolchain-funcs
-
-LPN=lapack
-LPV=3.7.0
-
-DESCRIPTION="Basic Linear Algebra Subprograms F77 reference implementations"
-HOMEPAGE="http://www.netlib.org/blas/"
-SRC_URI="http://www.netlib.org/${LPN}/${LPN}-${LPV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="doc"
-
-RDEPEND="
-	app-eselect/eselect-blas
-	doc? ( app-doc/blas-docs )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${LPN}-${LPV}"
-PATCHES=( "${FILESDIR}/lapack-reference-${LPV}-fix-build-system.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	ESELECT_PROF=reference
-
-	cp "${FILESDIR}"/eselect.blas.reference-r1 "${T}"/eselect.blas.reference || die
-	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.blas.reference || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
-			"${T}"/eselect.blas.reference || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Wno-dev
-		-DUSE_OPTIMIZED_BLAS=OFF
-		-DCMAKE_Fortran_FLAGS="$(get_abi_CFLAGS) ${FCFLAGS}"
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile -C BLAS
-}
-
-src_test() {
-	local BUILD_DIR="${WORKDIR}/${P}_build/BLAS"
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install -C BLAS
-
-	mkdir -p "${ED}/usr/$(get_libdir)/blas/reference" || die
-	mv "${ED}/usr/$(get_libdir)"/lib* "${ED}/usr/$(get_libdir)/pkgconfig"/* \
-		"${ED}/usr/$(get_libdir)/blas/reference" || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# modify install_names accordingly, bug #605214
-		local lib
-		for lib in "${ED}"/usr/$(get_libdir)/blas/reference/*.dylib ; do
-			install_name_tool -id "${lib#${D%/}}" "${lib}"
-		done
-	fi
-	rmdir "${ED}/usr/$(get_libdir)/pkgconfig" || die
-
-	eselect blas add $(get_libdir) "${T}"/eselect.blas.reference ${ESELECT_PROF}
-}
-
-pkg_postinst() {
-	local p=blas
-	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
-		[[ -e ${configfile} ]] && rm -f ${configfile}
-		eselect ${p} set ${ESELECT_PROF}
-		elog "${p} has been eselected to ${ESELECT_PROF}"
-	else
-		elog "Current eselected ${p} is ${current_lib}"
-		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-		elog "\t eselect ${p} set ${ESELECT_PROF}"
-	fi
-}
diff --git a/sci-libs/blas-reference/files/blas-reference-20070226-autotool.patch b/sci-libs/blas-reference/files/blas-reference-20070226-autotool.patch
deleted file mode 100644
index 8d8192fc0254..000000000000
--- a/sci-libs/blas-reference/files/blas-reference-20070226-autotool.patch
+++ /dev/null
@@ -1,243 +0,0 @@
---- configure.ac 	1970-01-01 01:00:00.000000000 +0100
-+++ configure.ac	2007-07-16 10:14:29.000000000 +0100
-@@ -0,0 +1,14 @@
-+AC_PREREQ(2.59)
-+AC_INIT(blas, 20070226, lapack@cs.utk.edu)
-+AM_INIT_AUTOMAKE([foreign])
-+
-+AC_LANG(Fortran 77)
-+AC_PROG_F77
-+AC_PROG_LIBTOOL
-+
-+AC_CONFIG_FILES([Makefile
-+		 BLAS/Makefile
-+		 BLAS/SRC/Makefile
-+		 BLAS/TESTING/Makefile
-+		 BLAS/blas.pc])
-+AC_OUTPUT
---- Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ Makefile.am	2007-07-16 01:51:11.000000000 +0100
-@@ -0,0 +1 @@
-+SUBDIRS = BLAS
---- BLAS/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ BLAS/Makefile.am	2007-08-14 11:38:42.000000000 +0100
-@@ -0,0 +1,7 @@
-+SUBDIRS = SRC TESTING
-+
-+pkgconfigdir = $(libdir)
-+pkgconfig_DATA = blas.pc
-+
-+EXTRA = blas.pc
-+
---- BLAS/blas.pc.in 	1970-01-01 01:00:00.000000000 +0100
-+++ BLAS/blas.pc.in	2007-08-17 11:38:23.000000000 +0100
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: @PACKAGE_NAME@
-+Description: Basic Linear Algebra Subprograms F77 reference implementations
-+Version: @PACKAGE_VERSION@
-+URL: http://www.netlib.org/blas
-+Libs: -lblas
-+Libs.private: -lm
---- BLAS/SRC/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ BLAS/SRC/Makefile.am	2007-07-16 01:50:12.000000000 +0100
-@@ -0,0 +1,153 @@
-+lib_LTLIBRARIES = libblas.la
-+
-+libblas_la_SOURCES = \
-+	caxpy.f \
-+	ccopy.f \
-+	cdotc.f \
-+	cdotu.f \
-+	cgbmv.f \
-+	cgemm.f \
-+	cgemv.f \
-+	cgerc.f \
-+	cgeru.f \
-+	chbmv.f \
-+	chemm.f \
-+	chemv.f \
-+	cher2.f \
-+	cher2k.f \
-+	cher.f \
-+	cherk.f \
-+	chpmv.f \
-+	chpr2.f \
-+	chpr.f \
-+	crotg.f \
-+	cscal.f \
-+	csrot.f \
-+	csscal.f \
-+	cswap.f \
-+	csymm.f \
-+	csyr2k.f \
-+	csyrk.f \
-+	ctbmv.f \
-+	ctbsv.f \
-+	ctpmv.f \
-+	ctpsv.f \
-+	ctrmm.f \
-+	ctrmv.f \
-+	ctrsm.f \
-+	ctrsv.f \
-+	dasum.f \
-+	daxpy.f \
-+	dcabs1.f \
-+	dcopy.f \
-+	ddot.f \
-+	dgbmv.f \
-+	dgemm.f \
-+	dgemv.f \
-+	dger.f \
-+	dnrm2.f \
-+	drot.f \
-+	drotg.f \
-+	drotm.f \
-+	drotmg.f \
-+	dsbmv.f \
-+	dscal.f \
-+	dsdot.f \
-+	dspmv.f \
-+	dspr2.f \
-+	dspr.f \
-+	dswap.f \
-+	dsymm.f \
-+	dsymv.f \
-+	dsyr2.f \
-+	dsyr2k.f \
-+	dsyr.f \
-+	dsyrk.f \
-+	dtbmv.f \
-+	dtbsv.f \
-+	dtpmv.f \
-+	dtpsv.f \
-+	dtrmm.f \
-+	dtrmv.f \
-+	dtrsm.f \
-+	dtrsv.f \
-+	dzasum.f \
-+	dznrm2.f \
-+	icamax.f \
-+	idamax.f \
-+	isamax.f \
-+	izamax.f \
-+	lsame.f \
-+	scabs1.f \
-+	sasum.f \
-+	saxpy.f \
-+	scasum.f \
-+	scnrm2.f \
-+	scopy.f \
-+	sdot.f \
-+	sdsdot.f \
-+	sgbmv.f \
-+	sgemm.f \
-+	sgemv.f \
-+	sger.f \
-+	snrm2.f \
-+	srot.f \
-+	srotg.f \
-+	srotm.f \
-+	srotmg.f \
-+	ssbmv.f \
-+	sscal.f \
-+	sspmv.f \
-+	sspr2.f \
-+	sspr.f \
-+	sswap.f \
-+	ssymm.f \
-+	ssymv.f \
-+	ssyr2.f \
-+	ssyr2k.f \
-+	ssyr.f \
-+	ssyrk.f \
-+	stbmv.f \
-+	stbsv.f \
-+	stpmv.f \
-+	stpsv.f \
-+	strmm.f \
-+	strmv.f \
-+	strsm.f \
-+	strsv.f \
-+	xerbla.f \
-+	zaxpy.f \
-+	zcopy.f \
-+	zdotc.f \
-+	zdotu.f \
-+	zdrot.f \
-+	zdscal.f \
-+	zgbmv.f \
-+	zgemm.f \
-+	zgemv.f \
-+	zgerc.f \
-+	zgeru.f \
-+	zhbmv.f \
-+	zhemm.f \
-+	zhemv.f \
-+	zher2.f \
-+	zher2k.f \
-+	zher.f \
-+	zherk.f \
-+	zhpmv.f \
-+	zhpr2.f \
-+	zhpr.f \
-+	zrotg.f \
-+	zscal.f \
-+	zswap.f \
-+	zsymm.f \
-+	zsyr2k.f \
-+	zsyrk.f \
-+	ztbmv.f \
-+	ztbsv.f \
-+	ztpmv.f \
-+	ztpsv.f \
-+	ztrmm.f \
-+	ztrmv.f \
-+	ztrsm.f \
-+	ztrsv.f
---- BLAS/TESTING/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ BLAS/TESTING/Makefile.am	2007-07-16 01:50:12.000000000 +0100
-@@ -0,0 +1,27 @@
-+TESTS = blas_tests
-+
-+blas_tests:
-+	@install -m0755 blas_tests.sh blas_tests
-+
-+check_PROGRAMS = \
-+	xsblat1 xdblat1 xcblat1 xzblat1 \
-+	xsblat2 xdblat2 xcblat2 xzblat2 \
-+	xsblat3 xdblat3 xcblat3 xzblat3
-+
-+LDADD = $(top_builddir)/BLAS/SRC/libblas.la
-+
-+xsblat1_SOURCES = sblat1.f
-+xdblat1_SOURCES = dblat1.f
-+xcblat1_SOURCES = cblat1.f
-+xzblat1_SOURCES = zblat1.f
-+
-+xsblat2_SOURCES = sblat2.f
-+xdblat2_SOURCES = dblat2.f
-+xcblat2_SOURCES = cblat2.f
-+xzblat2_SOURCES = zblat2.f
-+
-+xsblat3_SOURCES = sblat3.f
-+xdblat3_SOURCES = dblat3.f
-+xcblat3_SOURCES = cblat3.f
-+xzblat3_SOURCES = zblat3.f
-+
---- BLAS/TESTING/blas_tests.sh 	1970-01-01 01:00:00.000000000 +0100
-+++ BLAS/TESTING/blas_tests.sh	2007-07-16 01:50:12.000000000 +0100
-@@ -0,0 +1,9 @@
-+#!/bin/sh
-+
-+for t in cblat1 sblat1 dblat1 zblat1; do
-+    ./x${t}
-+done
-+
-+for t in cblat2 sblat2 dblat2 zblat2 cblat3 sblat3 dblat3 zblat3;  do
-+    ./x${t} < ../${t}.in
-+done
diff --git a/sci-libs/blas-reference/files/blas-reference-20070226-pkg-config.patch b/sci-libs/blas-reference/files/blas-reference-20070226-pkg-config.patch
deleted file mode 100644
index 14190f41e7d5..000000000000
--- a/sci-libs/blas-reference/files/blas-reference-20070226-pkg-config.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/BLAS/blas.pc.in b/BLAS/blas.pc.in
-index 367c87b..44b86db 100644
---- a/BLAS/blas.pc.in
-+++ b/BLAS/blas.pc.in
-@@ -7,5 +7,5 @@ Name: @PACKAGE_NAME@
- Description: Basic Linear Algebra Subprograms F77 reference implementations
- Version: @PACKAGE_VERSION@
- URL: http://www.netlib.org/blas
--Libs: -lblas
-+Libs: -L@libdir@ -lblas
- Libs.private: -lm
diff --git a/sci-libs/blas-reference/files/eselect.blas.reference b/sci-libs/blas-reference/files/eselect.blas.reference
deleted file mode 100644
index edb10ddd10d9..000000000000
--- a/sci-libs/blas-reference/files/eselect.blas.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-blas/reference/libblas.so /usr/@LIBDIR@/libblas.so
-blas/reference/libblas.so.0 /usr/@LIBDIR@/libblas.so.0
-blas/reference/libblas.a /usr/@LIBDIR@/libblas.a
-../blas/reference/blas.pc /usr/@LIBDIR@/pkgconfig/blas.pc
diff --git a/sci-libs/blas-reference/files/eselect.blas.reference-r1 b/sci-libs/blas-reference/files/eselect.blas.reference-r1
deleted file mode 100644
index f032181beb67..000000000000
--- a/sci-libs/blas-reference/files/eselect.blas.reference-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-blas/reference/libblas.so /usr/@LIBDIR@/libblas.so
-blas/reference/libblas.so.3 /usr/@LIBDIR@/libblas.so.3
-blas/reference/libblas.a /usr/@LIBDIR@/libblas.a
-../blas/reference/blas.pc /usr/@LIBDIR@/pkgconfig/blas.pc
diff --git a/sci-libs/blas-reference/files/lapack-reference-3.6.0-fix-build-system.patch b/sci-libs/blas-reference/files/lapack-reference-3.6.0-fix-build-system.patch
deleted file mode 100644
index 8661709d369b..000000000000
--- a/sci-libs/blas-reference/files/lapack-reference-3.6.0-fix-build-system.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- lapack-3.6.0/BLAS/blas.pc.in
-+++ lapack-3.6.0/BLAS/blas.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: blas
- Description: Basic Linear Algebra Subprograms F77 reference implementations
---- lapack-3.6.0/BLAS/CMakeLists.txt
-+++ lapack-3.6.0/BLAS/CMakeLists.txt
-@@ -2,7 +2,7 @@
- if(BUILD_TESTING)
- add_subdirectory(TESTING)
- endif(BUILD_TESTING)
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/blas.pc)
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/blas.pc @ONLY)
- install(FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/blas.pc
-   DESTINATION ${PKG_CONFIG_DIR}
---- lapack-3.6.0/CBLAS/cblas.pc.in
-+++ lapack-3.6.0/CBLAS/cblas.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: lapacke
- Description: C Standard Interface to BLAS Linear Algebra PACKage
---- lapack-3.6.0/CBLAS/CMakeLists.txt
-+++ lapack-3.6.0/CBLAS/CMakeLists.txt
-@@ -71,7 +71,7 @@
-   ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY)
- 
- 
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc)
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc @ONLY)
-   install(FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc
-   DESTINATION ${PKG_CONFIG_DIR}
---- lapack-3.6.0/CMakeLists.txt
-+++ lapack-3.6.0/CMakeLists.txt
-@@ -333,7 +333,7 @@
-   ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY)
- 
- 
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc)
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
-   install(FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
-   DESTINATION ${PKG_CONFIG_DIR}
---- lapack-3.6.0/LAPACKE/CMakeLists.txt
-+++ lapack-3.6.0/LAPACKE/CMakeLists.txt
-@@ -65,7 +65,7 @@
- endif(BUILD_TESTING)
- 
- 
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc)
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc @ONLY)
-  install(FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc
-   DESTINATION ${PKG_CONFIG_DIR}
---- lapack-3.6.0/LAPACKE/lapacke.pc.in
-+++ lapack-3.6.0/LAPACKE/lapacke.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: lapacke
- Description: C Standard Interface to LAPACK Linear Algebra PACKage
---- lapack-3.6.0/lapack.pc.in
-+++ lapack-3.6.0/lapack.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: lapack
- Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage
diff --git a/sci-libs/blas-reference/files/lapack-reference-3.7.0-fix-build-system.patch b/sci-libs/blas-reference/files/lapack-reference-3.7.0-fix-build-system.patch
deleted file mode 100644
index 70f7cb0ee926..000000000000
--- a/sci-libs/blas-reference/files/lapack-reference-3.7.0-fix-build-system.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/BLAS/blas.pc.in b/BLAS/blas.pc.in
-index 7fd6f1e..e52f3ad 100644
---- a/BLAS/blas.pc.in
-+++ b/BLAS/blas.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: BLAS
- Description: FORTRAN reference implementation of BLAS Basic Linear Algebra Subprograms
-diff --git a/CBLAS/cblas.pc.in b/CBLAS/cblas.pc.in
-index 4a938fe..311aed9 100644
---- a/CBLAS/cblas.pc.in
-+++ b/CBLAS/cblas.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: CBLAS
- Description: C Standard Interface to BLAS Basic Linear Algebra Subprograms
-diff --git a/LAPACKE/lapacke.pc.in b/LAPACKE/lapacke.pc.in
-index 028f8da..dc092b1 100644
---- a/LAPACKE/lapacke.pc.in
-+++ b/LAPACKE/lapacke.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: LAPACKE
- Description: C Standard Interface to LAPACK Linear Algebra PACKage
-diff --git a/lapack.pc.in b/lapack.pc.in
-index 878efc2..2cca4c2 100644
---- a/lapack.pc.in
-+++ b/lapack.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: LAPACK
- Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage
diff --git a/sci-libs/blas-reference/metadata.xml b/sci-libs/blas-reference/metadata.xml
deleted file mode 100644
index 1bde80743687..000000000000
--- a/sci-libs/blas-reference/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription lang="en">
-The BLAS (Basic Linear Algebra Subprograms) are high quality "building
-block" routines for performing basic vector and matrix operations. Level 1
-BLAS do vector-vector operations, Level 2 BLAS do matrix-vector operations,
-and Level 3 BLAS do matrix-matrix operations. Because the BLAS are
-efficient, portable, and widely available, they're commonly used in the
-development of high quality linear algebra software, LAPACK for
-example. This packages implements the reference FORTRAN 77 library.
-</longdescription>
-</pkgmetadata>
diff --git a/sci-libs/cblas-reference/Manifest b/sci-libs/cblas-reference/Manifest
deleted file mode 100644
index 5f6068e8b373..000000000000
--- a/sci-libs/cblas-reference/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cblas.tgz 197694 BLAKE2B a9a6feff0198cc62b2a9fd75740e9cebbecd36adff7a1fb3ea57942846d428dcbdb9b266d4510b67bc077b13fe833c063e4784278755513c3abddc66884f5e36 SHA512 8edc4f939d36e6bb9bcbc4ffe414b6c991192ef2e76ec4eda16d3578591185d31e46be5e747d74c740411db6bd2c2d414a18f73193d4a288e8c7e4b83cb0895d
-DIST lapack-3.6.0.tgz 6792324 BLAKE2B 438f3376b63b38ef0fe70f6becac847816f3a11c01f5ab237dc0d941792ceb54dbd2f8dc22d56286f5dab3499289ed94e67521ea951a98973c9640abc294ad6c SHA512 bc50441d415ef8896dd7626d77c6104184b996e758704366288089f03d4c99d068e33153b0d13305310886017e5d2e716130f812a95cfcad36ef37fe20417ab8
-DIST lapack-3.7.0.tgz 7359812 BLAKE2B 20aa42e22d8c920d1360afe41ceec7b36f6cd5fbe43ca9d7848ef7cc45a64a0314cb1321941c1a7c03654f41e28ec805445882ded0ca0ea07674e70b66cba6b5 SHA512 e4f4c7d0ba8a096eeb813160c6dbcdd535647df6b2ad5beac9181908158956b31d1a9554ec9b9836fd44fe7404c1f377b297cbb20d744f20d70e357fd246c91b
diff --git a/sci-libs/cblas-reference/cblas-reference-20030223-r6.ebuild b/sci-libs/cblas-reference/cblas-reference-20030223-r6.ebuild
deleted file mode 100644
index 7b8572d844d3..000000000000
--- a/sci-libs/cblas-reference/cblas-reference-20030223-r6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils fortran-2 multilib toolchain-funcs
-
-MyPN="${PN/-reference/}"
-
-DESCRIPTION="C wrapper interface to the F77 reference BLAS implementation"
-HOMEPAGE="http://www.netlib.org/blas/"
-SRC_URI="http://www.netlib.org/blas/blast-forum/${MyPN}.tgz"
-
-SLOT="0"
-LICENSE="public-domain"
-IUSE=""
-KEYWORDS="~alpha amd64 hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	virtual/blas
-	app-eselect/eselect-cblas"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-ESELECT_PROF=reference
-S="${WORKDIR}/CBLAS"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-autotool.patch
-	eautoreconf
-
-	cp "${FILESDIR}"/eselect.cblas.reference "${T}"/ || die
-	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.cblas.reference || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
-			"${T}"/eselect.cblas.reference || die
-	fi
-}
-
-src_configure() {
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/blas/reference \
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
-}
-
-src_install() {
-	default
-	dodoc cblas_example*c
-	eselect cblas add $(get_libdir) "${T}"/eselect.cblas.reference ${ESELECT_PROF}
-}
-
-pkg_postinst() {
-	local p=cblas
-	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
-		[[ -e ${configfile} ]] && rm -f ${configfile}
-		eselect ${p} set ${ESELECT_PROF}
-		elog "${p} has been eselected to ${ESELECT_PROF}"
-	else
-		elog "Current eselected ${p} is ${current_lib}"
-		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-		elog "\t eselect ${p} set ${ESELECT_PROF}"
-	fi
-}
diff --git a/sci-libs/cblas-reference/cblas-reference-20151113-r2.ebuild b/sci-libs/cblas-reference/cblas-reference-20151113-r2.ebuild
deleted file mode 100644
index f3dd39de4338..000000000000
--- a/sci-libs/cblas-reference/cblas-reference-20151113-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit eutils fortran-2 cmake-utils multilib flag-o-matic toolchain-funcs
-
-LPN=lapack
-LPV=3.6.0
-
-DESCRIPTION="C wrapper interface to the F77 reference BLAS implementation"
-HOMEPAGE="http://www.netlib.org/cblas/"
-SRC_URI="http://www.netlib.org/${LPN}/${LPN}-${LPV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-DEPEND="app-eselect/eselect-cblas
-	>=virtual/blas-3.6
-	virtual/pkgconfig"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${LPN}-${LPV}"
-PATCHES=( "${FILESDIR}/lapack-reference-${LPV}-fix-build-system.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	ESELECT_PROF=reference
-
-	cp "${FILESDIR}"/eselect.cblas.reference-r2 "${T}"/eselect.cblas.reference || die
-	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.cblas.reference || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
-			"${T}"/eselect.cblas.reference || die
-	fi
-
-	sed -i \
-		-e 's:/CMAKE/:/cmake/:g' \
-		CBLAS/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Wno-dev
-		-DCBLAS=ON
-		-DUSE_OPTIMIZED_BLAS=ON
-		-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
-		-DCMAKE_C_FLAGS="$($(tc-getPKG_CONFIG) --cflags blas) ${CFLAGS}"
-		-DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags blas) $(get_abi_CFLAGS) ${FCFLAGS}"
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile -C CBLAS
-}
-
-src_install() {
-	cmake-utils_src_install -C CBLAS
-
-	mkdir -p "${ED}/usr/$(get_libdir)/blas/reference" || die
-	mv "${ED}/usr/$(get_libdir)"/lib* "${ED}/usr/include"/cblas* \
-		"${ED}/usr/$(get_libdir)/pkgconfig"/* \
-		"${ED}/usr/$(get_libdir)/blas/reference" || die
-
-	rmdir "${ED}/usr/$(get_libdir)/pkgconfig" || die
-	rmdir "${ED}/usr/include" || die
-
-	eselect cblas add $(get_libdir) "${T}"/eselect.cblas.reference ${ESELECT_PROF}
-}
-
-pkg_postinst() {
-	local p=cblas
-	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
-		[[ -e ${configfile} ]] && rm -f ${configfile}
-		eselect ${p} set ${ESELECT_PROF}
-		elog "${p} has been eselected to ${ESELECT_PROF}"
-	else
-		elog "Current eselected ${p} is ${current_lib}"
-		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-		elog "\t eselect ${p} set ${ESELECT_PROF}"
-	fi
-}
diff --git a/sci-libs/cblas-reference/cblas-reference-20161223.ebuild b/sci-libs/cblas-reference/cblas-reference-20161223.ebuild
deleted file mode 100644
index 839759b7cde4..000000000000
--- a/sci-libs/cblas-reference/cblas-reference-20161223.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit eutils fortran-2 cmake-utils multilib flag-o-matic toolchain-funcs
-
-LPN=lapack
-LPV=3.7.0
-
-DESCRIPTION="C wrapper interface to the F77 reference BLAS implementation"
-HOMEPAGE="http://www.netlib.org/cblas/"
-SRC_URI="http://www.netlib.org/${LPN}/${LPN}-${LPV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-DEPEND="app-eselect/eselect-cblas
-	>=virtual/blas-3.6
-	virtual/pkgconfig"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${LPN}-${LPV}"
-PATCHES=( "${FILESDIR}/lapack-reference-${LPV}-fix-build-system.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	ESELECT_PROF=reference
-
-	cp "${FILESDIR}"/eselect.cblas.reference-r2 "${T}"/eselect.cblas.reference || die
-	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.cblas.reference || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
-			"${T}"/eselect.cblas.reference || die
-	fi
-
-	sed -i \
-		-e 's:/CMAKE/:/cmake/:g' \
-		CBLAS/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Wno-dev
-		-DCBLAS=ON
-		-DUSE_OPTIMIZED_BLAS=ON
-		-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
-		-DCMAKE_C_FLAGS="$($(tc-getPKG_CONFIG) --cflags blas) ${CFLAGS}"
-		-DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags blas) $(get_abi_CFLAGS) ${FCFLAGS}"
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile -C CBLAS
-}
-
-src_install() {
-	cmake-utils_src_install -C CBLAS
-
-	mkdir -p "${ED}/usr/$(get_libdir)/blas/reference" || die
-	mv "${ED}/usr/$(get_libdir)"/lib* "${ED}/usr/include"/cblas* \
-		"${ED}/usr/$(get_libdir)/pkgconfig"/* \
-		"${ED}/usr/$(get_libdir)/blas/reference" || die
-
-	rmdir "${ED}/usr/$(get_libdir)/pkgconfig" || die
-	rmdir "${ED}/usr/include" || die
-
-	eselect cblas add $(get_libdir) "${T}"/eselect.cblas.reference ${ESELECT_PROF}
-}
-
-pkg_postinst() {
-	local p=cblas
-	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
-		[[ -e ${configfile} ]] && rm -f ${configfile}
-		eselect ${p} set ${ESELECT_PROF}
-		elog "${p} has been eselected to ${ESELECT_PROF}"
-	else
-		elog "Current eselected ${p} is ${current_lib}"
-		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-		elog "\t eselect ${p} set ${ESELECT_PROF}"
-	fi
-}
diff --git a/sci-libs/cblas-reference/files/cblas-reference-20030223-autotool.patch b/sci-libs/cblas-reference/files/cblas-reference-20030223-autotool.patch
deleted file mode 100644
index 0dd595bf4a21..000000000000
--- a/sci-libs/cblas-reference/files/cblas-reference-20030223-autotool.patch
+++ /dev/null
@@ -1,567 +0,0 @@
---- configure.ac 	1970-01-01 01:00:00.000000000 +0100
-+++ configure.ac	2007-11-09 17:59:16.000000000 +0000
-@@ -0,0 +1,24 @@
-+AC_PREREQ(2.59)
-+AC_INIT(cblas, 20030223, lapack@cs.utk.edu)
-+AC_CONFIG_SRCDIR([cblas_example2.c])
-+AC_CONFIG_HEADER([config.h])
-+AM_INIT_AUTOMAKE([foreign])
-+
-+AC_LANG(C)
-+AC_PROG_CC
-+AC_PROG_F77
-+AC_F77_LIBRARY_LDFLAGS
-+AC_PROG_LIBTOOL
-+
-+sinclude(acx_blas.m4)
-+ACX_BLAS
-+if test x"$BLAS_LIBS" = x; then
-+   AC_MSG_ERROR([Cannot find blas libraries])
-+fi
-+
-+
-+AC_CONFIG_FILES([Makefile
-+		 src/Makefile
-+		 testing/Makefile
-+		 cblas.pc])
-+AC_OUTPUT
---- Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ Makefile.am	2007-11-09 16:20:41.000000000 +0000
-@@ -0,0 +1,8 @@
-+SUBDIRS = src testing
-+
-+pkgconfigdir = $(libdir)
-+pkgconfig_DATA = cblas.pc
-+
-+EXTRA = cblas.pc
-+
-+
---- cblas.pc.in 	1970-01-01 01:00:00.000000000 +0100
-+++ cblas.pc.in	2007-11-09 16:20:41.000000000 +0000
-@@ -0,0 +1,13 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: @PACKAGE_NAME@
-+Description: Basic Linear Algebra Subprograms C reference wrapper
-+Version: @PACKAGE_VERSION@
-+Requires: blas
-+URL: http://www.netlib.org/blas/
-+Libs: -lcblas
-+Libs.private: @FLIBS@
-+Cflags: -I${includedir}
---- acx_blas.m4 	1970-01-01 01:00:00.000000000 +0100
-+++ acx_blas.m4	2007-08-04 22:50:48.000000000 +0100
-@@ -0,0 +1,191 @@
-+##### http://autoconf-archive.cryp.to/acx_blas.html
-+#
-+# SYNOPSIS
-+#
-+#   ACX_BLAS([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-+#
-+# DESCRIPTION
-+#
-+#   This macro looks for a library that implements the BLAS
-+#   linear-algebra interface (see http://www.netlib.org/blas/). On
-+#   success, it sets the BLAS_LIBS output variable to hold the
-+#   requisite library linkages.
-+#
-+#   To link with BLAS, you should link with:
-+#
-+#   	$BLAS_LIBS $LIBS $FLIBS
-+#
-+#   in that order. FLIBS is the output variable of the
-+#   AC_F77_LIBRARY_LDFLAGS macro (called if necessary by ACX_BLAS), and
-+#   is sometimes necessary in order to link with F77 libraries. Users
-+#   will also need to use AC_F77_DUMMY_MAIN (see the autoconf manual),
-+#   for the same reason.
-+#
-+#   Many libraries are searched for, from ATLAS to CXML to ESSL. The
-+#   user may also use --with-blas=<lib> in order to use some specific
-+#   BLAS library <lib>. In order to link successfully, however, be
-+#   aware that you will probably need to use the same Fortran compiler
-+#   (which can be set via the F77 env. var.) as was used to compile the
-+#   BLAS library.
-+#
-+#   ACTION-IF-FOUND is a list of shell commands to run if a BLAS
-+#   library is found, and ACTION-IF-NOT-FOUND is a list of commands to
-+#   run it if it is not found. If ACTION-IF-FOUND is not specified, the
-+#   default action will define HAVE_BLAS.
-+#
-+#   This macro requires autoconf 2.50 or later.
-+#
-+# LAST MODIFICATION
-+#
-+#   2007-07-29
-+#
-+# COPYLEFT
-+#
-+#   Copyright (c) 2007 Steven G. Johnson <stevenj@alum.mit.edu>
-+#
-+#   This program is free software: you can redistribute it and/or
-+#   modify it under the terms of the GNU General Public License as
-+#   published by the Free Software Foundation, either version 3 of the
-+#   License, or (at your option) any later version.
-+#
-+#   This program is distributed in the hope that it will be useful, but
-+#   WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+#   General Public License for more details.
-+#
-+#   You should have received a copy of the GNU General Public License
-+#   along with this program. If not, see
-+#   <http://www.gnu.org/licenses/>.
-+#
-+#   As a special exception, the respective Autoconf Macro's copyright
-+#   owner gives unlimited permission to copy, distribute and modify the
-+#   configure scripts that are the output of Autoconf when processing
-+#   the Macro. You need not follow the terms of the GNU General Public
-+#   License when using or distributing such scripts, even though
-+#   portions of the text of the Macro appear in them. The GNU General
-+#   Public License (GPL) does govern all other use of the material that
-+#   constitutes the Autoconf Macro.
-+#
-+#   This special exception to the GPL applies to versions of the
-+#   Autoconf Macro released by the Autoconf Macro Archive. When you
-+#   make and distribute a modified version of the Autoconf Macro, you
-+#   may extend this special exception to the GPL to apply to your
-+#   modified version as well.
-+
-+AC_DEFUN([ACX_BLAS], [
-+AC_PREREQ(2.50)
-+AC_REQUIRE([AC_F77_LIBRARY_LDFLAGS])
-+acx_blas_ok=no
-+
-+AC_ARG_WITH(blas,
-+	[AC_HELP_STRING([--with-blas=<lib>], [use BLAS library <lib>])])
-+case $with_blas in
-+	yes | "") ;;
-+	no) acx_blas_ok=disable ;;
-+	-* | */* | *.a | *.so | *.so.* | *.o) BLAS_LIBS="$with_blas" ;;
-+	*) BLAS_LIBS="-l$with_blas" ;;
-+esac
-+
-+# Get fortran linker names of BLAS functions to check for.
-+AC_F77_FUNC(sgemm)
-+AC_F77_FUNC(dgemm)
-+
-+acx_blas_save_LIBS="$LIBS"
-+LIBS="$LIBS $FLIBS"
-+
-+# First, check BLAS_LIBS environment variable
-+if test $acx_blas_ok = no; then
-+if test "x$BLAS_LIBS" != x; then
-+	save_LIBS="$LIBS"; LIBS="$BLAS_LIBS $LIBS"
-+	AC_MSG_CHECKING([for $sgemm in $BLAS_LIBS])
-+	AC_TRY_LINK_FUNC($sgemm, [acx_blas_ok=yes], [BLAS_LIBS=""])
-+	AC_MSG_RESULT($acx_blas_ok)
-+	LIBS="$save_LIBS"
-+fi
-+fi
-+
-+# BLAS linked to by default?  (happens on some supercomputers)
-+if test $acx_blas_ok = no; then
-+	save_LIBS="$LIBS"; LIBS="$LIBS"
-+	AC_CHECK_FUNC($sgemm, [acx_blas_ok=yes])
-+	LIBS="$save_LIBS"
-+fi
-+
-+# BLAS in ATLAS library? (http://math-atlas.sourceforge.net/)
-+if test $acx_blas_ok = no; then
-+	AC_CHECK_LIB(atlas, ATL_xerbla,
-+		[AC_CHECK_LIB(f77blas, $sgemm,
-+		[AC_CHECK_LIB(cblas, cblas_dgemm,
-+			[acx_blas_ok=yes
-+			 BLAS_LIBS="-lcblas -lf77blas -latlas"],
-+			[], [-lf77blas -latlas])],
-+			[], [-latlas])])
-+fi
-+
-+# BLAS in PhiPACK libraries? (requires generic BLAS lib, too)
-+if test $acx_blas_ok = no; then
-+	AC_CHECK_LIB(blas, $sgemm,
-+		[AC_CHECK_LIB(dgemm, $dgemm,
-+		[AC_CHECK_LIB(sgemm, $sgemm,
-+			[acx_blas_ok=yes; BLAS_LIBS="-lsgemm -ldgemm -lblas"],
-+			[], [-lblas])],
-+			[], [-lblas])])
-+fi
-+
-+# BLAS in Alpha CXML library?
-+if test $acx_blas_ok = no; then
-+	AC_CHECK_LIB(cxml, $sgemm, [acx_blas_ok=yes;BLAS_LIBS="-lcxml"])
-+fi
-+
-+# BLAS in Alpha DXML library? (now called CXML, see above)
-+if test $acx_blas_ok = no; then
-+	AC_CHECK_LIB(dxml, $sgemm, [acx_blas_ok=yes;BLAS_LIBS="-ldxml"])
-+fi
-+
-+# BLAS in Sun Performance library?
-+if test $acx_blas_ok = no; then
-+	if test "x$GCC" != xyes; then # only works with Sun CC
-+		AC_CHECK_LIB(sunmath, acosp,
-+			[AC_CHECK_LIB(sunperf, $sgemm,
-+        			[BLAS_LIBS="-xlic_lib=sunperf -lsunmath"
-+                                 acx_blas_ok=yes],[],[-lsunmath])])
-+	fi
-+fi
-+
-+# BLAS in SCSL library?  (SGI/Cray Scientific Library)
-+if test $acx_blas_ok = no; then
-+	AC_CHECK_LIB(scs, $sgemm, [acx_blas_ok=yes; BLAS_LIBS="-lscs"])
-+fi
-+
-+# BLAS in SGIMATH library?
-+if test $acx_blas_ok = no; then
-+	AC_CHECK_LIB(complib.sgimath, $sgemm,
-+		     [acx_blas_ok=yes; BLAS_LIBS="-lcomplib.sgimath"])
-+fi
-+
-+# BLAS in IBM ESSL library? (requires generic BLAS lib, too)
-+if test $acx_blas_ok = no; then
-+	AC_CHECK_LIB(blas, $sgemm,
-+		[AC_CHECK_LIB(essl, $sgemm,
-+			[acx_blas_ok=yes; BLAS_LIBS="-lessl -lblas"],
-+			[], [-lblas $FLIBS])])
-+fi
-+
-+# Generic BLAS library?
-+if test $acx_blas_ok = no; then
-+	AC_CHECK_LIB(blas, $sgemm, [acx_blas_ok=yes; BLAS_LIBS="-lblas"])
-+fi
-+
-+AC_SUBST(BLAS_LIBS)
-+
-+LIBS="$acx_blas_save_LIBS"
-+
-+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-+if test x"$acx_blas_ok" = xyes; then
-+        ifelse([$1],,AC_DEFINE(HAVE_BLAS,1,[Define if you have a BLAS library.]),[$1])
-+        :
-+else
-+        acx_blas_ok=no
-+        $2
-+fi
-+])dnl ACX_BLAS
---- src/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ src/Makefile.am	2007-11-09 16:20:41.000000000 +0000
-@@ -0,0 +1,232 @@
-+lib_LTLIBRARIES = libcblas.la
-+
-+pkgincludedir = $(includedir)/cblas
-+pkginclude_HEADERS = cblas.h
-+
-+AM_CPPFLAGS = -DADD_
-+
-+ERRHAND_SOURCES = \
-+	cblas_globals.c \
-+	cblas_xerbla.c \
-+	xerbla.c
-+
-+SINGLE_SOURCES = \
-+	cblas_scasum.c \
-+	cblas_scnrm2.c \
-+	scasumsub.f \
-+	scnrm2sub.f
-+
-+SLEV_SOURCES = \
-+	isamaxsub.f \
-+	sdotsub.f \
-+	sdsdotsub.f \
-+	snrm2sub.f \
-+	sasumsub.f
-+
-+SLEV1_SOURCES = \
-+	cblas_srotg.c \
-+	cblas_srotmg.c \
-+	cblas_srot.c \
-+	cblas_srotm.c \
-+	cblas_sswap.c \
-+	cblas_sscal.c \
-+	cblas_scopy.c \
-+	cblas_saxpy.c \
-+	cblas_sdot.c \
-+	cblas_sdsdot.c \
-+	cblas_snrm2.c \
-+	cblas_sasum.c \
-+	cblas_isamax.c
-+
-+SLEV2_SOURCES = \
-+	cblas_sgemv.c \
-+	cblas_sgbmv.c \
-+	cblas_sger.c \
-+	cblas_ssbmv.c \
-+	cblas_sspmv.c \
-+	cblas_sspr.c \
-+	cblas_sspr2.c \
-+	cblas_ssymv.c \
-+	cblas_ssyr.c \
-+	cblas_ssyr2.c \
-+	cblas_stbmv.c \
-+	cblas_stbsv.c \
-+	cblas_stpmv.c \
-+	cblas_stpsv.c \
-+	cblas_strmv.c \
-+	cblas_strsv.c
-+
-+SLEV3_SOURCES = \
-+	cblas_sgemm.c \
-+	cblas_ssymm.c \
-+	cblas_ssyrk.c \
-+	cblas_ssyr2k.c \
-+	cblas_strmm.c \
-+	cblas_strsm.c
-+
-+DLEV_SOURCES = \
-+	ddotsub.f \
-+	dsdotsub.f \
-+	dnrm2sub.f \
-+	dasumsub.f \
-+	idamaxsub.f
-+
-+DLEV1_SOURCES = \
-+	cblas_drotg.c \
-+	cblas_drotmg.c \
-+	cblas_drot.c \
-+	cblas_drotm.c \
-+	cblas_dswap.c \
-+	cblas_dscal.c \
-+	cblas_dcopy.c \
-+	cblas_daxpy.c \
-+	cblas_ddot.c \
-+	cblas_dsdot.c \
-+	cblas_dnrm2.c \
-+	cblas_dasum.c \
-+	cblas_idamax.c
-+
-+DLEV2_SOURCES = \
-+	cblas_dgemv.c \
-+	cblas_dgbmv.c \
-+	cblas_dger.c \
-+	cblas_dsbmv.c \
-+	cblas_dspmv.c \
-+	cblas_dspr.c \
-+	cblas_dspr2.c \
-+	cblas_dsymv.c \
-+	cblas_dsyr.c \
-+	cblas_dsyr2.c \
-+	cblas_dtbmv.c \
-+	cblas_dtbsv.c \
-+	cblas_dtpmv.c \
-+	cblas_dtpsv.c \
-+	cblas_dtrmv.c \
-+	cblas_dtrsv.c
-+
-+DLEV3_SOURCES = \
-+	cblas_dgemm.c \
-+	cblas_dsymm.c \
-+	cblas_dsyrk.c \
-+	cblas_dsyr2k.c \
-+	cblas_dtrmm.c \
-+	cblas_dtrsm.c
-+
-+CLEV_SOURCES = \
-+	cdotcsub.f \
-+	cdotusub.f \
-+	icamaxsub.f
-+
-+CLEV1_SOURCES = \
-+	cblas_cswap.c \
-+	cblas_cscal.c \
-+	cblas_csscal.c \
-+	cblas_ccopy.c \
-+	cblas_caxpy.c \
-+	cblas_cdotu_sub.c \
-+	cblas_cdotc_sub.c \
-+	cblas_icamax.c
-+
-+CLEV2_SOURCES = \
-+	cblas_cgemv.c \
-+	cblas_cgbmv.c \
-+	cblas_chemv.c \
-+	cblas_chbmv.c \
-+	cblas_chpmv.c \
-+	cblas_ctrmv.c \
-+	cblas_ctbmv.c \
-+	cblas_ctpmv.c \
-+	cblas_ctrsv.c \
-+	cblas_ctbsv.c \
-+	cblas_ctpsv.c \
-+	cblas_cgeru.c \
-+	cblas_cgerc.c \
-+	cblas_cher.c \
-+	cblas_cher2.c \
-+	cblas_chpr.c \
-+	cblas_chpr2.c
-+
-+CLEV3_SOURCES = \
-+	cblas_cgemm.c \
-+	cblas_csymm.c \
-+	cblas_chemm.c \
-+	cblas_cherk.c \
-+	cblas_cher2k.c \
-+	cblas_ctrmm.c \
-+	cblas_ctrsm.c \
-+	cblas_csyrk.c \
-+	cblas_csyr2k.c
-+
-+ZLEV_SOURCES = \
-+	zdotcsub.f \
-+	zdotusub.f \
-+	dzasumsub.f \
-+	dznrm2sub.f \
-+	izamaxsub.f
-+
-+ZLEV1_SOURCES = \
-+	cblas_zswap.c \
-+	cblas_zscal.c \
-+	cblas_zdscal.c \
-+	cblas_zcopy.c \
-+	cblas_zaxpy.c \
-+	cblas_zdotu_sub.c \
-+	cblas_zdotc_sub.c \
-+	cblas_dznrm2.c \
-+	cblas_dzasum.c \
-+	cblas_izamax.c
-+
-+ZLEV2_SOURCES = \
-+	cblas_zgemv.c \
-+	cblas_zgbmv.c \
-+	cblas_zhemv.c \
-+	cblas_zhbmv.c \
-+	cblas_zhpmv.c \
-+	cblas_ztrmv.c \
-+	cblas_ztbmv.c \
-+	cblas_ztpmv.c \
-+	cblas_ztrsv.c \
-+	cblas_ztbsv.c \
-+	cblas_ztpsv.c \
-+	cblas_zgeru.c \
-+	cblas_zgerc.c \
-+	cblas_zher.c \
-+	cblas_zher2.c \
-+	cblas_zhpr.c \
-+	cblas_zhpr2.c
-+
-+ZLEV3_SOURCES = \
-+	cblas_zgemm.c \
-+	cblas_zsymm.c \
-+	cblas_zhemm.c \
-+	cblas_zherk.c \
-+	cblas_zher2k.c \
-+	cblas_ztrmm.c \
-+	cblas_ztrsm.c \
-+	cblas_zsyrk.c \
-+	cblas_zsyr2k.c
-+
-+libcblas_la_SOURCES = \
-+	cblas_f77.h \
-+	cblas.h \
-+	$(ERRHAND_SOURCES) \
-+	$(SINGLE_SOURCES) \
-+	$(SLEV_SOURCES) \
-+	$(DLEV_SOURCES) \
-+	$(CLEV_SOURCES) \
-+	$(ZLEV_SOURCES) \
-+	$(SLEV1_SOURCES) \
-+	$(DLEV1_SOURCES) \
-+	$(CLEV1_SOURCES) \
-+	$(ZLEV1_SOURCES) \
-+	$(SLEV2_SOURCES) \
-+	$(DLEV2_SOURCES) \
-+	$(CLEV2_SOURCES) \
-+	$(ZLEV2_SOURCES) \
-+	$(SLEV3_SOURCES) \
-+	$(DLEV3_SOURCES) \
-+	$(CLEV3_SOURCES) \
-+	$(ZLEV3_SOURCES)
-+
-+libcblas_la_LIBADD = @BLAS_LIBS@
-+
---- testing/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ testing/Makefile.am	2007-11-09 17:20:37.000000000 +0000
-@@ -0,0 +1,70 @@
-+TESTS = cblas_tests
-+
-+cblas_tests:
-+	@install -m0755 cblas_tests.sh cblas_tests
-+
-+check_PROGRAMS = \
-+	xscblat1 xdcblat1 xccblat1 xzcblat1 \
-+	xscblat2 xdcblat2 xccblat2 xzcblat2 \
-+	xscblat3 xdcblat3 xccblat3 xzcblat3
-+
-+LDADD = $(top_builddir)/src/libcblas.la @BLAS_LIBS@
-+
-+AM_CPPFLAGS = -I$(top_srcdir)/src -DADD_
-+
-+AUX_SOURCES = \
-+	auxiliary.c \
-+	c_xerbla.c
-+
-+xscblat1_SOURCES = \
-+	c_sblas1.c \
-+	c_sblat1.f
-+xscblat2_SOURCES = \
-+	c_sblas2.c \
-+	c_s2chke.c \
-+	c_sblat2.f \
-+	$(AUX_SOURCES)
-+xscblat3_SOURCES = \
-+	c_sblas3.c \
-+	c_s3chke.c \
-+	c_sblat3.f \
-+	$(AUX_SOURCES)
-+xdcblat1_SOURCES = \
-+	c_dblas1.c \
-+	c_dblat1.f
-+xdcblat2_SOURCES = \
-+	c_dblas2.c \
-+	c_d2chke.c \
-+	c_dblat2.f \
-+	$(AUX_SOURCES)
-+xdcblat3_SOURCES = \
-+	c_dblas3.c \
-+	c_d3chke.c \
-+	c_dblat3.f \
-+	$(AUX_SOURCES)
-+xccblat1_SOURCES = \
-+	c_cblas1.c \
-+	c_cblat1.f
-+xccblat2_SOURCES = \
-+	c_cblas2.c \
-+	c_c2chke.c \
-+	c_cblat2.f \
-+	$(AUX_SOURCES)
-+xccblat3_SOURCES = \
-+	c_cblas3.c \
-+	c_c3chke.c \
-+	c_cblat3.f \
-+	$(AUX_SOURCES)
-+xzcblat1_SOURCES = \
-+	c_zblas1.c \
-+	c_zblat1.f
-+xzcblat2_SOURCES = \
-+	c_zblas2.c \
-+	c_z2chke.c \
-+	c_zblat2.f \
-+	$(AUX_SOURCES)
-+xzcblat3_SOURCES = \
-+	c_zblas3.c \
-+	c_z3chke.c \
-+	c_zblat3.f \
-+	$(AUX_SOURCES)
---- testing/cblas_tests.sh 	1970-01-01 01:00:00.000000000 +0100
-+++ testing/cblas_tests.sh	2007-11-09 16:20:41.000000000 +0000
-@@ -0,0 +1,8 @@
-+#!/bin/sh
-+
-+for t in x*blat1; do
-+    ./${t}
-+done
-+for t in x*blat{2,3}; do
-+    ./${t} < ${t:1:1}in${t:7:1}
-+done
diff --git a/sci-libs/cblas-reference/files/eselect.cblas.reference b/sci-libs/cblas-reference/files/eselect.cblas.reference
deleted file mode 100644
index 62b581860fc7..000000000000
--- a/sci-libs/cblas-reference/files/eselect.cblas.reference
+++ /dev/null
@@ -1,5 +0,0 @@
-blas/reference/libcblas.so /usr/@LIBDIR@/libcblas.so
-blas/reference/libcblas.so.0 /usr/@LIBDIR@/libcblas.so.0
-blas/reference/libcblas.a /usr/@LIBDIR@/libcblas.a
-../blas/reference/cblas.pc /usr/@LIBDIR@/pkgconfig/cblas.pc
-cblas/cblas.h /usr/include/cblas.h
diff --git a/sci-libs/cblas-reference/files/eselect.cblas.reference-r2 b/sci-libs/cblas-reference/files/eselect.cblas.reference-r2
deleted file mode 100644
index b02188c8a9da..000000000000
--- a/sci-libs/cblas-reference/files/eselect.cblas.reference-r2
+++ /dev/null
@@ -1,8 +0,0 @@
-blas/reference/libcblas.so /usr/@LIBDIR@/libcblas.so
-blas/reference/libcblas.so.3 /usr/@LIBDIR@/libcblas.so.3
-blas/reference/libcblas.a /usr/@LIBDIR@/libcblas.a
-../blas/reference/cblas.pc /usr/@LIBDIR@/pkgconfig/cblas.pc
-../@LIBDIR@/blas/reference/cblas_test.h /usr/include/cblas_test.h
-../@LIBDIR@/blas/reference/cblas_mangling.h /usr/include/cblas_mangling.h
-../@LIBDIR@/blas/reference/cblas_f77.h /usr/include/cblas_f77.h
-../@LIBDIR@/blas/reference/cblas.h /usr/include/cblas.h
diff --git a/sci-libs/cblas-reference/files/lapack-reference-3.6.0-fix-build-system.patch b/sci-libs/cblas-reference/files/lapack-reference-3.6.0-fix-build-system.patch
deleted file mode 100644
index a187dac21a12..000000000000
--- a/sci-libs/cblas-reference/files/lapack-reference-3.6.0-fix-build-system.patch
+++ /dev/null
@@ -1,124 +0,0 @@
- BLAS/CMakeLists.txt    | 2 +-
- BLAS/blas.pc.in        | 6 ++++--
- CBLAS/CMakeLists.txt   | 2 +-
- CBLAS/cblas.pc.in      | 9 ++++++---
- CMakeLists.txt         | 2 +-
- LAPACKE/CMakeLists.txt | 2 +-
- LAPACKE/lapacke.pc.in  | 6 ++++--
- lapack.pc.in           | 6 ++++--
- 8 files changed, 22 insertions(+), 13 deletions(-)
-
-diff --git a/BLAS/CMakeLists.txt b/BLAS/CMakeLists.txt
-index 45e68e9..56c8354 100644
---- a/BLAS/CMakeLists.txt
-+++ b/BLAS/CMakeLists.txt
-@@ -2,7 +2,7 @@ add_subdirectory(SRC)
- if(BUILD_TESTING)
- add_subdirectory(TESTING)
- endif(BUILD_TESTING)
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/blas.pc)
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/blas.pc @ONLY)
- install(FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/blas.pc
-   DESTINATION ${PKG_CONFIG_DIR}
-diff --git a/BLAS/blas.pc.in b/BLAS/blas.pc.in
-index 845a25c..7a53ea5 100644
---- a/BLAS/blas.pc.in
-+++ b/BLAS/blas.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: blas
- Description: Basic Linear Algebra Subprograms F77 reference implementations
-diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt
-index 98b481f..8f98b04 100644
---- a/CBLAS/CMakeLists.txt
-+++ b/CBLAS/CMakeLists.txt
-@@ -71,7 +71,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CMAKE/cblas-config-build.cmake.in
-   ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY)
- 
- 
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc)
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc @ONLY)
-   install(FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc
-   DESTINATION ${PKG_CONFIG_DIR}
-diff --git a/CBLAS/cblas.pc.in b/CBLAS/cblas.pc.in
-index ee20206..14a141e 100644
---- a/CBLAS/cblas.pc.in
-+++ b/CBLAS/cblas.pc.in
-@@ -1,9 +1,12 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include/@PROFNAME@
- 
--Name: lapacke
-+Name: cblas-reference
- Description: C Standard Interface to BLAS Linear Algebra PACKage
- Version: @LAPACK_VERSION@
- URL: http://www.netlib.org/lapack/
- Libs: -L${libdir} -lcblas
-+Cflags: -I${includedir}
- Requires: blas
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ab29bd2..31b878a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -333,7 +333,7 @@ configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in
-   ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY)
- 
- 
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc)
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
-   install(FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
-   DESTINATION ${PKG_CONFIG_DIR}
-diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt
-index 008f24c..d8c4cb0 100644
---- a/LAPACKE/CMakeLists.txt
-+++ b/LAPACKE/CMakeLists.txt
-@@ -65,7 +65,7 @@ if(BUILD_TESTING)
- endif(BUILD_TESTING)
- 
- 
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc)
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc @ONLY)
-  install(FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc
-   DESTINATION ${PKG_CONFIG_DIR}
-diff --git a/LAPACKE/lapacke.pc.in b/LAPACKE/lapacke.pc.in
-index 75e6871..ce5201b 100644
---- a/LAPACKE/lapacke.pc.in
-+++ b/LAPACKE/lapacke.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: lapacke
- Description: C Standard Interface to LAPACK Linear Algebra PACKage
-diff --git a/lapack.pc.in b/lapack.pc.in
-index d34c870..0d0750f 100644
---- a/lapack.pc.in
-+++ b/lapack.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: lapack
- Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage
diff --git a/sci-libs/cblas-reference/files/lapack-reference-3.7.0-fix-build-system.patch b/sci-libs/cblas-reference/files/lapack-reference-3.7.0-fix-build-system.patch
deleted file mode 100644
index 70f7cb0ee926..000000000000
--- a/sci-libs/cblas-reference/files/lapack-reference-3.7.0-fix-build-system.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/BLAS/blas.pc.in b/BLAS/blas.pc.in
-index 7fd6f1e..e52f3ad 100644
---- a/BLAS/blas.pc.in
-+++ b/BLAS/blas.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: BLAS
- Description: FORTRAN reference implementation of BLAS Basic Linear Algebra Subprograms
-diff --git a/CBLAS/cblas.pc.in b/CBLAS/cblas.pc.in
-index 4a938fe..311aed9 100644
---- a/CBLAS/cblas.pc.in
-+++ b/CBLAS/cblas.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: CBLAS
- Description: C Standard Interface to BLAS Basic Linear Algebra Subprograms
-diff --git a/LAPACKE/lapacke.pc.in b/LAPACKE/lapacke.pc.in
-index 028f8da..dc092b1 100644
---- a/LAPACKE/lapacke.pc.in
-+++ b/LAPACKE/lapacke.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: LAPACKE
- Description: C Standard Interface to LAPACK Linear Algebra PACKage
-diff --git a/lapack.pc.in b/lapack.pc.in
-index 878efc2..2cca4c2 100644
---- a/lapack.pc.in
-+++ b/lapack.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: LAPACK
- Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage
diff --git a/sci-libs/cblas-reference/metadata.xml b/sci-libs/cblas-reference/metadata.xml
deleted file mode 100644
index f77724cb6a54..000000000000
--- a/sci-libs/cblas-reference/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription lang="en">
-The BLAS (Basic Linear Algebra Subprograms) are high quality "building
-block" routines for performing basic vector and matrix operations. Level 1
-BLAS do vector-vector operations, Level 2 BLAS do matrix-vector operations,
-and Level 3 BLAS do matrix-matrix operations. Because the BLAS are
-efficient, portable, and widely available, they're commonly used in the
-development of high quality linear algebra software, LAPACK for
-example. This packages implements the reference C library as a wrapper
-to the FORTRAN 77 BLAS library.
-</longdescription>
-</pkgmetadata>
diff --git a/sci-libs/cln/cln-1.3.3.ebuild b/sci-libs/cln/cln-1.3.3.ebuild
index 8b641d2d4f4d..9687c7bb01a1 100644
--- a/sci-libs/cln/cln-1.3.3.ebuild
+++ b/sci-libs/cln/cln-1.3.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftpthep.physik.uni-mainz.de/pub/gnu/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs"
+IUSE="doc examples"
 
 RDEPEND="dev-libs/gmp:0="
 DEPEND="${RDEPEND}
@@ -35,6 +35,11 @@ src_prepare() {
 	autotools-utils_src_prepare
 }
 
+src_configure() {
+	local myeconfargs=( --disable-static )
+	autotools-utils_src_configure
+}
+
 src_compile() {
 	autotools-utils_src_compile
 	if use doc; then
@@ -53,4 +58,6 @@ src_install() {
 		insinto /usr/share/doc/${PF}/examples
 		doins examples/*.cc
 	fi
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/cln/cln-1.3.4.ebuild b/sci-libs/cln/cln-1.3.4.ebuild
index e8173925c67e..29ac33c74b05 100644
--- a/sci-libs/cln/cln-1.3.4.ebuild
+++ b/sci-libs/cln/cln-1.3.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.ginac.de/CLN/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs"
+IUSE="doc examples"
 
 RDEPEND="dev-libs/gmp:0="
 DEPEND="${RDEPEND}
@@ -35,6 +35,11 @@ src_prepare() {
 	autotools-utils_src_prepare
 }
 
+src_configure() {
+	local myeconfargs=( --disable-static )
+	autotools-utils_src_configure
+}
+
 src_compile() {
 	autotools-utils_src_compile
 	if use doc; then
@@ -53,4 +58,6 @@ src_install() {
 		insinto /usr/share/doc/${PF}/examples
 		doins examples/*.cc
 	fi
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/cln/cln-1.3.6.ebuild b/sci-libs/cln/cln-1.3.6.ebuild
index 66502b2bb272..31c8d582f4b1 100644
--- a/sci-libs/cln/cln-1.3.6.ebuild
+++ b/sci-libs/cln/cln-1.3.6.ebuild
@@ -11,8 +11,8 @@ SRC_URI="https://www.ginac.de/CLN/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
 
 RDEPEND="dev-libs/gmp:0="
 DEPEND="${RDEPEND}
@@ -33,6 +33,10 @@ src_prepare() {
 		Makefile.in || die
 }
 
+src_configure() {
+	econf --disable-static
+}
+
 src_compile() {
 	default
 	if use doc; then
@@ -51,4 +55,6 @@ src_install() {
 		docinto examples
 		dodoc examples/*.cc
 	fi
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/gerris/gerris-20131206-r1.ebuild b/sci-libs/gerris/gerris-20131206-r1.ebuild
index d17000bbe95f..4ddca5bec04a 100644
--- a/sci-libs/gerris/gerris-20131206-r1.ebuild
+++ b/sci-libs/gerris/gerris-20131206-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools flag-o-matic toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs xdg
 
 MY_P=${P/-20/-snapshot-}
 
diff --git a/sci-libs/lapack-reference/Manifest b/sci-libs/lapack-reference/Manifest
deleted file mode 100644
index 82ed4199cf2e..000000000000
--- a/sci-libs/lapack-reference/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST lapack-3.2.1.tgz 4792502 BLAKE2B e9d39c958406db05383ebda7e781ae6c2d0b1f3896d4071a33bec0c7038f9ffca3e254f8ef36aa27118c83a1e5df9110c57ce90ab897e0f8f0ca5750d20cba0e SHA512 a89b88540f8e5b05b7c58e8e301a5068729ceb35fcb2143edfff1644458ff1a375e5185492cf116b50409fe0c17b51c253a2987f4df83e9f9c3968a4b77e5d97
-DIST lapack-3.6.0.tgz 6792324 BLAKE2B 438f3376b63b38ef0fe70f6becac847816f3a11c01f5ab237dc0d941792ceb54dbd2f8dc22d56286f5dab3499289ed94e67521ea951a98973c9640abc294ad6c SHA512 bc50441d415ef8896dd7626d77c6104184b996e758704366288089f03d4c99d068e33153b0d13305310886017e5d2e716130f812a95cfcad36ef37fe20417ab8
-DIST lapack-3.7.0.tgz 7359812 BLAKE2B 20aa42e22d8c920d1360afe41ceec7b36f6cd5fbe43ca9d7848ef7cc45a64a0314cb1321941c1a7c03654f41e28ec805445882ded0ca0ea07674e70b66cba6b5 SHA512 e4f4c7d0ba8a096eeb813160c6dbcdd535647df6b2ad5beac9181908158956b31d1a9554ec9b9836fd44fe7404c1f377b297cbb20d744f20d70e357fd246c91b
-DIST lapack-reference-3.2.1-autotools.patch.bz2 13338 BLAKE2B 1be1d2c273b92a106a9c914f17e0350b44fc42b3837ee48b040d7a61802bf5036c30e8800ec613ccf12a082a7801cad6878b6ddcbd4db32e27a06b7462f8ecd2 SHA512 957e8c7646a0d6ade9c0dfdaf2aa665a01f932dfda376ba1db164106fb174793e6504cdbed7daf158f23bb69502937963cb2e2d45ac720980d3832f6fc0fedbd
diff --git a/sci-libs/lapack-reference/files/eselect.lapack.reference b/sci-libs/lapack-reference/files/eselect.lapack.reference
deleted file mode 100644
index fe1a777b2dc2..000000000000
--- a/sci-libs/lapack-reference/files/eselect.lapack.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-lapack/reference/liblapack.so /usr/@LIBDIR@/liblapack.so
-lapack/reference/liblapack.so.0 /usr/@LIBDIR@/liblapack.so.0
-lapack/reference/liblapack.a /usr/@LIBDIR@/liblapack.a
-../lapack/reference/lapack.pc /usr/@LIBDIR@/pkgconfig/lapack.pc
diff --git a/sci-libs/lapack-reference/files/eselect.lapack.reference-r1 b/sci-libs/lapack-reference/files/eselect.lapack.reference-r1
deleted file mode 100644
index b6c4db325593..000000000000
--- a/sci-libs/lapack-reference/files/eselect.lapack.reference-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-lapack/reference/liblapack.so /usr/@LIBDIR@/liblapack.so
-lapack/reference/liblapack.so.3 /usr/@LIBDIR@/liblapack.so.3
-lapack/reference/liblapack.a /usr/@LIBDIR@/liblapack.a
-../lapack/reference/lapack.pc /usr/@LIBDIR@/pkgconfig/lapack.pc
diff --git a/sci-libs/lapack-reference/files/lapack-reference-3.2.1-parallel-make.patch b/sci-libs/lapack-reference/files/lapack-reference-3.2.1-parallel-make.patch
deleted file mode 100644
index 72bc71ca2d95..000000000000
--- a/sci-libs/lapack-reference/files/lapack-reference-3.2.1-parallel-make.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff -Nauru lapack-3.2.1.old/TESTING/EIG/Makefile lapack-3.2.1/TESTING/EIG/Makefile
---- lapack-3.2.1.old/TESTING/EIG/Makefile	2008-11-17 17:51:24.000000000 -0500
-+++ lapack-3.2.1/TESTING/EIG/Makefile	2009-12-12 11:23:22.000000000 -0500
-@@ -126,25 +126,25 @@
- double: ../xeigtstd
- complex16: ../xeigtstz
- 
--../xeigtsts: $(SEIGTST) $(SCIGTST) $(AEIGTST) ; \
--          $(LOADER) $(LOADOPTS) -o xeigtsts \
--          $(SEIGTST) $(SCIGTST) $(AEIGTST) ../../$(TMGLIB) \
--	  ../../$(LAPACKLIB) $(BLASLIB) && mv xeigtsts $@
--
--../xeigtstc: $(CEIGTST) $(SCIGTST) $(AEIGTST) ; \
--          $(LOADER) $(LOADOPTS) -o xeigtstc \
--          $(CEIGTST) $(SCIGTST) $(AEIGTST) ../../$(TMGLIB) \
--	  ../../$(LAPACKLIB) $(BLASLIB) && mv xeigtstc $@
--
--../xeigtstd: $(DEIGTST) $(DZIGTST) $(AEIGTST) ; \
--          $(LOADER) $(LOADOPTS) -o xeigtstd \
--          $(DEIGTST) $(DZIGTST) $(AEIGTST) ../../$(TMGLIB) \
--	  ../../$(LAPACKLIB) $(BLASLIB) && mv xeigtstd $@
--
--../xeigtstz: $(ZEIGTST) $(DZIGTST) $(AEIGTST) ; \
--          $(LOADER) $(LOADOPTS) -o xeigtstz \
--          $(ZEIGTST) $(DZIGTST) $(AEIGTST) ../../$(TMGLIB) \
--	  ../../$(LAPACKLIB) $(BLASLIB) && mv xeigtstz $@
-+../xeigtsts: $(SEIGTST) $(SCIGTST) $(AEIGTST)
-+	$(LOADER) $(LOADOPTS) \
-+	$(SEIGTST) $(SCIGTST) $(AEIGTST) ../../$(TMGLIB) \
-+	../../$(LAPACKLIB) $(BLASLIB) -o ../xeigtsts 
-+
-+../xeigtstc: $(CEIGTST) $(SCIGTST) $(AEIGTST)
-+	$(LOADER) $(LOADOPTS) \
-+	$(CEIGTST) $(SCIGTST) $(AEIGTST) ../../$(TMGLIB) \
-+	../../$(LAPACKLIB) $(BLASLIB) -o ../xeigtstc 
-+
-+../xeigtstd: $(DEIGTST) $(DZIGTST) $(AEIGTST)
-+	$(LOADER) $(LOADOPTS) \
-+	$(DEIGTST) $(DZIGTST) $(AEIGTST) ../../$(TMGLIB) \
-+	../../$(LAPACKLIB) $(BLASLIB) -o ../xeigtstd
-+
-+../xeigtstz: $(ZEIGTST) $(DZIGTST) $(AEIGTST)
-+	$(LOADER) $(LOADOPTS) \
-+	$(ZEIGTST) $(DZIGTST) $(AEIGTST) ../../$(TMGLIB) \
-+	../../$(LAPACKLIB) $(BLASLIB) -o ../xeigtstz
- 
- $(AEIGTST): $(FRC)
- $(SCIGTST): $(FRC)
-@@ -169,4 +169,5 @@
- zchkee.o: zchkee.f
- 	$(FORTRAN) $(DRVOPTS) -c $< -o $@
- 
--.f.o : ; $(FORTRAN) $(OPTS) -c $< -o $@
-+.f.o : 
-+	$(FORTRAN) $(OPTS) -c $< -o $@
-diff -Nauru lapack-3.2.1.old/TESTING/LIN/Makefile lapack-3.2.1/TESTING/LIN/Makefile
---- lapack-3.2.1.old/TESTING/LIN/Makefile	2009-02-10 12:23:05.000000000 -0500
-+++ lapack-3.2.1/TESTING/LIN/Makefile	2009-12-12 07:22:41.000000000 -0500
-@@ -238,43 +238,43 @@
- 
- ../xlintsts : $(ALINTST) $(SLINTST) $(SCLNTST)
- 	$(LOADER) $(LOADOPTS)  $(ALINTST) $(SCLNTST) $(SLINTST) \
--        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB)  $(BLASLIB) -o xlintsts && mv xlintsts $@
-+        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB)  $(BLASLIB) -o ../xlintsts 
- 
- ../xlintstc : $(ALINTST) $(CLINTST) $(SCLNTST)
- 	$(LOADER) $(LOADOPTS)  $(ALINTST) $(SCLNTST) $(CLINTST) \
--        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB)  $(BLASLIB) -o xlintstc && mv xlintstc $@
-+        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB)  $(BLASLIB) -o ../xlintstc 
-  
- ../xlintstd : $(ALINTST) $(DLINTST) $(DZLNTST)
- 	$(LOADER) $(LOADOPTS) $^ \
--        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB) $(BLASLIB) -o xlintstd && mv xlintstd $@
-+        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB) $(BLASLIB) -o ../xlintstd 
-  
- ../xlintstz : $(ALINTST) $(ZLINTST) $(DZLNTST)
- 	$(LOADER) $(LOADOPTS)  $(ALINTST) $(DZLNTST) $(ZLINTST) \
--        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB)  $(BLASLIB) -o xlintstz && mv xlintstz $@
-+        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB)  $(BLASLIB) -o ../xlintstz 
-  
- ../xlintstds : $(DSLINTST)
- 	$(LOADER) $(LOADOPTS)  $(DSLINTST) \
--        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o xlintstds && mv xlintstds $@
-+        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o ../xlintstds 
-  
- ../xlintstzc : $(ZCLINTST)
- 	$(LOADER) $(LOADOPTS)  $(ZCLINTST) \
--        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o xlintstzc && mv xlintstzc $@
-+        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o ../xlintstzc 
-  
- ../xlintstrfs : $(SLINTSTRFP)
- 	$(LOADER) $(LOADOPTS)  $(SLINTSTRFP) \
--        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o xlintstrfs && mv xlintstrfs $@
-+        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o ../xlintstrfs 
-  
- ../xlintstrfd : $(DLINTSTRFP)
- 	$(LOADER) $(LOADOPTS)  $(DLINTSTRFP) \
--        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o xlintstrfd && mv xlintstrfd $@
-+        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o ../xlintstrfd
-  
- ../xlintstrfc : $(CLINTSTRFP)
- 	$(LOADER) $(LOADOPTS)  $(CLINTSTRFP) \
--        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o xlintstrfc && mv xlintstrfc $@
-+        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o ../xlintstrfc 
-  
- ../xlintstrfz : $(ZLINTSTRFP)
- 	$(LOADER) $(LOADOPTS)  $(ZLINTSTRFP) \
--        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o xlintstrfz && mv xlintstrfz $@
-+        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o ../xlintstrfz
-  
- $(ALINTST): $(FRC)
- $(SCLNTST): $(FRC)
diff --git a/sci-libs/lapack-reference/files/lapack-reference-3.6.0-fix-build-system.patch b/sci-libs/lapack-reference/files/lapack-reference-3.6.0-fix-build-system.patch
deleted file mode 100644
index 8661709d369b..000000000000
--- a/sci-libs/lapack-reference/files/lapack-reference-3.6.0-fix-build-system.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- lapack-3.6.0/BLAS/blas.pc.in
-+++ lapack-3.6.0/BLAS/blas.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: blas
- Description: Basic Linear Algebra Subprograms F77 reference implementations
---- lapack-3.6.0/BLAS/CMakeLists.txt
-+++ lapack-3.6.0/BLAS/CMakeLists.txt
-@@ -2,7 +2,7 @@
- if(BUILD_TESTING)
- add_subdirectory(TESTING)
- endif(BUILD_TESTING)
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/blas.pc)
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/blas.pc @ONLY)
- install(FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/blas.pc
-   DESTINATION ${PKG_CONFIG_DIR}
---- lapack-3.6.0/CBLAS/cblas.pc.in
-+++ lapack-3.6.0/CBLAS/cblas.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: lapacke
- Description: C Standard Interface to BLAS Linear Algebra PACKage
---- lapack-3.6.0/CBLAS/CMakeLists.txt
-+++ lapack-3.6.0/CBLAS/CMakeLists.txt
-@@ -71,7 +71,7 @@
-   ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY)
- 
- 
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc)
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc @ONLY)
-   install(FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc
-   DESTINATION ${PKG_CONFIG_DIR}
---- lapack-3.6.0/CMakeLists.txt
-+++ lapack-3.6.0/CMakeLists.txt
-@@ -333,7 +333,7 @@
-   ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY)
- 
- 
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc)
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
-   install(FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
-   DESTINATION ${PKG_CONFIG_DIR}
---- lapack-3.6.0/LAPACKE/CMakeLists.txt
-+++ lapack-3.6.0/LAPACKE/CMakeLists.txt
-@@ -65,7 +65,7 @@
- endif(BUILD_TESTING)
- 
- 
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc)
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc @ONLY)
-  install(FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc
-   DESTINATION ${PKG_CONFIG_DIR}
---- lapack-3.6.0/LAPACKE/lapacke.pc.in
-+++ lapack-3.6.0/LAPACKE/lapacke.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: lapacke
- Description: C Standard Interface to LAPACK Linear Algebra PACKage
---- lapack-3.6.0/lapack.pc.in
-+++ lapack-3.6.0/lapack.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: lapack
- Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage
diff --git a/sci-libs/lapack-reference/files/lapack-reference-3.7.0-fix-build-system.patch b/sci-libs/lapack-reference/files/lapack-reference-3.7.0-fix-build-system.patch
deleted file mode 100644
index 70f7cb0ee926..000000000000
--- a/sci-libs/lapack-reference/files/lapack-reference-3.7.0-fix-build-system.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/BLAS/blas.pc.in b/BLAS/blas.pc.in
-index 7fd6f1e..e52f3ad 100644
---- a/BLAS/blas.pc.in
-+++ b/BLAS/blas.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: BLAS
- Description: FORTRAN reference implementation of BLAS Basic Linear Algebra Subprograms
-diff --git a/CBLAS/cblas.pc.in b/CBLAS/cblas.pc.in
-index 4a938fe..311aed9 100644
---- a/CBLAS/cblas.pc.in
-+++ b/CBLAS/cblas.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: CBLAS
- Description: C Standard Interface to BLAS Basic Linear Algebra Subprograms
-diff --git a/LAPACKE/lapacke.pc.in b/LAPACKE/lapacke.pc.in
-index 028f8da..dc092b1 100644
---- a/LAPACKE/lapacke.pc.in
-+++ b/LAPACKE/lapacke.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: LAPACKE
- Description: C Standard Interface to LAPACK Linear Algebra PACKage
-diff --git a/lapack.pc.in b/lapack.pc.in
-index 878efc2..2cca4c2 100644
---- a/lapack.pc.in
-+++ b/lapack.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: LAPACK
- Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage
diff --git a/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild b/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild
deleted file mode 100644
index b9ee0e8c6fee..000000000000
--- a/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils fortran-2 flag-o-matic multilib toolchain-funcs
-
-MyPN="${PN/-reference/}"
-PATCH_V="3.2.1"
-
-DESCRIPTION="FORTRAN reference implementation of LAPACK Linear Algebra PACKage"
-HOMEPAGE="http://www.netlib.org/lapack/index.html"
-SRC_URI="
-	mirror://gentoo/${MyPN}-${PV}.tgz
-	mirror://gentoo/${PN}-${PATCH_V}-autotools.patch.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="doc"
-
-RDEPEND="
-	app-eselect/eselect-lapack
-	virtual/blas"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/lapack-docs )"
-
-S="${WORKDIR}/${MyPN}-${PV}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	if  [[ $(tc-getFC) =~ if ]]; then
-		ewarn "Using Intel Fortran at your own risk"
-		export LDFLAGS="$(raw-ldflags)"
-		export NOOPT_FFLAGS=-O
-	fi
-	ESELECT_PROF=reference
-}
-
-src_prepare() {
-	epatch \
-		"${WORKDIR}"/${PN}-${PATCH_V}-autotools.patch \
-		"${FILESDIR}"/${P}-parallel-make.patch
-	eautoreconf
-
-	# set up the testing routines
-	sed \
-		-e "s:g77:$(tc-getFC):" \
-		-e "s:-funroll-all-loops -O3:${FFLAGS} $($(tc-getPKG_CONFIG) --cflags blas):" \
-		-e "s:LOADOPTS =:LOADOPTS = ${LDFLAGS} $($(tc-getPKG_CONFIG) --cflags blas):" \
-		-e "s:../../blas\$(PLAT).a:$($(tc-getPKG_CONFIG) --libs blas):" \
-		-e "s:lapack\$(PLAT).a:SRC/.libs/liblapack.a:" \
-		make.inc.example > make.inc \
-		|| die "Failed to set up make.inc"
-
-	cp "${FILESDIR}"/eselect.lapack.reference "${T}"/eselect.lapack.reference || die
-	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.lapack.reference || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
-			"${T}"/eselect.lapack.reference || die
-	fi
-	sed \
-		-e '/Libs:/s|: |: -L${libdir} |g' \
-		-i lapack.pc.in || die
-}
-
-src_configure() {
-	econf \
-		--libdir="${EPREFIX}/usr/$(get_libdir)/lapack/reference" \
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
-}
-
-src_install() {
-	default
-	eselect lapack add $(get_libdir) "${T}"/eselect.lapack.reference ${ESELECT_PROF}
-}
-
-src_test() {
-	MAKEOPTS+=" -j1"
-	cd "${S}"/TESTING/MATGEN && emake
-	cd "${S}"/TESTING && emake
-}
-
-pkg_postinst() {
-	local p=lapack
-	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
-		[[ -e ${configfile} ]] && rm -f ${configfile}
-		eselect ${p} set ${ESELECT_PROF}
-		elog "${p} has been eselected to ${ESELECT_PROF}"
-	else
-		elog "Current eselected ${p} is ${current_lib}"
-		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-		elog "\t eselect ${p} set ${ESELECT_PROF}"
-	fi
-}
diff --git a/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild b/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
deleted file mode 100644
index a3080330b1ff..000000000000
--- a/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils fortran-2 cmake-utils multilib flag-o-matic toolchain-funcs
-
-DESCRIPTION="Reference implementation of LAPACK"
-HOMEPAGE="http://www.netlib.org/lapack/"
-SRC_URI="http://www.netlib.org/lapack/lapack-${PV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="+deprecated"
-
-DEPEND="app-eselect/eselect-lapack
-	>=virtual/blas-3.6
-	virtual/pkgconfig"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/lapack-${PV}"
-PATCHES=( "${FILESDIR}/${P}-fix-build-system.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	ESELECT_PROF=reference
-
-	# some string does not get passed properly
-	sed -i \
-		-e '/lapack_testing.py/d' \
-		CTestCustom.cmake.in || die
-	# separate ebuild to tmglib
-	sed -i \
-		-e '/lapack_install_library(tmglib)/d' \
-		TESTING/MATGEN/CMakeLists.txt || die
-
-	cp "${FILESDIR}"/eselect.lapack.reference-r1 "${T}"/eselect.lapack.reference || die
-	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.lapack.reference || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
-			"${T}"/eselect.lapack.reference || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Wno-dev
-		-DUSE_OPTIMIZED_BLAS=ON
-		-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
-		-DBUILD_DEPRECATED=$(usex deprecated)
-		-DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags blas) $(get_abi_CFLAGS) ${FCFLAGS}"
-		-DBUILD_STATIC_LIBS=ON
-		-DBUILD_SHARED_LIBS=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	mkdir -p "${ED}/usr/$(get_libdir)/lapack/reference" || die
-	mv "${ED}/usr/$(get_libdir)"/lib* "${ED}/usr/$(get_libdir)/pkgconfig"/* \
-		"${ED}/usr/$(get_libdir)/lapack/reference" || die
-	rmdir "${ED}/usr/$(get_libdir)/pkgconfig" || die
-
-	eselect lapack add $(get_libdir) "${T}"/eselect.lapack.reference ${ESELECT_PROF}
-}
-
-pkg_postinst() {
-	local p=lapack
-	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
-		[[ -e ${configfile} ]] && rm -f ${configfile}
-		eselect ${p} set ${ESELECT_PROF}
-		elog "${p} has been eselected to ${ESELECT_PROF}"
-	else
-		elog "Current eselected ${p} is ${current_lib}"
-		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-		elog "\t eselect ${p} set ${ESELECT_PROF}"
-	fi
-}
diff --git a/sci-libs/lapack-reference/lapack-reference-3.7.0.ebuild b/sci-libs/lapack-reference/lapack-reference-3.7.0.ebuild
deleted file mode 100644
index 32c1ba6cfd12..000000000000
--- a/sci-libs/lapack-reference/lapack-reference-3.7.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils fortran-2 cmake-utils multilib flag-o-matic toolchain-funcs
-
-DESCRIPTION="Reference implementation of LAPACK"
-HOMEPAGE="http://www.netlib.org/lapack/"
-SRC_URI="http://www.netlib.org/lapack/lapack-${PV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="+deprecated"
-
-DEPEND="app-eselect/eselect-lapack
-	>=virtual/blas-3.6
-	virtual/pkgconfig"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/lapack-${PV}"
-PATCHES=( "${FILESDIR}/${P}-fix-build-system.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	ESELECT_PROF=reference
-
-	# some string does not get passed properly
-	sed -i \
-		-e '/lapack_testing.py/d' \
-		CTestCustom.cmake.in || die
-	# separate ebuild to tmglib
-	sed -i \
-		-e '/lapack_install_library(tmglib)/d' \
-		TESTING/MATGEN/CMakeLists.txt || die
-
-	cp "${FILESDIR}"/eselect.lapack.reference-r1 "${T}"/eselect.lapack.reference || die
-	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.lapack.reference || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
-			"${T}"/eselect.lapack.reference || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Wno-dev
-		-DUSE_OPTIMIZED_BLAS=ON
-		-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
-		-DBUILD_DEPRECATED=$(usex deprecated)
-		-DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags blas) $(get_abi_CFLAGS) ${FCFLAGS}"
-		-DBUILD_STATIC_LIBS=ON
-		-DBUILD_SHARED_LIBS=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	mkdir -p "${ED}/usr/$(get_libdir)/lapack/reference" || die
-	mv "${ED}/usr/$(get_libdir)"/lib* "${ED}/usr/$(get_libdir)/pkgconfig"/* \
-		"${ED}/usr/$(get_libdir)/lapack/reference" || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# modify install_names accordingly, bug #608266
-		local lib
-		for lib in "${ED}"/usr/$(get_libdir)/lapack/reference/*.dylib ; do
-			install_name_tool -id "${lib#${D%/}}" "${lib}"
-		done
-	fi
-	rmdir "${ED}/usr/$(get_libdir)/pkgconfig" || die
-
-	eselect lapack add $(get_libdir) "${T}"/eselect.lapack.reference ${ESELECT_PROF}
-}
-
-pkg_postinst() {
-	local p=lapack
-	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
-		[[ -e ${configfile} ]] && rm -f ${configfile}
-		eselect ${p} set ${ESELECT_PROF}
-		elog "${p} has been eselected to ${ESELECT_PROF}"
-	else
-		elog "Current eselected ${p} is ${current_lib}"
-		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-		elog "\t eselect ${p} set ${ESELECT_PROF}"
-	fi
-}
diff --git a/sci-libs/lapack-reference/metadata.xml b/sci-libs/lapack-reference/metadata.xml
deleted file mode 100644
index 9bd49b11cd5c..000000000000
--- a/sci-libs/lapack-reference/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription lang="en">
-LAPACK is a comprehensive library that does linear algebra
-operations including matrix inversions, least squared solutions to
-linear sets of equations, eigenvector analysis, singular value
-decomposition, etc. It is a very comprehensive and reputable package
-that has found extensive use in the scientific community.
-This package installs the reference FORTRAN 77 implementation from Netlib.
-  </longdescription>
-  <use>
-    <flag name="deprecated">Build deprecated routines</flag>
-  </use>
-</pkgmetadata>
diff --git a/sci-libs/lapack/lapack-3.8.0-r1.ebuild b/sci-libs/lapack/lapack-3.8.0-r1.ebuild
index fe759a13f358..47bcb4605cab 100644
--- a/sci-libs/lapack/lapack-3.8.0-r1.ebuild
+++ b/sci-libs/lapack/lapack-3.8.0-r1.ebuild
@@ -19,10 +19,6 @@ RDEPEND="
 	eselect-ldso? ( >=app-eselect/eselect-blas-0.2
 	>=app-eselect/eselect-lapack-0.2 )
 	!app-eselect/eselect-cblas
-	!sci-libs/blas-reference
-	!sci-libs/cblas-reference
-	!sci-libs/lapack-reference
-	!sci-libs/lapacke-reference
 	virtual/fortran
 	doc? ( app-doc/blas-docs )"
 DEPEND="${RDEPEND}
diff --git a/sci-libs/lapack/lapack-3.8.0.ebuild b/sci-libs/lapack/lapack-3.8.0.ebuild
index 7b7241aeb315..d661b9b9be54 100644
--- a/sci-libs/lapack/lapack-3.8.0.ebuild
+++ b/sci-libs/lapack/lapack-3.8.0.ebuild
@@ -19,10 +19,6 @@ RDEPEND="
 	eselect-ldso? ( >=app-eselect/eselect-blas-0.2
 	>=app-eselect/eselect-lapack-0.2 )
 	!app-eselect/eselect-cblas
-	!sci-libs/blas-reference
-	!sci-libs/cblas-reference
-	!sci-libs/lapack-reference
-	!sci-libs/lapacke-reference
 	virtual/fortran
 	doc? ( app-doc/blas-docs )"
 DEPEND="${RDEPEND}
diff --git a/sci-libs/lapack/lapack-3.9.0.ebuild b/sci-libs/lapack/lapack-3.9.0.ebuild
index 666527b497d5..311a994271d3 100644
--- a/sci-libs/lapack/lapack-3.9.0.ebuild
+++ b/sci-libs/lapack/lapack-3.9.0.ebuild
@@ -21,10 +21,6 @@ RDEPEND="
 	eselect-ldso? ( >=app-eselect/eselect-blas-0.2
 	>=app-eselect/eselect-lapack-0.2 )
 	!app-eselect/eselect-cblas
-	!sci-libs/blas-reference
-	!sci-libs/cblas-reference
-	!sci-libs/lapack-reference
-	!sci-libs/lapacke-reference
 	virtual/fortran
 	doc? ( app-doc/blas-docs )"
 DEPEND="${RDEPEND}
diff --git a/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild b/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild
index 58b61bc3195d..4e3808900012 100644
--- a/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild
+++ b/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild
@@ -28,7 +28,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/${PID}/${PN}_${PV}.tar.bz2"
 
 LICENSE="CeCILL-C"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc int64 mpi +smp starpu static-libs"
 
 RDEPEND="
diff --git a/sci-libs/scikits_image/Manifest b/sci-libs/scikit-image/Manifest
similarity index 50%
rename from sci-libs/scikits_image/Manifest
rename to sci-libs/scikit-image/Manifest
index ef33ed7e6302..a9303cfafc77 100644
--- a/sci-libs/scikits_image/Manifest
+++ b/sci-libs/scikit-image/Manifest
@@ -1 +1,2 @@
 DIST scikit-image-0.13.0.tar.gz 26101533 BLAKE2B c28284f64abd58c7bafa8f5f0c781496e8bb28af79c5c730df7cbf2fede958eb88ea420fd7f89e7b8d0d91719a98dd0935af3b2cc50fe501cc8d8d1d0ee56cb9 SHA512 923015e373c406ae2fbbfdf83ce8b91e83790bdf7842c4439fdc9fd58cffe46efc0cfc7a1b0b06e1b2d092a909a6f085335640850883e7608dbccd1074046550
+DIST scikit-image-0.17.2.tar.gz 22682646 BLAKE2B acfa38caff7aa2e1f724e173f544610e643976a40feb752040d2f20d49d871d19dddb34790bf846476932c771c260ad9bd210781439707d7c5f693c9a8fa021c SHA512 3e57d8bea2fd41270eb17e8489c477f58ed98e56cef0192b0b2d455f27f7a2d705161afd61c7bfd556ec938a9a2bf5663ec1aa7b79609a8e5946806356364e82
diff --git a/sci-libs/scikits_image/metadata.xml b/sci-libs/scikit-image/metadata.xml
similarity index 57%
rename from sci-libs/scikits_image/metadata.xml
rename to sci-libs/scikit-image/metadata.xml
index 8e05ce3947d6..aa3d4f7f7fb5 100644
--- a/sci-libs/scikits_image/metadata.xml
+++ b/sci-libs/scikit-image/metadata.xml
@@ -6,14 +6,13 @@
     <name>Gentoo Science Project</name>
   </maintainer>
   <longdescription lang="en">
-  This SciKit (toolkit for SciPy) includes useful image processing
-  algorithms for use with Python and NumPy. While SciPy’s ndimage
-  provides low-level manipulation, scikits.image centres around
-  algorithms and applications.
-</longdescription>
+    This SciKit (toolkit for SciPy) includes useful image processing
+    algorithms for use with Python and NumPy. While SciPy’s ndimage
+    provides low-level manipulation, scikits.image centres around
+    algorithms and applications.
+  </longdescription>
   <use>
-    <flag name="freeimage">Enable support for image i/o via
-  <pkg>media-libs/freeimage</pkg></flag>
+    <flag name="freeimage">Enable support for image i/o via<pkg>media-libs/freeimage</pkg></flag>
     <flag name="pyamg">Enable support for algebraic solvers via <pkg>dev-python/pyamg</pkg></flag>
   </use>
   <upstream>
diff --git a/sci-libs/scikits_image/scikits_image-0.13.0-r1.ebuild b/sci-libs/scikit-image/scikit-image-0.13.0-r1.ebuild
similarity index 92%
rename from sci-libs/scikits_image/scikits_image-0.13.0-r1.ebuild
rename to sci-libs/scikit-image/scikit-image-0.13.0-r1.ebuild
index 6764d75ad7cf..0db4ea687ed1 100644
--- a/sci-libs/scikits_image/scikits_image-0.13.0-r1.ebuild
+++ b/sci-libs/scikit-image/scikit-image-0.13.0-r1.ebuild
@@ -7,12 +7,9 @@ PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 optfeature virtualx
 
-MYPN="${PN/scikits_/scikit-}"
-MYP="${MYPN}-${PV}"
-
 DESCRIPTION="Image processing routines for SciPy"
 HOMEPAGE="https://scikit-image.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MYPN}/${MYP}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -35,8 +32,6 @@ DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (	dev-python/nose[${PYTHON_USEDEP}] )"
 
-S="${WORKDIR}/${MYP}"
-
 DOCS=( CONTRIBUTORS.txt DEPENDS.txt RELEASE.txt TASKS.txt TODO.txt )
 
 python_test() {
diff --git a/sci-libs/scikit-image/scikit-image-0.17.2.ebuild b/sci-libs/scikit-image/scikit-image-0.17.2.ebuild
new file mode 100644
index 000000000000..fe007d997ac2
--- /dev/null
+++ b/sci-libs/scikit-image/scikit-image-0.17.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# 8,9 not on dev-python/pyamg
+PYTHON_COMPAT=( python3_{6..7} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Image processing routines for SciPy"
+HOMEPAGE="https://scikit-image.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/imageio[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pywavelets[${PYTHON_USEDEP}]
+	dev-python/scipy[sparse,${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+DOCS=( CONTRIBUTORS.txt RELEASE.txt )
+
+pkg_postinst() {
+	optfeature "FITS io capability" dev-python/astropy
+	optfeature "GTK" dev-python/pygtk
+	optfeature "Parallel computation" dev-python/dask
+	optfeature "io plugin providing most standard formats" dev-python/imread
+	# not in portage yet
+	#optfeature "io plugin providing a wide variety of formats, including specialized formats using in medical imaging." dev-python/simpleitk
+}
diff --git a/sci-libs/scikit-learn/Manifest b/sci-libs/scikit-learn/Manifest
new file mode 100644
index 000000000000..0a578c3504c5
--- /dev/null
+++ b/sci-libs/scikit-learn/Manifest
@@ -0,0 +1,2 @@
+DIST scikit-learn-0.22.2_p1.tar.gz 7034850 BLAKE2B 41c362ef6594e837a9fc798837e666fbb51e33954fdf700292650204fd9d1ab4fc4d1695890d02a24ad68f4dcc2d3cde8f0827eca70c6fb9a6f0e5c0d9c04fd5 SHA512 20bcda5c65f76bce9b71c5b5fb1b499f7f3a7a3f6fa5fade80a38dc658cb434e16e9d5a4906a9657157a5cc90a6d51080575d6e510207baa9f8b06c4fa761d5b
+DIST scikit-learn-0.23.2.tar.gz 7190564 BLAKE2B db90e3d05d9b563c6cd98a6820c27b541e757e3fb6c25262b720842811b9e26d41a4a9c1d73e675714573d84dab799a0c450e768f4a41a39a6a61f6930c4c79a SHA512 e9797185b1b9def3ee5525e9b72742784aeb78fe8b069bb5aeab1d0f4513cf738c4489ed894274606dea9d6a32ccd3df26170ce1951e443dc77f9287c372e8c5
diff --git a/sci-libs/scikits_learn/metadata.xml b/sci-libs/scikit-learn/metadata.xml
similarity index 53%
rename from sci-libs/scikits_learn/metadata.xml
rename to sci-libs/scikit-learn/metadata.xml
index 0f62a4aec772..681e5c20b1f3 100644
--- a/sci-libs/scikits_learn/metadata.xml
+++ b/sci-libs/scikit-learn/metadata.xml
@@ -1,17 +1,21 @@
 <?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>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
   <longdescription lang="en">
-  scikits.learn is a python library for machine learning. It aims to
-  implement classic machine learning algorithms while remaining simple
-  and efficient.
+    sklearn is a python library for machine learning. It aims to
+    implement classic machine learning algorithms while remaining simple
+    and efficient.
   </longdescription>
   <upstream>
     <remote-id type="pypi">scikit-learn</remote-id>
-    <remote-id type="sourceforge">scikit-learn</remote-id>
+    <remote-id type="github">scikit-learn/scikit-learn</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/scikits_learn/scikits_learn-0.22.2_p1-r1.ebuild b/sci-libs/scikit-learn/scikit-learn-0.22.2_p1-r1.ebuild
similarity index 86%
rename from sci-libs/scikits_learn/scikits_learn-0.22.2_p1-r1.ebuild
rename to sci-libs/scikit-learn/scikit-learn-0.22.2_p1-r1.ebuild
index d191b819ec3c..db552f4ee708 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.22.2_p1-r1.ebuild
+++ b/sci-libs/scikit-learn/scikit-learn-0.22.2_p1-r1.ebuild
@@ -7,14 +7,12 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 MY_PV="${PV//_p/.post}"
-MY_PN="${PN//s_/-}"
 
 DESCRIPTION="Machine learning library for Python"
-HOMEPAGE="https://scikit-learn.org/stable/
-	https://github.com/scikit-learn/scikit-learn"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://scikit-learn.org/stable/"
+SRC_URI="https://github.com/scikit-learn/scikit-learn/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 #ffhttps://github.com/scikit-learn/scikit-learn/archive/0.22.2.post1.tar.gz
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
+S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/sci-libs/scikits_learn/scikits_learn-0.23.2.ebuild b/sci-libs/scikit-learn/scikit-learn-0.23.2.ebuild
similarity index 92%
rename from sci-libs/scikits_learn/scikits_learn-0.23.2.ebuild
rename to sci-libs/scikit-learn/scikit-learn-0.23.2.ebuild
index 8a8db3923d0f..626d84dd3335 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.23.2.ebuild
+++ b/sci-libs/scikit-learn/scikit-learn-0.23.2.ebuild
@@ -8,12 +8,9 @@ DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1
 
 DESCRIPTION="Machine learning library for Python"
-HOMEPAGE="https://scikit-learn.org/stable/
-	https://github.com/scikit-learn/scikit-learn"
+HOMEPAGE="https://scikit-learn.org/stable/"
 SRC_URI="https://github.com/scikit-learn/scikit-learn/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-S="${WORKDIR}/scikit-learn-${PV}"
-
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
@@ -66,5 +63,4 @@ python_install_all() {
 	if use examples; then
 		dodoc -r examples
 	fi
-
 }
diff --git a/sci-libs/scikit-optimize/Manifest b/sci-libs/scikit-optimize/Manifest
new file mode 100644
index 000000000000..e5c7a49776e4
--- /dev/null
+++ b/sci-libs/scikit-optimize/Manifest
@@ -0,0 +1 @@
+DIST scikit-optimize-0.8.1.tar.gz 278751 BLAKE2B c53b921ed47a2146510a041e34129918cc1b9118e8ae3614f39cc16c87ba5a749e268b9694ade9d95132ec4fb11777f2ef2ec509b1be59c8864ff7b6edde2250 SHA512 8ffacb62869810e1812bdbd2f9f3fe83cad2be03cd795ae2e9aa4e1143ed613c3901ae06be85aecd63c1e3e5b4805e88331d2d8848cc9953988fddfbe62a0287
diff --git a/sci-libs/scikit-optimize/metadata.xml b/sci-libs/scikit-optimize/metadata.xml
new file mode 100644
index 000000000000..11fe5dcb02d1
--- /dev/null
+++ b/sci-libs/scikit-optimize/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gentoo@aisha.cc</email>
+    <name>Aisha Tammy</name>
+  </maintainer>  
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">scikit-optimize</remote-id>
+    <remote-id type="github">scikit-optimize/scikit-optimize</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/scikit-optimize/scikit-optimize-0.8.1.ebuild b/sci-libs/scikit-optimize/scikit-optimize-0.8.1.ebuild
new file mode 100644
index 000000000000..c2d8bbb2631f
--- /dev/null
+++ b/sci-libs/scikit-optimize/scikit-optimize-0.8.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Sequential model-based optimization library"
+HOMEPAGE="https://scikit-optimize.github.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/joblib[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	sci-libs/scikit-learn[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest
deleted file mode 100644
index d89024ada31d..000000000000
--- a/sci-libs/scikits_learn/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST scikits_learn-0.22.2_p1.tar.gz 7034850 BLAKE2B 41c362ef6594e837a9fc798837e666fbb51e33954fdf700292650204fd9d1ab4fc4d1695890d02a24ad68f4dcc2d3cde8f0827eca70c6fb9a6f0e5c0d9c04fd5 SHA512 20bcda5c65f76bce9b71c5b5fb1b499f7f3a7a3f6fa5fade80a38dc658cb434e16e9d5a4906a9657157a5cc90a6d51080575d6e510207baa9f8b06c4fa761d5b
-DIST scikits_learn-0.23.2.tar.gz 7190564 BLAKE2B db90e3d05d9b563c6cd98a6820c27b541e757e3fb6c25262b720842811b9e26d41a4a9c1d73e675714573d84dab799a0c450e768f4a41a39a6a61f6930c4c79a SHA512 e9797185b1b9def3ee5525e9b72742784aeb78fe8b069bb5aeab1d0f4513cf738c4489ed894274606dea9d6a32ccd3df26170ce1951e443dc77f9287c372e8c5
diff --git a/sci-libs/sktime/Manifest b/sci-libs/sktime/Manifest
new file mode 100644
index 000000000000..fbfa59cf30d2
--- /dev/null
+++ b/sci-libs/sktime/Manifest
@@ -0,0 +1 @@
+DIST sktime-0.4.2.tar.gz 9662976 BLAKE2B 248c2a9868f9199caab5c4c724ddcad61301a75ce1425baaabb2185da37d80a68332bf5c2d2d64a10e0b844bea9226be5291005d9893705eb0ff8f2018c6493d SHA512 855b33f42f938c671e99b8fa58ff6adbf67144daf53dd883ac041fe9b8cd5400cfbb8e27169d491c6bea2d76a53c035bae08d9e4f8a1c6f5f444c08bcd65c4f4
diff --git a/sci-libs/sktime/metadata.xml b/sci-libs/sktime/metadata.xml
new file mode 100644
index 000000000000..a88194c685df
--- /dev/null
+++ b/sci-libs/sktime/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gentoo@aisha.cc</email>
+    <name>Aisha Tammy</name>
+  </maintainer>  
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">sktime</remote-id>
+    <remote-id type="github">alan-turing-institute/sktime</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/sktime/sktime-0.4.2.ebuild b/sci-libs/sktime/sktime-0.4.2.ebuild
new file mode 100644
index 000000000000..b3b2954314fc
--- /dev/null
+++ b/sci-libs/sktime/sktime-0.4.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+DESCRIPTION="scikit-learn toolbox for working with time series"
+HOMEPAGE="https://sktime.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/statsmodels[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+	sci-libs/scikit-learn[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+python_compile() {
+	distutils-r1_python_compile bdist_egg egg_info bdist_wheel
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 399b1a046173..49dc99b11205 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/agda/agda-2.5.2-r2.ebuild b/sci-mathematics/agda/agda-2.5.2-r2.ebuild
index 620d6ba28f88..bac38fefcb17 100644
--- a/sci-mathematics/agda/agda-2.5.2-r2.ebuild
+++ b/sci-mathematics/agda/agda-2.5.2-r2.ebuild
@@ -28,7 +28,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="+cpphs debug uhc +stdlib emacs"
+IUSE="+cpphs debug +stdlib emacs"
 
 RESTRICT=test # Unrecognized option: --test (did you mean any of --help --js --css ?)
 
@@ -57,10 +57,6 @@ RDEPEND=">=dev-haskell/boxes-0.1.3:=[profile?] <dev-haskell/boxes-0.2:=[profile?
 	>=dev-lang/ghc-7.10.1:=
 	>=dev-haskell/hashtables-1.0.1.8:=[profile?] <dev-haskell/hashtables-1.3:=[profile?]
 	>=dev-haskell/mtl-2.1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	uhc? ( >=dev-haskell/shuffle-0.1.3.3:=[profile?]
-		>=dev-haskell/uhc-light-1.1.9.2:=[profile?] <dev-haskell/uhc-light-1.2:=[profile?]
-		>=dev-haskell/uhc-util-0.1.6.7:=[profile?] <dev-haskell/uhc-util-0.1.7:=[profile?]
-		>=dev-haskell/uulib-0.9.20:=[profile?] )
 "
 RDEPEND+="
 		emacs? ( >=app-editors/emacs-23.1:*
@@ -92,8 +88,7 @@ src_prepare() {
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag cpphs cpphs) \
-		$(cabal_flag debug debug) \
-		$(cabal_flag uhc uhc)
+		$(cabal_flag debug debug)
 }
 
 src_compile() {
diff --git a/sci-mathematics/agda/metadata.xml b/sci-mathematics/agda/metadata.xml
index 057c778e5810..ea96b9e3cce7 100644
--- a/sci-mathematics/agda/metadata.xml
+++ b/sci-mathematics/agda/metadata.xml
@@ -18,6 +18,5 @@
 <use>
   <flag name="cpphs">Use cpphs instead of cpp.</flag>
   <flag name="stdlib">Install the standard library.</flag>
-  <flag name="uhc">Add support for the uhc backend.</flag>
 </use>
 </pkgmetadata>
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index caa458aa2ff8..1afa1b3c8b86 100644
Binary files a/sci-physics/Manifest.gz and b/sci-physics/Manifest.gz differ
diff --git a/sci-physics/lhapdf/lhapdf-6.2.3.ebuild b/sci-physics/lhapdf/lhapdf-6.2.3.ebuild
index 4b3de592bb3f..602bad369360 100644
--- a/sci-physics/lhapdf/lhapdf-6.2.3.ebuild
+++ b/sci-physics/lhapdf/lhapdf-6.2.3.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-AUTOTOOLS_IN_SOURCE_BUILD=yes
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -18,14 +17,14 @@ SRC_URI="http://www.hepforge.org/archive/lhapdf/${MY_PF}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="doc examples python static-libs"
+IUSE="doc examples python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	dev-libs/boost:0=
 	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	doc? (
 		app-doc/doxygen
 		dev-texlive/texlive-bibtexextra
@@ -33,13 +32,15 @@ DEPEND="${RDEPEND}
 		dev-texlive/texlive-fontutils
 		dev-texlive/texlive-latex
 		dev-texlive/texlive-latexextra
-	)
-"
+	)"
 
 S="${WORKDIR}/${MY_PF}"
 
 src_configure() {
-	econf $(use_enable python)
+	econf \
+		--disable-static \
+		$(use_enable python)
+
 	if use python; then
 		cd "${S}/wrappers/python" && distutils-r1_src_prepare
 	fi
@@ -47,6 +48,7 @@ src_configure() {
 
 src_compile() {
 	emake all $(use doc && echo doxy)
+
 	if use python; then
 	   cd "${S}/wrappers/python" && distutils-r1_src_compile
 	fi
@@ -64,8 +66,9 @@ src_install() {
 		doins examples/*.cc
 	fi
 	if use python; then
-	   cd "${S}/wrappers/python" && distutils-r1_src_install
+		cd "${S}/wrappers/python" && distutils-r1_src_install
 	fi
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 6b5e32b6db76..6aa6da59877e 100644
Binary files a/sci-visualization/Manifest.gz and b/sci-visualization/Manifest.gz differ
diff --git a/sci-visualization/ggobi/ggobi-2.1.10.ebuild b/sci-visualization/ggobi/ggobi-2.1.10.ebuild
index 79dd49b4198b..1ed254c14c87 100644
--- a/sci-visualization/ggobi/ggobi-2.1.10.ebuild
+++ b/sci-visualization/ggobi/ggobi-2.1.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils autotools
+inherit eutils autotools xdg
 
 DESCRIPTION="Visualization program for exploring high-dimensional data"
 HOMEPAGE="http://www.ggobi.org/"
diff --git a/sci-visualization/ggobi/ggobi-2.1.11.ebuild b/sci-visualization/ggobi/ggobi-2.1.11.ebuild
index 658728197cf2..5c9ba5817bb7 100644
--- a/sci-visualization/ggobi/ggobi-2.1.11.ebuild
+++ b/sci-visualization/ggobi/ggobi-2.1.11.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils autotools
+inherit eutils autotools xdg
 
 DESCRIPTION="Visualization program for exploring high-dimensional data"
 HOMEPAGE="http://www.ggobi.org/"
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 72a0888690eb..2566ae75cec9 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/acl/acl-2.2.53-r1.ebuild b/sys-apps/acl/acl-2.2.53-r1.ebuild
index c8592f85c4b3..9b2846af8dd4 100644
--- a/sys-apps/acl/acl-2.2.53-r1.ebuild
+++ b/sys-apps/acl/acl-2.2.53-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls static-libs"
 
 RDEPEND="
diff --git a/sys-apps/attr/attr-2.4.48-r4.ebuild b/sys-apps/attr/attr-2.4.48-r4.ebuild
index eccc8c6622f9..25e4f4a9ccfb 100644
--- a/sys-apps/attr/attr-2.4.48-r4.ebuild
+++ b/sys-apps/attr/attr-2.4.48-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug nls static-libs"
 
 BDEPEND="nls? ( sys-devel/gettext )"
diff --git a/sys-apps/baselayout/baselayout-2.7-r1.ebuild b/sys-apps/baselayout/baselayout-2.7-r1.ebuild
new file mode 100644
index 000000000000..3d5fac97ac66
--- /dev/null
+++ b/sys-apps/baselayout/baselayout-2.7-r1.ebuild
@@ -0,0 +1,317 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib versionator prefix
+
+DESCRIPTION="Filesystem baselayout and init scripts"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="build kernel_FreeBSD kernel_linux +split-usr"
+
+pkg_setup() {
+	multilib_layout
+}
+
+# Create our multilib dirs - the Makefile has no knowledge of this
+multilib_layout() {
+	local dir def_libdir libdir libdirs
+	local prefix prefix_lst
+	def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
+	libdirs=$(get_all_libdirs)
+	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
+
+	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
+		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
+		for prefix in "${prefix_lst[@]}"; do
+			for libdir in ${libdirs}; do
+				dir="${prefix}${libdir}"
+				if [[ -e "${dir}" ]]; then
+					[[ ! -d "${dir}" ]] &&
+						die "${dir} exists but is not a directory"
+					continue
+				fi
+				if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then
+					einfo "symlinking ${dir} to usr/${libdir}"
+					ln -s usr/${libdir} ${dir} ||
+						die " Unable to make ${dir} symlink"
+				else
+					einfo "creating directory ${dir}"
+					mkdir -p "${dir}" ||
+						die "Unable to create ${dir} directory"
+				fi
+			done
+		done
+		return 0
+	fi
+
+	[ -z "${def_libdir}" ] &&
+		die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
+
+	# figure out which paths should be symlinks and which should be directories
+	local dirs syms exp d
+	for libdir in ${libdirs} ; do
+		if use split-usr ; then
+			exp=( {,usr/,usr/local/}${libdir} )
+		else
+			exp=( {usr/,usr/local/}${libdir} )
+		fi
+		for d in "${exp[@]}" ; do
+			# most things should be dirs
+			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
+				[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
+			else
+				[ -h "${d}" ] && syms+=" ${d}"
+			fi
+		done
+	done
+	if [ -n "${syms}${dirs}" ] ; then
+		ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
+		ewarn "have these paths configured as follows:"
+		[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
+		[ -n "${syms}" ] && ewarn "directories:${syms}"
+		ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
+		ewarn "If things fail, you will need to manually create/move the directories."
+		echo
+	fi
+
+	# setup symlinks and dirs where we expect them to be; do not migrate
+	# data ... just fall over in that case.
+	if use split-usr ; then
+		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
+	else
+		prefix_lst=( "${EROOT}"{usr/,usr/local/} )
+	fi
+	for prefix in "${prefix_lst[@]}"; do
+		if [ "${SYMLINK_LIB}" = yes ] ; then
+			# we need to make sure "lib" points to the native libdir
+			if [ -h "${prefix}lib" ] ; then
+				# it's already a symlink!  assume it's pointing to right place ...
+				continue
+			elif [ -d "${prefix}lib" ] ; then
+				# "lib" is a dir, so need to convert to a symlink
+				ewarn "Converting ${prefix}lib from a dir to a symlink"
+				rm -f "${prefix}lib"/.keep || die
+				if rmdir "${prefix}lib" 2>/dev/null ; then
+					ln -s ${def_libdir} "${prefix}lib" || die
+				else
+					die "non-empty dir found where we needed a symlink: ${prefix}lib"
+				fi
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a symlink"
+				mkdir -p "${prefix}" || die
+				rm -f "${prefix}lib" || die
+				ln -s ${def_libdir} "${prefix}lib" || die
+				mkdir -p "${prefix}${def_libdir}" || die #423571
+			fi
+		else
+			# we need to make sure "lib" is a dir
+			if [ -h "${prefix}lib" ] ; then
+				# "lib" is a symlink, so need to convert to a dir
+				ewarn "Converting ${prefix}lib from a symlink to a dir"
+				rm -f "${prefix}lib" || die
+				if [ -d "${prefix}lib32" ] ; then
+					ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
+					mv "${prefix}lib32" "${prefix}lib" || die
+				else
+					mkdir -p "${prefix}lib" || die
+				fi
+			elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
+				# make sure the old "lib" ABI location does not exist; we
+				# only symlinked the lib dir on systems where we moved it
+				# to "lib32" ...
+				case ${CHOST} in
+				*-gentoo-freebsd*) ;; # We want it the other way on fbsd.
+				i?86*|x86_64*|powerpc*|sparc*|s390*)
+					if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
+						rm -f "${prefix}lib32"/.keep || die
+						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
+							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
+							die "non-empty dir found where there should be none: ${prefix}lib32"
+						fi
+					fi
+					;;
+				esac
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a dir"
+				mkdir -p "${prefix}lib" || die
+			fi
+		fi
+	done
+	if ! use split-usr ; then
+		for libdir in ${libdirs}; do
+			if [[ ! -e "${EROOT}${libdir}" ]]; then
+				ln -s usr/"${libdir}" "${EROOT}${libdir}" ||
+					die " Unable to make ${EROOT}${libdir} symlink"
+			fi
+		done
+	fi
+}
+
+pkg_preinst() {
+	# This is written in src_install (so it's in CONTENTS), but punt all
+	# pending updates to avoid user having to do etc-update (and make the
+	# pkg_postinst logic simpler).
+	rm -f "${EROOT}"/etc/._cfg????_gentoo-release || die
+
+	# We need to install directories and maybe some dev nodes when building
+	# stages, but they cannot be in CONTENTS.
+	# Also, we cannot reference $S as binpkg will break so we do this.
+	multilib_layout
+	if use build ; then
+		if use split-usr ; then
+			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout
+		else
+			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge
+		fi
+	fi
+	rm -f "${ED}"/usr/share/${PN}/Makefile || die
+}
+
+src_prepare() {
+	default
+	if use prefix; then
+		hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile
+		hprefixify etc/{env.d/50baselayout,shells} share.Linux/passwd
+		echo PATH=/usr/bin:/bin >> etc/env.d/99host
+		echo ROOTPATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
+	fi
+
+	# don't want symlinked directories in PATH on systems with usr-merge
+	if ! use split-usr; then
+		sed \
+			-e 's|/usr/local/sbin:||g' \
+			-e 's|:/usr/sbin:|:|g' \
+			-e 's|:/sbin:|:|g' \
+			-e 's|:/bin:|:|g' \
+			-i etc/env.d/50baselayout || die
+	fi
+
+	# handle multilib paths.  do it here because we want this behavior
+	# regardless of the C library that you're using.  we do explicitly
+	# list paths which the native ldconfig searches, but this isn't
+	# problematic as it doesn't change the resulting ld.so.cache or
+	# take longer to generate.  similarly, listing both the native
+	# path and the symlinked path doesn't change the resulting cache.
+	local libdir ldpaths
+	for libdir in $(get_all_libdirs) ; do
+		use split-usr && ldpaths+=":${EPREFIX}/${libdir}"
+		ldpaths+=":${EPREFIX}/usr/${libdir}"
+		ldpaths+=":${EPREFIX}/usr/local/${libdir}"
+	done
+	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
+
+	# rc-scripts version for testing of features that *should* be present
+	echo "Gentoo Base System release ${PV}" > etc/gentoo-release
+}
+
+src_install() {
+	emake \
+		OS=$(usex kernel_FreeBSD BSD Linux) \
+		DESTDIR="${ED}" \
+		install
+	dodoc ChangeLog
+	rm "${ED}"/etc/sysctl.d/README || die
+
+	# need the makefile in pkg_preinst
+	insinto /usr/share/${PN}
+	doins Makefile
+
+	# This is needed for https://bugs.gentoo.org/732142
+	dodir /usr/lib
+	mv "${ED}"/etc/os-release "${ED}"/usr/lib || die
+	dosym ../usr/lib/os-release /etc/os-release
+}
+
+pkg_postinst() {
+	local x
+
+	# We installed some files to /usr/share/baselayout instead of /etc to stop
+	# (1) overwriting the user's settings
+	# (2) screwing things up when attempting to merge files
+	# (3) accidentally packaging up personal files with quickpkg
+	# If they don't exist then we install them
+	for x in master.passwd passwd shadow group fstab ; do
+		[ -e "${EROOT}etc/${x}" ] && continue
+		[ -e "${EROOT}usr/share/baselayout/${x}" ] || continue
+		cp -p "${EROOT}usr/share/baselayout/${x}" "${EROOT}"etc || die
+	done
+
+	# Force shadow permissions to not be world-readable #260993
+	for x in shadow ; do
+		if [ -e "${EROOT}etc/${x}" ] ; then
+			chmod o-rwx "${EROOT}etc/${x}" || die
+		fi
+	done
+
+	# Take care of the etc-update for the user
+	if [ -e "${EROOT}"etc/._cfg0000_gentoo-release ] ; then
+		mv "${EROOT}"etc/._cfg0000_gentoo-release "${EROOT}"etc/gentoo-release || die
+	fi
+
+	# whine about users that lack passwords #193541
+	if [[ -e "${EROOT}"etc/shadow ]] ; then
+		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
+		if [[ -n ${bad_users} ]] ; then
+			echo
+			ewarn "The following users lack passwords!"
+			ewarn ${bad_users}
+		fi
+	fi
+
+	# whine about users with invalid shells #215698
+	if [[ -e "${EROOT}"etc/passwd ]] ; then
+		local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' "${EROOT}"etc/passwd | sort)
+		if [[ -n ${bad_shells} ]] ; then
+			echo
+			ewarn "The following users have non-existent shells!"
+			ewarn "${bad_shells}"
+		fi
+	fi
+
+	# https://bugs.gentoo.org/361349
+	if use kernel_linux; then
+		mkdir -p "${EROOT}"run || die
+
+		local found fstype mountpoint
+		while read -r _ mountpoint fstype _; do
+		[[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
+		done < "${ROOT}"proc/mounts
+		[[ -z ${found} ]] &&
+			ewarn "You should reboot now to get /run mounted with tmpfs!"
+	fi
+
+	for x in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 2.4 ${x}; then
+			ewarn "After updating ${EROOT}etc/profile, please run"
+			ewarn "env-update && . /etc/profile"
+		fi
+
+		if ! version_is_at_least 2.6 ${x}; then
+			ewarn "Please run env-update then log out and back in to"
+			ewarn "update your path."
+		fi
+		# clean up after 2.5 typos
+		# https://bugs.gentoo.org/show_bug.cgi?id=656380
+		if [[ ${x} == 2.5 ]]; then
+			rm -fr "${EROOT}{,usr" || die
+		fi
+	done
+
+	if [[ -e "${EROOT}"etc/env.d/00basic ]]; then
+		ewarn "${EROOT}etc/env.d/00basic is now ${EROOT}etc/env.d/50baselayout"
+		ewarn "Please migrate your changes."
+	fi
+}
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index 80ef1cdbb22a..f05bd38435f7 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,2 +1 @@
-DIST cpuid-20200427.src.tar.gz 115896 BLAKE2B 0c325fe140ffb9e9d1591d414156d280ac6e802eb652f876fcb6888ea4d6cefd485bc6501179a4f7f3db33ca0fe9f64b83214f883b86bda0c8014b81916d893c SHA512 8f943ac517680c8744563f35654f5b5201fde16cfe24264d8ad171ab517b65a6f50dc569789228e095e2b485e5a0d4fe58e2a0d7f199df2b225652689e3a2e83
 DIST cpuid-20201006.src.tar.gz 118994 BLAKE2B 05c547858358a92b0c9270066dc33e08693922e4ba765edcba7aca201811c54074a0cd683edb3e9dedf2bb0fd23682b3cc5725e4067b27ec27e0fe979eb22f56 SHA512 f037c1707b49e92f1bd605ec87a0995ae36215d075bcbadfed1d11f5fefda43391b48f10d2517334574aa7e243f0b73d22f1fcbfe1fb133aaf5bad1046e8ba5e
diff --git a/sys-apps/cpuid/cpuid-20200427.ebuild b/sys-apps/cpuid/cpuid-20200427.ebuild
deleted file mode 100644
index df1d0117c3b7..000000000000
--- a/sys-apps/cpuid/cpuid-20200427.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Linux tool to dump x86 CPUID information about the CPUs"
-HOMEPAGE="http://www.etallen.com/cpuid.html"
-SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="dev-lang/perl"
-DEPEND="app-arch/gzip"
-
-DOCS=( "ChangeLog" "FUTURE" )
-
-PATCHES=( "${FILESDIR}/${PN}-20200203-makefile.patch" )
-
-src_prepare() {
-	default
-
-	tc-export CC
-}
-
-src_install() {
-	emake BUILDROOT="${ED}" install
-
-	einstalldocs
-}
diff --git a/sys-apps/cpuid/cpuid-20201006.ebuild b/sys-apps/cpuid/cpuid-20201006.ebuild
index b928a580f8bf..df1d0117c3b7 100644
--- a/sys-apps/cpuid/cpuid-20201006.ebuild
+++ b/sys-apps/cpuid/cpuid-20201006.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="dev-lang/perl"
 DEPEND="app-arch/gzip"
diff --git a/sys-apps/firejail/firejail-0.9.64.ebuild b/sys-apps/firejail/firejail-0.9.64.ebuild
index 43c722146092..21d6c2b97361 100644
--- a/sys-apps/firejail/firejail-0.9.64.ebuild
+++ b/sys-apps/firejail/firejail-0.9.64.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6..9} )
 inherit toolchain-funcs python-single-r1
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	SRC_URI="https://github.com/netblue30/${PN}/releases/download/${PV}/${P}.tar.xz"
 else
 	inherit git-r3
@@ -48,6 +48,11 @@ src_prepare() {
 	if use contrib; then
 		python_fix_shebang -f contrib/*.py
 	fi
+
+	# some tests were missing from this release's tarball
+	if use test; then
+		sed -i -r -e 's/^(test:.*) test-private-lib (.*)/\1 \2/; s/^(test:.*) test-fnetfilter (.*)/\1 \2/' Makefile.in || die
+	fi
 }
 
 src_configure() {
diff --git a/sys-apps/grep/grep-3.5.ebuild b/sys-apps/grep/grep-3.5.ebuild
index 3ccfcce9c909..43c8ebe75f34 100644
--- a/sys-apps/grep/grep-3.5.ebuild
+++ b/sys-apps/grep/grep-3.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls pcre static"
 
 LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
diff --git a/sys-apps/hw-probe/Manifest b/sys-apps/hw-probe/Manifest
index 6bc85b53ded8..92a03dc0b272 100644
--- a/sys-apps/hw-probe/Manifest
+++ b/sys-apps/hw-probe/Manifest
@@ -1,2 +1 @@
-DIST hw-probe-1.5.tar.gz 113996 BLAKE2B 59f6fc27e2cbb99a4b7dd9428e32a93dce2ffcc1133e82539b8836a694e6c5634fe2e172732675acf0d83504907a750c63f138d6dec236039eb7c805010a8383 SHA512 80dd2484bd317ac1e86d7f434626f288648aebf110a4bf81c0c05548abcb19d990119c1690fcb5796384a6c32fd5c1e827698a31165bfc41ef6df9fc7fdd368d
 DIST hw-probe-1.6_beta2.tar.gz 143569 BLAKE2B fc7b7562f86eb1b26fef32a8ed9b4a8d01c5621bedbc7e810d5a011c53d528b000ff9df312cf5e3f0ab455558e08e2b9a3ddcd543cd6856208466721f9a0e13c SHA512 2727e7b0fe449cbb6dd21fc112660df4ec666be845bbfd21037b41372a499dfb80c8c2dc37bd222032c68faadff91192a6d6f5229353cb0fc63b8e3dbd715f5d
diff --git a/sys-apps/hw-probe/hw-probe-1.5-r1.ebuild b/sys-apps/hw-probe/hw-probe-1.5-r1.ebuild
deleted file mode 100644
index 5cf31892ccff..000000000000
--- a/sys-apps/hw-probe/hw-probe-1.5-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature readme.gentoo-r1
-
-DESCRIPTION="A tool to probe for hardware, check it's operability and find drivers"
-HOMEPAGE="https://github.com/linuxhw/hw-probe/"
-SRC_URI="https://github.com/linuxhw/hw-probe/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-lang/perl
-	dev-perl/Digest-SHA1
-	net-misc/curl
-	sys-apps/dmidecode
-	sys-apps/edid-decode
-	sys-apps/hwinfo
-	sys-apps/pciutils
-	sys-apps/smartmontools
-	sys-apps/usbutils
-	virtual/perl-Data-Dumper
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.5-disable-automatic-upload.patch" )
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	default
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	optfeature "showing Machine Check Exceptions." app-admin/mcelog
-	optfeature "showing additional I/O statistics." app-admin/sysstat
-	optfeature "showing smart card (reader) information." dev-libs/opensc
-	optfeature "showing Vulkan GPU hardware information." dev-util/vulkan-tools
-	optfeature "showing information of attached scanners." media-gfx/sane-backends
-	optfeature "showing GPU information provided by MESA." media-libs/mesa
-	optfeature "showing zeroconf statistics." net-dns/avahi
-	optfeature "showing HP printer statistics." net-print/hplip
-	optfeature "showing status about rfkill switches on communication devices." net-wireless/rfkill
-	optfeature "showing additional CPU capabilities." sys-apps/cpuid
-	optfeature "showing hard disk (HDD, SSD, ..) capabilities." sys-apps/hdparm
-	optfeature "showing available I2C sensors." sys-apps/i2c-tools
-	optfeature "showing additional hardware and system information detected by inxi." sys-apps/inxi
-	optfeature "showing information about tested memory for faults." sys-apps/memtester
-	optfeature "showing 'Plug & Play' devices." sys-apps/pnputils
-	optfeature "showing systemd boot process information." sys-apps/systemd
-	optfeature "showing ACPI statistics and tables." sys-power/iasl
-	optfeature "showing information about NUMA." sys-process/numactl
-	optfeature "showing additional GPU information provided by MESA progs." x11-apps/mesa-progs
-	optfeature "showing available Xinput devices." x11-apps/xinput
-}
diff --git a/sys-apps/hw-probe/hw-probe-1.6_beta2-r1.ebuild b/sys-apps/hw-probe/hw-probe-1.6_beta2-r1.ebuild
index 502bd5dad434..d10255310db4 100644
--- a/sys-apps/hw-probe/hw-probe-1.6_beta2-r1.ebuild
+++ b/sys-apps/hw-probe/hw-probe-1.6_beta2-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_PV_BETA}"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild
index 2bf4240201b7..aa2af512c5fa 100644
--- a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild
+++ b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild
@@ -28,7 +28,7 @@ SRC_URI+="
 #IUSE="freeipmi openipmi status"
 IUSE="libressl openbmc openipmi static"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 hppa ~ia64 ppc ~ppc64 x86"
 LICENSE="BSD"
 
 RDEPEND="
diff --git a/sys-apps/sandbox/sandbox-2.20.ebuild b/sys-apps/sandbox/sandbox-2.20.ebuild
index 7591473a10bd..658a9208a0f4 100644
--- a/sys-apps/sandbox/sandbox-2.20.ebuild
+++ b/sys-apps/sandbox/sandbox-2.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-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"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/unscd/unscd-0.54-r1.ebuild b/sys-apps/unscd/unscd-0.54-r1.ebuild
index 371a0de780ad..93f6096726f3 100644
--- a/sys-apps/unscd/unscd-0.54-r1.ebuild
+++ b/sys-apps/unscd/unscd-0.54-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://busybox.net/~vda/unscd/nscd-${PV}.c -> nscd-${PV}-r1.c"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="sys-libs/glibc[nscd(+)]"
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index df8d337d29d7..878ff1379ab0 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/libfprint/Manifest b/sys-auth/libfprint/Manifest
index 192cfd223be2..efc89c6a426b 100644
--- a/sys-auth/libfprint/Manifest
+++ b/sys-auth/libfprint/Manifest
@@ -3,3 +3,4 @@ DIST libfprint-1.0.tar.gz 475347 BLAKE2B cb560898cec11861c4529c0c37c328f74eaf271
 DIST libfprint-1.90.0.tar.gz 1760869 BLAKE2B fd0692e5a4924101399684289501d607da2183acf7f7b7c7ce22b7ed301fe0da75cb0b88c0642e1b1b6f82fe7d8505616ead456b48c3b0449201fd91669ce782 SHA512 99d7a62b3a1c329a2c13f508c98b60c6311fd01cd165fca12de5873305980167dd79c7d75edc74f53fce5066047e814fa654c6ac4f3f12342b57afa5b2dbe6d3
 DIST libfprint-1.90.1.tar.gz 2348486 BLAKE2B d9f43253d8be874f3d78e19dbd148788d8abdc3cd0d6f5c931a4aad650acaf647f9c818c22a575f9ebe0a698a338693448f6f460c780adcd7140dedbdc4e025f SHA512 0548d29e55aaa59e73f0fd13cac6b85dd3a048358c365423e12884c3877c3e30422ee3fc4d18a3daba2f26383fb886f1d40a74dba5d947f7bdec6b8852995b4e
 DIST libfprint-1.90.2.tar.gz 4152489 BLAKE2B d8e8dde93acfc83dc253741517eb840b1a950b5626f2aabef4d4a44fcef2db95096e7d467ae3191c3478e93c0919acbf48010b0c4dd23a538466a25d8204ddf6 SHA512 58326714ce92514e2f95da84c94ca1286cadb0f0bb7de68f15aba0120a22e4a51d8bc6d3d7dc0a4e46e3620e2bd0b3247d07782a3308daf2edd44a4ddb60d226
+DIST libfprint-1.90.3.tar.gz 4169175 BLAKE2B ae883910dac19159c9183eac263d0ab71a92f67c233d9ec562630897f51063154bc207f54b41396ce169e87304d7989930b3f3204b87590eb56a82f7e796eba9 SHA512 3420df99c0e388af523f74c008fe603d28599d2ca482ec12a777d8b876e959cac946405fb14ba41fa536997ebd6857d945453e1374a0e05cd8f4fb02ca739891
diff --git a/sys-auth/libfprint/libfprint-1.90.3.ebuild b/sys-auth/libfprint/libfprint-1.90.3.ebuild
new file mode 100644
index 000000000000..311455ba8c5a
--- /dev/null
+++ b/sys-auth/libfprint/libfprint-1.90.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson udev
+
+DESCRIPTION="library to add support for consumer fingerprint readers"
+HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint https://gitlab.freedesktop.org/libfprint/libfprint"
+SRC_URI="https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/nss
+	>=dev-libs/libgusb-0.3.1
+	virtual/libusb:1=
+	x11-libs/gtk+:3
+	x11-libs/pixman
+	x11-libs/libX11
+	x11-libs/libXv"
+
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( ${FILESDIR}/${PN}-0.8.2-fix-implicit-declaration.patch )
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+src_configure() {
+		local emesonargs=(
+			-Ddoc=false
+			-Dgtk-examples=$(usex examples true false)
+			-Ddrivers=all
+			-Dudev_rules=true
+			-Dudev_rules_dir=$(get_udevdir)/rules.d
+			--libdir=/usr/$(get_libdir)
+		)
+		meson_src_configure
+}
diff --git a/sys-auth/pam_mount/pam_mount-2.16-r2.ebuild b/sys-auth/pam_mount/pam_mount-2.16-r2.ebuild
index 1fa00f2e62f4..bdd4260927d4 100644
--- a/sys-auth/pam_mount/pam_mount-2.16-r2.ebuild
+++ b/sys-auth/pam_mount/pam_mount-2.16-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/pam-mount/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="amd64 ppc x86"
 
 IUSE="crypt libressl ssl selinux"
 
diff --git a/sys-auth/pam_passwdqc/metadata.xml b/sys-auth/pam_passwdqc/metadata.xml
deleted file mode 100644
index 4abb4efe616c..000000000000
--- a/sys-auth/pam_passwdqc/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-		Password strength checking for PAM aware password changing programs. This is an alternative to the default cracklib.
-	</longdescription>
-	<longdescription lang="ja">
-		パスワード変更プログラムに反応する PAM のパスワード強度検査機能です。これはデフォルトの cracklib の代替です。
-	</longdescription>
-</pkgmetadata>
diff --git a/sys-auth/pam_passwdqc/pam_passwdqc-1.3.0.ebuild b/sys-auth/pam_passwdqc/pam_passwdqc-1.3.0.ebuild
deleted file mode 100644
index 0d8901ab8eed..000000000000
--- a/sys-auth/pam_passwdqc/pam_passwdqc-1.3.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Stub ebuild to help migrate to newer package name"
-HOMEPAGE="http://www.openwall.com/passwdqc/"
-
-LICENSE="Openwall BSD public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="sys-auth/passwdqc[pam(+)]"
-RDEPEND="${DEPEND}"
diff --git a/sys-auth/pam_ssh_agent_auth/Manifest b/sys-auth/pam_ssh_agent_auth/Manifest
index 1c43b8634e49..023aa7f9e0ca 100644
--- a/sys-auth/pam_ssh_agent_auth/Manifest
+++ b/sys-auth/pam_ssh_agent_auth/Manifest
@@ -1 +1,2 @@
+DIST pam_ssh_agent_auth-0.10.3-openssl-1.1.1.patch 46417 BLAKE2B bb62c32fc9c1eb5dc0788b9a535fdf6000812c57a6a758e693406a0d01bcf0cc5ec9f7622c4f21cee74895657a5a3ad13255e19d51e20eca8978e63864266629 SHA512 279fad3be9289c1da06d34e08d2b81a8ad863e07c7b0471419c029aa121abe9942ae4cc4259b7f1e2c2dd32368fc07dc1f9432aba860820455e0d9419c9e7f74
 DIST pam_ssh_agent_auth-0.10.3.tar.bz2 1066393 BLAKE2B 07b113d05e09f770d63dbea813ea644199d2b103f9c6d7e5960bfad37cb181ce5a5f111f72e0274c0335e4c217ccd19bd53d61af23f8bc6aff14c1995fc4edc9 SHA512 d75062c4e46b0b011f46aed9704a99049995fea8b5115ff7ee26dad7e93cbcf54a8af7efc6b521109d77dc03c6f5284574d2e1b84c6829cec25610f24fb4bd66
diff --git a/sys-auth/pam_ssh_agent_auth/files/pam_ssh_agent_auth-0.10.3-openssl-1.1.1.patch b/sys-auth/pam_ssh_agent_auth/files/pam_ssh_agent_auth-0.10.3-openssl-1.1.1.patch
deleted file mode 100644
index a422cd5e479f..000000000000
--- a/sys-auth/pam_ssh_agent_auth/files/pam_ssh_agent_auth-0.10.3-openssl-1.1.1.patch
+++ /dev/null
@@ -1,1244 +0,0 @@
-From eef90424a0545b7b0125dfaf5e3cef3c5248ada0 Mon Sep 17 00:00:00 2001
-From: Guido Falsi <mad@madpilot.net>
-Date: Sat, 20 Oct 2018 14:29:43 +0200
-Subject: [PATCH 1/2] Adapt to OpenSSL 1.1.1.
-
-The FreeBSD operating system is migrating to OpenSSL 1.1.1 and I have created this set of patches to make pam_ssh_agent_auth compile with it.
-
-The patch comments out some parts of include files which are not actually used and reference now opaque OpenSSL internals.
-
-I also have migrated the source files to use accessors to use the OpenSSL objects.
-
-The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header-check argument is required in configure there.
----
- authfd.c    |  50 ++++++++++++++++++++
- bufbn.c     |   4 ++
- cipher.h    |   6 ++-
- kex.h       |   9 +++-
- key.c       | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++--
- ssh-dss.c   |  51 ++++++++++++++++----
- ssh-ecdsa.c |  40 ++++++++++++----
- ssh-rsa.c   |  22 +++++++--
- 8 files changed, 287 insertions(+), 28 deletions(-)
-
-diff --git a/authfd.c b/authfd.c
-index 7b96921..35f8de1 100644
---- a/authfd.c
-+++ b/authfd.c
-@@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
- 	case 1:
- 		key = pamsshagentauth_key_new(KEY_RSA1);
- 		bits = pamsshagentauth_buffer_get_int(&auth->identities);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->e);
- 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->n);
- 		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
-@@ -379,6 +380,15 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
- 		if (keybits < 0 || bits != (u_int)keybits)
- 			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
- 			    BN_num_bits(key->rsa->n), bits);
-+#else
-+		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_e(key->rsa));
-+		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_n(key->rsa));
-+		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
-+		keybits = BN_num_bits(RSA_get0_n(key->rsa));
-+		if (keybits < 0 || bits != (u_int)keybits)
-+			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
-+			    BN_num_bits(RSA_get0_n(key->rsa)), bits);
-+#endif
- 		break;
- 	case 2:
- 		blob = pamsshagentauth_buffer_get_string(&auth->identities, &blen);
-@@ -422,9 +432,15 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
- 	}
- 	pamsshagentauth_buffer_init(&buffer);
- 	pamsshagentauth_buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
- 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->e);
- 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->n);
-+#else
-+	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(RSA_get0_n(key->rsa)));
-+	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_e(key->rsa));
-+	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_n(key->rsa));
-+#endif
- 	pamsshagentauth_buffer_put_bignum(&buffer, challenge);
- 	pamsshagentauth_buffer_append(&buffer, session_id, 16);
- 	pamsshagentauth_buffer_put_int(&buffer, response_type);
-@@ -501,6 +517,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
- static void
- ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
- {
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 	pamsshagentauth_buffer_put_int(b, BN_num_bits(key->n));
- 	pamsshagentauth_buffer_put_bignum(b, key->n);
- 	pamsshagentauth_buffer_put_bignum(b, key->e);
-@@ -509,6 +526,16 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
- 	pamsshagentauth_buffer_put_bignum(b, key->iqmp);	/* ssh key->u */
- 	pamsshagentauth_buffer_put_bignum(b, key->q);	/* ssh key->p, SSL key->q */
- 	pamsshagentauth_buffer_put_bignum(b, key->p);	/* ssh key->q, SSL key->p */
-+#else
-+	pamsshagentauth_buffer_put_int(b, BN_num_bits(RSA_get0_n(key)));
-+	pamsshagentauth_buffer_put_bignum(b, RSA_get0_n(key));
-+	pamsshagentauth_buffer_put_bignum(b, RSA_get0_e(key));
-+	pamsshagentauth_buffer_put_bignum(b, RSA_get0_d(key));
-+	/* To keep within the protocol: p < q for ssh. in SSL p > q */
-+	pamsshagentauth_buffer_put_bignum(b, RSA_get0_iqmp(key));	/* ssh key->u */
-+	pamsshagentauth_buffer_put_bignum(b, RSA_get0_q(key));	/* ssh key->p, SSL key->q */
-+	pamsshagentauth_buffer_put_bignum(b, RSA_get0_p(key));	/* ssh key->q, SSL key->p */
-+#endif
- 	pamsshagentauth_buffer_put_cstring(b, comment);
- }
- 
-@@ -518,19 +545,36 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
- 	pamsshagentauth_buffer_put_cstring(b, key_ssh_name(key));
- 	switch (key->type) {
- 	case KEY_RSA:
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->n);
- 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->e);
- 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->d);
- 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->iqmp);
- 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->p);
- 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->q);
-+#else
-+		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_n(key->rsa));
-+		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_e(key->rsa));
-+		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_d(key->rsa));
-+		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_iqmp(key->rsa));
-+		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_p(key->rsa));
-+		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_q(key->rsa));
-+#endif
- 		break;
- 	case KEY_DSA:
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->p);
- 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->q);
- 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->g);
- 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->pub_key);
- 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->priv_key);
-+#else
-+		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_p(key->dsa));
-+		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_q(key->dsa));
-+		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_g(key->dsa));
-+		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_pub_key(key->dsa));
-+		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_priv_key(key->dsa));
-+#endif
- 		break;
- 	}
- 	pamsshagentauth_buffer_put_cstring(b, comment);
-@@ -610,9 +654,15 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
- 
- 	if (key->type == KEY_RSA1) {
- 		pamsshagentauth_buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(key->rsa->n));
- 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->e);
- 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->n);
-+#else
-+		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(RSA_get0_n(key->rsa)));
-+		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_e(key->rsa));
-+		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_n(key->rsa));
-+#endif
- 	} else if (key->type == KEY_DSA || key->type == KEY_RSA) {
- 		pamsshagentauth_key_to_blob(key, &blob, &blen);
- 		pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
-diff --git a/bufbn.c b/bufbn.c
-index 6a49c73..4ecedc1 100644
---- a/bufbn.c
-+++ b/bufbn.c
-@@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
- 		pamsshagentauth_buffer_put_int(buffer, 0);
- 		return 0;
- 	}
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 	if (value->neg) {
-+#else
-+	if (BN_is_negative(value)) {
-+#endif
- 		pamsshagentauth_logerror("buffer_put_bignum2_ret: negative numbers not supported");
- 		return (-1);
- 	}
-diff --git a/cipher.h b/cipher.h
-index 49bbc16..64f59ca 100644
---- a/cipher.h
-+++ b/cipher.h
-@@ -59,15 +59,18 @@
- #define CIPHER_DECRYPT		0
- 
- typedef struct Cipher Cipher;
--typedef struct CipherContext CipherContext;
-+// typedef struct CipherContext CipherContext;
- 
- struct Cipher;
-+/*
- struct CipherContext {
- 	int	plaintext;
- 	EVP_CIPHER_CTX evp;
- 	Cipher *cipher;
- };
-+*/
- 
-+/*
- u_int	 cipher_mask_ssh1(int);
- Cipher	*cipher_by_name(const char *);
- Cipher	*cipher_by_number(int);
-@@ -88,4 +91,5 @@ void	 cipher_set_keyiv(CipherContext *, u_char *);
- int	 cipher_get_keyiv_len(const CipherContext *);
- int	 cipher_get_keycontext(const CipherContext *, u_char *);
- void	 cipher_set_keycontext(CipherContext *, u_char *);
-+*/
- #endif				/* CIPHER_H */
-diff --git a/kex.h b/kex.h
-index 8e29c90..81ca57d 100644
---- a/kex.h
-+++ b/kex.h
-@@ -70,7 +70,7 @@ enum kex_exchange {
- #define KEX_INIT_SENT	0x0001
- 
- typedef struct Kex Kex;
--typedef struct Mac Mac;
-+// typedef struct Mac Mac;
- typedef struct Comp Comp;
- typedef struct Enc Enc;
- typedef struct Newkeys Newkeys;
-@@ -84,6 +84,7 @@ struct Enc {
- 	u_char	*key;
- 	u_char	*iv;
- };
-+/*
- struct Mac {
- 	char	*name;
- 	int	enabled;
-@@ -95,11 +96,13 @@ struct Mac {
- 	HMAC_CTX	evp_ctx;
- 	struct umac_ctx *umac_ctx;
- };
-+*/
- struct Comp {
- 	int	type;
- 	int	enabled;
- 	char	*name;
- };
-+/*
- struct Newkeys {
- 	Enc	enc;
- 	Mac	mac;
-@@ -126,7 +129,9 @@ struct Kex {
- 	int	(*host_key_index)(Key *);
- 	void	(*kex[KEX_MAX])(Kex *);
- };
-+*/
- 
-+/*
- Kex	*kex_setup(char *[PROPOSAL_MAX]);
- void	 kex_finish(Kex *);
- 
-@@ -152,6 +157,8 @@ kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
- void
- derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
- 
-+*/
-+
- #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
- void	dump_digest(char *, u_char *, int);
- #endif
-diff --git a/key.c b/key.c
-index 107a442..aedbbb5 100644
---- a/key.c
-+++ b/key.c
-@@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type)
- 	case KEY_RSA:
- 		if ((rsa = RSA_new()) == NULL)
- 			pamsshagentauth_fatal("key_new: RSA_new failed");
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 		if ((rsa->n = BN_new()) == NULL)
- 			pamsshagentauth_fatal("key_new: BN_new failed");
- 		if ((rsa->e = BN_new()) == NULL)
- 			pamsshagentauth_fatal("key_new: BN_new failed");
-+#else
-+		if (RSA_set0_key(rsa, BN_new(), BN_new(), NULL) != 1)
-+			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
-+#endif
- 		k->rsa = rsa;
- 		break;
- 	case KEY_DSA:
- 		if ((dsa = DSA_new()) == NULL)
- 			pamsshagentauth_fatal("key_new: DSA_new failed");
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 		if ((dsa->p = BN_new()) == NULL)
- 			pamsshagentauth_fatal("key_new: BN_new failed");
- 		if ((dsa->q = BN_new()) == NULL)
-@@ -94,6 +100,12 @@ pamsshagentauth_key_new(int type)
- 			pamsshagentauth_fatal("key_new: BN_new failed");
- 		if ((dsa->pub_key = BN_new()) == NULL)
- 			pamsshagentauth_fatal("key_new: BN_new failed");
-+#else
-+		if (DSA_set0_pqg(dsa, BN_new(), BN_new(), BN_new()) != 1)
-+			pamsshagentauth_fatal("key_new: DSA_set0_pqg failed");
-+		if (DSA_set0_key(dsa, BN_new(), NULL) != 1)
-+			pamsshagentauth_fatal("key_new: DSA_set0_key failed");
-+#endif
- 		k->dsa = dsa;
- 		break;
- 	case KEY_ECDSA:
-@@ -118,6 +130,7 @@ pamsshagentauth_key_new_private(int type)
- 	switch (k->type) {
- 	case KEY_RSA1:
- 	case KEY_RSA:
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 		if ((k->rsa->d = BN_new()) == NULL)
- 			pamsshagentauth_fatal("key_new_private: BN_new failed");
- 		if ((k->rsa->iqmp = BN_new()) == NULL)
-@@ -130,14 +143,30 @@ pamsshagentauth_key_new_private(int type)
- 			pamsshagentauth_fatal("key_new_private: BN_new failed");
- 		if ((k->rsa->dmp1 = BN_new()) == NULL)
- 			pamsshagentauth_fatal("key_new_private: BN_new failed");
-+#else
-+		if (RSA_set0_key(k->rsa, NULL, NULL, BN_new()) != 1)
-+			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
-+		if (RSA_set0_crt_params(k->rsa, BN_new(), BN_new(), BN_new()) != 1)
-+			pamsshagentauth_fatal("key_new: RSA_set0_crt_params failed");
-+		if (RSA_set0_factors(k->rsa, BN_new(), BN_new()) != 1)
-+			pamsshagentauth_fatal("key_new: RSA_set0_factors failed");
-+#endif
- 		break;
- 	case KEY_DSA:
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 		if ((k->dsa->priv_key = BN_new()) == NULL)
- 			pamsshagentauth_fatal("key_new_private: BN_new failed");
-+#else
-+		if (DSA_set0_key(k->dsa, NULL, BN_new()) != 1)
-+			pamsshagentauth_fatal("key_new_private: DSA_set0_key failed");
-+#endif
- 		break;
- 	case KEY_ECDSA:
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 		if (EC_KEY_set_private_key(k->ecdsa, BN_new()) != 1)
- 			pamsshagentauth_fatal("key_new_private: EC_KEY_set_private_key failed");
-+#else
-+#endif
- 		break;
- 	case KEY_ED25519:
- 		RAND_bytes(k->ed25519->sk, sizeof(k->ed25519->sk));
-@@ -195,14 +224,26 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
- 	case KEY_RSA1:
- 	case KEY_RSA:
- 		return a->rsa != NULL && b->rsa != NULL &&
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 		    BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
- 		    BN_cmp(a->rsa->n, b->rsa->n) == 0;
-+#else
-+		    BN_cmp(RSA_get0_e(a->rsa), RSA_get0_e(b->rsa)) == 0 &&
-+		    BN_cmp(RSA_get0_n(a->rsa), RSA_get0_n(b->rsa)) == 0;
-+#endif
- 	case KEY_DSA:
- 		return a->dsa != NULL && b->dsa != NULL &&
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 		    BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
- 		    BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
- 		    BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
- 		    BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
-+#else
-+		    BN_cmp(DSA_get0_p(a->dsa), DSA_get0_p(b->dsa)) == 0 &&
-+		    BN_cmp(DSA_get0_q(a->dsa), DSA_get0_q(b->dsa)) == 0 &&
-+		    BN_cmp(DSA_get0_g(a->dsa), DSA_get0_g(b->dsa)) == 0 &&
-+		    BN_cmp(DSA_get0_pub_key(a->dsa), DSA_get0_pub_key(b->dsa)) == 0;
-+#endif
- 	case KEY_ECDSA:
- 		return a->ecdsa != NULL && b->ecdsa != NULL &&
- 			EC_KEY_check_key(a->ecdsa) == 1 &&
-@@ -231,7 +272,7 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
-     u_int *dgst_raw_length)
- {
- 	const EVP_MD *md = NULL;
--	EVP_MD_CTX ctx;
-+	EVP_MD_CTX *ctx;
- 	u_char *blob = NULL;
- 	u_char *retval = NULL;
- 	u_int len = 0;
-@@ -252,12 +293,21 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
- 	}
- 	switch (k->type) {
- 	case KEY_RSA1:
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 		nlen = BN_num_bytes(k->rsa->n);
- 		elen = BN_num_bytes(k->rsa->e);
- 		len = nlen + elen;
- 		blob = pamsshagentauth_xmalloc(len);
- 		BN_bn2bin(k->rsa->n, blob);
- 		BN_bn2bin(k->rsa->e, blob + nlen);
-+#else
-+		nlen = BN_num_bytes(RSA_get0_n(k->rsa));
-+		elen = BN_num_bytes(RSA_get0_e(k->rsa));
-+		len = nlen + elen;
-+		blob = pamsshagentauth_xmalloc(len);
-+		BN_bn2bin(RSA_get0_n(k->rsa), blob);
-+		BN_bn2bin(RSA_get0_e(k->rsa), blob + nlen);
-+#endif
- 		break;
- 	case KEY_DSA:
- 	case KEY_ECDSA:
-@@ -273,11 +323,14 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
- 	}
- 	if (blob != NULL) {
- 		retval = pamsshagentauth_xmalloc(EVP_MAX_MD_SIZE);
--		EVP_DigestInit(&ctx, md);
--		EVP_DigestUpdate(&ctx, blob, len);
--		EVP_DigestFinal(&ctx, retval, dgst_raw_length);
-+		/* XXX Errors from EVP_* functions are not hadled */
-+		ctx = EVP_MD_CTX_create();
-+		EVP_DigestInit(ctx, md);
-+		EVP_DigestUpdate(ctx, blob, len);
-+		EVP_DigestFinal(ctx, retval, dgst_raw_length);
- 		memset(blob, 0, len);
- 		pamsshagentauth_xfree(blob);
-+		EVP_MD_CTX_destroy(ctx);
- 	} else {
- 		pamsshagentauth_fatal("key_fingerprint_raw: blob is null");
- 	}
-@@ -457,10 +510,17 @@ pamsshagentauth_key_read(Key *ret, char **cpp)
- 			return -1;
- 		*cpp = cp;
- 		/* Get public exponent, public modulus. */
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 		if (!read_bignum(cpp, ret->rsa->e))
- 			return -1;
- 		if (!read_bignum(cpp, ret->rsa->n))
- 			return -1;
-+#else
-+		if (!read_bignum(cpp, RSA_get0_e(ret->rsa)))
-+			return -1;
-+		if (!read_bignum(cpp, RSA_get0_n(ret->rsa)))
-+			return -1;
-+#endif
- 		success = 1;
- 		break;
- 	case KEY_UNSPEC:
-@@ -583,10 +643,17 @@ pamsshagentauth_key_write(const Key *key, FILE *f)
- 
- 	if (key->type == KEY_RSA1 && key->rsa != NULL) {
- 		/* size of modulus 'n' */
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 		bits = BN_num_bits(key->rsa->n);
- 		fprintf(f, "%u", bits);
- 		if (write_bignum(f, key->rsa->e) &&
- 		    write_bignum(f, key->rsa->n)) {
-+#else
-+		bits = BN_num_bits(RSA_get0_n(key->rsa));
-+		fprintf(f, "%u", bits);
-+		if (write_bignum(f, RSA_get0_e(key->rsa)) &&
-+		    write_bignum(f, RSA_get0_n(key->rsa))) {
-+#endif
- 			success = 1;
- 		} else {
- 			pamsshagentauth_logerror("key_write: failed for RSA key");
-@@ -675,10 +742,17 @@ pamsshagentauth_key_size(const Key *k)
- {
- 	switch (k->type) {
- 	case KEY_RSA1:
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 	case KEY_RSA:
- 		return BN_num_bits(k->rsa->n);
- 	case KEY_DSA:
- 		return BN_num_bits(k->dsa->p);
-+#else
-+	case KEY_RSA:
-+		return BN_num_bits(RSA_get0_n(k->rsa));
-+	case KEY_DSA:
-+		return BN_num_bits(DSA_get0_p(k->dsa));
-+#endif
- 	case KEY_ECDSA:
- 	{
- 		int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(k->ecdsa));
-@@ -769,17 +843,29 @@ pamsshagentauth_key_from_private(const Key *k)
- 	switch (k->type) {
- 	case KEY_DSA:
- 		n = pamsshagentauth_key_new(k->type);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 		if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
- 		    (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
- 		    (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
- 		    (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL))
-+#else
-+		if ((BN_copy(DSA_get0_p(n->dsa), DSA_get0_p(k->dsa)) == NULL) ||
-+		    (BN_copy(DSA_get0_q(n->dsa), DSA_get0_q(k->dsa)) == NULL) ||
-+		    (BN_copy(DSA_get0_g(n->dsa), DSA_get0_g(k->dsa)) == NULL) ||
-+		    (BN_copy(DSA_get0_pub_key(n->dsa), DSA_get0_pub_key(k->dsa)) == NULL))
-+#endif
- 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
- 		break;
- 	case KEY_RSA:
- 	case KEY_RSA1:
- 		n = pamsshagentauth_key_new(k->type);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 		if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
- 		    (BN_copy(n->rsa->e, k->rsa->e) == NULL))
-+#else
-+		if ((BN_copy(RSA_get0_n(n->rsa), RSA_get0_n(k->rsa)) == NULL) ||
-+		    (BN_copy(RSA_get0_e(n->rsa), RSA_get0_e(k->rsa)) == NULL))
-+#endif
- 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
- 		break;
- 	case KEY_ECDSA:
-@@ -881,8 +967,13 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
- 	switch (type) {
- 	case KEY_RSA:
- 		key = pamsshagentauth_key_new(type);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->e) == -1 ||
- 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->n) == -1) {
-+#else
-+		if (pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_e(key->rsa)) == -1 ||
-+		    pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_n(key->rsa)) == -1) {
-+#endif
- 			pamsshagentauth_logerror("key_from_blob: can't read rsa key");
- 			pamsshagentauth_key_free(key);
- 			key = NULL;
-@@ -894,10 +985,17 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
- 		break;
- 	case KEY_DSA:
- 		key = pamsshagentauth_key_new(type);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->p) == -1 ||
- 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->q) == -1 ||
- 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->g) == -1 ||
- 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->pub_key) == -1) {
-+#else
-+		if (pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_p(key->dsa)) == -1 ||
-+		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_q(key->dsa)) == -1 ||
-+		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_g(key->dsa)) == -1 ||
-+		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_pub_key(key->dsa)) == -1) {
-+#endif
- 			pamsshagentauth_logerror("key_from_blob: can't read dsa key");
- 			pamsshagentauth_key_free(key);
- 			key = NULL;
-@@ -1015,6 +1113,7 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
- 	}
- 	pamsshagentauth_buffer_init(&b);
- 	switch (key->type) {
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 	case KEY_DSA:
- 		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
- 		pamsshagentauth_buffer_put_bignum2(&b, key->dsa->p);
-@@ -1027,6 +1126,20 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
- 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->e);
- 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->n);
- 		break;
-+#else
-+	case KEY_DSA:
-+		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
-+		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_p(key->dsa));
-+		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_q(key->dsa));
-+		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_g(key->dsa));
-+		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_pub_key(key->dsa));
-+		break;
-+	case KEY_RSA:
-+		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
-+		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_e(key->rsa));
-+		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_n(key->rsa));
-+		break;
-+#endif
- 	case KEY_ECDSA:
- 	{
- 		size_t l = 0;
-@@ -1138,14 +1251,20 @@ pamsshagentauth_key_demote(const Key *k)
- 	case KEY_RSA:
- 		if ((pk->rsa = RSA_new()) == NULL)
- 			pamsshagentauth_fatal("key_demote: RSA_new failed");
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 		if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL)
- 			pamsshagentauth_fatal("key_demote: BN_dup failed");
- 		if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL)
- 			pamsshagentauth_fatal("key_demote: BN_dup failed");
-+#else
-+		if (RSA_set0_key(pk->rsa, BN_dup(RSA_get0_n(k->rsa)), BN_dup(RSA_get0_e(k->rsa)), NULL) != 1)
-+			pamsshagentauth_fatal("key_demote: RSA_set0_key failed");
-+#endif
- 		break;
- 	case KEY_DSA:
- 		if ((pk->dsa = DSA_new()) == NULL)
- 			pamsshagentauth_fatal("key_demote: DSA_new failed");
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 		if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL)
- 			pamsshagentauth_fatal("key_demote: BN_dup failed");
- 		if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL)
-@@ -1154,6 +1273,12 @@ pamsshagentauth_key_demote(const Key *k)
- 			pamsshagentauth_fatal("key_demote: BN_dup failed");
- 		if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL)
- 			pamsshagentauth_fatal("key_demote: BN_dup failed");
-+#else
-+		if (DSA_set0_pqg(pk->dsa, BN_dup(DSA_get0_p(k->dsa)), BN_dup(DSA_get0_q(k->dsa)), BN_dup(DSA_get0_g(k->dsa))) != 1)
-+			pamsshagentauth_fatal("key_demote: DSA_set0_pqg failed");
-+		if (DSA_set0_key(pk->dsa, BN_dup(DSA_get0_pub_key(k->dsa)), NULL) != 1)
-+			pamsshagentauth_fatal("key_demote: DSA_set0_key failed");
-+#endif
- 		break;
- 	case KEY_ECDSA:
- 		pamsshagentauth_fatal("key_demote: implement me");
-diff --git a/ssh-dss.c b/ssh-dss.c
-index 9fdaa5d..1051ae2 100644
---- a/ssh-dss.c
-+++ b/ssh-dss.c
-@@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
- {
- 	DSA_SIG *sig;
- 	const EVP_MD *evp_md = EVP_sha1();
--	EVP_MD_CTX md;
-+	EVP_MD_CTX *md;
- 	u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
- 	u_int rlen, slen, len, dlen;
- 	Buffer b;
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+	const BIGNUM *r, *s;
-+#endif
- 
- 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
- 		pamsshagentauth_logerror("ssh_dss_sign: no DSA key");
- 		return -1;
- 	}
--	EVP_DigestInit(&md, evp_md);
--	EVP_DigestUpdate(&md, data, datalen);
--	EVP_DigestFinal(&md, digest, &dlen);
-+	md = EVP_MD_CTX_create();
-+	EVP_DigestInit(md, evp_md);
-+	EVP_DigestUpdate(md, data, datalen);
-+	EVP_DigestFinal(md, digest, &dlen);
- 
- 	sig = DSA_do_sign(digest, dlen, key->dsa);
- 	memset(digest, 'd', sizeof(digest));
-+	EVP_MD_CTX_destroy(md);
- 
- 	if (sig == NULL) {
- 		pamsshagentauth_logerror("ssh_dss_sign: sign failed");
- 		return -1;
- 	}
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 	rlen = BN_num_bytes(sig->r);
- 	slen = BN_num_bytes(sig->s);
-+#else
-+	DSA_SIG_get0((const DSA_SIG *)sig, (const BIGNUM **)r, (const BIGNUM **)s);
-+	rlen = BN_num_bytes(r);
-+	slen = BN_num_bytes(s);
-+#endif
- 	if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
- 		pamsshagentauth_logerror("bad sig size %u %u", rlen, slen);
- 		DSA_SIG_free(sig);
- 		return -1;
- 	}
- 	memset(sigblob, 0, SIGBLOB_LEN);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
- 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
-+#else
-+	BN_bn2bin(r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
-+	BN_bn2bin(s, sigblob+ SIGBLOB_LEN - slen);
-+#endif
- 	DSA_SIG_free(sig);
- 
- 	if (datafellows & SSH_BUG_SIGBLOB) {
-@@ -110,11 +126,14 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
- {
- 	DSA_SIG *sig;
- 	const EVP_MD *evp_md = EVP_sha1();
--	EVP_MD_CTX md;
-+	EVP_MD_CTX *md;
- 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
- 	u_int len, dlen;
- 	int rlen, ret;
- 	Buffer b;
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+	BIGNUM *r, *s;
-+#endif
- 
- 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
- 		pamsshagentauth_logerror("ssh_dss_verify: no DSA key");
-@@ -157,6 +176,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
- 	/* parse signature */
- 	if ((sig = DSA_SIG_new()) == NULL)
- 		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_new failed");
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 	if ((sig->r = BN_new()) == NULL)
- 		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
- 	if ((sig->s = BN_new()) == NULL)
-@@ -164,18 +184,33 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
- 	if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
- 	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL))
- 		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
-+#else
-+	if ((r = BN_new()) == NULL)
-+		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
-+	if ((s = BN_new()) == NULL)
-+		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
-+	if (DSA_SIG_set0(sig, r, s) != 1)
-+		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
-+	if ((BN_bin2bn(sigblob, INTBLOB_LEN, r) == NULL) ||
-+	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s) == NULL))
-+		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
-+	if (DSA_SIG_set0(sig, r, s) != 1)
-+		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
-+#endif
- 
- 	/* clean up */
- 	memset(sigblob, 0, len);
- 	pamsshagentauth_xfree(sigblob);
- 
- 	/* sha1 the data */
--	EVP_DigestInit(&md, evp_md);
--	EVP_DigestUpdate(&md, data, datalen);
--	EVP_DigestFinal(&md, digest, &dlen);
-+	md = EVP_MD_CTX_create();
-+	EVP_DigestInit(md, evp_md);
-+	EVP_DigestUpdate(md, data, datalen);
-+	EVP_DigestFinal(md, digest, &dlen);
- 
- 	ret = DSA_do_verify(digest, dlen, sig, key->dsa);
- 	memset(digest, 'd', sizeof(digest));
-+	EVP_MD_CTX_destroy(md);
- 
- 	DSA_SIG_free(sig);
- 
-diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
-index efa0f3d..c213959 100644
---- a/ssh-ecdsa.c
-+++ b/ssh-ecdsa.c
-@@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
- {
-     ECDSA_SIG *sig;
-     const EVP_MD *evp_md = evp_from_key(key);
--    EVP_MD_CTX md;
-+    EVP_MD_CTX *md;
-     u_char digest[EVP_MAX_MD_SIZE];
-     u_int len, dlen;
-     Buffer b, bb;
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+	BIGNUM *r, *s;
-+#endif
- 
-     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
-         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
-         return -1;
-     }
- 
--    EVP_DigestInit(&md, evp_md);
--    EVP_DigestUpdate(&md, data, datalen);
--    EVP_DigestFinal(&md, digest, &dlen);
-+    md = EVP_MD_CTX_create();
-+    EVP_DigestInit(md, evp_md);
-+    EVP_DigestUpdate(md, data, datalen);
-+    EVP_DigestFinal(md, digest, &dlen);
- 
-     sig = ECDSA_do_sign(digest, dlen, key->ecdsa);
-     memset(digest, 'd', sizeof(digest));
-+    EVP_MD_CTX_destroy(md);
- 
-     if (sig == NULL) {
-         pamsshagentauth_logerror("ssh_ecdsa_sign: sign failed");
-@@ -64,8 +69,14 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
-     }
- 
-     pamsshagentauth_buffer_init(&bb);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
-         pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
-+#else
-+    DSA_SIG_get0(sig, &r, &s);
-+    if (pamsshagentauth_buffer_get_bignum2_ret(&bb, r) == -1 ||
-+        pamsshagentauth_buffer_get_bignum2_ret(&bb, s) == -1) {
-+#endif
-         pamsshagentauth_logerror("couldn't serialize signature");
-         ECDSA_SIG_free(sig);
-         return -1;
-@@ -94,11 +105,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
- {
-     ECDSA_SIG *sig;
-     const EVP_MD *evp_md = evp_from_key(key);
--    EVP_MD_CTX md;
-+    EVP_MD_CTX *md;
-     u_char digest[EVP_MAX_MD_SIZE], *sigblob;
-     u_int len, dlen;
-     int rlen, ret;
-     Buffer b;
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+	BIGNUM *r, *s;
-+#endif
- 
-     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
-         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
-@@ -127,8 +141,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
- 
-     pamsshagentauth_buffer_init(&b);
-     pamsshagentauth_buffer_append(&b, sigblob, len);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
-         (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
-+#else
-+    DSA_SIG_get0(sig, &r, &s);
-+    if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
-+        (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
-+#endif
-         pamsshagentauth_fatal("ssh_ecdsa_verify:"
-             "pamsshagentauth_buffer_get_bignum2_ret failed");
- 
-@@ -137,16 +157,18 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
-     pamsshagentauth_xfree(sigblob);
- 
-     /* sha256 the data */
--    EVP_DigestInit(&md, evp_md);
--    EVP_DigestUpdate(&md, data, datalen);
--    EVP_DigestFinal(&md, digest, &dlen);
-+    md = EVP_MD_CTX_create();
-+    EVP_DigestInit(md, evp_md);
-+    EVP_DigestUpdate(md, data, datalen);
-+    EVP_DigestFinal(md, digest, &dlen);
- 
-     ret = ECDSA_do_verify(digest, dlen, sig, key->ecdsa);
-     memset(digest, 'd', sizeof(digest));
-+    EVP_MD_CTX_destroy(md);
- 
-     ECDSA_SIG_free(sig);
- 
-     pamsshagentauth_verbose("ssh_ecdsa_verify: signature %s",
-         ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error");
-     return ret;
--}
-\ No newline at end of file
-+}
-diff --git a/ssh-rsa.c b/ssh-rsa.c
-index d05844b..9d74eb6 100644
---- a/ssh-rsa.c
-+++ b/ssh-rsa.c
-@@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
-     const u_char *data, u_int datalen)
- {
- 	const EVP_MD *evp_md;
--	EVP_MD_CTX md;
-+	EVP_MD_CTX *md;
- 	u_char digest[EVP_MAX_MD_SIZE], *sig;
- 	u_int slen, dlen, len;
- 	int ok, nid;
-@@ -55,6 +55,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
- 		pamsshagentauth_logerror("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
- 		return -1;
- 	}
-+	md = EVP_MD_CTX_create();
- 	EVP_DigestInit(&md, evp_md);
- 	EVP_DigestUpdate(&md, data, datalen);
- 	EVP_DigestFinal(&md, digest, &dlen);
-@@ -64,6 +65,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
- 
- 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
- 	memset(digest, 'd', sizeof(digest));
-+	EVP_MD_CTX_destroy(md);
- 
- 	if (ok != 1) {
- 		int ecode = ERR_get_error();
-@@ -107,7 +109,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
- {
- 	Buffer b;
- 	const EVP_MD *evp_md;
--	EVP_MD_CTX md;
-+	EVP_MD_CTX *md;
- 	char *ktype;
- 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
- 	u_int len, dlen, modlen;
-@@ -117,9 +119,17 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
- 		pamsshagentauth_logerror("ssh_rsa_verify: no RSA key");
- 		return -1;
- 	}
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 	if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
-+#else
-+	if (BN_num_bits(RSA_get0_n(key->rsa)) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
-+#endif
- 		pamsshagentauth_logerror("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits",
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 		    BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE);
-+#else
-+		    BN_num_bits(RSA_get0_n(key->rsa)), SSH_RSA_MINIMUM_MODULUS_SIZE);
-+#endif
- 		return -1;
- 	}
- 	pamsshagentauth_buffer_init(&b);
-@@ -161,12 +171,14 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
- 		pamsshagentauth_xfree(sigblob);
- 		return -1;
- 	}
--	EVP_DigestInit(&md, evp_md);
--	EVP_DigestUpdate(&md, data, datalen);
--	EVP_DigestFinal(&md, digest, &dlen);
-+	md = EVP_MD_CTX_create();
-+	EVP_DigestInit(md, evp_md);
-+	EVP_DigestUpdate(md, data, datalen);
-+	EVP_DigestFinal(md, digest, &dlen);
- 
- 	ret = openssh_RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
- 	memset(digest, 'd', sizeof(digest));
-+	EVP_MD_CTX_destroy(md);
- 	memset(sigblob, 's', len);
- 	pamsshagentauth_xfree(sigblob);
- 	pamsshagentauth_verbose("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
-
-From 4dc87369134f215378042ec4d971a4fe48d1a02b Mon Sep 17 00:00:00 2001
-From: Guido Falsi <mad@madpilot.net>
-Date: Wed, 24 Oct 2018 20:36:15 +0200
-Subject: [PATCH 2/2] Check against the correct OPENSSL_VERSION_NUMBER
-
-Alexey Dokuchaev (a fellow FreeBSD developer) pointed out to me the opaque structures were introduced in 1.1.0-pre
-5, so the correct OPENSSL_VERSION_NUMBER to discriminate is 0x10100005L.
----
- authfd.c    | 12 ++++++------
- bufbn.c     |  2 +-
- key.c       | 36 ++++++++++++++++++------------------
- ssh-dss.c   | 10 +++++-----
- ssh-ecdsa.c |  8 ++++----
- ssh-rsa.c   |  4 ++--
- 6 files changed, 36 insertions(+), 36 deletions(-)
-
-diff --git a/authfd.c b/authfd.c
-index 35f8de1..01d1d89 100644
---- a/authfd.c
-+++ b/authfd.c
-@@ -372,7 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
- 	case 1:
- 		key = pamsshagentauth_key_new(KEY_RSA1);
- 		bits = pamsshagentauth_buffer_get_int(&auth->identities);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->e);
- 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->n);
- 		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
-@@ -432,7 +432,7 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
- 	}
- 	pamsshagentauth_buffer_init(&buffer);
- 	pamsshagentauth_buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- 	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
- 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->e);
- 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->n);
-@@ -517,7 +517,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
- static void
- ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- 	pamsshagentauth_buffer_put_int(b, BN_num_bits(key->n));
- 	pamsshagentauth_buffer_put_bignum(b, key->n);
- 	pamsshagentauth_buffer_put_bignum(b, key->e);
-@@ -545,7 +545,7 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
- 	pamsshagentauth_buffer_put_cstring(b, key_ssh_name(key));
- 	switch (key->type) {
- 	case KEY_RSA:
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->n);
- 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->e);
- 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->d);
-@@ -562,7 +562,7 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
- #endif
- 		break;
- 	case KEY_DSA:
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->p);
- 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->q);
- 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->g);
-@@ -654,7 +654,7 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
- 
- 	if (key->type == KEY_RSA1) {
- 		pamsshagentauth_buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- 		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(key->rsa->n));
- 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->e);
- 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->n);
-diff --git a/bufbn.c b/bufbn.c
-index 4ecedc1..b4754cc 100644
---- a/bufbn.c
-+++ b/bufbn.c
-@@ -151,7 +151,7 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
- 		pamsshagentauth_buffer_put_int(buffer, 0);
- 		return 0;
- 	}
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- 	if (value->neg) {
- #else
- 	if (BN_is_negative(value)) {
-diff --git a/key.c b/key.c
-index aedbbb5..dcc5fc8 100644
---- a/key.c
-+++ b/key.c
-@@ -77,7 +77,7 @@ pamsshagentauth_key_new(int type)
- 	case KEY_RSA:
- 		if ((rsa = RSA_new()) == NULL)
- 			pamsshagentauth_fatal("key_new: RSA_new failed");
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- 		if ((rsa->n = BN_new()) == NULL)
- 			pamsshagentauth_fatal("key_new: BN_new failed");
- 		if ((rsa->e = BN_new()) == NULL)
-@@ -91,7 +91,7 @@ pamsshagentauth_key_new(int type)
- 	case KEY_DSA:
- 		if ((dsa = DSA_new()) == NULL)
- 			pamsshagentauth_fatal("key_new: DSA_new failed");
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- 		if ((dsa->p = BN_new()) == NULL)
- 			pamsshagentauth_fatal("key_new: BN_new failed");
- 		if ((dsa->q = BN_new()) == NULL)
-@@ -130,7 +130,7 @@ pamsshagentauth_key_new_private(int type)
- 	switch (k->type) {
- 	case KEY_RSA1:
- 	case KEY_RSA:
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- 		if ((k->rsa->d = BN_new()) == NULL)
- 			pamsshagentauth_fatal("key_new_private: BN_new failed");
- 		if ((k->rsa->iqmp = BN_new()) == NULL)
-@@ -153,7 +153,7 @@ pamsshagentauth_key_new_private(int type)
- #endif
- 		break;
- 	case KEY_DSA:
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- 		if ((k->dsa->priv_key = BN_new()) == NULL)
- 			pamsshagentauth_fatal("key_new_private: BN_new failed");
- #else
-@@ -162,7 +162,7 @@ pamsshagentauth_key_new_private(int type)
- #endif
- 		break;
- 	case KEY_ECDSA:
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- 		if (EC_KEY_set_private_key(k->ecdsa, BN_new()) != 1)
- 			pamsshagentauth_fatal("key_new_private: EC_KEY_set_private_key failed");
- #else
-@@ -224,7 +224,7 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
- 	case KEY_RSA1:
- 	case KEY_RSA:
- 		return a->rsa != NULL && b->rsa != NULL &&
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- 		    BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
- 		    BN_cmp(a->rsa->n, b->rsa->n) == 0;
- #else
-@@ -233,7 +233,7 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
- #endif
- 	case KEY_DSA:
- 		return a->dsa != NULL && b->dsa != NULL &&
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- 		    BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
- 		    BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
- 		    BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
-@@ -293,7 +293,7 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
- 	}
- 	switch (k->type) {
- 	case KEY_RSA1:
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- 		nlen = BN_num_bytes(k->rsa->n);
- 		elen = BN_num_bytes(k->rsa->e);
- 		len = nlen + elen;
-@@ -510,7 +510,7 @@ pamsshagentauth_key_read(Key *ret, char **cpp)
- 			return -1;
- 		*cpp = cp;
- 		/* Get public exponent, public modulus. */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- 		if (!read_bignum(cpp, ret->rsa->e))
- 			return -1;
- 		if (!read_bignum(cpp, ret->rsa->n))
-@@ -643,7 +643,7 @@ pamsshagentauth_key_write(const Key *key, FILE *f)
- 
- 	if (key->type == KEY_RSA1 && key->rsa != NULL) {
- 		/* size of modulus 'n' */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- 		bits = BN_num_bits(key->rsa->n);
- 		fprintf(f, "%u", bits);
- 		if (write_bignum(f, key->rsa->e) &&
-@@ -742,7 +742,7 @@ pamsshagentauth_key_size(const Key *k)
- {
- 	switch (k->type) {
- 	case KEY_RSA1:
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- 	case KEY_RSA:
- 		return BN_num_bits(k->rsa->n);
- 	case KEY_DSA:
-@@ -843,7 +843,7 @@ pamsshagentauth_key_from_private(const Key *k)
- 	switch (k->type) {
- 	case KEY_DSA:
- 		n = pamsshagentauth_key_new(k->type);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- 		if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
- 		    (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
- 		    (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
-@@ -859,7 +859,7 @@ pamsshagentauth_key_from_private(const Key *k)
- 	case KEY_RSA:
- 	case KEY_RSA1:
- 		n = pamsshagentauth_key_new(k->type);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- 		if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
- 		    (BN_copy(n->rsa->e, k->rsa->e) == NULL))
- #else
-@@ -967,7 +967,7 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
- 	switch (type) {
- 	case KEY_RSA:
- 		key = pamsshagentauth_key_new(type);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->e) == -1 ||
- 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->n) == -1) {
- #else
-@@ -985,7 +985,7 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
- 		break;
- 	case KEY_DSA:
- 		key = pamsshagentauth_key_new(type);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->p) == -1 ||
- 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->q) == -1 ||
- 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->g) == -1 ||
-@@ -1113,7 +1113,7 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
- 	}
- 	pamsshagentauth_buffer_init(&b);
- 	switch (key->type) {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- 	case KEY_DSA:
- 		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
- 		pamsshagentauth_buffer_put_bignum2(&b, key->dsa->p);
-@@ -1251,7 +1251,7 @@ pamsshagentauth_key_demote(const Key *k)
- 	case KEY_RSA:
- 		if ((pk->rsa = RSA_new()) == NULL)
- 			pamsshagentauth_fatal("key_demote: RSA_new failed");
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- 		if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL)
- 			pamsshagentauth_fatal("key_demote: BN_dup failed");
- 		if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL)
-@@ -1264,7 +1264,7 @@ pamsshagentauth_key_demote(const Key *k)
- 	case KEY_DSA:
- 		if ((pk->dsa = DSA_new()) == NULL)
- 			pamsshagentauth_fatal("key_demote: DSA_new failed");
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- 		if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL)
- 			pamsshagentauth_fatal("key_demote: BN_dup failed");
- 		if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL)
-diff --git a/ssh-dss.c b/ssh-dss.c
-index 1051ae2..9b96274 100644
---- a/ssh-dss.c
-+++ b/ssh-dss.c
-@@ -52,7 +52,7 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
- 	u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
- 	u_int rlen, slen, len, dlen;
- 	Buffer b;
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100005L
- 	const BIGNUM *r, *s;
- #endif
- 
-@@ -74,7 +74,7 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
- 		return -1;
- 	}
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- 	rlen = BN_num_bytes(sig->r);
- 	slen = BN_num_bytes(sig->s);
- #else
-@@ -88,7 +88,7 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
- 		return -1;
- 	}
- 	memset(sigblob, 0, SIGBLOB_LEN);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
- 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
- #else
-@@ -131,7 +131,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
- 	u_int len, dlen;
- 	int rlen, ret;
- 	Buffer b;
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100005L
- 	BIGNUM *r, *s;
- #endif
- 
-@@ -176,7 +176,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
- 	/* parse signature */
- 	if ((sig = DSA_SIG_new()) == NULL)
- 		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_new failed");
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- 	if ((sig->r = BN_new()) == NULL)
- 		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
- 	if ((sig->s = BN_new()) == NULL)
-diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
-index c213959..5b13b30 100644
---- a/ssh-ecdsa.c
-+++ b/ssh-ecdsa.c
-@@ -45,7 +45,7 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
-     u_char digest[EVP_MAX_MD_SIZE];
-     u_int len, dlen;
-     Buffer b, bb;
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100005L
- 	BIGNUM *r, *s;
- #endif
- 
-@@ -69,7 +69,7 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
-     }
- 
-     pamsshagentauth_buffer_init(&bb);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
-     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
-         pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
- #else
-@@ -110,7 +110,7 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
-     u_int len, dlen;
-     int rlen, ret;
-     Buffer b;
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100005L
- 	BIGNUM *r, *s;
- #endif
- 
-@@ -141,7 +141,7 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
- 
-     pamsshagentauth_buffer_init(&b);
-     pamsshagentauth_buffer_append(&b, sigblob, len);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
-     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
-         (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
- #else
-diff --git a/ssh-rsa.c b/ssh-rsa.c
-index 9d74eb6..35f2e36 100644
---- a/ssh-rsa.c
-+++ b/ssh-rsa.c
-@@ -119,13 +119,13 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
- 		pamsshagentauth_logerror("ssh_rsa_verify: no RSA key");
- 		return -1;
- 	}
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- 	if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
- #else
- 	if (BN_num_bits(RSA_get0_n(key->rsa)) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
- #endif
- 		pamsshagentauth_logerror("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits",
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- 		    BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE);
- #else
- 		    BN_num_bits(RSA_get0_n(key->rsa)), SSH_RSA_MINIMUM_MODULUS_SIZE);
diff --git a/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.10.3.ebuild b/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.10.3.ebuild
index 37eb86d8b47a..0f8057731085 100644
--- a/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.10.3.ebuild
+++ b/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.10.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,8 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/jbeverly/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="mirror://sourceforge/pamsshagentauth/${PN}/v${PV}/${P}.tar.bz2"
+	SRC_URI="mirror://sourceforge/pamsshagentauth/${PN}/v${PV}/${P}.tar.bz2
+	https://dev.gentoo.org/~juippis/distfiles/tmp/pam_ssh_agent_auth-0.10.3-openssl-1.1.1.patch"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
@@ -21,7 +22,7 @@ SLOT="0"
 IUSE=""
 
 PATCHES=(
-	"${FILESDIR}/${P}-openssl-1.1.1.patch"
+	"${DISTDIR}/${P}-openssl-1.1.1.patch"
 )
 DEPEND="sys-libs/pam
 	dev-libs/openssl:0="
diff --git a/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-9999.ebuild b/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-9999.ebuild
index 12b2fba91df3..0f8057731085 100644
--- a/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-9999.ebuild
+++ b/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,8 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/jbeverly/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="mirror://sourceforge/pamsshagentauth/${PN}/v${PV}/${P}.tar.bz2"
+	SRC_URI="mirror://sourceforge/pamsshagentauth/${PN}/v${PV}/${P}.tar.bz2
+	https://dev.gentoo.org/~juippis/distfiles/tmp/pam_ssh_agent_auth-0.10.3-openssl-1.1.1.patch"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
@@ -20,6 +21,9 @@ LICENSE="MIT"
 SLOT="0"
 IUSE=""
 
+PATCHES=(
+	"${DISTDIR}/${P}-openssl-1.1.1.patch"
+)
 DEPEND="sys-libs/pam
 	dev-libs/openssl:0="
 
diff --git a/sys-auth/seatd/seatd-0.4.0.ebuild b/sys-auth/seatd/seatd-0.4.0.ebuild
index af30955801c9..06bf3fce1be6 100644
--- a/sys-auth/seatd/seatd-0.4.0.ebuild
+++ b/sys-auth/seatd/seatd-0.4.0.ebuild
@@ -30,6 +30,7 @@ BDEPEND=">=app-text/scdoc-1.9.7"
 src_configure() {
 	local emesonargs=(
 		-Dman-pages=enabled
+		-Dwerror=false
 	)
 
 	if use elogind || use systemd; then
diff --git a/sys-auth/seatd/seatd-9999.ebuild b/sys-auth/seatd/seatd-9999.ebuild
index 9e9664be82a0..3d89eb8e867b 100644
--- a/sys-auth/seatd/seatd-9999.ebuild
+++ b/sys-auth/seatd/seatd-9999.ebuild
@@ -29,6 +29,7 @@ BDEPEND=">=app-text/scdoc-1.9.7"
 src_configure() {
 	local emesonargs=(
 		-Dman-pages=enabled
+		-Dwerror=false
 	)
 
 	if use elogind || use systemd; then
diff --git a/sys-auth/ykclient/ykclient-2.15.ebuild b/sys-auth/ykclient/ykclient-2.15.ebuild
index cec75e52208d..e119df25b795 100644
--- a/sys-auth/ykclient/ykclient-2.15.ebuild
+++ b/sys-auth/ykclient/ykclient-2.15.ebuild
@@ -1,19 +1,26 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Yubico C client library"
 SRC_URI="http://opensource.yubico.com/yubico-c-client/releases/${P}.tar.gz"
 HOMEPAGE="https://github.com/Yubico/yubico-c-client"
 
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
 LICENSE="BSD-2"
-IUSE="static-libs"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# Tests require an active network connection, we don't want to run them
+RESTRICT="test"
 
-RDEPEND=">=net-misc/curl-7.21.1"
+RDEPEND="net-misc/curl"
 DEPEND="${RDEPEND}"
 
-# Tests require an active network connection, we don't want to run them
-RESTRICT="test"
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 6490a796e806..8ecf299d8b96 100644
Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ
diff --git a/sys-block/libzbc/libzbc-5.5.1.ebuild b/sys-block/libzbc/libzbc-5.5.1.ebuild
index 093cc27ec453..f61ae7b6e199 100644
--- a/sys-block/libzbc/libzbc-5.5.1.ebuild
+++ b/sys-block/libzbc/libzbc-5.5.1.ebuild
@@ -29,5 +29,12 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_with gtk gtk3)
+	econf \
+		$(use_with gtk gtk3) \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest
index 5f56dd2b3869..50657888893e 100644
--- a/sys-block/parted/Manifest
+++ b/sys-block/parted/Manifest
@@ -1,4 +1 @@
-DIST parted-3.2.tar.xz 1655244 BLAKE2B 56608590b26a9b5266dacf3698d990b730bdb35d9374d1da57103fbef3ef5037e40dd2fe0f523ca8e0e75401a3b25cf543e5ca5c94cf410bbaa62ea15d6f0ba3 SHA512 4e37dbdd6f5032c9ebfec43704f6882379597d038167b9c4d04053efa083c68a705196713864451fa9e11d32777e16c68982877945c5efd9ea5f8252cb20e1c4
 DIST parted-3.3.tar.xz 1757432 BLAKE2B d1e248cd8fdce22d4957055d65f9f93333505229f92174f343897422a31a43f3d35ea06f8f1bdafd254e4629c5890ec38d6b75d3b499c39a9ada4a8d5f9d9d8f SHA512 d1384694a491aa53bab6206fdeccd1d192de2ed379fe25aa865dd6aa06ed945a728e85b2ccc2fb23f5aa9dfee4a8bd8f0f2be1dd386cb8e8861b73382c6a07e4
-DIST parted_3.2-23.debian.tar.xz 88152 BLAKE2B 5e69a5799cc909bf54d1dcd1c7a8f7fe5dd7ce46b03957406f4a6118480d5acca3a165cc16b720fd03a89339fcfb46844d470079c4e10a4683e270c9e804c245 SHA512 7f449a24d1ea75a185b5fd589fea73a2f0944f1276288ece2790c5889de6adf8354f94388046a25b2dbf5735759f6010397f140607320a4de348cf77f8c75b09
-DIST parted_3.2-25.debian.tar.xz 88524 BLAKE2B e994ca8a68f700773e0a67657d59793ea130a5c7e9eca31688fa48e7133a0c350446b8c0a175ac2f59aca8c2fe1ef419a94f3f6f0547b0b25cca329c6f569571 SHA512 2d4e52513b016ef67b203db577641cd56b4d2d013e1bc186b665ab47d0f6c673321b108f81d36caaa0fd14c555d8336a2556a60cccbeccb9d2cf98a85872d949
diff --git a/sys-block/parted/files/parted-3.2-devmapper.patch b/sys-block/parted/files/parted-3.2-devmapper.patch
deleted file mode 100644
index 0cd3e0e3307f..000000000000
--- a/sys-block/parted/files/parted-3.2-devmapper.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/libparted/arch/linux.c
-+++ b/libparted/arch/linux.c
-@@ -2304,6 +2304,7 @@
-   return r < 0 ? NULL : resultp;
- }
- 
-+#ifdef ENABLE_DEVICE_MAPPER
- static char *
- dm_canonical_path (PedDevice const *dev)
- {
-@@ -2326,12 +2327,22 @@
- err:
-         return NULL;
- }
-+#endif /* ENABLE_DEVICE_MAPPER */
- 
- static char*
- _device_get_part_path (PedDevice const *dev, int num)
- {
--        char *devpath = (dev->type == PED_DEVICE_DM
--                         ? dm_canonical_path (dev) : dev->path);
-+        char *devpath =
-+#ifdef ENABLE_DEVICE_MAPPER
-+                        (
-+                         dev->type == PED_DEVICE_DM
-+                         ? dm_canonical_path (dev) :
-+#endif /* ENABLE_DEVICE_MAPPER */
-+						 dev->path
-+#ifdef ENABLE_DEVICE_MAPPER
-+                        )
-+#endif /* ENABLE_DEVICE_MAPPER */
-+                        ;
-         size_t path_len = strlen (devpath);
-         char *result;
-         /* Check for devfs-style /disc => /partN transformation
-@@ -2945,12 +2956,14 @@
-                                                unsigned long long *length);
- 
- 
-+#ifdef ENABLE_DEVICE_MAPPER
-         if (disk->dev->type == PED_DEVICE_DM) {
-                 add_partition = _dm_add_partition;
-                 remove_partition = _dm_remove_partition;
-                 resize_partition = _dm_resize_partition;
-                 get_partition_start_and_length = _dm_get_partition_start_and_length;
-         } else {
-+#endif /* ENABLE_DEVICE_MAPPER */
-                 add_partition = _blkpg_add_partition;
-                 remove_partition = _blkpg_remove_partition;
- #ifdef BLKPG_RESIZE_PARTITION
-@@ -2959,7 +2972,9 @@
-                 resize_partition = NULL;
- #endif
-                 get_partition_start_and_length = _kernel_get_partition_start_and_length;
-+#ifdef ENABLE_DEVICE_MAPPER
-         }
-+#endif /* ENABLE_DEVICE_MAPPER */
- 
-         /* lpn = largest partition number.
-          * for remove pass, use greater of device or label limit */
diff --git a/sys-block/parted/files/parted-3.2-fix-resizing-FAT16.patch b/sys-block/parted/files/parted-3.2-fix-resizing-FAT16.patch
deleted file mode 100644
index 2a5a2311f1dd..000000000000
--- a/sys-block/parted/files/parted-3.2-fix-resizing-FAT16.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 1e9e770f4bc7f3d80e09ecd1df58575fad064163 Mon Sep 17 00:00:00 2001
-From: Mike Fleetwood <mike.fleetwood@googlemail.com>
-Date: Sun, 28 Sep 2014 15:15:48 +0000
-Subject: lib-fs-resize: Prevent crash resizing FAT16 file systems
-
-Resizing FAT16 file system crashes in libparted/fs/r/fat/resize.c
-create_resize_context() because it was dereferencing NULL pointer
-fs_info->info_sector to copy the info_sector.
-
-Only FAT32 file systems have info_sector populated by fat_open() ->
-fat_info_sector_read().  FAT12 and FAT16 file systems don't have an
-info_sector so pointer fs_info->info_sector remains assigned NULL from
-fat_alloc().  When resizing a FAT file system create_resize_context()
-was always dereferencing fs_info->info_sector to memory copy the
-info_sector, hence it crashed for FAT12 and FAT16.
-
-Make create_resize_context() only copy the info_sector for FAT32 file
-systems.
-
-Reported by Christian Hesse in
-https://bugzilla.gnome.org/show_bug.cgi?id=735669
----
-diff --git a/NEWS b/NEWS
-index 297b0a5..da7db50 100644
---- a/NEWS
-+++ b/NEWS
-@@ -2,6 +2,10 @@ GNU parted NEWS                                    -*- outline -*-
- 
- * Noteworthy changes in release ?.? (????-??-??) [?]
- 
-+** Bug Fixes
-+
-+  libparted-fs-resize: Prevent crash resizing FAT16 file systems.
-+
- 
- * Noteworthy changes in release 3.2 (2014-07-28) [stable]
- 
-diff --git a/libparted/fs/r/fat/resize.c b/libparted/fs/r/fat/resize.c
-index 919acf0..bfe60a0 100644
---- a/libparted/fs/r/fat/resize.c
-+++ b/libparted/fs/r/fat/resize.c
-@@ -668,11 +668,17 @@ create_resize_context (PedFileSystem* fs, const PedGeometry* new_geom)
- 
- /* preserve boot code, etc. */
- 	new_fs_info->boot_sector = ped_malloc (new_geom->dev->sector_size);
--	new_fs_info->info_sector = ped_malloc (new_geom->dev->sector_size);
- 	memcpy (new_fs_info->boot_sector, fs_info->boot_sector,
- 		new_geom->dev->sector_size);
--	memcpy (new_fs_info->info_sector, fs_info->info_sector,
--		new_geom->dev->sector_size);
-+	new_fs_info->info_sector = NULL;
-+	if (fs_info->fat_type == FAT_TYPE_FAT32)
-+	{
-+		PED_ASSERT (fs_info->info_sector != NULL);
-+		new_fs_info->info_sector =
-+			ped_malloc (new_geom->dev->sector_size);
-+		memcpy (new_fs_info->info_sector, fs_info->info_sector,
-+			new_geom->dev->sector_size);
-+	}
- 
- 	new_fs_info->logical_sector_size = fs_info->logical_sector_size;
- 	new_fs_info->sector_count = new_geom->length;
---
-cgit v0.9.0.2
diff --git a/sys-block/parted/files/parted-3.2-sysmacros.patch b/sys-block/parted/files/parted-3.2-sysmacros.patch
deleted file mode 100644
index a29e7619b148..000000000000
--- a/sys-block/parted/files/parted-3.2-sysmacros.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://bugs.gentoo.org/580022
-
-From dec8995fe80508374beba6356f6ecbba8ef6b18b Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 21 Jun 2016 15:01:08 -0400
-Subject: [PATCH] include sysmacros.h for major/minor/makedev
-
-Linux C libs are moving away from including this header implicitly via
-sys/types.h, so include it explicitly.
----
- libparted/arch/linux.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
-index 326b95619d31..e5c168be3c68 100644
---- a/libparted/arch/linux.c
-+++ b/libparted/arch/linux.c
-@@ -37,6 +37,7 @@
- #include <dirent.h>
- #include <sys/ioctl.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/utsname.h>        /* for uname() */
- #include <scsi/scsi.h>
--- 
-2.8.2
-
diff --git a/sys-block/parted/parted-3.2-r1.ebuild b/sys-block/parted/parted-3.2-r1.ebuild
deleted file mode 100644
index 5c7263071d8e..000000000000
--- a/sys-block/parted/parted-3.2-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic ltprune
-
-DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
-HOMEPAGE="https://www.gnu.org/software/parted"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="+debug device-mapper nls readline selinux static-libs"
-RESTRICT="test"
-
-# specific version for gettext needed
-# to fix bug 85999
-RDEPEND="
-	>=sys-fs/e2fsprogs-1.27
-	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
-	readline? ( >=sys-libs/readline-5.2:0= >=sys-libs/ncurses-5.7-r7:0= )
-	selinux? ( sys-libs/libselinux )
-	elibc_uclibc? ( dev-libs/libiconv )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.12.1-r2 )
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-3.2-devmapper.patch \
-		"${FILESDIR}"/${PN}-3.2-po4a-mandir.patch \
-		"${FILESDIR}"/${PN}-3.2-fix-resizing-FAT16.patch \
-		"${FILESDIR}"/${PN}-3.2-sysmacros.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	use elibc_uclibc && append-libs -liconv
-	econf \
-		$(use_enable debug) \
-		$(use_enable device-mapper) \
-		$(use_enable nls) \
-		$(use_enable selinux) \
-		$(use_enable static-libs static) \
-		$(use_with readline) \
-		--disable-rpath
-}
-
-DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} )
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/sys-block/parted/parted-3.2_p23.ebuild b/sys-block/parted/parted-3.2_p23.ebuild
deleted file mode 100644
index c02bd5426f6d..000000000000
--- a/sys-block/parted/parted-3.2_p23.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
-inherit autotools flag-o-matic
-
-DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
-HOMEPAGE="https://www.gnu.org/software/parted"
-SRC_URI="
-	mirror://gnu/${PN}/${P/_p*/}.tar.xz
-	mirror://debian/pool/main/p/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="+debug device-mapper nls readline selinux static-libs"
-RESTRICT="test"
-
-# specific version for gettext needed
-# to fix bug 85999
-RDEPEND="
-	>=sys-fs/e2fsprogs-1.27
-	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
-	readline? ( >=sys-libs/readline-5.2:0= >=sys-libs/ncurses-5.7-r7:0= )
-	selinux? ( sys-libs/libselinux )
-	elibc_uclibc? ( dev-libs/libiconv )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.12.1-r2 )
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2-devmapper.patch
-	"${FILESDIR}"/${PN}-3.2-po4a-mandir.patch
-)
-S=${WORKDIR}/${P/_p*/}
-
-src_prepare() {
-	default
-	sed -i -e '/atari\.patch/d' "${WORKDIR}"/debian/patches/series || die
-	for patch in $(< "${WORKDIR}"/debian/patches/series); do
-		eapply "${WORKDIR}/debian/patches/$patch"
-	done
-
-	eautoreconf
-}
-
-src_configure() {
-	use elibc_uclibc && append-libs -liconv
-	econf \
-		$(use_enable debug) \
-		$(use_enable device-mapper) \
-		$(use_enable nls) \
-		$(use_enable selinux) \
-		$(use_enable static-libs static) \
-		$(use_with readline) \
-		--disable-rpath
-}
-
-DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} )
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sys-block/parted/parted-3.2_p25.ebuild b/sys-block/parted/parted-3.2_p25.ebuild
deleted file mode 100644
index fceabd18435f..000000000000
--- a/sys-block/parted/parted-3.2_p25.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
-inherit autotools flag-o-matic
-
-DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
-HOMEPAGE="https://www.gnu.org/software/parted"
-SRC_URI="
-	mirror://gnu/${PN}/${P/_p*/}.tar.xz
-	mirror://debian/pool/main/p/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="+debug device-mapper nls readline selinux static-libs"
-RESTRICT="test"
-
-# specific version for gettext needed
-# to fix bug 85999
-RDEPEND="
-	>=sys-fs/e2fsprogs-1.27
-	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
-	readline? ( >=sys-libs/readline-5.2:0= >=sys-libs/ncurses-5.7-r7:0= )
-	selinux? ( sys-libs/libselinux )
-	elibc_uclibc? ( dev-libs/libiconv )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.12.1-r2 )
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2-devmapper.patch
-	"${FILESDIR}"/${PN}-3.2-po4a-mandir.patch
-)
-S=${WORKDIR}/${P/_p*/}
-
-src_prepare() {
-	default
-	sed -i -e '/atari\.patch/d' "${WORKDIR}"/debian/patches/series || die
-	for patch in $(< "${WORKDIR}"/debian/patches/series); do
-		eapply "${WORKDIR}/debian/patches/$patch"
-	done
-
-	eautoreconf
-}
-
-src_configure() {
-	use elibc_uclibc && append-libs -liconv
-	econf \
-		$(use_enable debug) \
-		$(use_enable device-mapper) \
-		$(use_enable nls) \
-		$(use_enable selinux) \
-		$(use_enable static-libs static) \
-		$(use_with readline) \
-		--disable-rpath
-}
-
-DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} )
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sys-block/parted/parted-3.3-r2.ebuild b/sys-block/parted/parted-3.3-r2.ebuild
index 40f2f7b8ea7e..5cc32e79496f 100644
--- a/sys-block/parted/parted-3.3-r2.ebuild
+++ b/sys-block/parted/parted-3.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="+debug device-mapper nls readline selinux"
 
 RDEPEND="
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index ba8e20084146..670daf59f108 100644
Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ
diff --git a/sys-boot/unetbootin/unetbootin-700.ebuild b/sys-boot/unetbootin/unetbootin-700.ebuild
index b5809cfc55d5..8f28fc70455f 100644
--- a/sys-boot/unetbootin/unetbootin-700.ebuild
+++ b/sys-boot/unetbootin/unetbootin-700.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/unetbootin/unetbootin/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 UNBI_LINGUAS="
 	am ar ast be bg bn ca cs da de el eo es et eu fa fi fo fr gl he hr hu id it
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index f7bf36753182..4c3ca8cb1d5b 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/ceph/ceph-14.2.11-r1.ebuild b/sys-cluster/ceph/ceph-14.2.11-r1.ebuild
index 35c24e6a41de..43094784627a 100644
--- a/sys-cluster/ceph/ceph-14.2.11-r1.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.11-r1.ebuild
@@ -151,7 +151,7 @@ RDEPEND="${DEPEND}
 		diskprediction? (
 			$(python_gen_cond_dep '<dev-python/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7})
 		)
-		sci-libs/scikits_learn[${PYTHON_USEDEP}]
+		sci-libs/scikit-learn[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 	)
 "
diff --git a/sys-cluster/ceph/ceph-14.2.11.ebuild b/sys-cluster/ceph/ceph-14.2.11.ebuild
index 09fdd24959db..e1920626c418 100644
--- a/sys-cluster/ceph/ceph-14.2.11.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.11.ebuild
@@ -150,7 +150,7 @@ RDEPEND="${DEPEND}
 		diskprediction? (
 			$(python_gen_cond_dep '<dev-python/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7})
 		)
-		sci-libs/scikits_learn[${PYTHON_USEDEP}]
+		sci-libs/scikit-learn[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 	)
 "
diff --git a/sys-cluster/ceph/ceph-14.2.13.ebuild b/sys-cluster/ceph/ceph-14.2.13.ebuild
index 56971678154c..5983452b9664 100644
--- a/sys-cluster/ceph/ceph-14.2.13.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.13.ebuild
@@ -151,7 +151,7 @@ RDEPEND="${DEPEND}
 		diskprediction? (
 			$(python_gen_cond_dep '<dev-python/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7})
 		)
-		sci-libs/scikits_learn[${PYTHON_USEDEP}]
+		sci-libs/scikit-learn[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 	)
 "
diff --git a/sys-cluster/ceph/ceph-15.2.4-r3.ebuild b/sys-cluster/ceph/ceph-15.2.4-r3.ebuild
index 5a32d2f37876..3c6f8a003fc5 100644
--- a/sys-cluster/ceph/ceph-15.2.4-r3.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.4-r3.ebuild
@@ -155,7 +155,7 @@ RDEPEND="${DEPEND}
 		diskprediction? (
 			$(python_gen_cond_dep '<dev-python/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7})
 		)
-		sci-libs/scikits_learn[${PYTHON_USEDEP}]
+		sci-libs/scikit-learn[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 	)
 "
diff --git a/sys-cluster/ceph/ceph-15.2.5-r1.ebuild b/sys-cluster/ceph/ceph-15.2.5-r1.ebuild
index ace42c44650b..eef323fd6146 100644
--- a/sys-cluster/ceph/ceph-15.2.5-r1.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.5-r1.ebuild
@@ -156,7 +156,7 @@ RDEPEND="${DEPEND}
 		diskprediction? (
 			$(python_gen_cond_dep '<dev-python/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7})
 		)
-		sci-libs/scikits_learn[${PYTHON_USEDEP}]
+		sci-libs/scikit-learn[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 	)
 "
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
index 19db3e948cff..9819d391ebbc 100644
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://hg.linux-ha.org/glue/archive/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa x86"
+KEYWORDS="amd64 hppa x86"
 IUSE="doc ipmilan libnet static-libs"
 
 RDEPEND="
diff --git a/sys-cluster/galera/galera-26.4.4.ebuild b/sys-cluster/galera/galera-26.4.4.ebuild
index 32400de86ef0..bb3365ea44ed 100644
--- a/sys-cluster/galera/galera-26.4.4.ebuild
+++ b/sys-cluster/galera/galera-26.4.4.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2 BSD"
 
 SLOT="0"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 x86"
 IUSE="cpu_flags_x86_sse4_2 garbd test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-cluster/libqb/libqb-1.9.0.ebuild b/sys-cluster/libqb/libqb-1.9.0.ebuild
index 3192028e05fa..198540ff7b96 100644
--- a/sys-cluster/libqb/libqb-1.9.0.ebuild
+++ b/sys-cluster/libqb/libqb-1.9.0.ebuild
@@ -40,6 +40,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		--disable-static \
 		$(use_enable systemd systemd-journal) \
 		$(use_enable debug)
 }
@@ -59,4 +60,6 @@ src_install() {
 
 	use doc && HTML_DOCS=("docs/html/.")
 	einstalldocs
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sys-cluster/mpich/mpich-3.3.ebuild b/sys-cluster/mpich/mpich-3.3-r1.ebuild
similarity index 95%
rename from sys-cluster/mpich/mpich-3.3.ebuild
rename to sys-cluster/mpich/mpich-3.3-r1.ebuild
index 7f8f685b41ad..5aab7b8bb090 100644
--- a/sys-cluster/mpich/mpich-3.3.ebuild
+++ b/sys-cluster/mpich/mpich-3.3-r1.ebuild
@@ -16,16 +16,20 @@ SRC_URI="http://www.mpich.org/static/downloads/${PV}/${P}.tar.gz"
 SLOT="0"
 LICENSE="mpich2"
 KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+cxx doc fortran mpi-threads romio threads"
+IUSE="+cxx doc fortran mpi-threads +romio threads"
+REQUIRED_USE="mpi-threads? ( threads )"
 
 COMMON_DEPEND="
 	>=dev-libs/libaio-0.3.109-r5[${MULTILIB_USEDEP}]
 	>=sys-apps/hwloc-2.0.2[${MULTILIB_USEDEP}]
-	romio? ( net-fs/nfs-utils )"
+	sys-libs/libunwind[${MULTILIB_USEDEP}]
+	romio? ( net-fs/nfs-utils )
+"
 
 DEPEND="${COMMON_DEPEND}
 	dev-lang/perl
-	sys-devel/libtool"
+	sys-devel/libtool
+"
 
 RDEPEND="${COMMON_DEPEND}
 	!sys-cluster/mpich2
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 14f7f3010123..712c69b3f5a5 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -1,3 +1,4 @@
 DIST torque-4.1.7.tar.gz 6218108 BLAKE2B 6c1ad0f1bb3f364603ad7f498999bd910491910fa5632b9f6b82e08b3afb8c54e8775c38bc8e5c959aa99d0647c54c7c348cd07bcbe11add8bfab5f3f06a4c80 SHA512 5a085c0a7b205fed075bff4599db90ca5c4bb5f22d87d76fd56539d5cc1935bb8eeffcd4d18ba84401bd4ca128718070b69c8b91ab6814a4638622ba351654e6
 DIST torque-4.2.10-gh-20150517.tar.gz 5836286 BLAKE2B 7108f1adcb6f674526b7db97df4ebcee04ae5c818d4f35ed1230a4e72e52ec0bc3b44e17334a143b21bcd3acccefc3927eca4f98d54d37745c8bb46a75e07045 SHA512 600bb5389b6a4161732b7aa82627f1ebeae238d7091aa2e223d9a14c44bf4668662f664b976f62ba3f1d8a366f90fb6058a8c904e20c26432dccd6abcd9c57fa
+DIST torque-6.0.4-gcc7.patch 50412 BLAKE2B 43748e9bfd3811abdfeb56f93dd517fcb07a6902194120e2c9e16bbe5bbe0f04afd3f898616d46e0310902a6376671be0c8f3865e8f7dd5381fca46e7ad62fc8 SHA512 430ae6a80ebbfb2066831326f8ce25a34cb6fc17c1fbe4a202c495baceb2b7011c9f6782da31b78c34287f26765c76c587611d689791523b8bd53d634e3681b6
 DIST torque-6.0.4-gh-20170829.tar.gz 6182495 BLAKE2B f9156ae4ffe388a7f3fa0df142e5f2d48c16fd7b8c148a3a80cd1c977eb0c1ef4a455da275f993100867be043422526ed05c53734e707851083d6d23ee1a2cc4 SHA512 8f1101adb89e06617de501f7956e126633b78b495baeb7980d3c534d34537cc604a3cf0a7c23c48eb2554b26cc13672b0e00c75d0f722d63ac4d42d57388ed94
diff --git a/sys-cluster/torque/files/torque-6.0.4-gcc7.patch b/sys-cluster/torque/files/torque-6.0.4-gcc7.patch
deleted file mode 100644
index 340eb9e1bfc0..000000000000
--- a/sys-cluster/torque/files/torque-6.0.4-gcc7.patch
+++ /dev/null
@@ -1,1606 +0,0 @@
-From 8a0b748d3644dde30372ee25c4fe05bec10b2166 Mon Sep 17 00:00:00 2001
-From: Chad Vizino <cvizino@adaptivecomputing.com>
-Date: Fri, 29 Mar 2019 09:23:08 -0600
-Subject: [PATCH] TRQ-4330 - fix gcc/g++ 7 compile issues
-
----
- src/cmds/qdel.c                            |  6 +-
- src/cmds/qsub_functions.c                  | 12 ++--
- src/cmds/qterm.c                           |  2 +
- src/include/array.h                        |  2 +-
- src/include/attribute.h                    |  4 +-
- src/lib/Libattr/attr_fn_acl.c              |  4 +-
- src/lib/Libattr/attr_fn_arst.c             |  4 +-
- src/lib/Libcmds/cvtdate.c                  |  8 +--
- src/lib/Libdis/disrsc.c                    |  2 +
- src/lib/Libdis/disrsi.c                    |  2 +
- src/lib/Libdis/disrsl.c                    |  2 +
- src/lib/Libdis/disrss.c                    |  2 +
- src/lib/Libnet/net_client.c                |  4 +-
- src/lib/Libnet/net_common.c                |  1 +
- src/lib/Libutils/jsoncpp.cpp               |  9 +++
- src/lib/Libutils/numa_chip.cpp             | 10 +--
- src/resmom/checkpoint.c                    | 59 ++++++++++------
- src/resmom/generate_alps_status.c          |  7 +-
- src/resmom/linux/mom_mach.c                | 79 +++++++++++++--------
- src/resmom/mom_main.c                      | 16 ++---
- src/resmom/mom_req_quejob.c                | 12 ++--
- src/resmom/mom_server.c                    | 41 +++++------
- src/resmom/parse_config.c                  |  4 +-
- src/resmom/requests.c                      |  8 +--
- src/scheduler.cc/samples/fifo/dedtime.c    |  2 +-
- src/server/array_func.c                    |  6 +-
- src/server/array_func.h                    |  2 +-
- src/server/geteusernam.c                   |  2 +-
- src/server/job_func.c                      | 28 ++++++--
- src/server/node_attr_def.c                 | 16 ++---
- src/server/node_manager.c                  |  5 +-
- src/server/pbsd_init.c                     |  2 +
- src/server/process_request.c               | 18 ++---
- src/server/req_jobobit.c                   | 16 ++++-
- src/server/req_quejob.c                    |  2 +-
- src/server/req_runjob.c                    | 10 ++-
- src/server/req_stat.c                      |  2 +-
- src/server/svr_chk_owner.c                 | 47 +++++++++----
- src/server/svr_jobfunc.c                   | 80 +++++++++++++++-------
- src/test/catch_child/scaffolding.c         |  1 +
- src/test/geteusernam/scaffolding.c         |  2 +-
- src/test/node_manager/test_uut.c           |  4 +-
- src/test/pbs_log/scaffolding.c             |  3 +-
- src/test/pbsd_main/scaffolding.c           |  2 +-
- src/test/process_alps_status/scaffolding.c |  2 +
- src/test/process_request/scaffolding.c     |  6 +-
- src/test/req_stat/scaffolding.c            |  4 +-
- src/test/svr_chk_owner/scaffolding.c       |  2 +-
- torque.setup.in                            |  2 +-
- 49 files changed, 358 insertions(+), 208 deletions(-)
-
-diff --git a/src/cmds/qdel.c b/src/cmds/qdel.c
-index 909018da66..d7e64f6289 100644
---- a/src/cmds/qdel.c
-+++ b/src/cmds/qdel.c
-@@ -49,7 +49,7 @@ void process_config_file(
- 
- 
- 
--bool is_array(
-+bool is_job_array(
- 
-   char *job_id)
- 
-@@ -66,7 +66,7 @@ bool is_array(
-     }
-     
-   return(false);
--  } /* END is_array() */
-+  } /* END is_job_array() */
- 
- 
- 
-@@ -289,7 +289,7 @@ int qdel_main(
-     snprintf(job_id, sizeof(job_id), "%s", argv[optind]);
-    
-     if ((dash_t == true) && 
--        (is_array(job_id) == false))
-+        (is_job_array(job_id) == false))
-       {
-       fprintf(stderr, "qdel: Error: job id '%s' isn't a job array but -t was specified.\n",
-         job_id);
-diff --git a/src/cmds/qsub_functions.c b/src/cmds/qsub_functions.c
-index 4fdfac0a7b..9799c831f4 100644
---- a/src/cmds/qsub_functions.c
-+++ b/src/cmds/qsub_functions.c
-@@ -3363,14 +3363,14 @@ void process_opts(
-         if (add_verify_resources(ji->res_attr, optarg, data_type) != 0)
-           print_qsub_usage_exit("qsub: illegal -l value");
- 
--          //If cpuclock gets set we need to set the node exclusive flag
-+        //If cpuclock gets set we need to set the node exclusive flag
-+        {
-+        job_data *pData = NULL;
-+        if (hash_find(ji->res_attr,"cpuclock",&pData))
-           {
--          job_data *pData = NULL;
--          if (hash_find(ji->res_attr,"cpuclock",&pData))
--            {
--            hash_add_or_exit(ji->job_attr, ATTR_node_exclusive, "TRUE", data_type);
--            }
-+          hash_add_or_exit(ji->job_attr, ATTR_node_exclusive, "TRUE", data_type);
-           }
-+        }
- 
-         break;
- 
-diff --git a/src/cmds/qterm.c b/src/cmds/qterm.c
-index d05bd42d4e..0519328c01 100644
---- a/src/cmds/qterm.c
-+++ b/src/cmds/qterm.c
-@@ -89,6 +89,8 @@ int main(
- 
-         local = true;
- 
-+        break;
-+
-       case 't':
- 
-         type = optarg;
-diff --git a/src/include/array.h b/src/include/array.h
-index 74050d0a25..d53dec1d3a 100644
---- a/src/include/array.h
-+++ b/src/include/array.h
-@@ -176,7 +176,7 @@ 
- #define TOKENS_TAG "tokens"
- #define TOKEN_TAG "token"
- 
--int  is_array(char *id);
-+int  is_id_array(char *id);
- int  array_delete(job_array *pa);
- int  array_save(job_array *pa);
- int  array_save(job_array *pa);
-diff --git a/src/include/attribute.h b/src/include/attribute.h
-index 8fbff163b8..3d025ab66f 100644
---- a/src/include/attribute.h
-+++ b/src/include/attribute.h
-@@ -512,12 +512,12 @@ int to_size(const char *val, struct size_value *psize);
- void from_size(struct size_value *psize, char *cvnbuf);
- void create_size_string(char *buf, struct size_value values);
- 
--#define NULL_FUNC '\0'
-+#define NULL_FUNC NULL
- 
- /* other associated funtions */
- 
- int   acl_check(pbs_attribute *, char *canidate, int type);
--int   acl_check_my_array_string(struct array_strings *, char *, int);
-+int   acl_check_my_array_string(struct array_strings *, const char *, int);
- char *arst_string(const char *str, pbs_attribute *pattr);
- void  attrl_fixlink(tlist_head *svrattrl);
- void  recov_acl(pbs_attribute *, attribute_def *, const char *, const char *);
-diff --git a/src/lib/Libattr/attr_fn_acl.c b/src/lib/Libattr/attr_fn_acl.c
-index ebb2775bf4..a7368b9f3b 100644
---- a/src/lib/Libattr/attr_fn_acl.c
-+++ b/src/lib/Libattr/attr_fn_acl.c
-@@ -232,7 +232,7 @@ fptr_int get_my_match_func(
- int acl_check_my_array_string(
- 
-   struct array_strings *pas,
--  char                 *name,
-+  const char           *name,
-   int                   type)
- 
-   {
-@@ -503,6 +503,8 @@ int set_allacl(
- 
-       /* No break, "Set" falls into "Incr" to add strings */
- 
-+      // fall through
-+
-     case INCR_OLD:
-     case INCR:
- 
-diff --git a/src/lib/Libattr/attr_fn_arst.c b/src/lib/Libattr/attr_fn_arst.c
-index c63281637e..9d82e873a3 100644
---- a/src/lib/Libattr/attr_fn_arst.c
-+++ b/src/lib/Libattr/attr_fn_arst.c
-@@ -532,7 +532,8 @@ int encode_arst(
- 
-         *pc++ = '\\';
- 
--        // escape sequence added. Fall through.
-+        // escape sequence added.
-+        // fall through
- 
-       default:
- 
-@@ -735,6 +736,7 @@ int set_arst(
-       pas->as_next = pas->as_buf;
- 
-       /* no break, "SET" falls into "MERGE" to add strings */
-+      // fall through
- 
-     case INCR_OLD:
-     case MERGE:
-diff --git a/src/lib/Libcmds/cvtdate.c b/src/lib/Libcmds/cvtdate.c
-index e936c6fbed..0e24639619 100644
---- a/src/lib/Libcmds/cvtdate.c
-+++ b/src/lib/Libcmds/cvtdate.c
-@@ -167,7 +167,7 @@ time_t cvtdate(
-       year   = atoi(buf) * 100;
-       datestr += 2;
- 
--      /* no break, fall into next case */
-+      // fall through
- 
-     case 10:  /* YYMMDDhhmm */
-       buf[0] = datestr[0];
-@@ -187,7 +187,7 @@ time_t cvtdate(
- 
-       datestr += 2;
- 
--      /* no break, fall into next case */
-+      // fall through
- 
-     case 8:  /* MMDDhhmm */
-       buf[0] = datestr[0];
-@@ -209,7 +209,7 @@ time_t cvtdate(
- 
-       datestr += 2;
- 
--      /* no break, fall into next case */
-+      // fall through
- 
-     case 6:  /* DDhhmm */
-       buf[0] = datestr[0];
-@@ -229,7 +229,7 @@ time_t cvtdate(
- 
-       datestr += 2;
- 
--      /* no break, fall into next case */
-+      // fall through
- 
-     case 4:  /* hhmm */
-       buf[0] = datestr[0];
-diff --git a/src/lib/Libdis/disrsc.c b/src/lib/Libdis/disrsc.c
-index ac7fec6cbb..2baf87b2b9 100644
---- a/src/lib/Libdis/disrsc.c
-+++ b/src/lib/Libdis/disrsc.c
-@@ -141,6 +141,8 @@ signed char disrsc(
-       else
-         locret = DIS_OVERFLOW;
- 
-+      // fall through
-+
-     case DIS_OVERFLOW:
-       value = negate ? SCHAR_MIN : SCHAR_MAX;
-     }
-diff --git a/src/lib/Libdis/disrsi.c b/src/lib/Libdis/disrsi.c
-index a2417725fe..dd073b1bb0 100644
---- a/src/lib/Libdis/disrsi.c
-+++ b/src/lib/Libdis/disrsi.c
-@@ -141,6 +141,8 @@ int disrsi(
-         *retval = locret;
-         }
- 
-+    // fall through
-+
-     case DIS_OVERFLOW:
- 
-       value = negate ? INT_MIN : INT_MAX;
-diff --git a/src/lib/Libdis/disrsl.c b/src/lib/Libdis/disrsl.c
-index 9853056fcf..5fba4a4ba0 100644
---- a/src/lib/Libdis/disrsl.c
-+++ b/src/lib/Libdis/disrsl.c
-@@ -139,6 +139,8 @@ long disrsl(
-       else
-         locret = DIS_OVERFLOW;
- 
-+      // fall through
-+
-     case DIS_OVERFLOW:
-       value = negate ? LONG_MIN : LONG_MAX;
-     }
-diff --git a/src/lib/Libdis/disrss.c b/src/lib/Libdis/disrss.c
-index 80eb98109b..e2496b8adf 100644
---- a/src/lib/Libdis/disrss.c
-+++ b/src/lib/Libdis/disrss.c
-@@ -140,6 +140,8 @@ short disrss(
-       else
-         locret = DIS_OVERFLOW;
- 
-+      // fall through
-+
-     case DIS_OVERFLOW:
-       value = negate ? SHRT_MIN : SHRT_MAX;
-     }
-diff --git a/src/lib/Libnet/net_client.c b/src/lib/Libnet/net_client.c
-index 8f8542320b..a324c08197 100644
---- a/src/lib/Libnet/net_client.c
-+++ b/src/lib/Libnet/net_client.c
-@@ -532,7 +532,7 @@ int client_to_svr(
-         break;
-         }/* Interrupted system call */
-       
--      /* fall through to next case */
-+      // fall through
- 
-     case EINVAL:		/* Invalid argument */
-     
-@@ -583,6 +583,8 @@ int client_to_svr(
-         
-         goto retry;
-         }
-+
-+      // fall through
-       
-     default:
-       
-diff --git a/src/lib/Libnet/net_common.c b/src/lib/Libnet/net_common.c
-index 7b36d31aa1..80bb78bee5 100644
---- a/src/lib/Libnet/net_common.c
-+++ b/src/lib/Libnet/net_common.c
-@@ -405,6 +405,7 @@ int socket_connect_addr(
-           }
- 
-         /* essentially, only fall through for a transient failure */
-+        // fall through
- 
-       /* socket not ready for writing after 5 timeout */
-       case EINVAL:    /* Invalid argument */
-diff --git a/src/resmom/checkpoint.c b/src/resmom/checkpoint.c
-index f178f48408..7e94b8b00a 100644
---- a/src/resmom/checkpoint.c
-+++ b/src/resmom/checkpoint.c
-@@ -51,6 +51,8 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <string>
-+#include <sstream>
- #include <unistd.h>
- #include <assert.h>
- #include <dirent.h>
-@@ -950,6 +952,7 @@ int blcr_checkpoint_job(
-   char             sid[20];
-   char            *arg[20];
-   char             buf[1024];
-+  std::string      err_msg;
-   int              len;
-   char           **ap;
-   FILE            *fs;
-@@ -1107,9 +1110,10 @@ int blcr_checkpoint_job(
- 
-     /* remove checkpoint directory that was created for this checkpoint attempt */
- 
--    sprintf(buf, "Checkpoint failed for job %s, removing checkpoint directory\n",
--        pjob->ji_qs.ji_jobid);
--    log_ext(-1, __func__, buf, LOG_DEBUG);
-+    err_msg = "Checkpoint failed for job ";
-+    err_msg += pjob->ji_qs.ji_jobid;
-+    err_msg += ", removing checkpoint directory\n";
-+    log_ext(-1, __func__, err_msg.c_str(), LOG_DEBUG);
- 
-     delete_blcr_checkpoint_files(pjob);
- 
-@@ -1123,9 +1127,12 @@ int blcr_checkpoint_job(
- 
-       if (err != 0)
-         {
--        sprintf(buf, "pbs_alterjob requested on job %s failed (%d-%s)\n",
--            pjob->ji_qs.ji_jobid, err, pbs_strerror(err));
--        log_err(-1, __func__, buf);
-+        std::ostringstream buf_s;
-+
-+        buf_s << "pbs_alterjob requested on job " << pjob->ji_qs.ji_jobid <<
-+          " failed (" << err << "-" << pbs_strerror(err) << ")\n";
-+        err_msg = buf_s.str();
-+        log_err(-1, __func__, err_msg.c_str());
-         if (err == PBSE_UNKJOBID)
-           {
-           /* TODO: GB - can the job exit while waiting for the checkpoint
-@@ -1190,9 +1197,12 @@ int blcr_checkpoint_job(
- 
-       if (err != 0)
-         {
--        sprintf(buf, "pbs_alterjob requested on job %s failed (%d-%s)\n",
--            pjob->ji_qs.ji_jobid, err, pbs_strerror(err));
--        log_err(-1, __func__, buf);
-+        std::ostringstream buf_s;
-+
-+        buf_s << "pbs_alterjob requested on job " << pjob->ji_qs.ji_jobid <<
-+          " failed (" << err << "-" << pbs_strerror(err) << ")\n";
-+        err_msg = buf_s.str();
-+        log_err(-1, __func__, err_msg.c_str());
-         if (err == PBSE_UNKJOBID)
-           {
-           /* TODO: GB - can the job exit while waiting for the checkpoint
-@@ -1527,6 +1537,8 @@ int start_checkpoint(
-   pid_t     pid;
-   int       rc = PBSE_NONE;
-   char      name_buffer[MAXPATHLEN + 1];
-+  std::ostringstream buf_s;
-+  std::string buf;
-   time_t    time_now;
- 
-   time_now = time((time_t *)0);
-@@ -1548,11 +1560,10 @@ int start_checkpoint(
-        * to the pbs_server until the checkpoint has completed successfully.
-        */
- 
--      sprintf(name_buffer,"ckpt.%s.%d",
--        pjob->ji_qs.ji_jobid,
--        (int)time_now);
-+      buf_s << "ckpt." << pjob->ji_qs.ji_jobid << "." << time_now;
-+      buf = buf_s.str();
- 
--      decode_str(&pjob->ji_wattr[JOB_ATR_checkpoint_name], NULL, NULL, name_buffer, 0);
-+      decode_str(&pjob->ji_wattr[JOB_ATR_checkpoint_name], NULL, NULL, buf.c_str(), 0);
- 
-       pjob->ji_wattr[JOB_ATR_checkpoint_name].at_flags =
-         ATR_VFLAG_SET | ATR_VFLAG_MODIFY;
-@@ -1760,8 +1771,8 @@ int blcr_restart_job(
-   int            pid;
-   char           sid[20];
-   char          *arg[20];
-+  std::string    err_msg;
-   extern char    restart_script_name[MAXPATHLEN + 1];
--  char           buf[1024];
-   char           namebuf[MAXPATHLEN + 1];
-   char           restartfile[MAXPATHLEN + 1];
-   char           script_buf[MAXPATHLEN + 1];
-@@ -1886,14 +1897,18 @@ int blcr_restart_job(
-     arg[6] = SET_ARG(pjob->ji_wattr[JOB_ATR_checkpoint_name].at_val.at_str);
-     arg[7] = NULL;
- 
--    snprintf(buf, sizeof(buf), "restart args: %s %s %s %s %s %s %s",
--      restart_script_name, sid, pjob->ji_qs.ji_jobid,
--      SET_ARG(pjob->ji_wattr[JOB_ATR_euser].at_val.at_str),
--      SET_ARG(pjob->ji_wattr[JOB_ATR_egroup].at_val.at_str),
--      namebuf,
--      SET_ARG(pjob->ji_wattr[JOB_ATR_checkpoint_name].at_val.at_str));
--
--    log_ext(-1, __func__, buf, LOG_DEBUG);
-+    err_msg = "restart args: ";
-+    err_msg += restart_script_name;
-+    err_msg += " ";
-+    err_msg += SET_ARG(pjob->ji_wattr[JOB_ATR_euser].at_val.at_str);
-+    err_msg += " ";
-+    err_msg += SET_ARG(pjob->ji_wattr[JOB_ATR_egroup].at_val.at_str);
-+    err_msg += " ";
-+    err_msg += namebuf;
-+    err_msg += " ";
-+    err_msg += SET_ARG(pjob->ji_wattr[JOB_ATR_checkpoint_name].at_val.at_str);
-+
-+    log_ext(-1, __func__, err_msg.c_str(), LOG_DEBUG);
- 
-     log_close(0);
- 
-diff --git a/src/resmom/generate_alps_status.c b/src/resmom/generate_alps_status.c
-index 305d603874..286d6b02ef 100644
---- a/src/resmom/generate_alps_status.c
-+++ b/src/resmom/generate_alps_status.c
-@@ -87,6 +87,7 @@
- #include "alps_constants.h"
- #include "alps_functions.h"
- #include <string>
-+#include <sstream>
- #include <vector>
- #include <set>
- #include <time.h>
-@@ -586,9 +587,9 @@ int process_node(
-     ani.features += features.c_str();
-     }
- 
--  char node_index_buf[MAXLINE];
--  snprintf(node_index_buf, sizeof(node_index_buf), "node_index=%lu", alps_nodes.size());
--  ani.node_index = node_index_buf;
-+  std::ostringstream ostr;
-+  ostr << "node_index=" << alps_nodes.size();
-+  ani.node_index = ostr.str();
- 
-   alps_nodes[nid] = ani;
- 
-diff --git a/src/resmom/linux/mom_mach.c b/src/resmom/linux/mom_mach.c
-index acaf81d467..8d8011a868 100644
---- a/src/resmom/linux/mom_mach.c
-+++ b/src/resmom/linux/mom_mach.c
-@@ -3,6 +3,7 @@
- #include "lib_mom.h" /* header */
- 
- #include <string>
-+#include <sstream>
- #include <vector>
- #include <assert.h>
- #include <limits.h>
-@@ -1221,6 +1222,7 @@ unsigned long cput_sum(
-   int          fd;
-   int          rc;
-   char         buf[LOCAL_BUF_SIZE];
-+  std::string  err_msg;
- 
-   pbs_attribute *pattr;
-   pattr = &pjob->ji_wattr[JOB_ATR_req_information];
-@@ -1234,8 +1236,11 @@ unsigned long cput_sum(
-     rc = cr->get_req_index_for_host(mom_alias, req_index);
-     if (rc != PBSE_NONE)
-       {
--      sprintf(buf, "Could not find req for host %s, job_id %s", mom_alias, pjob->ji_qs.ji_jobid);
--      log_event(PBSEVENT_JOB, PBS_EVENTCLASS_JOB, __func__, buf);
-+      err_msg = "Could not find req for host ";
-+      err_msg += mom_alias;
-+      err_msg += ", job_id ";
-+      err_msg += pjob->ji_qs.ji_jobid;
-+      log_event(PBSEVENT_JOB, PBS_EVENTCLASS_JOB, __func__, err_msg.c_str());
-       return(cputime);
-       }
- 
-@@ -1272,8 +1277,11 @@ unsigned long cput_sum(
-       {
-       if (pjob->ji_cgroups_created == true)
-         {
--        sprintf(buf, "failed to open %s: %s", full_cgroup_path.c_str(), strerror(errno));
--        log_err(-1, __func__, buf);
-+        err_msg = "failed to open ";
-+        err_msg += full_cgroup_path;
-+        err_msg += ": ";
-+        err_msg += strerror(errno);
-+        log_err(-1, __func__, err_msg.c_str());
-         }
-       return(0);
-       }
-@@ -1281,8 +1289,11 @@ unsigned long cput_sum(
-     rc = read(fd, buf, LOCAL_BUF_SIZE);
-     if (rc == -1)
-       {
--      sprintf(buf, "failed to read %s: %s", full_cgroup_path.c_str(), strerror(errno));
--      log_err(-1, __func__, buf);
-+      err_msg = "failed to read ";
-+      err_msg += full_cgroup_path;
-+      err_msg += ": ";
-+      err_msg += strerror(errno);
-+      log_err(-1, __func__, err_msg.c_str());
-       close(fd);
-       return(0);
-       }
-@@ -1567,6 +1578,7 @@ unsigned long long resi_sum(
-   char         buf[LOCAL_BUF_SIZE];
-   int          fd;
-   int          rc;
-+  std::string  err_msg;
- 
-   pbs_attribute *pattr;
-   pattr = &pjob->ji_wattr[JOB_ATR_req_information];
-@@ -1579,8 +1591,11 @@ unsigned long long resi_sum(
-     rc = cr->get_req_index_for_host(mom_alias, req_index);
-     if (rc != PBSE_NONE)
-       {
--      sprintf(buf, "Could not find req for host %s, job_id %s", mom_alias, pjob->ji_qs.ji_jobid);
--      log_event(PBSEVENT_JOB, PBS_EVENTCLASS_JOB, __func__, buf);
-+      err_msg = "Could not find req for host ";
-+      err_msg += mom_alias;
-+      err_msg += ", job_id ";
-+      err_msg += pjob->ji_qs.ji_jobid;
-+      log_event(PBSEVENT_JOB, PBS_EVENTCLASS_JOB, __func__, err_msg.c_str());
-       return(resisize);
-       }
- 
-@@ -1614,8 +1629,11 @@ unsigned long long resi_sum(
-     {
-     if (pjob->ji_cgroups_created == true)
-       {
--      sprintf(buf, "failed to open %s: %s", full_cgroup_path.c_str(), strerror(errno));
--      log_err(-1, __func__, buf);
-+      err_msg = "failed to open ";
-+      err_msg += full_cgroup_path;
-+      err_msg += ": ";
-+      err_msg += strerror(errno);
-+      log_err(-1, __func__, err_msg.c_str());
-       }
- 
-     return(0);
-@@ -1624,8 +1642,11 @@ unsigned long long resi_sum(
-   rc = read(fd, buf, LOCAL_BUF_SIZE);
-   if (rc == -1)
-     {
--    sprintf(buf, "failed to read %s: %s", full_cgroup_path.c_str(), strerror(errno));
--    log_err(-1, __func__, buf);
-+    err_msg = "failed to read ";
-+    err_msg += full_cgroup_path;
-+    err_msg += ": ";
-+    err_msg += strerror(errno);
-+    log_err(-1, __func__, err_msg.c_str());
-     close(fd);
-     return(0);
-     }
-@@ -1637,8 +1658,9 @@ unsigned long long resi_sum(
-     buf2 = strstr(buf, "\nrss ");
-     if (buf2 == NULL)
-       {
--      sprintf(buf, "read failed finding rss %s", full_cgroup_path.c_str());
--      log_err(errno, __func__, buf);
-+      err_msg = "read failed finding rss ";
-+      err_msg += full_cgroup_path;
-+      log_err(errno, __func__, err_msg.c_str());
-       close(fd);
-       return(0);
-       }
-@@ -4983,16 +5005,17 @@ void scan_non_child_tasks(void)
- 
-       if (!found)
-         {
--        char buf[MAXLINE];
-+        std::ostringstream sbuf;
-+        std::string buf;
- 
-         extern int exiting_tasks;
- 
--        sprintf(buf, "found exited session %d for task %d in job %s",
--            pTask->ti_qs.ti_sid,
--            pTask->ti_qs.ti_task,
--            pJob->ji_qs.ji_jobid);
-+        sbuf << "found exited session " << pTask->ti_qs.ti_sid <<
-+          " for task " << pTask->ti_qs.ti_task << " in job " <<
-+          pJob->ji_qs.ji_jobid;
-+        buf = sbuf.str();
- 
--        log_event(PBSEVENT_JOB, PBS_EVENTCLASS_JOB, __func__, buf);
-+        log_event(PBSEVENT_JOB, PBS_EVENTCLASS_JOB, __func__, buf.c_str());
- 
-         pTask->ti_qs.ti_exitstat = 0;  /* actually unknown */
-         pTask->ti_qs.ti_status = TI_STATE_EXITED;
-@@ -5006,10 +5029,11 @@ void scan_non_child_tasks(void)
- 
-           if (LOGLEVEL >= 7)
-             {
--            sprintf(buf, "marking job as MOM_JOB_RECOVERY for task %d",
--                pTask->ti_qs.ti_task);
-+            sbuf << "marking job as MOM_JOB_RECOVERY for task " <<
-+              pTask->ti_qs.ti_task);
-+            buf = sbuf.str();
- 
--            log_event(PBSEVENT_DEBUG, PBS_EVENTCLASS_JOB, pJob->ji_qs.ji_jobid, buf);
-+            log_event(PBSEVENT_DEBUG, PBS_EVENTCLASS_JOB, pJob->ji_qs.ji_jobid, buf.c_str());
-             }
-           }
- #endif    /* USESAVEDRESOURCES */
-@@ -5075,7 +5099,6 @@ const char *idletime(
-   DIR         *dp;
- 
-   struct dirent *de;
--  char          ttyname[50];
-   time_t         curtm;
- 
-   if (attrib)
-@@ -5104,16 +5127,18 @@ const char *idletime(
- 
-   while ((de = readdir(dp)) != NULL)
-     {
-+    std::string ttyname;
-+
-     if (maxtm >= curtm)
-       break;
- 
-     if (strncmp(de->d_name, "tty", 3))
-       continue;
- 
--    sprintf(ttyname, "/dev/%s",
--            de->d_name);
-+    ttyname = "/dev/";
-+    ttyname += de->d_name;
- 
--    setmax(ttyname);
-+    setmax(ttyname.c_str());
-     }
- 
-   closedir(dp);
-diff --git a/src/resmom/mom_main.c b/src/resmom/mom_main.c
-index 2d8453a15f..35896e58b1 100644
---- a/src/resmom/mom_main.c
-+++ b/src/resmom/mom_main.c
-@@ -1067,7 +1067,7 @@ char *conf_res(
-     goto done;
-     }
- 
--  name[i] = '\0';
-+  name[i] = NULL;
- 
-   for (d = ret_string, resline++;*resline;)
-     {
-@@ -6519,17 +6519,17 @@ void prepare_child_tasks_for_delete()
-     for (unsigned int i = 0; i < pJob->ji_tasks->size(); i++)
-       {
-       task *pTask = pJob->ji_tasks->at(i);
--
--      char buf[128];
-+      std::ostringstream sbuf;
-+      std::string buf;
- 
-       extern int exiting_tasks;
- 
--      sprintf(buf, "preparing exited session %d for task %d in job %s for deletion",
--              pTask->ti_qs.ti_sid,
--              pTask->ti_qs.ti_task,
--              pJob->ji_qs.ji_jobid);
-+      sbuf << "preparing exited session " << pTask->ti_qs.ti_sid <<
-+        " for task " << pTask->ti_qs.ti_task << " in job " <<
-+        pJob->ji_qs.ji_jobid << " for deletion";
-+      buf = sbuf.str();
- 
--      log_event(PBSEVENT_JOB, PBS_EVENTCLASS_JOB, __func__, buf);
-+      log_event(PBSEVENT_JOB, PBS_EVENTCLASS_JOB, __func__, buf.c_str());
- 
-       pTask->ti_qs.ti_exitstat = 0;  /* actually unknown */
-       pTask->ti_qs.ti_status = TI_STATE_EXITED;
-diff --git a/src/resmom/mom_req_quejob.c b/src/resmom/mom_req_quejob.c
-index 2211f52d55..4e10581184 100644
---- a/src/resmom/mom_req_quejob.c
-+++ b/src/resmom/mom_req_quejob.c
-@@ -743,11 +743,15 @@ void req_mvjobfile(
- 
-   if (pj == NULL)
-     {
--    snprintf(log_buffer, 1024, "cannot find job %s for move of %s file",
--      preq->rq_ind.rq_jobfile.rq_jobid,
--      TJobFileType[jft]);
-+    std::string err_msg;
- 
--    log_err(-1, __func__, log_buffer);
-+    err_msg = "cannot find job ";
-+    err_msg += preq->rq_ind.rq_jobfile.rq_jobid;
-+    err_msg += " for move of ";
-+    err_msg += TJobFileType[jft];
-+    err_msg += " file";
-+
-+    log_err(-1, __func__, err_msg.c_str());
- 
-     req_reject(PBSE_UNKJOBID, 0, preq, NULL, NULL);
- 
-diff --git a/src/resmom/mom_server.c b/src/resmom/mom_server.c
-index f90c2cd227..e03395225a 100644
---- a/src/resmom/mom_server.c
-+++ b/src/resmom/mom_server.c
-@@ -1900,7 +1900,6 @@ void mom_server_diag(
-   std::stringstream &output)
- 
-   {
--  char tmpLine[1024];
-   time_t Now;
- 
-   if (pms->pbs_servername[0] == '\0')
-@@ -1910,22 +1909,18 @@ void mom_server_diag(
- 
-   time(&Now);
- 
--  sprintf(tmpLine, "Server[%d]: %s (%s)\n",
--          sindex,
--          pms->pbs_servername,
--          netaddr(&(pms->sock_addr)));
--
--  output << tmpLine;
-+  output << "Server[" << sindex << "]: " << pms->pbs_servername <<
-+    " (" << netaddr(&(pms->sock_addr)) << ")\n";
- 
-   if (pms->MOMSendStatFailure[0] != '\0')
-     {
--    sprintf(tmpLine, "  WARNING:  could not open connection to server, %s%s\n",
--            pms->MOMSendStatFailure,
--            (strstr(pms->MOMSendStatFailure, "cname") != NULL) ?
--            " (check name resolution - /etc/hosts?)" :
--            "");
-+    output << "  WARNING:  could not open connection to server, " <<
-+      pms->MOMSendStatFailure;
-+
-+    if (strstr(pms->MOMSendStatFailure, "cname") != NULL)
-+      output << " (check name resolution - /etc/hosts?)";
- 
--    output << tmpLine;
-+    output << "\n";
-     }
- 
-   if (TMOMRejectConn[0] != '\0')
-@@ -1935,30 +1930,26 @@ void mom_server_diag(
- 
-   if (pms->MOMLastRecvFromServerTime > 0)
-     {
--    sprintf(tmpLine, "  Last Msg From Server:   %ld seconds (%s)\n",
--            (long)Now - pms->MOMLastRecvFromServerTime,
--            (pms->MOMLastRecvFromServerCmd[0] != '\0') ?
--            pms->MOMLastRecvFromServerCmd : "N/A");
-+    output << "  Last Msg From Server:   " <<
-+      ((long)Now - pms->MOMLastRecvFromServerTime) << " seconds (" <<
-+      ((pms->MOMLastRecvFromServerCmd[0] != '\0') ?
-+        pms->MOMLastRecvFromServerCmd : "N/A") << "\n";
-     }
-   else
-     {
--    sprintf(tmpLine, "  WARNING:  no messages received from server\n");
-+    output << "  WARNING:  no messages received from server\n";
-     }
- 
--  output << tmpLine;
--
-   if (pms->MOMLastSendToServerTime > 0)
-     {
--    sprintf(tmpLine, "  Last Msg To Server:     %ld seconds\n",
--            (long)Now - pms->MOMLastSendToServerTime);
-+    output << "  Last Msg To Server:     " <<
-+      ((long)Now - pms->MOMLastSendToServerTime) << " seconds\n";
-     }
-   else
-     {
--    sprintf(tmpLine, "  WARNING:  no messages sent to server\n");
-+    output << "  WARNING:  no messages sent to server\n";
-     }
- 
--  output << tmpLine;
--
-   return;
-   }  /* END mom_server_diag() */
- 
-diff --git a/src/resmom/parse_config.c b/src/resmom/parse_config.c
-index 8c4bb8585d..35efb7880e 100644
---- a/src/resmom/parse_config.c
-+++ b/src/resmom/parse_config.c
-@@ -2385,14 +2385,14 @@ void reset_config_vars()
-   mom_host[0] = '\0';
-   hostname_specified = 0;
-   MOMConfigRReconfig = 0;
--  TNoSpoolDirList[0] = '\0';
-+  TNoSpoolDirList[0] = NULL;
-   is_reporter_mom = FALSE;
-   is_login_node = FALSE;
-   job_exit_wait_time = DEFAULT_JOB_EXIT_WAIT_TIME;
-   jobstarter_exe_name[0] = '\0';
-   jobstarter_set = 0;
-   server_alias = NULL;
--  TRemChkptDirList[0] = '\0';
-+  TRemChkptDirList[0] = NULL;
-   tmpdir_basename[0] = '\0';  /* for $TMPDIR */
-   rcp_path[0] = '\0';
-   rcp_args[0] = '\0';
-diff --git a/src/resmom/requests.c b/src/resmom/requests.c
-index 588905e4e3..6fce46cdfb 100644
---- a/src/resmom/requests.c
-+++ b/src/resmom/requests.c
-@@ -1490,16 +1490,16 @@ void req_modifyjob(
-   int            rc;
-   unsigned int   momport = 0;
- 
--  char           tmpLine[1024];
-+  std::string    tmpLine;
- 
-   pjob = mom_find_job(preq->rq_ind.rq_modify.rq_objname);
- 
-   if (pjob == NULL)
-     {
--    sprintf(tmpLine, "modify job failed, unknown job %s",
--            preq->rq_ind.rq_modify.rq_objname);
-+    tmpLine = "modify job failed, unknown job ";
-+    tmpLine += preq->rq_ind.rq_modify.rq_objname;
- 
--    req_reject(PBSE_UNKJOBID, 0, preq, mom_host, tmpLine);
-+    req_reject(PBSE_UNKJOBID, 0, preq, mom_host, tmpLine.c_str());
- 
-     return;
-     }
-diff --git a/src/scheduler.cc/samples/fifo/dedtime.c b/src/scheduler.cc/samples/fifo/dedtime.c
-index b919ec8946..246bd4f8af 100644
---- a/src/scheduler.cc/samples/fifo/dedtime.c
-+++ b/src/scheduler.cc/samples/fifo/dedtime.c
-@@ -118,7 +118,7 @@ int parse_ded_file(const char *filename)
- 
-   i = 0;
- 
--  memset(conf.ded_time, 0, MAX_DEDTIME_SIZE);
-+  memset(conf.ded_time, 0, sizeof(struct timegap) * MAX_DEDTIME_SIZE);
- 
-   while (fgets(line, 256, fp) != NULL)
-     {
-diff --git a/src/server/array_func.c b/src/server/array_func.c
-index fabe4541fa..8f5caf0520 100644
---- a/src/server/array_func.c
-+++ b/src/server/array_func.c
-@@ -4,7 +4,7 @@
- 
-   included functions:
- 
--  is_array() determine if jobnum is actually an array identifyer
-+  is_id_array() determine if jobnum is actually an array identifyer
-   get_array() return array struct for given "parent id"
-   array_save() save array struct to disk
-   array_get_parent_id() return id of parent job if job belongs to a job array
-@@ -90,7 +90,7 @@ void        force_purge_work(job *pjob);
- 
- /* search job array list to determine if id is a job array */
- 
--int is_array(
-+int is_id_array(
-     
-   char *id)
- 
-@@ -154,7 +154,7 @@ int is_array(
-   allarrays.unlock();
- 
-   return(rc);
--  } /* END is_array() */
-+  } /* END is_id_array() */
- 
- 
- 
-diff --git a/src/server/array_func.h b/src/server/array_func.h
-index 6cb1b84c9c..70e3d326f7 100644
---- a/src/server/array_func.h
-+++ b/src/server/array_func.h
-@@ -8,7 +8,7 @@
- #include "batch_request.h" /* batch_request */
- 
- 
--int is_array(char *id);
-+int is_id_array(char *id);
- 
- int array_save(job_array *pa);
- 
-diff --git a/src/server/job_func.c b/src/server/job_func.c
-index dbc47de458..8922deab35 100644
---- a/src/server/job_func.c
-+++ b/src/server/job_func.c
-@@ -2387,22 +2387,36 @@ int fix_cray_exec_hosts(
- 
- 
- 
-+// change job id from x.y to x-0.y
- 
- int change_external_job_name(
- 
-   job *pjob)
- 
-   {
--  char  tmp_jobid[PBS_MAXSVRJOBID + 1];
--  char *dot = strchr(pjob->ji_qs.ji_jobid, '.');
-+  std::string jobid_new;
-+  size_t pos;
- 
--  if (dot != NULL)
--    *dot = '\0';
-+  // null job pointer
-+  if (pjob == NULL)
-+    return(-1);
- 
--  snprintf(tmp_jobid, sizeof(tmp_jobid), "%s-0.%s",
--    pjob->ji_qs.ji_jobid, dot + 1);
-+  // copy original job id
-+  jobid_new = pjob->ji_qs.ji_jobid;
-+
-+  // make sure job id has a .
-+  if ((pos = jobid_new.find('.', 0)) == std::string::npos)
-+    return(-1);
-+
-+  // change "." to "-0."
-+  jobid_new.replace(pos, 1, "-0.");
-+
-+  // confirm new string will fit
-+  if (jobid_new.length() > PBS_MAXSVRJOBID)
-+    return(-1);
- 
--  strcpy(pjob->ji_qs.ji_jobid, tmp_jobid);
-+  // update original
-+  strncpy(pjob->ji_qs.ji_jobid, jobid_new.c_str(), PBS_MAXSVRJOBID);
- 
-   return(PBSE_NONE);
-   } /* END change_external_job_name() */
-diff --git a/src/server/node_attr_def.c b/src/server/node_attr_def.c
-index 37aa121ca2..386f12b32d 100644
---- a/src/server/node_attr_def.c
-+++ b/src/server/node_attr_def.c
-@@ -380,7 +380,7 @@ attribute_def node_attr_def[] =
- 	  set_l,
- 	  comp_null,
- 	  free_null,
--    NULL_FUNC,
-+          NULL_FUNC,
- 	  NO_USER_SET,
- 	  ATR_TYPE_LONG,
- 	  PARENT_TYPE_NODE,
-@@ -392,7 +392,7 @@ attribute_def node_attr_def[] =
- 	  set_l,
- 	  comp_null,
- 	  free_null,
--    NULL_FUNC,
-+          NULL_FUNC,
- 	  NO_USER_SET,
- 	  ATR_TYPE_LONG,
- 	  PARENT_TYPE_NODE,
-@@ -404,7 +404,7 @@ attribute_def node_attr_def[] =
- 	  set_l,
- 	  comp_null,
- 	  free_null,
--    NULL_FUNC,
-+          NULL_FUNC,
- 	  NO_USER_SET,
- 	  ATR_TYPE_LONG,
- 	  PARENT_TYPE_NODE,
-@@ -416,7 +416,7 @@ attribute_def node_attr_def[] =
- 	  set_l,
- 	  comp_null,
- 	  free_null,
--    NULL_FUNC,
-+          NULL_FUNC,
- 	  NO_USER_SET,
- 	  ATR_TYPE_LONG,
- 	  PARENT_TYPE_NODE,
-@@ -428,7 +428,7 @@ attribute_def node_attr_def[] =
- 	  set_l,
- 	  comp_null,
- 	  free_null,
--    NULL_FUNC,
-+          NULL_FUNC,
- 	  NO_USER_SET,
- 	  ATR_TYPE_LONG,
- 	  PARENT_TYPE_NODE,
-@@ -440,7 +440,7 @@ attribute_def node_attr_def[] =
- 	  set_l,
- 	  comp_null,
- 	  free_null,
--    NULL_FUNC,
-+          NULL_FUNC,
- 	  NO_USER_SET,
- 	  ATR_TYPE_LONG,
- 	  PARENT_TYPE_NODE,
-@@ -452,7 +452,7 @@ attribute_def node_attr_def[] =
- 	  set_l,
- 	  comp_null,
- 	  free_null,
--		NULL_FUNC,
-+          NULL_FUNC,
- 	  NO_USER_SET,
- 	  ATR_TYPE_LONG,
- 	  PARENT_TYPE_NODE,
-@@ -464,7 +464,7 @@ attribute_def node_attr_def[] =
- 	  set_l,
- 	  comp_null,
- 	  free_null,
--		NULL_FUNC,
-+          NULL_FUNC,
- 	  NO_USER_SET,
- 	  ATR_TYPE_LONG,
- 	  PARENT_TYPE_NODE,
-diff --git a/src/server/node_manager.c b/src/server/node_manager.c
-index 663b741da6..92c4d73f8a 100644
---- a/src/server/node_manager.c
-+++ b/src/server/node_manager.c
-@@ -924,9 +924,10 @@ void process_legacy_job_attribute_information(
-       {
-       char *attr_name = threadsafe_tokenizer(&attr_val, "=");
- 
--      if ((attr_name != NULL) &&
--          (attr_val != '\0'))
-+      if ((attr_name != NULL) && (*attr_name != '\0') &&
-+          (attr_val != NULL) && (*attr_val != '\0'))
-         {
-+        // convert attr_name, attr_val strings to an attribute
-         if (str_to_attr(attr_name, attr_val, pjob->ji_wattr, job_attr_def, JOB_ATR_LAST) == ATTR_NOT_FOUND)
-           {
-           // should be resources used if not found as attribute
-diff --git a/src/server/pbsd_init.c b/src/server/pbsd_init.c
-index 0233800586..1a639ab2dc 100644
---- a/src/server/pbsd_init.c
-+++ b/src/server/pbsd_init.c
-@@ -2667,6 +2667,8 @@ int pbsd_init_job(
- 
-       svr_setjobstate(pjob, JOB_STATE_COMPLETE, JOB_SUBSTATE_COMPLETE, FALSE);
- 
-+      // fall through
-+
- 
-     case JOB_SUBSTATE_COMPLETE:
- 
-diff --git a/src/server/process_request.c b/src/server/process_request.c
-index e7f243f58e..ec1935cca4 100644
---- a/src/server/process_request.c
-+++ b/src/server/process_request.c
-@@ -795,7 +795,7 @@ int dispatch_request(
-        * req_deletejob() function.
-       */
- 
--      if (is_array(request->rq_ind.rq_delete.rq_objname))
-+      if (is_id_array(request->rq_ind.rq_delete.rq_objname))
-         rc = req_deletearray(request);
-       else
-         rc = req_deletejob(request);
-@@ -803,7 +803,7 @@ int dispatch_request(
-       break;
- 
-     case PBS_BATCH_HoldJob:
--      if (is_array(request->rq_ind.rq_hold.rq_orig.rq_objname))
-+      if (is_id_array(request->rq_ind.rq_hold.rq_orig.rq_objname))
-         rc = req_holdarray(request);
-       else
-         rc = req_holdjob(request);
-@@ -843,7 +843,7 @@ int dispatch_request(
-     case PBS_BATCH_AsyModifyJob:
- 
-     case PBS_BATCH_ModifyJob:
--      if (is_array(request->rq_ind.rq_delete.rq_objname))
-+      if (is_id_array(request->rq_ind.rq_delete.rq_objname))
-         rc = req_modifyarray(request);
-       else
-         req_modifyjob(request);
-@@ -888,7 +888,7 @@ int dispatch_request(
- 
-     case PBS_BATCH_ReleaseJob:
- 
--      if (is_array(request->rq_ind.rq_delete.rq_objname))
-+      if (is_id_array(request->rq_ind.rq_delete.rq_objname))
-         rc = req_releasearray(request);
-       else
-         rc = req_releasejob(request);
-@@ -972,7 +972,7 @@ int dispatch_request(
- 
-     case PBS_BATCH_RegistDep:
- 
--      if (is_array(request->rq_ind.rq_register.rq_parent))
-+      if (is_id_array(request->rq_ind.rq_register.rq_parent))
-         {
-         rc = req_registerarray(request);
-         }
-diff --git a/src/server/req_quejob.c b/src/server/req_quejob.c
-index e30acbb59d..5ce1ec3fdf 100644
---- a/src/server/req_quejob.c
-+++ b/src/server/req_quejob.c
-@@ -326,7 +326,7 @@ void sum_select_mem_request(
-       tmp = atoi(current);
-       
-       /* advance past the digits to the units */
--      while ((current != '\0') &&
-+      while ((*current != '\0') &&
-              (isdigit(*current)))
-         current++;
- 
-diff --git a/src/server/req_runjob.c b/src/server/req_runjob.c
-index 8b128b8dba..59dbe77b48 100644
---- a/src/server/req_runjob.c
-+++ b/src/server/req_runjob.c
-@@ -1676,8 +1676,14 @@ job *chk_job_torun(
- 
-   if ((pjob->ji_qs.ji_state != JOB_STATE_QUEUED) && (pjob->ji_qs.ji_state != JOB_STATE_HELD))
-     {
--    sprintf(EMsg, "job %s state %s", pjob->ji_qs.ji_jobid, PJobState[pjob->ji_qs.ji_state]);
--    req_reject(PBSE_BADSTATE, 0, preq, NULL, EMsg);
-+    std::string err_msg;
-+
-+    err_msg = "job ";
-+    err_msg += pjob->ji_qs.ji_jobid;
-+    err_msg += " state ";
-+    err_msg += PJobState[pjob->ji_qs.ji_state];
-+
-+    req_reject(PBSE_BADSTATE, 0, preq, NULL, err_msg.c_str());
-     return(NULL);
-     }
- 
-diff --git a/src/server/req_stat.c b/src/server/req_stat.c
-index 21a608aeee..392f22772e 100644
---- a/src/server/req_stat.c
-+++ b/src/server/req_stat.c
-@@ -241,7 +241,7 @@ int req_stat_job(
-     {
-     /* status a single job */
- 
--    if (is_array(name))
-+    if (is_id_array(name))
-       {
-       if (type != tjstSummarizeArraysServer)
-         {
-diff --git a/src/server/svr_chk_owner.c b/src/server/svr_chk_owner.c
-index 4b33c57226..b98135710e 100644
---- a/src/server/svr_chk_owner.c
-+++ b/src/server/svr_chk_owner.c
-@@ -413,9 +413,8 @@ int authenticate_user(
- 
-   {
-   int    rc;
--  char   uath[PBS_MAXUSER + PBS_MAXHOSTNAME + 1];
-   time_t time_now = time(NULL);
--  char   error_msg[1024];
-+  std::string error_msg;
-   long   acl_enabled = FALSE;
- 
- #ifdef MUNGE_AUTH
-@@ -437,9 +436,14 @@ int authenticate_user(
-     if ((acl_check_my_array_string(my_acl, uh, ACL_User_Host)) == 0)
-       {
-       *autherr = strdup("User not in authorized user list.");
--      sprintf(error_msg, "%s Requested user %s: requested from host %s",
--                     *autherr, preq->rq_user, preq->rq_host);
--      log_event(PBSEVENT_ADMIN, PBS_EVENTCLASS_SERVER, __func__, error_msg);
-+
-+      error_msg = *autherr;
-+      error_msg += " Requested user ";
-+      error_msg += preq->rq_user;
-+      error_msg += ": requested from host ";
-+      error_msg += preq->rq_host;
-+  
-+      log_event(PBSEVENT_ADMIN, PBS_EVENTCLASS_SERVER, __func__, error_msg.c_str());
-       return(PBSE_BADCRED);
-       }
-     }
-@@ -447,9 +451,16 @@ int authenticate_user(
-   if (strncmp(preq->rq_user, pcred->username, PBS_MAXUSER))
-     {
-     *autherr = strdup("Users do not match");
--    sprintf(error_msg, "%s: Requested user %s: credential user %s: requested from host %s",
--                   *autherr, preq->rq_user, pcred->username, preq->rq_host);
--    log_event(PBSEVENT_ADMIN, PBS_EVENTCLASS_SERVER, __func__, error_msg);
-+
-+    error_msg = *autherr;
-+    error_msg += " Requested user ";
-+    error_msg += preq->rq_user;
-+    error_msg += ": credential user ";
-+    error_msg += pcred->username;
-+    error_msg += ": requested from host ";
-+    error_msg += preq->rq_host;
-+
-+    log_event(PBSEVENT_ADMIN, PBS_EVENTCLASS_SERVER, __func__, error_msg.c_str());
-     return(PBSE_BADCRED);
-     }
- #endif
-@@ -481,10 +492,14 @@ int authenticate_user(
-         (memcmp(sai1, sai2, sizeof(struct sockaddr_in))))
-       {
-       *autherr = strdup("Hosts do not match");
--      
--      sprintf(error_msg, "%s: Requested host %s: credential host: %s",
--        *autherr, preq->rq_host, pcred->hostname);
--      log_event(PBSEVENT_ADMIN, PBS_EVENTCLASS_SERVER, __func__, error_msg);
-+     
-+      error_msg = *autherr; 
-+      error_msg += ": Requested host ";
-+      error_msg += preq->rq_host;
-+      error_msg += ": credential host: ";
-+      error_msg += pcred->hostname;
-+
-+      log_event(PBSEVENT_ADMIN, PBS_EVENTCLASS_SERVER, __func__, error_msg.c_str());
-     
-       return(PBSE_BADCRED);
-       }
-@@ -520,10 +535,14 @@ int authenticate_user(
-   if (acl_enabled)
-     {
-     struct array_strings *acl_users = NULL;
--    snprintf(uath, sizeof(uath), "%s@%s", preq->rq_user, preq->rq_host);
-+    std::string uath;
-+
-+    uath = preq->rq_user;
-+    uath += "@";
-+    uath = preq->rq_host;
-     
-     get_svr_attr_arst(SRV_ATR_AclUsers, &acl_users);
--    if (acl_check_my_array_string(acl_users, uath, ACL_User) == 0)
-+    if (acl_check_my_array_string(acl_users, uath.c_str(), ACL_User) == 0)
-       {
-       int       my_err;
-       pbs_net_t connect_addr = get_hostaddr(&my_err, preq->rq_host);
-diff --git a/src/test/catch_child/scaffolding.c b/src/test/catch_child/scaffolding.c
-index 7db1077854..f08383d01e 100644
---- a/src/test/catch_child/scaffolding.c
-+++ b/src/test/catch_child/scaffolding.c
-@@ -1012,6 +1012,7 @@ int DIS_reply_read(struct tcp_chan *chan, struct batch_reply *preply)
-         {
-       case 1:
-           rc = 1;
-+          // fall through
-       case 2:
-           preply->brp_code = PBSE_NONE;
-           LOGLEVEL = 4;
-diff --git a/src/test/geteusernam/scaffolding.c b/src/test/geteusernam/scaffolding.c
-index ec849ab6df..f2cb83be16 100644
---- a/src/test/geteusernam/scaffolding.c
-+++ b/src/test/geteusernam/scaffolding.c
-@@ -64,7 +64,7 @@ void get_jobowner(char *from, char *to)
-   exit(1);
-   }
- 
--int acl_check_my_array_string(struct array_strings *pas, char *name, int type)
-+int acl_check_my_array_string(struct array_strings *pas, const char *name, int type)
-   {
-   return(0);
-   }
-diff --git a/src/test/node_manager/test_uut.c b/src/test/node_manager/test_uut.c
-index 75c23b39af..b4aa98912f 100644
---- a/src/test/node_manager/test_uut.c
-+++ b/src/test/node_manager/test_uut.c
-@@ -284,12 +284,12 @@ END_TEST
- START_TEST(test_kill_job_on_mom)
-   {
-   struct pbsnode  pnode;
--  char            job_id[20];
-+  char            *job_id;
-   int             rc;
-   unsigned long   addr = 4567;
- 
-   memset(&pnode, 0, sizeof(pnode));
--  strcpy(job_id, "33.torque-devtest-03");
-+  job_id = strdup("33.torque-devtest-03");
- 
-   pnode.change_name("numa3.ac");
-   pnode.nd_mom_port = 1234;
-diff --git a/src/test/pbs_log/scaffolding.c b/src/test/pbs_log/scaffolding.c
-index fc5878c601..d63f053851 100644
---- a/src/test/pbs_log/scaffolding.c
-+++ b/src/test/pbs_log/scaffolding.c
-@@ -37,8 +37,7 @@ DIR *opendir(const char *name)
- 
- int closedir(DIR *dirp)
-   {
--  if (dirp != NULL)
--    free(dirp);
-+  free(dirp);
-   return(0);
-   }
- 
-diff --git a/src/test/pbsd_main/scaffolding.c b/src/test/pbsd_main/scaffolding.c
-index 90110e8fe8..0d7179a795 100644
---- a/src/test/pbsd_main/scaffolding.c
-+++ b/src/test/pbsd_main/scaffolding.c
-@@ -407,7 +407,7 @@ int get_svr_attr_arst(int index, struct array_strings **arst)
-   return(0);
-   }
- 
--int acl_check_my_array_string(struct array_strings *pas, char *name, int type)
-+int acl_check_my_array_string(struct array_strings *pas, const char *name, int type)
-   {
-   return(0);
-   }
-diff --git a/src/test/process_alps_status/scaffolding.c b/src/test/process_alps_status/scaffolding.c
-index dd8ab2c577..3c6449aa70 100644
---- a/src/test/process_alps_status/scaffolding.c
-+++ b/src/test/process_alps_status/scaffolding.c
-@@ -713,6 +713,8 @@ int set_arst(
-       pas->as_next = pas->as_buf;
- 
-       /* no break, "SET" falls into "MERGE" to add strings */
-+      // fall through
-+
-     case INCR_OLD:
-     case MERGE:
- 
-diff --git a/src/test/process_request/scaffolding.c b/src/test/process_request/scaffolding.c
-index 66618f8900..36aff63746 100644
---- a/src/test/process_request/scaffolding.c
-+++ b/src/test/process_request/scaffolding.c
-@@ -373,9 +373,9 @@ int req_modify_node(struct batch_request *preq)
-   }
- 
- 
--int is_array(char *id)
-+int is_id_array(char *id)
-   {
--  fprintf(stderr, "The call to is_array needs to be mocked!!\n");
-+  fprintf(stderr, "The call to is_id_array needs to be mocked!!\n");
-   exit(1);
-   }
- 
-@@ -489,7 +489,7 @@ int get_svr_attr_b(int index, bool *b)
-   return(0);
-   }
- 
--int acl_check_my_array_string(struct array_strings *pas, char *name, int type)
-+int acl_check_my_array_string(struct array_strings *pas, const char *name, int type)
-   {
-   return(0);
-   }
-diff --git a/src/test/req_stat/scaffolding.c b/src/test/req_stat/scaffolding.c
-index cbba4d809a..80f1956d61 100644
---- a/src/test/req_stat/scaffolding.c
-+++ b/src/test/req_stat/scaffolding.c
-@@ -221,9 +221,9 @@ int svr_connect(pbs_net_t hostaddr, unsigned int port, int *err, struct pbsnode
-   exit(1);
-   }
- 
--int is_array(char *id)
-+int is_id_array(char *id)
-   {
--  fprintf(stderr, "The call to is_array to be mocked!!\n");
-+  fprintf(stderr, "The call to is_id_array to be mocked!!\n");
-   exit(1);
-   }
- 
-diff --git a/src/test/svr_chk_owner/scaffolding.c b/src/test/svr_chk_owner/scaffolding.c
-index 6d00f6e381..59a8c84e95 100644
---- a/src/test/svr_chk_owner/scaffolding.c
-+++ b/src/test/svr_chk_owner/scaffolding.c
-@@ -79,7 +79,7 @@ int get_svr_attr_arst(int index, struct array_strings **arst)
-   return(0);
-   }
- 
--int acl_check_my_array_string(struct array_strings *pas, char *name, int type)
-+int acl_check_my_array_string(struct array_strings *pas, const char *name, int type)
-   {
-   return(0);
-   }
-diff --git a/torque.setup.in b/torque.setup.in
-index 15716c9b97..b0f2ee305f 100644
---- a/torque.setup.in
-+++ b/torque.setup.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- #
- # torque.setup - create pbs_server database and default queue
- # 
---- a/src/server/svr_jobfunc.c	2017-08-29 22:25:11.000000000 -0000
-+++ b/src/server/svr_jobfunc.c	2019-10-22 14:29:39.465723637 -0000
-@@ -4015,16 +4015,18 @@
- 
-   {
-   int rc = PBSE_NONE;
--  char *err_msg = NULL;
--  char stub_msg[] = "no pos";
-+  std::string err_msg;
- 
-   if (logging >= 10)
-     {
--    err_msg = (char *)calloc(1, MSG_LEN_LONG);
--    if (msg == NULL)
--      msg = stub_msg;
--    snprintf(err_msg, MSG_LEN_LONG, "locking %s in method %s-%s", pjob->ji_qs.ji_jobid, id, msg);
--    log_record(PBSEVENT_DEBUG, PBS_EVENTCLASS_NODE, id, err_msg);
-+    err_msg = "locking ";
-+    err_msg += pjob->ji_qs.ji_jobid;
-+    err_msg += " in method ";
-+    err_msg += id;
-+    err_msg += "-";
-+    if (msg != NULL)
-+      err_msg += msg;
-+    log_record(PBSEVENT_DEBUG, PBS_EVENTCLASS_NODE, id, err_msg.c_str());
-     }
- 
-   if (pjob->ji_mutex != NULL)
-@@ -4033,9 +4035,11 @@
-       {
-       if (logging >= 20)
-         {
--        snprintf(err_msg, MSG_LEN_LONG, "ALERT: cannot lock job %s mutex in method %s",
--                                     pjob->ji_qs.ji_jobid, id);
--        log_record(PBSEVENT_DEBUG, PBS_EVENTCLASS_NODE, id, err_msg);
-+        err_msg = "ALERT: cannot lock job ";
-+        err_msg += pjob->ji_qs.ji_jobid;
-+        err_msg += " mutex in method ";
-+        err_msg += id;
-+        log_record(PBSEVENT_DEBUG, PBS_EVENTCLASS_NODE, id, err_msg.c_str());
-         }
-       rc = PBSE_MUTEX;
-       }
-@@ -4046,9 +4050,6 @@
-     log_err(rc, __func__, "Uninitialized mutex pass to pthread_mutex_lock!");
-     }
- 
--  if (err_msg != NULL)
--  free(err_msg);
--
-   return rc;
-   }
- 
-@@ -4063,16 +4064,18 @@
- 
-   {
-   int rc = PBSE_NONE;
--  char *err_msg = NULL;
--  char stub_msg[] = "no pos";
-+  std::string err_msg;
- 
-   if (logging >= 10)
-     {
--    err_msg = (char *)calloc(1, MSG_LEN_LONG);
--    if (msg == NULL)
--      msg = stub_msg;
--    snprintf(err_msg, MSG_LEN_LONG, "unlocking %s in method %s-%s", pjob->ji_qs.ji_jobid, id, msg);
--    log_record(PBSEVENT_DEBUG, PBS_EVENTCLASS_NODE, id, err_msg);
-+    err_msg = "unlocking ";
-+    err_msg += pjob->ji_qs.ji_jobid;
-+    err_msg += " in method ";
-+    err_msg += id;
-+    err_msg += "-";
-+    if (msg != NULL)
-+      err_msg += msg;
-+    log_record(PBSEVENT_DEBUG, PBS_EVENTCLASS_NODE, id, err_msg.c_str());
-     }
- 
-   if (pjob->ji_mutex != NULL)
-@@ -4081,9 +4084,11 @@
-       {
-     if (logging >= 20)
-         {
--        snprintf(err_msg, MSG_LEN_LONG, "ALERT: cannot unlock job %s mutex in method %s",
--                                            pjob->ji_qs.ji_jobid, id);
--        log_record(PBSEVENT_DEBUG, PBS_EVENTCLASS_NODE, id, err_msg);
-+        err_msg = "ALERT: cannot unlock job ";
-+        err_msg += pjob->ji_qs.ji_jobid;
-+        err_msg += " mutex in method ";
-+        err_msg += id;
-+        log_record(PBSEVENT_DEBUG, PBS_EVENTCLASS_NODE, id, err_msg.c_str());
-         }
-       rc = PBSE_MUTEX;
-       }
-@@ -4094,9 +4099,6 @@
-     log_err(rc, __func__, "Uninitialized mutex pass to pthread_mutex_unlock!");
-     }
- 
--   if (err_msg != NULL)
--     free(err_msg);
--
-    return rc;
-    }
- 
-@@ -4110,32 +4112,33 @@
- 
-   {
-   int rc = PBSE_NONE;
--  char *err_msg = NULL;
--  char stub_msg[] = "no pos";
-+  std::string err_msg;
- 
-   if (logging >= 10)
-     {
--    err_msg = (char *)calloc(1, MSG_LEN_LONG);
--    if (msg == NULL)
--      msg = stub_msg;
--    snprintf(err_msg, MSG_LEN_LONG, "locking %s in method %s-%s", pa->ai_qs.parent_id, id, msg);
--    log_record(PBSEVENT_DEBUG, PBS_EVENTCLASS_NODE, id, err_msg);
-+    err_msg = "locking ";
-+    err_msg += pa->ai_qs.parent_id,
-+    err_msg += " in method ";
-+    err_msg += id;
-+    err_msg += "-";
-+    if (msg != NULL)
-+      err_msg += msg;
-+    log_record(PBSEVENT_DEBUG, PBS_EVENTCLASS_NODE, id, err_msg.c_str());
-     }
- 
-   if (pthread_mutex_lock(pa->ai_mutex) != 0)
-     {
-     if (logging >= 20)
-       {
--      snprintf(err_msg, MSG_LEN_LONG, "ALERT: cannot lock job array %s mutex in method %s",
--                                   pa->ai_qs.parent_id, id);
--      log_record(PBSEVENT_DEBUG, PBS_EVENTCLASS_NODE, id, err_msg);
-+      err_msg = "ALERT: cannot lock job array ";
-+      err_msg += pa->ai_qs.parent_id,
-+      err_msg += " mutex in method ";
-+      err_msg += id;
-+      log_record(PBSEVENT_DEBUG, PBS_EVENTCLASS_NODE, id, err_msg.c_str());
-       }
-     rc = PBSE_MUTEX;
-     }
- 
--  if (err_msg != NULL)
--  free(err_msg);
--
-   return rc;
-   }
- 
-@@ -4149,32 +4152,33 @@
- 
-   {
-   int rc = PBSE_NONE;
--  char *err_msg = NULL;
--  char stub_msg[] = "no pos";
-+  std::string err_msg;
- 
-   if (logging >= 10)
-     {
--    err_msg = (char *)calloc(1, MSG_LEN_LONG);
--    if (msg == NULL)
--      msg = stub_msg;
--    snprintf(err_msg, MSG_LEN_LONG, "unlocking %s in method %s-%s", pa->ai_qs.parent_id, id, msg);
--    log_record(PBSEVENT_DEBUG, PBS_EVENTCLASS_NODE, id, err_msg);
-+    err_msg = "unlocking ";
-+    err_msg += pa->ai_qs.parent_id,
-+    err_msg += " in method ";
-+    err_msg += id;
-+    err_msg += "-";
-+    if (msg != NULL)
-+      err_msg += msg;
-+    log_record(PBSEVENT_DEBUG, PBS_EVENTCLASS_NODE, id, err_msg.c_str());
-     }
- 
-   if (pthread_mutex_unlock(pa->ai_mutex) != 0)
-     {
-     if (logging >= 20)
-       {
--      snprintf(err_msg, MSG_LEN_LONG, "ALERT: cannot unlock job array %s mutex in method %s",
--                                   pa->ai_qs.parent_id, id);
--      log_record(PBSEVENT_DEBUG, PBS_EVENTCLASS_NODE, id, err_msg);
-+      err_msg = "ALERT: cannot unlock job array ";
-+      err_msg += pa->ai_qs.parent_id,
-+      err_msg += " mutex in method ";
-+      err_msg += id;
-+      log_record(PBSEVENT_DEBUG, PBS_EVENTCLASS_NODE, id, err_msg.c_str());
-       }
-     rc = PBSE_MUTEX;
-     }
- 
--  if (err_msg != NULL)
--  free(err_msg);
--
-   return rc;
-   }
- 
diff --git a/sys-cluster/torque/torque-6.0.4-r1.ebuild b/sys-cluster/torque/torque-6.0.4-r1.ebuild
index 6f18c0252662..b551a3e06694 100644
--- a/sys-cluster/torque/torque-6.0.4-r1.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-r1.ebuild
@@ -7,7 +7,8 @@ inherit autotools flag-o-matic linux-info
 
 DESCRIPTION="Resource manager and queuing system based on OpenPBS"
 HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque"
-SRC_URI="https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e9217cbab1542792d646f59a6.tar.gz -> ${P}-gh-20170829.tar.gz"
+SRC_URI="https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e9217cbab1542792d646f59a6.tar.gz -> ${P}-gh-20170829.tar.gz
+	https://dev.gentoo.org/~juippis/distfiles/tmp/torque-6.0.4-gcc7.patch"
 
 LICENSE="torque-2.5"
 SLOT="0"
@@ -47,7 +48,7 @@ RDEPEND="${DEPEND_COMMON}
 S="${WORKDIR}"/${PN}-6a0b37f85c7d644e9217cbab1542792d646f59a6
 
 PATCHES=(
-	"${FILESDIR}"/${P}-gcc7.patch
+	"${DISTDIR}"/${P}-gcc7.patch
 	"${FILESDIR}"/${PN}-6.0.3-fix-emptystring-comparison.patch
 	"${FILESDIR}"/${P}-no-openssl.patch
 	"${FILESDIR}"/${P}-error_buf_overflow_prevent.patch
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index ed724b7c6c4e..046aaa0e3c8a 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/binutils/binutils-2.34-r2.ebuild b/sys-devel/binutils/binutils-2.34-r2.ebuild
index a9d1db8faad5..517ec9a28bee 100644
--- a/sys-devel/binutils/binutils-2.34-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.34-r2.ebuild
@@ -33,7 +33,7 @@ case ${PV} in
 	*)
 		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
 		SLOT=$(ver_cut 1-2)
-		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"
 		;;
 esac
 
diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index 8033295d6823..67df01c68470 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -4,7 +4,6 @@ DIST bison-3.6.3-patches-01.tar.xz 10316 BLAKE2B a99e12e69334371316e5841f8c86ed7
 DIST bison-3.6.4.tar.xz 2472456 BLAKE2B d2efe7ff1a349efe5a8c79eb69aa296dbc7eb9fde549afc91986460f27976e033dd793e904dda2f919f11e011ff6c458805288dff4939dcd1ee20e2b316cb9e6 SHA512 041cd87f4ca6b012031719a49aa81e62d3c0817c6364289732e6a3cb9a0762498760e0f2ce84c03ca9e9b74eb74bdffd1b8b86d2b4a6e4a0d8c8a4b864b672dc
 DIST bison-3.7.1-patches-01.tar.xz 11072 BLAKE2B e68dc42fdeebd9c530d04ba906fb49dec3f2df0a68186a54de9671564ee47f9adc9ca4cb167ddaa3e15458dd339570191b2fe6debb33fdf47f29d1a7aa8d868f SHA512 d167f5278cf3136a96450b2bd664b2563c94205d7c82298951b0b08a6b4b0733101e25636f905c8d4033b5e6d1aaaddab70b7772c28e8c1d6c31a05e23df7ce5
 DIST bison-3.7.1.tar.xz 2605940 BLAKE2B a00e8af6a74100154d2dad1597c901f8473dbdcc57826eff947878c3568bfc9070d92857b3b3e349302e9fcfd67eb3287e7a04f6fcff3b897a6fecf43c1cd03d SHA512 9c4097b6ff26e819be14a9d4ef39f6f259c04627cd305e11da8e67897a369b2bba5ce96bf19fa5f6088670e90a9c5bc5c45172f8f482252aeec546b285dd0797
-DIST bison-3.7.2-patches-02.tar.xz 99664 BLAKE2B 8f719265d16b42f398beef9ff9fde01c5f86d301421f64f8ac801cbc55af8d1258e1ae0f90e67b4de7bb8b25e99480acacc73815534f25e116f2f2b920ee9697 SHA512 bd99762a1f244755499efb400d2bb4399a5d21126eff253533b7f1320c8a4cd8513485cd176c90932029d720369182eb595ff36fa32ccaaa8d7048e46921e79b
-DIST bison-3.7.2.tar.xz 2613404 BLAKE2B 7543c7df4496fbe6b9ab18ffb643a0d58eb63d0d1e91d67eaa6f9a7c805180c1cef02a640fd41eec228782a6758f82058dc4a45c13e3730b740883efad77498d SHA512 42eb501c246e9b4b24cb212c8da538b11b1944b997314105e67f88f22d73b7d00cf19b21e086aa7523630a2a24e1fd70a89d85a7e3003783990e08d31f711a27
 DIST bison-3.7.3-patches-01.tar.xz 11336 BLAKE2B 2648dacd99c64c366946dad34f9e5fd838b43257df47bf74e3a3b63b03099152b4884d9b1c5943ee5c47afb090369278874c5f2b40dfa69b3abfa4eaa556843f SHA512 a53d541a550cc45f6c677fb6fa830640b64ba2c9a4ab4e6aef1f52ecd5fa38501e2391707d66c2958dd7a139dfba74ae5734e80d15360a3aa544fdea8ecf5500
 DIST bison-3.7.3.tar.xz 2613028 BLAKE2B a6f1063fb9441ae9102b29dc2786b7eb7104f7f13288d537080c26e7982e63f7a954abf1903f2a79a88578d88e9f3c30da8dcf12b7d6c89de0b60943186332c7 SHA512 34fe630749dc015f15a830ad13742c4b0b9163143a11e987c16954bee0451e819ec2fa7b43bd34c867e5ce72c758eb9070348d1d581c9435b9531a99caa46eed
+DIST bison-3.7.4.tar.xz 2617336 BLAKE2B e49a4a6fba1dc93314133541c24c6619b465a81850d6b8c4ff63074df46fa7d6e1d9645797c14be32a87c0ffee6830b24e49137b6357d3284d736b407fe7d118 SHA512 3fc13ab21e28218afc9b7f1196a5607de7ff4403c4126df359848422a8057ac6c17ce4344864dd320b7c47a08d98e0f3e2929f25b06be3b1f1c867c0568f367c
diff --git a/sys-devel/bison/bison-3.7.2.ebuild b/sys-devel/bison/bison-3.7.4.ebuild
similarity index 96%
rename from sys-devel/bison/bison-3.7.2.ebuild
rename to sys-devel/bison/bison-3.7.4.ebuild
index e23f6ca6bef4..a123b190e3d0 100644
--- a/sys-devel/bison/bison-3.7.2.ebuild
+++ b/sys-devel/bison/bison-3.7.4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit flag-o-matic
 
-PATCH_TAR="${PN}-3.7.2-patches-02.tar.xz"
+PATCH_TAR="${PN}-3.7.3-patches-01.tar.xz"
 
 DESCRIPTION="A general-purpose (yacc-compatible) parser generator"
 HOMEPAGE="https://www.gnu.org/software/bison/"
@@ -18,7 +18,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples nls static test"
-RESTRICT="!test? ( test )"
+RESTRICT="!test? ( test )
+	mirror"
 
 # gettext _IS_ required in RDEPEND because >=bison-3.7 links against
 # libtextstyle.so!!! (see bug #740754)
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 723fd66fce7c..bdf2fe877136 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -1,3 +1,4 @@
+DIST 10.0.1-0003-clang-tools-extra-Prevent-linking-to-duplicate-.a-li.patch 23184 BLAKE2B 42bfc9401bceea6627703f7611aafe4708e4e745e47e8caa01fb8c7126524ef65e4c135cfd0541bc663bfc52fa8c47342f7f8de462abe283ec353b068d2e3532 SHA512 9561c9ab6dc62257b7626f7898afa667401522817ec57137641f8687549b0b8e531659a5afd5226dd7619126cc67f68235f628cbe639345277415343c4ca3650
 DIST llvm-10.0.0-manpages.tar.bz2 177084 BLAKE2B 16b38e60fce4d67ac602b317ea7089c095d46b9426ba9940041e65d7ab493f85dba2e94a4aeba7b7c52042f23825efcfcd32a57d306aaf05b4307061a5a8a368 SHA512 eac57ad218ff4c2b5a74e453a29192ee6e911152b668d8a9420b59529d5cae8aa241f2485b4a7ea304acbecc7ecb27391a77552080726432c2b7b59b95fc0bd7
 DIST llvm-10.0.1-manpages.tar.bz2 180157 BLAKE2B ddf5951c8f5a2a8a80726fd713e6c818c852851a2261e904b484afdb67ac55f2ce10976ca2ca5d81fe2bf4806a72cc7b59f4068741306491a4f39065ca8fb56e SHA512 d3c2470dbd0f3143d64b380f7534ebcacdcf4bc4f140a6014283150007fe615ebd86247cf13b2432165a681614849e8eaab69a8d077f7a51e4e040e28ed33ebc
 DIST llvm-11.0.0-manpages.tar.bz2 179592 BLAKE2B d03dff5e7426f4c648d6112dee0fa7a91edf41584290c94c3f738fc65fa82fc6ef47b49c245fb0e741bdf267fc64534311194c476ece4b447649ba2250e61430 SHA512 1cf598f50c99a85a35b03398e4768cd1eafec9d602f788d401120adb91b3b59965216ed7102da26b7c2af7e1bbca4bca8f1d43bb687fcd8ed418e2f7076bdce4
diff --git a/sys-devel/clang/clang-10.0.1.ebuild b/sys-devel/clang/clang-10.0.1.ebuild
index 699c9ae63189..42c03f5c3c62 100644
--- a/sys-devel/clang/clang-10.0.1.ebuild
+++ b/sys-devel/clang/clang-10.0.1.ebuild
@@ -9,6 +9,7 @@ inherit cmake llvm llvm.org multilib-minimal pax-utils \
 
 DESCRIPTION="C language family frontend for LLVM"
 HOMEPAGE="https://llvm.org/"
+SRC_URI+=" https://dev.gentoo.org/~juippis/distfiles/tmp/10.0.1-0003-clang-tools-extra-Prevent-linking-to-duplicate-.a-li.patch"
 LLVM_COMPONENTS=( clang clang-tools-extra )
 LLVM_MANPAGES=pregenerated
 LLVM_TEST_COMPONENTS=(
@@ -70,7 +71,7 @@ PDEPEND="
 
 PATCHES=(
 	# fix simultaneous linking to .a and dylib
-	"${FILESDIR}"/10.0.1/0003-clang-tools-extra-Prevent-linking-to-duplicate-.a-li.patch
+	"${DISTDIR}"/10.0.1-0003-clang-tools-extra-Prevent-linking-to-duplicate-.a-li.patch
 	"${FILESDIR}"/10.0.1/0004-clang-Avoid-linking-c-index-test-to-duplicate-librar.patch
 )
 
diff --git a/sys-devel/clang/files/10.0.1/0003-clang-tools-extra-Prevent-linking-to-duplicate-.a-li.patch b/sys-devel/clang/files/10.0.1/0003-clang-tools-extra-Prevent-linking-to-duplicate-.a-li.patch
deleted file mode 100644
index d01bd5d51e23..000000000000
--- a/sys-devel/clang/files/10.0.1/0003-clang-tools-extra-Prevent-linking-to-duplicate-.a-li.patch
+++ /dev/null
@@ -1,788 +0,0 @@
-From 248d706ca72666a203a24b84406be430ccf40558 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 16 Jun 2020 20:43:55 +0200
-Subject: [PATCH 3/4] [clang-tools-extra] Prevent linking to duplicate .a libs
- and dylib
-
-Fix various tool libraries not to link to clang's .a libraries and dylib
-simultaneously.  This may cause breakage, in particular through
-duplicate command-line option declarations.
----
- .../clang-apply-replacements/CMakeLists.txt        |  4 +++-
- .../clang-change-namespace/CMakeLists.txt          |  4 +++-
- clang-tools-extra/clang-doc/CMakeLists.txt         |  4 +++-
- .../clang-include-fixer/CMakeLists.txt             |  6 +++++-
- .../find-all-symbols/CMakeLists.txt                |  4 +++-
- clang-tools-extra/clang-move/CMakeLists.txt        |  4 +++-
- clang-tools-extra/clang-query/CMakeLists.txt       |  4 +++-
- .../clang-reorder-fields/CMakeLists.txt            |  4 +++-
- clang-tools-extra/clang-tidy/CMakeLists.txt        |  7 +++++--
- clang-tools-extra/clang-tidy/abseil/CMakeLists.txt |  8 ++++++--
- .../clang-tidy/android/CMakeLists.txt              |  8 ++++++--
- clang-tools-extra/clang-tidy/boost/CMakeLists.txt  |  8 ++++++--
- .../clang-tidy/bugprone/CMakeLists.txt             | 10 +++++++---
- clang-tools-extra/clang-tidy/cert/CMakeLists.txt   | 12 ++++++++----
- .../clang-tidy/cppcoreguidelines/CMakeLists.txt    | 14 +++++++++-----
- clang-tools-extra/clang-tidy/darwin/CMakeLists.txt |  8 ++++++--
- .../clang-tidy/fuchsia/CMakeLists.txt              | 10 +++++++---
- clang-tools-extra/clang-tidy/google/CMakeLists.txt | 10 +++++++---
- clang-tools-extra/clang-tidy/hicpp/CMakeLists.txt  | 14 +++++++++-----
- .../clang-tidy/linuxkernel/CMakeLists.txt          |  8 ++++++--
- clang-tools-extra/clang-tidy/llvm/CMakeLists.txt   | 10 +++++++---
- clang-tools-extra/clang-tidy/misc/CMakeLists.txt   |  8 ++++++--
- .../clang-tidy/modernize/CMakeLists.txt            | 10 +++++++---
- clang-tools-extra/clang-tidy/mpi/CMakeLists.txt    |  8 ++++++--
- clang-tools-extra/clang-tidy/objc/CMakeLists.txt   |  8 ++++++--
- clang-tools-extra/clang-tidy/openmp/CMakeLists.txt |  8 ++++++--
- .../clang-tidy/performance/CMakeLists.txt          |  8 ++++++--
- clang-tools-extra/clang-tidy/plugin/CMakeLists.txt |  8 ++++++--
- .../clang-tidy/portability/CMakeLists.txt          |  8 ++++++--
- .../clang-tidy/readability/CMakeLists.txt          |  8 ++++++--
- clang-tools-extra/clang-tidy/utils/CMakeLists.txt  |  6 +++++-
- clang-tools-extra/clang-tidy/zircon/CMakeLists.txt |  8 ++++++--
- clang-tools-extra/clangd/CMakeLists.txt            | 11 +++++++----
- clang-tools-extra/clangd/unittests/CMakeLists.txt  |  1 -
- 34 files changed, 188 insertions(+), 73 deletions(-)
-
-diff --git a/clang-tools-extra/clang-apply-replacements/CMakeLists.txt b/clang-tools-extra/clang-apply-replacements/CMakeLists.txt
-index 5bfdcb487e1..27383b488e4 100644
---- a/clang-tools-extra/clang-apply-replacements/CMakeLists.txt
-+++ b/clang-tools-extra/clang-apply-replacements/CMakeLists.txt
-@@ -4,8 +4,10 @@ set(LLVM_LINK_COMPONENTS
- 
- add_clang_library(clangApplyReplacements
-   lib/Tooling/ApplyReplacements.cpp
-+)
- 
--  LINK_LIBS
-+clang_target_link_libraries(clangApplyReplacements
-+  PRIVATE
-   clangAST
-   clangBasic
-   clangRewrite
-diff --git a/clang-tools-extra/clang-change-namespace/CMakeLists.txt b/clang-tools-extra/clang-change-namespace/CMakeLists.txt
-index 178306423eb..dccfd7c0673 100644
---- a/clang-tools-extra/clang-change-namespace/CMakeLists.txt
-+++ b/clang-tools-extra/clang-change-namespace/CMakeLists.txt
-@@ -4,8 +4,10 @@ set(LLVM_LINK_COMPONENTS
- 
- add_clang_library(clangChangeNamespace
-   ChangeNamespace.cpp
-+)
- 
--  LINK_LIBS
-+clang_target_link_libraries(clangChangeNamespace
-+  PRIVATE
-   clangAST
-   clangASTMatchers
-   clangBasic
-diff --git a/clang-tools-extra/clang-doc/CMakeLists.txt b/clang-tools-extra/clang-doc/CMakeLists.txt
-index c301ad5afac..6f303a67c9a 100644
---- a/clang-tools-extra/clang-doc/CMakeLists.txt
-+++ b/clang-tools-extra/clang-doc/CMakeLists.txt
-@@ -14,8 +14,10 @@ add_clang_library(clangDoc
-   Representation.cpp
-   Serialize.cpp
-   YAMLGenerator.cpp
-+)
- 
--  LINK_LIBS
-+clang_target_link_libraries(clangDoc
-+  PRIVATE
-   clangAnalysis
-   clangAST
-   clangASTMatchers
-diff --git a/clang-tools-extra/clang-include-fixer/CMakeLists.txt b/clang-tools-extra/clang-include-fixer/CMakeLists.txt
-index f27f7403ea6..d8685cb2075 100644
---- a/clang-tools-extra/clang-include-fixer/CMakeLists.txt
-+++ b/clang-tools-extra/clang-include-fixer/CMakeLists.txt
-@@ -11,6 +11,11 @@ add_clang_library(clangIncludeFixer
-   YamlSymbolIndex.cpp
- 
-   LINK_LIBS
-+  findAllSymbols
-+  )
-+
-+clang_target_link_libraries(clangIncludeFixer
-+  PRIVATE
-   clangAST
-   clangBasic
-   clangFormat
-@@ -21,7 +26,6 @@ add_clang_library(clangIncludeFixer
-   clangSerialization
-   clangTooling
-   clangToolingCore
--  findAllSymbols
-   )
- 
- add_subdirectory(plugin)
-diff --git a/clang-tools-extra/clang-include-fixer/find-all-symbols/CMakeLists.txt b/clang-tools-extra/clang-include-fixer/find-all-symbols/CMakeLists.txt
-index c5fe19bfdbd..06a2324e918 100644
---- a/clang-tools-extra/clang-include-fixer/find-all-symbols/CMakeLists.txt
-+++ b/clang-tools-extra/clang-include-fixer/find-all-symbols/CMakeLists.txt
-@@ -11,8 +11,10 @@ add_clang_library(findAllSymbols
-   PragmaCommentHandler.cpp
-   STLPostfixHeaderMap.cpp
-   SymbolInfo.cpp
-+  )
- 
--  LINK_LIBS
-+clang_target_link_libraries(findAllSymbols
-+  PRIVATE
-   clangAST
-   clangASTMatchers
-   clangBasic
-diff --git a/clang-tools-extra/clang-move/CMakeLists.txt b/clang-tools-extra/clang-move/CMakeLists.txt
-index c63127ea325..9ea409932da 100644
---- a/clang-tools-extra/clang-move/CMakeLists.txt
-+++ b/clang-tools-extra/clang-move/CMakeLists.txt
-@@ -5,8 +5,10 @@ set(LLVM_LINK_COMPONENTS
- add_clang_library(clangMove
-   Move.cpp
-   HelperDeclRefGraph.cpp
-+  )
- 
--  LINK_LIBS
-+clang_target_link_libraries(clangMove
-+  PRIVATE
-   clangAnalysis
-   clangAST
-   clangASTMatchers
-diff --git a/clang-tools-extra/clang-query/CMakeLists.txt b/clang-tools-extra/clang-query/CMakeLists.txt
-index d1d68d502e3..bc76bae9c0e 100644
---- a/clang-tools-extra/clang-query/CMakeLists.txt
-+++ b/clang-tools-extra/clang-query/CMakeLists.txt
-@@ -6,8 +6,10 @@ set(LLVM_LINK_COMPONENTS
- add_clang_library(clangQuery
-   Query.cpp
-   QueryParser.cpp
-+  )
- 
--  LINK_LIBS
-+clang_target_link_libraries(clangQuery
-+  PRIVATE
-   clangAST
-   clangASTMatchers
-   clangBasic
-diff --git a/clang-tools-extra/clang-reorder-fields/CMakeLists.txt b/clang-tools-extra/clang-reorder-fields/CMakeLists.txt
-index 9c75d785cc9..e555fd5cdf0 100644
---- a/clang-tools-extra/clang-reorder-fields/CMakeLists.txt
-+++ b/clang-tools-extra/clang-reorder-fields/CMakeLists.txt
-@@ -2,8 +2,10 @@ set(LLVM_LINK_COMPONENTS support)
- 
- add_clang_library(clangReorderFields
-   ReorderFieldsAction.cpp
-+)
- 
--  LINK_LIBS
-+clang_target_link_libraries(clangReorderFields
-+  PRIVATE
-   clangAST
-   clangASTMatchers
-   clangBasic
-diff --git a/clang-tools-extra/clang-tidy/CMakeLists.txt b/clang-tools-extra/clang-tidy/CMakeLists.txt
-index 6dadb271771..329df19f331 100644
---- a/clang-tools-extra/clang-tidy/CMakeLists.txt
-+++ b/clang-tools-extra/clang-tidy/CMakeLists.txt
-@@ -14,8 +14,10 @@ add_clang_library(clangTidy
- 
-   DEPENDS
-   ClangSACheckers
-+  )
- 
--  LINK_LIBS
-+clang_target_link_libraries(clangTidy
-+  PRIVATE
-   clangAnalysis
-   clangAST
-   clangASTMatchers
-@@ -31,7 +33,8 @@ add_clang_library(clangTidy
-   )
- 
- if(CLANG_ENABLE_STATIC_ANALYZER)
--  target_link_libraries(clangTidy PRIVATE
-+  clang_target_link_libraries(clangTidy
-+    PRIVATE
-     clangStaticAnalyzerCore
-     clangStaticAnalyzerFrontend
-   )
-diff --git a/clang-tools-extra/clang-tidy/abseil/CMakeLists.txt b/clang-tools-extra/clang-tidy/abseil/CMakeLists.txt
-index 3f88da6233f..0f040e56a05 100644
---- a/clang-tools-extra/clang-tidy/abseil/CMakeLists.txt
-+++ b/clang-tools-extra/clang-tidy/abseil/CMakeLists.txt
-@@ -22,11 +22,15 @@ add_clang_library(clangTidyAbseilModule
-   UpgradeDurationConversionsCheck.cpp
- 
-   LINK_LIBS
-+  clangTidy
-+  clangTidyUtils
-+  )
-+
-+clang_target_link_libraries(clangTidyAbseilModule
-+  PRIVATE
-   clangAST
-   clangASTMatchers
-   clangBasic
-   clangLex
--  clangTidy
--  clangTidyUtils
-   clangTooling
-   )
-diff --git a/clang-tools-extra/clang-tidy/android/CMakeLists.txt b/clang-tools-extra/clang-tidy/android/CMakeLists.txt
-index 9d04003d9bb..d29adc610c8 100644
---- a/clang-tools-extra/clang-tidy/android/CMakeLists.txt
-+++ b/clang-tools-extra/clang-tidy/android/CMakeLists.txt
-@@ -20,10 +20,14 @@ add_clang_library(clangTidyAndroidModule
-   ComparisonInTempFailureRetryCheck.cpp
- 
-   LINK_LIBS
-+  clangTidy
-+  clangTidyUtils
-+  )
-+
-+clang_target_link_libraries(clangTidyAndroidModule
-+  PRIVATE
-   clangAST
-   clangASTMatchers
-   clangBasic
-   clangLex
--  clangTidy
--  clangTidyUtils
-   )
-diff --git a/clang-tools-extra/clang-tidy/boost/CMakeLists.txt b/clang-tools-extra/clang-tidy/boost/CMakeLists.txt
-index 059f6e91eca..481a709600c 100644
---- a/clang-tools-extra/clang-tidy/boost/CMakeLists.txt
-+++ b/clang-tools-extra/clang-tidy/boost/CMakeLists.txt
-@@ -5,10 +5,14 @@ add_clang_library(clangTidyBoostModule
-   UseToStringCheck.cpp
- 
-   LINK_LIBS
-+  clangTidy
-+  clangTidyUtils
-+  )
-+
-+clang_target_link_libraries(clangTidyBoostModule
-+  PRIVATE
-   clangAST
-   clangASTMatchers
-   clangBasic
-   clangLex
--  clangTidy
--  clangTidyUtils
-   )
-diff --git a/clang-tools-extra/clang-tidy/bugprone/CMakeLists.txt b/clang-tools-extra/clang-tidy/bugprone/CMakeLists.txt
-index 2cb28f4e8f1..d664f5eb875 100644
---- a/clang-tools-extra/clang-tidy/bugprone/CMakeLists.txt
-+++ b/clang-tools-extra/clang-tidy/bugprone/CMakeLists.txt
-@@ -52,13 +52,17 @@ add_clang_library(clangTidyBugproneModule
-   VirtualNearMissCheck.cpp
- 
-   LINK_LIBS
-+  clangTidy
-+  clangTidyCppCoreGuidelinesModule
-+  clangTidyUtils
-+  )
-+
-+clang_target_link_libraries(clangTidyBugproneModule
-+  PRIVATE
-   clangAnalysis
-   clangAST
-   clangASTMatchers
-   clangBasic
-   clangLex
--  clangTidy
--  clangTidyCppCoreGuidelinesModule
--  clangTidyUtils
-   clangTooling
-   )
-diff --git a/clang-tools-extra/clang-tidy/cert/CMakeLists.txt b/clang-tools-extra/clang-tidy/cert/CMakeLists.txt
-index 66ea2a13acd..75a13349f2f 100644
---- a/clang-tools-extra/clang-tidy/cert/CMakeLists.txt
-+++ b/clang-tools-extra/clang-tidy/cert/CMakeLists.txt
-@@ -17,10 +17,6 @@ add_clang_library(clangTidyCERTModule
-   VariadicFunctionDefCheck.cpp
- 
-   LINK_LIBS
--  clangAST
--  clangASTMatchers
--  clangBasic
--  clangLex
-   clangTidy
-   clangTidyBugproneModule
-   clangTidyGoogleModule
-@@ -29,3 +25,11 @@ add_clang_library(clangTidyCERTModule
-   clangTidyReadabilityModule
-   clangTidyUtils
-   )
-+
-+clang_target_link_libraries(clangTidyCERTModule
-+  PRIVATE
-+  clangAST
-+  clangASTMatchers
-+  clangBasic
-+  clangLex
-+  )
-diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/CMakeLists.txt b/clang-tools-extra/clang-tidy/cppcoreguidelines/CMakeLists.txt
-index 13c15bc9d22..e48bc1c8b1a 100644
---- a/clang-tools-extra/clang-tidy/cppcoreguidelines/CMakeLists.txt
-+++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/CMakeLists.txt
-@@ -23,15 +23,19 @@ add_clang_library(clangTidyCppCoreGuidelinesModule
-   SpecialMemberFunctionsCheck.cpp
- 
-   LINK_LIBS
--  clangAST
--  clangASTMatchers
--  clangBasic
--  clangLex
--  clangSerialization
-   clangTidy
-   clangTidyMiscModule
-   clangTidyModernizeModule
-   clangTidyReadabilityModule
-   clangTidyUtils
-+  )
-+
-+clang_target_link_libraries(clangTidyCppCoreGuidelinesModule
-+  PRIVATE
-+  clangAST
-+  clangASTMatchers
-+  clangBasic
-+  clangLex
-+  clangSerialization
-   clangTooling
-   )
-diff --git a/clang-tools-extra/clang-tidy/darwin/CMakeLists.txt b/clang-tools-extra/clang-tidy/darwin/CMakeLists.txt
-index c650efb2a5f..feec79c12bf 100644
---- a/clang-tools-extra/clang-tidy/darwin/CMakeLists.txt
-+++ b/clang-tools-extra/clang-tidy/darwin/CMakeLists.txt
-@@ -6,11 +6,15 @@ add_clang_library(clangTidyDarwinModule
-   DispatchOnceNonstaticCheck.cpp
- 
-   LINK_LIBS
-+  clangTidy
-+  clangTidyUtils
-+  )
-+
-+clang_target_link_libraries(clangTidyDarwinModule
-+  PRIVATE
-   clangAnalysis
-   clangAST
-   clangASTMatchers
-   clangBasic
-   clangLex
--  clangTidy
--  clangTidyUtils
-   )
-diff --git a/clang-tools-extra/clang-tidy/fuchsia/CMakeLists.txt b/clang-tools-extra/clang-tidy/fuchsia/CMakeLists.txt
-index 30b319e7e5a..0148b20f364 100644
---- a/clang-tools-extra/clang-tidy/fuchsia/CMakeLists.txt
-+++ b/clang-tools-extra/clang-tidy/fuchsia/CMakeLists.txt
-@@ -12,11 +12,15 @@ add_clang_library(clangTidyFuchsiaModule
-   VirtualInheritanceCheck.cpp
- 
-   LINK_LIBS
-+  clangTidy
-+  clangTidyGoogleModule
-+  clangTidyUtils
-+  )
-+
-+clang_target_link_libraries(clangTidyFuchsiaModule
-+  PRIVATE
-   clangAST
-   clangASTMatchers
-   clangBasic
-   clangLex
--  clangTidy
--  clangTidyGoogleModule
--  clangTidyUtils
-   )
-diff --git a/clang-tools-extra/clang-tidy/google/CMakeLists.txt b/clang-tools-extra/clang-tidy/google/CMakeLists.txt
-index 08368932da5..302561ba646 100644
---- a/clang-tools-extra/clang-tidy/google/CMakeLists.txt
-+++ b/clang-tools-extra/clang-tidy/google/CMakeLists.txt
-@@ -21,11 +21,15 @@ add_clang_library(clangTidyGoogleModule
-   UsingNamespaceDirectiveCheck.cpp
- 
-   LINK_LIBS
-+  clangTidy
-+  clangTidyReadabilityModule
-+  clangTidyUtils
-+  )
-+
-+clang_target_link_libraries(clangTidyGoogleModule
-+  PRIVATE
-   clangAST
-   clangASTMatchers
-   clangBasic
-   clangLex
--  clangTidy
--  clangTidyReadabilityModule
--  clangTidyUtils
-   )
-diff --git a/clang-tools-extra/clang-tidy/hicpp/CMakeLists.txt b/clang-tools-extra/clang-tidy/hicpp/CMakeLists.txt
-index 4cf26767f3d..b4c9eb7a445 100644
---- a/clang-tools-extra/clang-tidy/hicpp/CMakeLists.txt
-+++ b/clang-tools-extra/clang-tidy/hicpp/CMakeLists.txt
-@@ -8,11 +8,6 @@ add_clang_library(clangTidyHICPPModule
-   SignedBitwiseCheck.cpp
- 
-   LINK_LIBS
--  clangAST
--  clangASTMatchers
--  clangBasic
--  clangLex
--  clangSerialization
-   clangTidy
-   clangTidyBugproneModule
-   clangTidyCppCoreGuidelinesModule
-@@ -23,3 +18,12 @@ add_clang_library(clangTidyHICPPModule
-   clangTidyReadabilityModule
-   clangTidyUtils
-   )
-+
-+clang_target_link_libraries(clangTidyHICPPModule
-+  PRIVATE
-+  clangAST
-+  clangASTMatchers
-+  clangBasic
-+  clangLex
-+  clangSerialization
-+  )
-diff --git a/clang-tools-extra/clang-tidy/linuxkernel/CMakeLists.txt b/clang-tools-extra/clang-tidy/linuxkernel/CMakeLists.txt
-index f0e766d30e4..bfcc2ba526d 100644
---- a/clang-tools-extra/clang-tidy/linuxkernel/CMakeLists.txt
-+++ b/clang-tools-extra/clang-tidy/linuxkernel/CMakeLists.txt
-@@ -5,10 +5,14 @@ add_clang_library(clangTidyLinuxKernelModule
-   MustCheckErrsCheck.cpp
- 
-   LINK_LIBS
-+  clangTidy
-+  clangTidyUtils
-+  )
-+
-+clang_target_link_libraries(clangTidyLinuxKernelModule
-+  PRIVATE
-   clangAST
-   clangASTMatchers
-   clangBasic
-   clangLex
--  clangTidy
--  clangTidyUtils
-   )
-diff --git a/clang-tools-extra/clang-tidy/llvm/CMakeLists.txt b/clang-tools-extra/clang-tidy/llvm/CMakeLists.txt
-index c035596b556..bff128cbba7 100644
---- a/clang-tools-extra/clang-tidy/llvm/CMakeLists.txt
-+++ b/clang-tools-extra/clang-tidy/llvm/CMakeLists.txt
-@@ -9,12 +9,16 @@ add_clang_library(clangTidyLLVMModule
-   TwineLocalCheck.cpp
- 
-   LINK_LIBS
-+  clangTidy
-+  clangTidyReadabilityModule
-+  clangTidyUtils
-+  )
-+
-+clang_target_link_libraries(clangTidyLLVMModule
-+  PRIVATE
-   clangAST
-   clangASTMatchers
-   clangBasic
-   clangLex
--  clangTidy
--  clangTidyReadabilityModule
--  clangTidyUtils
-   clangTooling
-   )
-diff --git a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
-index 3fc152148d6..37bc2aa5af6 100644
---- a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
-+++ b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
-@@ -17,13 +17,17 @@ add_clang_library(clangTidyMiscModule
-   UnusedUsingDeclsCheck.cpp
- 
-   LINK_LIBS
-+  clangTidy
-+  clangTidyUtils
-+  )
-+
-+clang_target_link_libraries(clangTidyMiscModule
-+  PRIVATE
-   clangAnalysis
-   clangAST
-   clangASTMatchers
-   clangBasic
-   clangLex
-   clangSerialization
--  clangTidy
--  clangTidyUtils
-   clangTooling
-   )
-diff --git a/clang-tools-extra/clang-tidy/modernize/CMakeLists.txt b/clang-tools-extra/clang-tidy/modernize/CMakeLists.txt
-index 36193f0a6d1..162f44568c5 100644
---- a/clang-tools-extra/clang-tidy/modernize/CMakeLists.txt
-+++ b/clang-tools-extra/clang-tidy/modernize/CMakeLists.txt
-@@ -36,12 +36,16 @@ add_clang_library(clangTidyModernizeModule
-   UseUsingCheck.cpp
- 
-   LINK_LIBS
-+  clangTidy
-+  clangTidyReadabilityModule
-+  clangTidyUtils
-+  )
-+
-+clang_target_link_libraries(clangTidyModernizeModule
-+  PRIVATE
-   clangAST
-   clangASTMatchers
-   clangBasic
-   clangLex
--  clangTidy
--  clangTidyReadabilityModule
--  clangTidyUtils
-   clangTooling
-   )
-diff --git a/clang-tools-extra/clang-tidy/mpi/CMakeLists.txt b/clang-tools-extra/clang-tidy/mpi/CMakeLists.txt
-index 5be7b36550a..b36767ac7f3 100644
---- a/clang-tools-extra/clang-tidy/mpi/CMakeLists.txt
-+++ b/clang-tools-extra/clang-tidy/mpi/CMakeLists.txt
-@@ -6,13 +6,17 @@ add_clang_library(clangTidyMPIModule
-   TypeMismatchCheck.cpp
- 
-   LINK_LIBS
-+  clangTidy
-+  clangTidyUtils
-+  )
-+
-+clang_target_link_libraries(clangTidyMPIModule
-+  PRIVATE
-   clangAnalysis
-   clangAST
-   clangASTMatchers
-   clangBasic
-   clangLex
--  clangTidy
--  clangTidyUtils
-   clangTooling
-   clangStaticAnalyzerCheckers
-   )
-diff --git a/clang-tools-extra/clang-tidy/objc/CMakeLists.txt b/clang-tools-extra/clang-tidy/objc/CMakeLists.txt
-index 68dda6530f7..3624d2f3ef0 100644
---- a/clang-tools-extra/clang-tidy/objc/CMakeLists.txt
-+++ b/clang-tools-extra/clang-tidy/objc/CMakeLists.txt
-@@ -9,10 +9,14 @@ add_clang_library(clangTidyObjCModule
-   SuperSelfCheck.cpp
- 
-   LINK_LIBS
-+  clangTidy
-+  clangTidyUtils
-+  )
-+
-+clang_target_link_libraries(clangTidyObjCModule
-+  PRIVATE
-   clangAST
-   clangASTMatchers
-   clangBasic
-   clangLex
--  clangTidy
--  clangTidyUtils
-   )
-diff --git a/clang-tools-extra/clang-tidy/openmp/CMakeLists.txt b/clang-tools-extra/clang-tidy/openmp/CMakeLists.txt
-index af95704fd44..d182b29f366 100644
---- a/clang-tools-extra/clang-tidy/openmp/CMakeLists.txt
-+++ b/clang-tools-extra/clang-tidy/openmp/CMakeLists.txt
-@@ -8,9 +8,13 @@ add_clang_library(clangTidyOpenMPModule
-   UseDefaultNoneCheck.cpp
- 
-   LINK_LIBS
-+  clangTidy
-+  clangTidyUtils
-+  )
-+
-+clang_target_link_libraries(clangTidyOpenMPModule
-+  PRIVATE
-   clangAST
-   clangASTMatchers
-   clangBasic
--  clangTidy
--  clangTidyUtils
-   )
-diff --git a/clang-tools-extra/clang-tidy/performance/CMakeLists.txt b/clang-tools-extra/clang-tidy/performance/CMakeLists.txt
-index d1f9897b015..c9a7e262124 100644
---- a/clang-tools-extra/clang-tidy/performance/CMakeLists.txt
-+++ b/clang-tools-extra/clang-tidy/performance/CMakeLists.txt
-@@ -18,11 +18,15 @@ add_clang_library(clangTidyPerformanceModule
-   UnnecessaryValueParamCheck.cpp
- 
-   LINK_LIBS
-+  clangTidy
-+  clangTidyUtils
-+  )
-+
-+clang_target_link_libraries(clangTidyPerformanceModule
-+  PRIVATE
-   clangAST
-   clangASTMatchers
-   clangAnalysis
-   clangBasic
-   clangLex
--  clangTidy
--  clangTidyUtils
-   )
-diff --git a/clang-tools-extra/clang-tidy/plugin/CMakeLists.txt b/clang-tools-extra/clang-tidy/plugin/CMakeLists.txt
-index 4adc3f26977..0bfe122314e 100644
---- a/clang-tools-extra/clang-tidy/plugin/CMakeLists.txt
-+++ b/clang-tools-extra/clang-tidy/plugin/CMakeLists.txt
-@@ -2,12 +2,16 @@ add_clang_library(clangTidyPlugin
-   ClangTidyPlugin.cpp
- 
-   LINK_LIBS
-+  clangTidy
-+  ${ALL_CLANG_TIDY_CHECKS}
-+  )
-+
-+clang_target_link_libraries(clangTidyPlugin
-+  PRIVATE
-   clangAST
-   clangASTMatchers
-   clangBasic
-   clangFrontend
-   clangSema
--  clangTidy
-   clangTooling
--  ${ALL_CLANG_TIDY_CHECKS}
-   )
-diff --git a/clang-tools-extra/clang-tidy/portability/CMakeLists.txt b/clang-tools-extra/clang-tidy/portability/CMakeLists.txt
-index 0420a18a2a6..bbe9ccbef1f 100644
---- a/clang-tools-extra/clang-tidy/portability/CMakeLists.txt
-+++ b/clang-tools-extra/clang-tidy/portability/CMakeLists.txt
-@@ -5,11 +5,15 @@ add_clang_library(clangTidyPortabilityModule
-   SIMDIntrinsicsCheck.cpp
- 
-   LINK_LIBS
-+  clangTidy
-+  clangTidyUtils
-+  )
-+
-+clang_target_link_libraries(clangTidyPortabilityModule
-+  PRIVATE
-   clangAST
-   clangASTMatchers
-   clangBasic
-   clangLex
--  clangTidy
--  clangTidyUtils
-   clangTooling
-   )
-diff --git a/clang-tools-extra/clang-tidy/readability/CMakeLists.txt b/clang-tools-extra/clang-tidy/readability/CMakeLists.txt
-index 97144af06ca..5af900db5fd 100644
---- a/clang-tools-extra/clang-tidy/readability/CMakeLists.txt
-+++ b/clang-tools-extra/clang-tidy/readability/CMakeLists.txt
-@@ -41,11 +41,15 @@ add_clang_library(clangTidyReadabilityModule
-   UppercaseLiteralSuffixCheck.cpp
- 
-   LINK_LIBS
-+  clangTidy
-+  clangTidyUtils
-+  )
-+
-+clang_target_link_libraries(clangTidyReadabilityModule
-+  PRIVATE
-   clangAST
-   clangASTMatchers
-   clangBasic
-   clangLex
--  clangTidy
--  clangTidyUtils
-   clangTooling
-   )
-diff --git a/clang-tools-extra/clang-tidy/utils/CMakeLists.txt b/clang-tools-extra/clang-tidy/utils/CMakeLists.txt
-index fc383a318b9..5c837ca79aa 100644
---- a/clang-tools-extra/clang-tidy/utils/CMakeLists.txt
-+++ b/clang-tools-extra/clang-tidy/utils/CMakeLists.txt
-@@ -18,11 +18,15 @@ add_clang_library(clangTidyUtils
-   UsingInserter.cpp
- 
-   LINK_LIBS
-+  clangTidy
-+  )
-+
-+clang_target_link_libraries(clangTidyUtils
-+  PRIVATE
-   clangAST
-   clangASTMatchers
-   clangBasic
-   clangLex
-   clangSema
--  clangTidy
-   clangTransformer
-   )
-diff --git a/clang-tools-extra/clang-tidy/zircon/CMakeLists.txt b/clang-tools-extra/clang-tidy/zircon/CMakeLists.txt
-index 7aa7cd3f669..71db5e90f25 100644
---- a/clang-tools-extra/clang-tidy/zircon/CMakeLists.txt
-+++ b/clang-tools-extra/clang-tidy/zircon/CMakeLists.txt
-@@ -5,10 +5,14 @@ add_clang_library(clangTidyZirconModule
-   ZirconTidyModule.cpp
- 
-   LINK_LIBS
-+  clangTidy
-+  clangTidyUtils
-+  )
-+
-+clang_target_link_libraries(clangTidyZirconModule
-+  PRIVATE
-   clangAST
-   clangASTMatchers
-   clangBasic
-   clangLex
--  clangTidy
--  clangTidyUtils
-   )
-diff --git a/clang-tools-extra/clangd/CMakeLists.txt b/clang-tools-extra/clangd/CMakeLists.txt
-index e3eccb50a49..148043ee9df 100644
---- a/clang-tools-extra/clangd/CMakeLists.txt
-+++ b/clang-tools-extra/clangd/CMakeLists.txt
-@@ -110,6 +110,13 @@ add_clang_library(clangDaemon
-   refactor/Tweak.cpp
- 
-   LINK_LIBS
-+  clangTidy
-+  ${LLVM_PTHREAD_LIB}
-+  ${ALL_CLANG_TIDY_CHECKS}
-+  )
-+
-+clang_target_link_libraries(clangDaemon
-+  PRIVATE
-   clangAST
-   clangASTMatchers
-   clangBasic
-@@ -120,15 +127,11 @@ add_clang_library(clangDaemon
-   clangLex
-   clangSema
-   clangSerialization
--  clangTidy
-   clangTooling
-   clangToolingCore
-   clangToolingInclusions
-   clangToolingRefactoring
-   clangToolingSyntax
--  ${LLVM_PTHREAD_LIB}
--  ${CLANGD_ATOMIC_LIB}
--  ${ALL_CLANG_TIDY_CHECKS}
-   )
- 
- add_subdirectory(refactor/tweaks)
-diff --git a/clang-tools-extra/clangd/unittests/CMakeLists.txt b/clang-tools-extra/clangd/unittests/CMakeLists.txt
-index 62113c6e4bb..6c2b56c93d5 100644
---- a/clang-tools-extra/clangd/unittests/CMakeLists.txt
-+++ b/clang-tools-extra/clangd/unittests/CMakeLists.txt
-@@ -103,7 +103,6 @@ target_link_libraries(ClangdTests
-   PRIVATE
-   clangDaemon
-   clangTidy
--  LLVMSupport
-   LLVMTestingSupport
-   )
- 
--- 
-2.27.0
-
diff --git a/sys-fabric/Manifest.gz b/sys-fabric/Manifest.gz
index d87356abc9d5..f982471840b1 100644
Binary files a/sys-fabric/Manifest.gz and b/sys-fabric/Manifest.gz differ
diff --git a/sys-fabric/infiniband-diags/infiniband-diags-1.6.4.ebuild b/sys-fabric/infiniband-diags/infiniband-diags-1.6.4.ebuild
index a3fbe0a72e2a..6bda2d97ac74 100644
--- a/sys-fabric/infiniband-diags/infiniband-diags-1.6.4.ebuild
+++ b/sys-fabric/infiniband-diags/infiniband-diags-1.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -20,3 +20,12 @@ DEPEND="
 	sys-fabric/opensm:${SLOT}"
 RDEPEND="${DEPEND}"
 block_other_ofed_versions
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-fabric/libcxgb3/libcxgb3-1.3.1-r2.ebuild b/sys-fabric/libcxgb3/libcxgb3-1.3.1-r2.ebuild
index a3f162eb82c6..2d5bc5c6608d 100644
--- a/sys-fabric/libcxgb3/libcxgb3-1.3.1-r2.ebuild
+++ b/sys-fabric/libcxgb3/libcxgb3-1.3.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -17,3 +17,12 @@ IUSE=""
 DEPEND="sys-fabric/libibverbs:${SLOT}"
 RDEPEND="${DEPEND}"
 block_other_ofed_versions
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-fabric/libcxgb4/libcxgb4-1.3.2.ebuild b/sys-fabric/libcxgb4/libcxgb4-1.3.2.ebuild
index 532a8f553747..ff8ef23cbd6b 100644
--- a/sys-fabric/libcxgb4/libcxgb4-1.3.2.ebuild
+++ b/sys-fabric/libcxgb4/libcxgb4-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -17,3 +17,12 @@ IUSE=""
 DEPEND="sys-fabric/libibverbs:${SLOT}"
 RDEPEND="${DEPEND}"
 block_other_ofed_versions
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-fabric/libibcm/libibcm-1.0.5-r3.ebuild b/sys-fabric/libibcm/libibcm-1.0.5-r3.ebuild
index d335c5e20e61..14e31272f463 100644
--- a/sys-fabric/libibcm/libibcm-1.0.5-r3.ebuild
+++ b/sys-fabric/libibcm/libibcm-1.0.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -17,3 +17,12 @@ IUSE=""
 RDEPEND="sys-fabric/libibverbs:${SLOT}"
 DEPEND="${RDEPEND}"
 block_other_ofed_versions
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-fabric/libibmad/libibmad-1.3.11.ebuild b/sys-fabric/libibmad/libibmad-1.3.11.ebuild
index 785819b5fbd7..133c5aee3ddc 100644
--- a/sys-fabric/libibmad/libibmad-1.3.11.ebuild
+++ b/sys-fabric/libibmad/libibmad-1.3.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -19,3 +19,12 @@ DEPEND="
 	"
 RDEPEND="${DEPEND}"
 block_other_ofed_versions
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-fabric/libibumad/libibumad-1.3.9.ebuild b/sys-fabric/libibumad/libibumad-1.3.9.ebuild
index c0768c754c9c..cc946e2ac877 100644
--- a/sys-fabric/libibumad/libibumad-1.3.9.ebuild
+++ b/sys-fabric/libibumad/libibumad-1.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -19,3 +19,12 @@ DEPEND="
 	"
 RDEPEND="${DEPEND}"
 block_other_ofed_versions
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-fabric/libipathverbs/libipathverbs-1.2.1.ebuild b/sys-fabric/libipathverbs/libipathverbs-1.2.1.ebuild
index 7c3f102a195a..fc983278b0a2 100644
--- a/sys-fabric/libipathverbs/libipathverbs-1.2.1.ebuild
+++ b/sys-fabric/libipathverbs/libipathverbs-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -17,3 +17,12 @@ IUSE=""
 DEPEND="sys-fabric/libibverbs:${SLOT}"
 RDEPEND="${DEPEND}"
 block_other_ofed_versions
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-fabric/libmlx4/libmlx4-1.0.5.ebuild b/sys-fabric/libmlx4/libmlx4-1.0.5.ebuild
index d3258f9a47a4..7c98fbec8def 100644
--- a/sys-fabric/libmlx4/libmlx4-1.0.5.ebuild
+++ b/sys-fabric/libmlx4/libmlx4-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -20,3 +20,12 @@ DEPEND="
 RDEPEND="
 		!sys-fabric/openib-userspace"
 block_other_ofed_versions
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-fabric/libmlx5/libmlx5-1.0.1.ebuild b/sys-fabric/libmlx5/libmlx5-1.0.1.ebuild
index 4b7a5b45ba86..52884509e40b 100644
--- a/sys-fabric/libmlx5/libmlx5-1.0.1.ebuild
+++ b/sys-fabric/libmlx5/libmlx5-1.0.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 OFED_VER="3.12"
 OFED_RC="1"
@@ -12,11 +12,22 @@ inherit openib
 
 DESCRIPTION="OpenIB userspace driver for Mellanox ConnectIB HCA"
 KEYWORDS="amd64 ~x86 ~amd64-linux"
-IUSE=""
 
-DEPEND="
-	sys-fabric/libibverbs:${SLOT}
-	"
-RDEPEND="
-		!sys-fabric/openib-userspace"
+DEPEND="sys-fabric/libibverbs:${SLOT}"
+RDEPEND="!sys-fabric/openib-userspace"
 block_other_ofed_versions
+
+src_prepare() {
+	default
+
+	sed -i -e '/CFLAGS=\"$CFLAGS -Werror\"/d' configure || die
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-fabric/libmthca/libmthca-1.0.6.ebuild b/sys-fabric/libmthca/libmthca-1.0.6.ebuild
index 12b7d53cec48..498608f416a9 100644
--- a/sys-fabric/libmthca/libmthca-1.0.6.ebuild
+++ b/sys-fabric/libmthca/libmthca-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -18,3 +18,12 @@ DEPEND="sys-fabric/libibverbs:${SLOT}"
 RDEPEND="${DEPEND}
 		!sys-fabric/openib-userspace"
 block_other_ofed_versions
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-fabric/libocrdma/libocrdma-1.0.2.ebuild b/sys-fabric/libocrdma/libocrdma-1.0.2.ebuild
index 35a150e93522..539124d24d1c 100644
--- a/sys-fabric/libocrdma/libocrdma-1.0.2.ebuild
+++ b/sys-fabric/libocrdma/libocrdma-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -20,3 +20,12 @@ DEPEND="
 RDEPEND="
 		!sys-fabric/openib-userspace"
 block_other_ofed_versions
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index aa13f1256fb4..4987de105069 100644
Binary files a/sys-firmware/Manifest.gz and b/sys-firmware/Manifest.gz differ
diff --git a/sys-firmware/intel-microcode/Manifest b/sys-firmware/intel-microcode/Manifest
index b08601f29ba0..3373bca79870 100644
--- a/sys-firmware/intel-microcode/Manifest
+++ b/sys-firmware/intel-microcode/Manifest
@@ -1,6 +1,8 @@
 DIST intel-microcode-collection-20200617.tar.xz 6097076 BLAKE2B cbd323fb98569c58c3d89f0f7ae3bb4b215c518d90a83086e19fba9f61cfc591908e24a3d8620f93fbd6b6aa418ceb4e8899684dab3bc9450d4af08314d7a243 SHA512 0e99a75c1632da1e80b6d888b313d280e97e2902b51a21d2551444a5b6a332f85e8a008f69553b7154c50e68f90bfe7f86e152e2babd7a2d0b839ff27d18f8c0
 DIST intel-microcode-collection-20200921.tar.xz 6482440 BLAKE2B d8cc478bf61c750fc73f1fd55ce8d8dd6655abc79bea77d2dfa21241ee0ff44c10931e28c6343494433d8dc1784b5bbf6ab47e5c8d5fa7c230749e057e21e33a SHA512 7c34a851b7047640557a2708bf0af9adcb40cffae73aa0c6d4a64dec33ba3df00854b056bb042d9886a9726eccb6053b418a2c515f07faa06d1ed0dfa984db05
 DIST intel-microcode-collection-20201110.tar.xz 6476772 BLAKE2B 9f6bbc568f62a1593eba85a34861b70fd2598b745e1aac58df0ba4c248a9fafd1cda7bc428dfeff5b8da05d8098b7b98c7a64dc16ad4967aa34eff5b25d64a84 SHA512 6cf50f8f3b3531de11231e1f209c667bb715c5d4362ae5d4852ba7b76087e51dca2028b78dd521034013a32daf82c06cb6573f8fefc4acc8b955b42cef2ddea9
+DIST intel-microcode-collection-20201116.tar.xz 6506624 BLAKE2B b74ec0ddafe9681ae94d6a0df1de51655004eecae83c413fa824c9ad25cf68a25059627e2809a3b8cd5b3cb18647455385de0be2b2a7fcc6bc6c30e2ccabd1af SHA512 3a1aab0af9ff6dc95778276964b457a4429aa12f13499f6f89fa48285cf8aef9a0990099a80e360b76b2d4b6a836f2528f984aab17f12d905cf237dbab2a8b33
 DIST intel-ucode-sig_0x406e3-rev_0xd6.bin 101376 BLAKE2B 66d55867954d69dda1425febd93bb8c89f7aa836d504f8b5fee127f8505bcf2246f4fcc55cc245bc5e532528d60cca2eee278de7ab5174dc2862db7982a2b36f SHA512 248066b521bf512b5d8e4a8c7e921464ce52169c954d6e4ca580d8c172cd789519e22b4cf56c212e452b4191741f0202019f7061d322c9433b5af9ce5413b567
 DIST microcode-20200616.tar.gz 3036726 BLAKE2B c4db887743c916804624683b51306ba1fdb2281c3583a35706edfd5d6fbd7027793bf6fa952ba96dacd0e9b399a8e632d4997e46e13eba89d55f49328e0b5367 SHA512 39c4de3a292da0aeef4f35624d22ca6116dc8baa7f0683b1c16f5e153ba6d9d52f0879263313ef67922eda551d998521d3721af880c22c63083d8ebce81f413f
 DIST microcode-20201110.tar.gz 3609989 BLAKE2B e984f6a69d8652f2842c78e62902c1aaca2fa39c2d9079be03ef829e8e9cb7e621bdfa6c5d49a2ad16759b393a7daaa375fe853c4e37a8789e280dfc749c3a9c SHA512 da0a2614fcd651536a2dc64a2207ab02d8b482453e9d2ae18f628f1cbc3da0aa0734f830264fca5541823693d300f74ae60f7014cbf43b87ff55345c8fd80014
+DIST microcode-20201112.tar.gz 3610834 BLAKE2B 4212924f1673afded961266a25fe6063ec6cdafaa26c8bee1c42372eb8ab5f278dc2501615b23e09e2f9809bf2792a8db317c98c170bf0c5e1dd62b7dc80a084 SHA512 0875675d065a83ee14fa34a31022ee34e46aee579d1ff192414e79861af157ae269ca7c2c462f03b3accbd45590c76e5cbf4f53d7a6ed237e410213a96459211
diff --git a/sys-firmware/intel-microcode/intel-microcode-20201112_p20201116.ebuild b/sys-firmware/intel-microcode/intel-microcode-20201112_p20201116.ebuild
new file mode 100644
index 000000000000..fb5b79ed7459
--- /dev/null
+++ b/sys-firmware/intel-microcode/intel-microcode-20201112_p20201116.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit linux-info toolchain-funcs mount-boot
+
+# Find updates by searching and clicking the first link (hopefully it's the one):
+# https://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
+
+COLLECTION_SNAPSHOT="${PV##*_p}"
+INTEL_SNAPSHOT="${PV/_p*}"
+#NUM="28087"
+#https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}
+#https://downloadmirror.intel.com/${NUM}/eng/microcode-${INTEL_SNAPSHOT}.tgz
+DESCRIPTION="Intel IA32/IA64 microcode update data"
+HOMEPAGE="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/"
+SRC_URI="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-${INTEL_SNAPSHOT}.tar.gz
+	https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin
+	https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-${COLLECTION_SNAPSHOT}.tar.xz"
+
+LICENSE="intel-ucode"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE="hostonly initramfs +split-ucode vanilla"
+REQUIRED_USE="|| ( initramfs split-ucode )"
+
+BDEPEND=">=sys-apps/iucode_tool-2.3"
+
+# !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586
+RDEPEND="hostonly? ( sys-apps/iucode_tool )"
+
+RESTRICT="binchecks bindist mirror strip"
+
+S=${WORKDIR}
+
+# Blacklist bad microcode here.
+# 0x000406f1 aka 06-4f-01 aka CPUID 406F1 require newer microcode loader
+MICROCODE_BLACKLIST_DEFAULT="-s !0x000406f1"
+
+# https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/issues/31
+MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000406e3,0xc0,eq:0x00dc"
+
+# https://bugs.gentoo.org/722768
+MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000406e3,0xc0,eq:0x00da"
+
+# In case we want to set some defaults ...
+MICROCODE_SIGNATURES_DEFAULT=""
+
+# Advanced users only!
+# Set MIRCOCODE_SIGNATURES to merge with:
+# only current CPU: MICROCODE_SIGNATURES="-S"
+# only specific CPU: MICROCODE_SIGNATURES="-s 0x00000f4a -s 0x00010676"
+# exclude specific CPU: MICROCODE_SIGNATURES="-s !0x00000686"
+
+pkg_pretend() {
+	use initramfs && mount-boot_pkg_pretend
+}
+
+src_prepare() {
+	default
+
+	if cd Intel-Linux-Processor-Microcode-Data* &>/dev/null; then
+		# new tarball format from GitHub
+		mv * ../ || die "Failed to move Intel-Linux-Processor-Microcode-Data*"
+		cd .. || die
+		rm -r Intel-Linux-Processor-Microcode-Data* || die
+	fi
+
+	mkdir intel-ucode-old || die
+	cp "${DISTDIR}"/intel-ucode-sig_0x406e3-rev_0xd6.bin "${S}"/intel-ucode-old/ || die
+
+	# Prevent "invalid file format" errors from iucode_tool
+	rm -f "${S}"/intel-ucod*/list || die
+}
+
+src_install() {
+	# This will take ALL of the upstream microcode sources:
+	# - microcode.dat
+	# - intel-ucode/
+	# In some cases, they have not contained the same content (eg the directory has newer stuff).
+	MICROCODE_SRC=(
+		"${S}"/intel-ucode/
+		"${S}"/intel-ucode-with-caveats/
+		"${S}"/intel-ucode-old/
+	)
+
+	# Allow users who are scared about microcode updates not included in Intel's official
+	# microcode tarball to opt-out and comply with Intel marketing
+	if ! use vanilla; then
+		MICROCODE_SRC+=( "${S}"/intel-microcode-collection-${COLLECTION_SNAPSHOT} )
+	fi
+
+	# These will carry into pkg_preinst via env saving.
+	: ${MICROCODE_BLACKLIST=${MICROCODE_BLACKLIST_DEFAULT}}
+	: ${MICROCODE_SIGNATURES=${MICROCODE_SIGNATUES_DEFAULT}}
+
+	opts=(
+		${MICROCODE_BLACKLIST}
+		${MICROCODE_SIGNATURES}
+		# be strict about what we are doing
+		--overwrite
+		--strict-checks
+		--no-ignore-broken
+		# we want to install latest version
+		--no-downgrade
+		# show everything we find
+		--list-all
+		# show what we selected
+		--list
+	)
+
+	# The earlyfw cpio needs to be in /boot because it must be loaded before
+	# rootfs is mounted.
+	use initramfs && dodir /boot && opts+=( --write-earlyfw="${ED}/boot/intel-uc.img" )
+
+	keepdir /lib/firmware/intel-ucode
+	opts+=( --write-firmware="${ED}/lib/firmware/intel-ucode" )
+
+	iucode_tool \
+		"${opts[@]}" \
+		"${MICROCODE_SRC[@]}" \
+		|| die "iucode_tool ${opts[@]} ${MICROCODE_SRC[@]}"
+
+	dodoc releasenote.md
+}
+
+pkg_preinst() {
+	if [[ ${MICROCODE_BLACKLIST} != ${MICROCODE_BLACKLIST_DEFAULT} ]]; then
+		ewarn "MICROCODE_BLACKLIST is set to \"${MICROCODE_BLACKLIST}\" instead of default \"${MICROCODE_BLACKLIST_DEFAULT}\". You are on your own!"
+	fi
+
+	if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
+		ewarn "Package was created using advanced options:"
+		ewarn "MICROCODE_SIGNATURES is set to \"${MICROCODE_SIGNATURES}\" instead of default \"${MICROCODE_SIGNATURES_DEFAULT}\"!"
+	fi
+
+	# Make sure /boot is available if needed.
+	use initramfs && mount-boot_pkg_preinst
+
+	local _initramfs_file="${ED}/boot/intel-uc.img"
+
+	if use hostonly; then
+		# While this output looks redundant we do this check to detect
+		# rare cases where iucode_tool was unable to detect system's processor(s).
+		local _detected_processors=$(iucode_tool --scan-system 2>&1)
+		if [[ -z "${_detected_processors}" ]]; then
+			ewarn "Looks like iucode_tool was unable to detect any processor!"
+		else
+			einfo "Only installing ucode(s) for ${_detected_processors#iucode_tool: system has } due to USE=hostonly ..."
+		fi
+
+		opts=(
+			--scan-system
+			# be strict about what we are doing
+			--overwrite
+			--strict-checks
+			--no-ignore-broken
+			# we want to install latest version
+			--no-downgrade
+			# show everything we find
+			--list-all
+			# show what we selected
+			--list
+		)
+
+		# The earlyfw cpio needs to be in /boot because it must be loaded before
+		# rootfs is mounted.
+		use initramfs && opts+=( --write-earlyfw=${_initramfs_file} )
+
+		if use split-ucode; then
+			opts+=( --write-firmware="${ED}/lib/firmware/intel-ucode" )
+		fi
+
+		opts+=( "${ED}/lib/firmware/intel-ucode-temp" )
+
+		mv "${ED}"/lib/firmware/intel-ucode{,-temp} || die
+		keepdir /lib/firmware/intel-ucode
+
+		iucode_tool "${opts[@]}" || die "iucode_tool ${opts[@]}"
+
+		rm -r "${ED}"/lib/firmware/intel-ucode-temp || die
+
+	elif ! use split-ucode; then # hostonly disabled
+		rm -r "${ED}"/lib/firmware/intel-ucode || die
+	fi
+
+	# Because it is possible that this package will install not one single file
+	# due to user selection which is still somehow unexpected we add the following
+	# check to inform user so that the user has at least a chance to detect
+	# a problem/invalid select.
+	local _has_installed_something=
+	if use initramfs && [[ -s "${_initramfs_file}" ]]; then
+		_has_installed_something="yes"
+	elif use split-ucode; then
+		_has_installed_something=$(find "${ED}/lib/firmware/intel-ucode" -maxdepth 0 -not -empty -exec echo yes \;)
+	fi
+
+	if use hostonly && [[ -n "${_has_installed_something}" ]]; then
+		elog "You only installed ucode(s) for all currently available (=online)"
+		elog "processor(s). Remember to re-emerge this package whenever you"
+		elog "change the system's processor model."
+		elog ""
+	elif [[ -z "${_has_installed_something}" ]]; then
+		ewarn "WARNING:"
+		if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
+			ewarn "No ucode was installed! Because you have created this package"
+			ewarn "using MICROCODE_SIGNATURES variable please double check if you"
+			ewarn "have an invalid select."
+			ewarn "It's rare but it is also possible that just no ucode update"
+			ewarn "is available for your processor(s). In this case it is safe"
+			ewarn "to ignore this warning."
+		else
+			ewarn "No ucode was installed! It's rare but it is also possible"
+			ewarn "that just no ucode update is available for your processor(s)."
+			ewarn "In this case it is safe to ignore this warning."
+		fi
+
+		ewarn ""
+
+		if use hostonly; then
+			ewarn "Unset \"hostonly\" USE flag to install all available ucodes."
+			ewarn ""
+		fi
+	fi
+}
+
+pkg_prerm() {
+	# Make sure /boot is mounted so that we can remove /boot/intel-uc.img!
+	use initramfs && mount-boot_pkg_prerm
+}
+
+pkg_postrm() {
+	# Don't forget to umount /boot if it was previously mounted by us.
+	use initramfs && mount-boot_pkg_postrm
+}
+
+pkg_postinst() {
+	# Don't forget to umount /boot if it was previously mounted by us.
+	use initramfs && mount-boot_pkg_postinst
+
+	# We cannot give detailed information if user is affected or not:
+	# If MICROCODE_BLACKLIST wasn't modified, user can still use MICROCODE_SIGNATURES
+	# to to force a specific, otherwise blacklisted, microcode. So we
+	# only show a generic warning based on running kernel version:
+	if kernel_is -lt 4 14 34; then
+		ewarn "${P} contains microcode updates which require"
+		ewarn "additional kernel patches which aren't yet included in kernel <4.14.34."
+		ewarn "Loading such a microcode through kernel interface from an unpatched kernel"
+		ewarn "can crash your system!"
+		ewarn ""
+		ewarn "Those microcodes are blacklisted per default. However, if you have altered"
+		ewarn "MICROCODE_BLACKLIST or MICROCODE_SIGNATURES, you maybe have unintentionally"
+		ewarn "re-enabled those microcodes...!"
+		ewarn ""
+		ewarn "Check \"${EROOT}/usr/share/doc/${PN}-*/releasenot*\" if your microcode update"
+		ewarn "requires additional kernel patches or not."
+	fi
+}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index c990b9f73169..a9e3b281055d 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/clamfs/clamfs-1.2.0.ebuild b/sys-fs/clamfs/clamfs-1.2.0.ebuild
index af8952ff74bc..c7a90b3a7d45 100644
--- a/sys-fs/clamfs/clamfs-1.2.0.ebuild
+++ b/sys-fs/clamfs/clamfs-1.2.0.ebuild
@@ -22,6 +22,8 @@ RDEPEND="${DEPEND}
 CONFIG_CHECK="~FUSE_FS"
 
 src_prepare() {
+	# Do not use Werror ( #754180 )
+	sed -i 's/\-Werror//g' configure.ac || die "Sed failed"
 	default
 	eautoreconf
 }
diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild
index 320b28d98390..722b317a2d7c 100644
--- a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild
+++ b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-${MY_PV}.
 		 mirror://gentoo/diskdev_cmds-${PV}.patch.bz2"
 LICENSE="APSL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE="libressl"
 DEPEND="
 	!libressl? ( dev-libs/openssl:0= )
diff --git a/sys-fs/dislocker/Manifest b/sys-fs/dislocker/Manifest
index 5765522a20ec..40ff38a7b8fe 100644
--- a/sys-fs/dislocker/Manifest
+++ b/sys-fs/dislocker/Manifest
@@ -1 +1,2 @@
+DIST dislocker-0.7.1-fix-find-ruby.patch 25942 BLAKE2B bd9d93c5eddcbade0039c1787dae36f5dd01f91cd435dfb9dbcfcb16f0f09cba7e73a3221c8b2f3843d0a68199fb9e38bdb91428fa784442659f7af53ab6d4dd SHA512 70f5a628659ef4645d757b899f3e6310e3a4d2ab89f429748c711177a0944e9b0eabf5341e394ab09216b0fa18e3c2b0832406b27f40c04510df937ffe5f65ef
 DIST dislocker-0.7.1.tar.gz 103194 BLAKE2B 05421b0d3e7686480e40a41e67086017c454b76e0852fef78a7b5d10134cf388b4bf7b9669d87b867418f4c074cc023ea9b0260dbdbc837322d04f217aa40b28 SHA512 8852ba3e363fdea992eebecfe1e4dad2b85404f57c57ce6b2937a9859d03cfa88d969926c9e11e6d22596c6d96805b7d1737893ae2c5a957448ab26708bce226
diff --git a/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild b/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild
index a15c39558ddc..73f3b33aa545 100644
--- a/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild
+++ b/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild
@@ -12,7 +12,8 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/Aorimn/dislocker.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/Aorimn/dislocker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/Aorimn/dislocker/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~juippis/distfiles/tmp/dislocker-0.7.1-fix-find-ruby.patch"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -31,7 +32,7 @@ CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindRuby"
 
 src_prepare() {
 	if use ruby && [[ ${PV} == "0.7.1" ]]; then
-		PATCHES=( "${FILESDIR}/${P}-fix-find-ruby.patch" )
+		PATCHES=( "${DISTDIR}/${P}-fix-find-ruby.patch" )
 	fi
 	cmake_src_prepare
 
diff --git a/sys-fs/dislocker/dislocker-9999.ebuild b/sys-fs/dislocker/dislocker-9999.ebuild
index a15c39558ddc..73f3b33aa545 100644
--- a/sys-fs/dislocker/dislocker-9999.ebuild
+++ b/sys-fs/dislocker/dislocker-9999.ebuild
@@ -12,7 +12,8 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/Aorimn/dislocker.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/Aorimn/dislocker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/Aorimn/dislocker/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~juippis/distfiles/tmp/dislocker-0.7.1-fix-find-ruby.patch"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -31,7 +32,7 @@ CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindRuby"
 
 src_prepare() {
 	if use ruby && [[ ${PV} == "0.7.1" ]]; then
-		PATCHES=( "${FILESDIR}/${P}-fix-find-ruby.patch" )
+		PATCHES=( "${DISTDIR}/${P}-fix-find-ruby.patch" )
 	fi
 	cmake_src_prepare
 
diff --git a/sys-fs/dislocker/files/dislocker-0.7.1-fix-find-ruby.patch b/sys-fs/dislocker/files/dislocker-0.7.1-fix-find-ruby.patch
deleted file mode 100644
index b5659f062ccf..000000000000
--- a/sys-fs/dislocker/files/dislocker-0.7.1-fix-find-ruby.patch
+++ /dev/null
@@ -1,671 +0,0 @@
-diff -Nuar a/cmake/FindPackageHandleStandardArgs.cmake b/cmake/FindPackageHandleStandardArgs.cmake
---- a/cmake/FindPackageHandleStandardArgs.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ b/cmake/FindPackageHandleStandardArgs.cmake	2020-03-04 11:38:51.062021412 +0100
-@@ -0,0 +1,258 @@
-+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-+# file Copyright.txt or https://cmake.org/licensing for details.
-+
-+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageMessage.cmake)
-+
-+# internal helper macro
-+macro(_FPHSA_FAILURE_MESSAGE _msg)
-+  if (${_NAME}_FIND_REQUIRED)
-+    message(FATAL_ERROR "${_msg}")
-+  else ()
-+    if (NOT ${_NAME}_FIND_QUIETLY)
-+      message(STATUS "${_msg}")
-+    endif ()
-+  endif ()
-+endmacro()
-+
-+
-+# internal helper macro to generate the failure message when used in CONFIG_MODE:
-+macro(_FPHSA_HANDLE_FAILURE_CONFIG_MODE)
-+  # <PackageName>_CONFIG is set, but FOUND is false, this means that some other of the REQUIRED_VARS was not found:
-+  if(${_NAME}_CONFIG)
-+    _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: missing:${MISSING_VARS} (found ${${_NAME}_CONFIG} ${VERSION_MSG})")
-+  else()
-+    # If _CONSIDERED_CONFIGS is set, the config-file has been found, but no suitable version.
-+    # List them all in the error message:
-+    if(${_NAME}_CONSIDERED_CONFIGS)
-+      set(configsText "")
-+      list(LENGTH ${_NAME}_CONSIDERED_CONFIGS configsCount)
-+      math(EXPR configsCount "${configsCount} - 1")
-+      foreach(currentConfigIndex RANGE ${configsCount})
-+        list(GET ${_NAME}_CONSIDERED_CONFIGS ${currentConfigIndex} filename)
-+        list(GET ${_NAME}_CONSIDERED_VERSIONS ${currentConfigIndex} version)
-+        string(APPEND configsText "    ${filename} (version ${version})\n")
-+      endforeach()
-+      if (${_NAME}_NOT_FOUND_MESSAGE)
-+        string(APPEND configsText "    Reason given by package: ${${_NAME}_NOT_FOUND_MESSAGE}\n")
-+      endif()
-+      _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} ${VERSION_MSG}, checked the following files:\n${configsText}")
-+
-+    else()
-+      # Simple case: No Config-file was found at all:
-+      _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: found neither ${_NAME}Config.cmake nor ${_NAME_LOWER}-config.cmake ${VERSION_MSG}")
-+    endif()
-+  endif()
-+endmacro()
-+
-+
-+function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
-+
-+# Set up the arguments for `cmake_parse_arguments`.
-+  set(options  CONFIG_MODE  HANDLE_COMPONENTS)
-+  set(oneValueArgs  FAIL_MESSAGE  VERSION_VAR  FOUND_VAR)
-+  set(multiValueArgs REQUIRED_VARS)
-+
-+# Check whether we are in 'simple' or 'extended' mode:
-+  set(_KEYWORDS_FOR_EXTENDED_MODE  ${options} ${oneValueArgs} ${multiValueArgs} )
-+  list(FIND _KEYWORDS_FOR_EXTENDED_MODE "${_FIRST_ARG}" INDEX)
-+
-+  if(${INDEX} EQUAL -1)
-+    set(FPHSA_FAIL_MESSAGE ${_FIRST_ARG})
-+    set(FPHSA_REQUIRED_VARS ${ARGN})
-+    set(FPHSA_VERSION_VAR)
-+  else()
-+    cmake_parse_arguments(FPHSA "${options}" "${oneValueArgs}" "${multiValueArgs}"  ${_FIRST_ARG} ${ARGN})
-+
-+    if(FPHSA_UNPARSED_ARGUMENTS)
-+      message(FATAL_ERROR "Unknown keywords given to FIND_PACKAGE_HANDLE_STANDARD_ARGS(): \"${FPHSA_UNPARSED_ARGUMENTS}\"")
-+    endif()
-+
-+    if(NOT FPHSA_FAIL_MESSAGE)
-+      set(FPHSA_FAIL_MESSAGE  "DEFAULT_MSG")
-+    endif()
-+
-+    # In config-mode, we rely on the variable <PackageName>_CONFIG, which is set by find_package()
-+    # when it successfully found the config-file, including version checking:
-+    if(FPHSA_CONFIG_MODE)
-+      list(INSERT FPHSA_REQUIRED_VARS 0 ${_NAME}_CONFIG)
-+      list(REMOVE_DUPLICATES FPHSA_REQUIRED_VARS)
-+      set(FPHSA_VERSION_VAR ${_NAME}_VERSION)
-+    endif()
-+
-+    if(NOT FPHSA_REQUIRED_VARS)
-+      message(FATAL_ERROR "No REQUIRED_VARS specified for FIND_PACKAGE_HANDLE_STANDARD_ARGS()")
-+    endif()
-+  endif()
-+
-+# now that we collected all arguments, process them
-+
-+  if("x${FPHSA_FAIL_MESSAGE}" STREQUAL "xDEFAULT_MSG")
-+    set(FPHSA_FAIL_MESSAGE "Could NOT find ${_NAME}")
-+  endif()
-+
-+  list(GET FPHSA_REQUIRED_VARS 0 _FIRST_REQUIRED_VAR)
-+
-+  string(TOUPPER ${_NAME} _NAME_UPPER)
-+  string(TOLOWER ${_NAME} _NAME_LOWER)
-+
-+  if(FPHSA_FOUND_VAR)
-+    if(FPHSA_FOUND_VAR MATCHES "^${_NAME}_FOUND$"  OR  FPHSA_FOUND_VAR MATCHES "^${_NAME_UPPER}_FOUND$")
-+      set(_FOUND_VAR ${FPHSA_FOUND_VAR})
-+    else()
-+      message(FATAL_ERROR "The argument for FOUND_VAR is \"${FPHSA_FOUND_VAR}\", but only \"${_NAME}_FOUND\" and \"${_NAME_UPPER}_FOUND\" are valid names.")
-+    endif()
-+  else()
-+    set(_FOUND_VAR ${_NAME_UPPER}_FOUND)
-+  endif()
-+
-+  # collect all variables which were not found, so they can be printed, so the
-+  # user knows better what went wrong (#6375)
-+  set(MISSING_VARS "")
-+  set(DETAILS "")
-+  # check if all passed variables are valid
-+  set(FPHSA_FOUND_${_NAME} TRUE)
-+  foreach(_CURRENT_VAR ${FPHSA_REQUIRED_VARS})
-+    if(NOT ${_CURRENT_VAR})
-+      set(FPHSA_FOUND_${_NAME} FALSE)
-+      string(APPEND MISSING_VARS " ${_CURRENT_VAR}")
-+    else()
-+      string(APPEND DETAILS "[${${_CURRENT_VAR}}]")
-+    endif()
-+  endforeach()
-+  if(FPHSA_FOUND_${_NAME})
-+    set(${_NAME}_FOUND TRUE)
-+    set(${_NAME_UPPER}_FOUND TRUE)
-+  else()
-+    set(${_NAME}_FOUND FALSE)
-+    set(${_NAME_UPPER}_FOUND FALSE)
-+  endif()
-+
-+  # component handling
-+  unset(FOUND_COMPONENTS_MSG)
-+  unset(MISSING_COMPONENTS_MSG)
-+
-+  if(FPHSA_HANDLE_COMPONENTS)
-+    foreach(comp ${${_NAME}_FIND_COMPONENTS})
-+      if(${_NAME}_${comp}_FOUND)
-+
-+        if(NOT DEFINED FOUND_COMPONENTS_MSG)
-+          set(FOUND_COMPONENTS_MSG "found components: ")
-+        endif()
-+        string(APPEND FOUND_COMPONENTS_MSG " ${comp}")
-+
-+      else()
-+
-+        if(NOT DEFINED MISSING_COMPONENTS_MSG)
-+          set(MISSING_COMPONENTS_MSG "missing components: ")
-+        endif()
-+        string(APPEND MISSING_COMPONENTS_MSG " ${comp}")
-+
-+        if(${_NAME}_FIND_REQUIRED_${comp})
-+          set(${_NAME}_FOUND FALSE)
-+          string(APPEND MISSING_VARS " ${comp}")
-+        endif()
-+
-+      endif()
-+    endforeach()
-+    set(COMPONENT_MSG "${FOUND_COMPONENTS_MSG} ${MISSING_COMPONENTS_MSG}")
-+    string(APPEND DETAILS "[c${COMPONENT_MSG}]")
-+  endif()
-+
-+  # version handling:
-+  set(VERSION_MSG "")
-+  set(VERSION_OK TRUE)
-+
-+  # check with DEFINED here as the requested or found version may be "0"
-+  if (DEFINED ${_NAME}_FIND_VERSION)
-+    if(DEFINED ${FPHSA_VERSION_VAR})
-+      set(_FOUND_VERSION ${${FPHSA_VERSION_VAR}})
-+
-+      if(${_NAME}_FIND_VERSION_EXACT)       # exact version required
-+        # count the dots in the version string
-+        string(REGEX REPLACE "[^.]" "" _VERSION_DOTS "${_FOUND_VERSION}")
-+        # add one dot because there is one dot more than there are components
-+        string(LENGTH "${_VERSION_DOTS}." _VERSION_DOTS)
-+        if (_VERSION_DOTS GREATER ${_NAME}_FIND_VERSION_COUNT)
-+          # Because of the C++ implementation of find_package() ${_NAME}_FIND_VERSION_COUNT
-+          # is at most 4 here. Therefore a simple lookup table is used.
-+          if (${_NAME}_FIND_VERSION_COUNT EQUAL 1)
-+            set(_VERSION_REGEX "[^.]*")
-+          elseif (${_NAME}_FIND_VERSION_COUNT EQUAL 2)
-+            set(_VERSION_REGEX "[^.]*\\.[^.]*")
-+          elseif (${_NAME}_FIND_VERSION_COUNT EQUAL 3)
-+            set(_VERSION_REGEX "[^.]*\\.[^.]*\\.[^.]*")
-+          else ()
-+            set(_VERSION_REGEX "[^.]*\\.[^.]*\\.[^.]*\\.[^.]*")
-+          endif ()
-+          string(REGEX REPLACE "^(${_VERSION_REGEX})\\..*" "\\1" _VERSION_HEAD "${_FOUND_VERSION}")
-+          unset(_VERSION_REGEX)
-+          if (NOT ${_NAME}_FIND_VERSION VERSION_EQUAL _VERSION_HEAD)
-+            set(VERSION_MSG "Found unsuitable version \"${_FOUND_VERSION}\", but required is exact version \"${${_NAME}_FIND_VERSION}\"")
-+            set(VERSION_OK FALSE)
-+          else ()
-+            set(VERSION_MSG "(found suitable exact version \"${_FOUND_VERSION}\")")
-+          endif ()
-+          unset(_VERSION_HEAD)
-+        else ()
-+          if (NOT ${_NAME}_FIND_VERSION VERSION_EQUAL _FOUND_VERSION)
-+            set(VERSION_MSG "Found unsuitable version \"${_FOUND_VERSION}\", but required is exact version \"${${_NAME}_FIND_VERSION}\"")
-+            set(VERSION_OK FALSE)
-+          else ()
-+            set(VERSION_MSG "(found suitable exact version \"${_FOUND_VERSION}\")")
-+          endif ()
-+        endif ()
-+        unset(_VERSION_DOTS)
-+
-+      else()     # minimum version specified:
-+        if (${_NAME}_FIND_VERSION VERSION_GREATER _FOUND_VERSION)
-+          set(VERSION_MSG "Found unsuitable version \"${_FOUND_VERSION}\", but required is at least \"${${_NAME}_FIND_VERSION}\"")
-+          set(VERSION_OK FALSE)
-+        else ()
-+          set(VERSION_MSG "(found suitable version \"${_FOUND_VERSION}\", minimum required is \"${${_NAME}_FIND_VERSION}\")")
-+        endif ()
-+      endif()
-+
-+    else()
-+
-+      # if the package was not found, but a version was given, add that to the output:
-+      if(${_NAME}_FIND_VERSION_EXACT)
-+         set(VERSION_MSG "(Required is exact version \"${${_NAME}_FIND_VERSION}\")")
-+      else()
-+         set(VERSION_MSG "(Required is at least version \"${${_NAME}_FIND_VERSION}\")")
-+      endif()
-+
-+    endif()
-+  else ()
-+    # Check with DEFINED as the found version may be 0.
-+    if(DEFINED ${FPHSA_VERSION_VAR})
-+      set(VERSION_MSG "(found version \"${${FPHSA_VERSION_VAR}}\")")
-+    endif()
-+  endif ()
-+
-+  if(VERSION_OK)
-+    string(APPEND DETAILS "[v${${FPHSA_VERSION_VAR}}(${${_NAME}_FIND_VERSION})]")
-+  else()
-+    set(${_NAME}_FOUND FALSE)
-+  endif()
-+
-+
-+  # print the result:
-+  if (${_NAME}_FOUND)
-+    FIND_PACKAGE_MESSAGE(${_NAME} "Found ${_NAME}: ${${_FIRST_REQUIRED_VAR}} ${VERSION_MSG} ${COMPONENT_MSG}" "${DETAILS}")
-+  else ()
-+
-+    if(FPHSA_CONFIG_MODE)
-+      _FPHSA_HANDLE_FAILURE_CONFIG_MODE()
-+    else()
-+      if(NOT VERSION_OK)
-+        _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: ${VERSION_MSG} (found ${${_FIRST_REQUIRED_VAR}})")
-+      else()
-+        _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} (missing:${MISSING_VARS}) ${VERSION_MSG}")
-+      endif()
-+    endif()
-+
-+  endif ()
-+
-+  set(${_NAME}_FOUND ${${_NAME}_FOUND} PARENT_SCOPE)
-+  set(${_NAME_UPPER}_FOUND ${${_NAME}_FOUND} PARENT_SCOPE)
-+endfunction()
-diff -Nuar a/cmake/FindPackageMessage.cmake b/cmake/FindPackageMessage.cmake
---- a/cmake/FindPackageMessage.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ b/cmake/FindPackageMessage.cmake	2020-03-04 11:38:51.062021412 +0100
-@@ -0,0 +1,19 @@
-+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-+# file Copyright.txt or https://cmake.org/licensing for details.
-+
-+function(find_package_message pkg msg details)
-+  # Avoid printing a message repeatedly for the same find result.
-+  if(NOT ${pkg}_FIND_QUIETLY)
-+    string(REPLACE "\n" "" details "${details}")
-+    set(DETAILS_VAR FIND_PACKAGE_MESSAGE_DETAILS_${pkg})
-+    if(NOT "${details}" STREQUAL "${${DETAILS_VAR}}")
-+      # The message has not yet been printed.
-+      message(STATUS "${msg}")
-+
-+      # Save the find details in the cache to avoid printing the same
-+      # message again.
-+      set("${DETAILS_VAR}" "${details}"
-+        CACHE INTERNAL "Details about finding ${pkg}")
-+    endif()
-+  endif()
-+endfunction()
-diff -Nuar a/cmake/FindRuby.cmake b/cmake/FindRuby.cmake
---- a/cmake/FindRuby.cmake	2017-02-09 10:33:45.000000000 +0100
-+++ b/cmake/FindRuby.cmake	2020-03-04 11:38:51.062021412 +0100
-@@ -1,89 +1,297 @@
--# Ruby cmake package
--#
--# Returns
--# RUBY_FOUND
--# RUBY_INCLUDE_DIRS
--# RUBY_LIBRARIES
--# RUBY_VERSION_MAJOR
--# RUBY_VERSION_MINOR
--# RUBY_VERSION_STRING
--
--if(RUBY_FOUND)
--   set(RUBY_FIND_QUIETLY TRUE)
--endif()
--
--find_program(RUBY_EXECUTABLE
--  NAMES ruby2.2 ruby22 ruby2.1 ruby21 ruby2.0 ruby2 ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby
--  PATHS /usr/bin /usr/local/bin /usr/pkg/bin
--  )
--if(RUBY_EXECUTABLE)
--  execute_process(
--    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['MAJOR']"
--    OUTPUT_VARIABLE RUBY_VERSION_MAJOR
--    )
--
--  execute_process(
--    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['MINOR']"
--    OUTPUT_VARIABLE RUBY_VERSION_MINOR
--    )
--
--  execute_process(
--    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['TEENY']"
--    OUTPUT_VARIABLE RUBY_VERSION_TEENY
--    )
--  set(RUBY_VERSION_STRING ${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.${RUBY_VERSION_TEENY})
--
--  execute_process(
--    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubyhdrdir'] || RbConfig::CONFIG['archdir']"
--    OUTPUT_VARIABLE RUBY_ARCH_DIR
--    )
--  execute_process(
--    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['arch']"
--    OUTPUT_VARIABLE RUBY_ARCH
--    )
--  execute_process(
--    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['libdir']"
--    OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH
--    )
--  execute_process(
--    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubylibdir']"
--    OUTPUT_VARIABLE RUBY_LIB_PATH
--    )
--  execute_process(
--    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['archincludedir']"
--    OUTPUT_VARIABLE RUBY_ARCH_INC_DIR
--    )
--  execute_process(
--    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['RUBY_SO_NAME']"
--    OUTPUT_VARIABLE RUBY_SO_NAME
--    )
--
--  find_path(RUBY_INCLUDE_DIRS
--    NAMES ruby.h ruby/config.h
--    PATHS ${RUBY_ARCH_DIR}
--    )
--  set(RUBY_INCLUDE_ARCH "${RUBY_INCLUDE_DIRS}/${RUBY_ARCH}")
--  find_library(RUBY_LIB
--    NAMES ${RUBY_SO_NAME}
--    PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH}
--    )
--
--  if(RUBY_LIB AND RUBY_INCLUDE_DIRS)
--    set(RUBY_FOUND TRUE)
--    set(RUBY_INCLUDE_DIRS "${RUBY_INCLUDE_DIRS};${RUBY_INCLUDE_ARCH};${RUBY_ARCH_INC_DIR}/ruby-${RUBY_VERSION_STRING}")
--    set(RUBY_LIBRARIES ${RUBY_LIB})
--  endif()
-+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-+# file Copyright.txt or https://cmake.org/licensing for details.
-+
-+#[[
-+FindRuby
-+--------
-+
-+This module finds if Ruby is installed and determines where the
-+include files and libraries are.  Ruby 1.8, 1.9, 2.0 through 2.5 are
-+supported.
-+
-+The minimum required version of Ruby can be specified using the
-+standard syntax, e.g.  find_package(Ruby 1.8)
-+
-+It also determines what the name of the library is.  This code sets
-+the following variables:
-+
-+RUBY_EXECUTABLE
-+    full path to the ruby binary
-+RUBY_INCLUDE_DIRS
-+    include dirs to be used when using the ruby library
-+RUBY_LIBRARY
-+    full path to the ruby library
-+RUBY_VERSION
-+    the version of ruby which was found, e.g. "1.8.7"
-+RUBY_FOUND
-+    set to true if ruby ws found successfully
- 
--  if(RUBY_OLD_VERSION)
--    set(RUBY_FOUND FALSE)
--    set(RUBY_NOT_FOUND TRUE)
-+Also:
-+
-+RUBY_INCLUDE_PATH
-+    same as RUBY_INCLUDE_DIRS, only provided for compatibility reasons, don't use it
-+#]]
-+
-+#   RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
-+#   RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
-+#   RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
-+#   RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
-+#   RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
-+
-+# uncomment the following line to get debug output for this file
-+set(_RUBY_DEBUG_OUTPUT TRUE)
-+
-+# Determine the list of possible names of the ruby executable depending
-+# on which version of ruby is required
-+set(_RUBY_POSSIBLE_EXECUTABLE_NAMES ruby)
-+
-+# if 1.9 is required, don't look for ruby18 and ruby1.8, default to version 1.8
-+if(DEFINED Ruby_FIND_VERSION_MAJOR AND DEFINED Ruby_FIND_VERSION_MINOR)
-+   set(Ruby_FIND_VERSION_SHORT_NODOT "${Ruby_FIND_VERSION_MAJOR}${RUBY_FIND_VERSION_MINOR}")
-+   # we can't construct that if only major version is given
-+   set(_RUBY_POSSIBLE_EXECUTABLE_NAMES
-+       ruby${Ruby_FIND_VERSION_MAJOR}.${Ruby_FIND_VERSION_MINOR}
-+       ruby${Ruby_FIND_VERSION_MAJOR}${Ruby_FIND_VERSION_MINOR}
-+       ${_RUBY_POSSIBLE_EXECUTABLE_NAMES})
-+else()
-+   set(Ruby_FIND_VERSION_SHORT_NODOT "18")
-+endif()
-+
-+if(NOT Ruby_FIND_VERSION_EXACT)
-+  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.5 ruby25)
-+  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.4 ruby24)
-+  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.3 ruby23)
-+  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.2 ruby22)
-+  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.1 ruby21)
-+  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.0 ruby20)
-+  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby1.9 ruby19)
-+
-+  # if we want a version below 1.9, also look for ruby 1.8
-+  if("${Ruby_FIND_VERSION_SHORT_NODOT}" VERSION_LESS "19")
-+    list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby1.8 ruby18)
-   endif()
- 
--  mark_as_advanced(
--    RUBY_INCLUDE_DIRS
--    RUBY_LIBRARIES
--    RUBY_LIB
--    RUBY_VERSION_MAJOR RUBY_VERSION_MINOR
--    RUBY_VERSION_STRING
--    )
-+  list(REMOVE_DUPLICATES _RUBY_POSSIBLE_EXECUTABLE_NAMES)
-+endif()
-+
-+find_program(RUBY_EXECUTABLE NAMES ${_RUBY_POSSIBLE_EXECUTABLE_NAMES})
-+
-+if(RUBY_EXECUTABLE  AND NOT  RUBY_VERSION_MAJOR)
-+  function(_RUBY_CONFIG_VAR RBVAR OUTVAR)
-+    execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['${RBVAR}']"
-+      RESULT_VARIABLE _RUBY_SUCCESS
-+      OUTPUT_VARIABLE _RUBY_OUTPUT
-+      ERROR_QUIET)
-+    if(_RUBY_SUCCESS OR _RUBY_OUTPUT STREQUAL "")
-+      execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['${RBVAR}']"
-+        RESULT_VARIABLE _RUBY_SUCCESS
-+        OUTPUT_VARIABLE _RUBY_OUTPUT
-+        ERROR_QUIET)
-+    endif()
-+    set(${OUTVAR} "${_RUBY_OUTPUT}" PARENT_SCOPE)
-+  endfunction()
-+
-+
-+  # query the ruby version
-+   _RUBY_CONFIG_VAR("MAJOR" RUBY_VERSION_MAJOR)
-+   _RUBY_CONFIG_VAR("MINOR" RUBY_VERSION_MINOR)
-+   _RUBY_CONFIG_VAR("TEENY" RUBY_VERSION_PATCH)
-+
-+   # query the different directories
-+   _RUBY_CONFIG_VAR("archdir" RUBY_ARCH_DIR)
-+   _RUBY_CONFIG_VAR("arch" RUBY_ARCH)
-+   _RUBY_CONFIG_VAR("rubyhdrdir" RUBY_HDR_DIR)
-+   _RUBY_CONFIG_VAR("rubyarchhdrdir" RUBY_ARCHHDR_DIR)
-+   _RUBY_CONFIG_VAR("libdir" RUBY_POSSIBLE_LIB_DIR)
-+   _RUBY_CONFIG_VAR("rubylibdir" RUBY_RUBY_LIB_DIR)
-+
-+   # site_ruby
-+   _RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR)
-+   _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
-+
-+   # vendor_ruby available ?
-+   execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'"
-+      OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY  ERROR_QUIET)
-+
-+   if(RUBY_HAS_VENDOR_RUBY)
-+      _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR)
-+      _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR)
-+   endif()
-+
-+   # save the results in the cache so we don't have to run ruby the next time again
-+   set(RUBY_VERSION_MAJOR    ${RUBY_VERSION_MAJOR}    CACHE PATH "The Ruby major version" FORCE)
-+   set(RUBY_VERSION_MINOR    ${RUBY_VERSION_MINOR}    CACHE PATH "The Ruby minor version" FORCE)
-+   set(RUBY_VERSION_PATCH    ${RUBY_VERSION_PATCH}    CACHE PATH "The Ruby patch version" FORCE)
-+   set(RUBY_ARCH_DIR         ${RUBY_ARCH_DIR}         CACHE PATH "The Ruby arch dir" FORCE)
-+   set(RUBY_HDR_DIR          ${RUBY_HDR_DIR}          CACHE PATH "The Ruby header dir (1.9+)" FORCE)
-+   set(RUBY_ARCHHDR_DIR      ${RUBY_ARCHHDR_DIR}      CACHE PATH "The Ruby arch header dir (2.0+)" FORCE)
-+   set(RUBY_POSSIBLE_LIB_DIR ${RUBY_POSSIBLE_LIB_DIR} CACHE PATH "The Ruby lib dir" FORCE)
-+   set(RUBY_RUBY_LIB_DIR     ${RUBY_RUBY_LIB_DIR}     CACHE PATH "The Ruby ruby-lib dir" FORCE)
-+   set(RUBY_SITEARCH_DIR     ${RUBY_SITEARCH_DIR}     CACHE PATH "The Ruby site arch dir" FORCE)
-+   set(RUBY_SITELIB_DIR      ${RUBY_SITELIB_DIR}      CACHE PATH "The Ruby site lib dir" FORCE)
-+   set(RUBY_HAS_VENDOR_RUBY  ${RUBY_HAS_VENDOR_RUBY}  CACHE BOOL "Vendor Ruby is available" FORCE)
-+   set(RUBY_VENDORARCH_DIR   ${RUBY_VENDORARCH_DIR}   CACHE PATH "The Ruby vendor arch dir" FORCE)
-+   set(RUBY_VENDORLIB_DIR    ${RUBY_VENDORLIB_DIR}    CACHE PATH "The Ruby vendor lib dir" FORCE)
-+
-+   mark_as_advanced(
-+     RUBY_ARCH_DIR
-+     RUBY_ARCH
-+     RUBY_HDR_DIR
-+     RUBY_ARCHHDR_DIR
-+     RUBY_POSSIBLE_LIB_DIR
-+     RUBY_RUBY_LIB_DIR
-+     RUBY_SITEARCH_DIR
-+     RUBY_SITELIB_DIR
-+     RUBY_HAS_VENDOR_RUBY
-+     RUBY_VENDORARCH_DIR
-+     RUBY_VENDORLIB_DIR
-+     RUBY_VERSION_MAJOR
-+     RUBY_VERSION_MINOR
-+     RUBY_VERSION_PATCH
-+     )
-+endif()
-+
-+# In case RUBY_EXECUTABLE could not be executed (e.g. cross compiling)
-+# try to detect which version we found. This is not too good.
-+if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
-+   # by default assume 1.8.0
-+   set(RUBY_VERSION_MAJOR 1)
-+   set(RUBY_VERSION_MINOR 8)
-+   set(RUBY_VERSION_PATCH 0)
-+   # check whether we found 1.9.x
-+   if(${RUBY_EXECUTABLE} MATCHES "ruby1\\.?9")
-+      set(RUBY_VERSION_MAJOR 1)
-+      set(RUBY_VERSION_MINOR 9)
-+   endif()
-+   # check whether we found 2.0.x
-+   if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?0")
-+      set(RUBY_VERSION_MAJOR 2)
-+      set(RUBY_VERSION_MINOR 0)
-+   endif()
-+   # check whether we found 2.1.x
-+   if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?1")
-+      set(RUBY_VERSION_MAJOR 2)
-+      set(RUBY_VERSION_MINOR 1)
-+   endif()
-+   # check whether we found 2.2.x
-+   if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?2")
-+      set(RUBY_VERSION_MAJOR 2)
-+      set(RUBY_VERSION_MINOR 2)
-+   endif()
-+   # check whether we found 2.3.x
-+   if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?3")
-+      set(RUBY_VERSION_MAJOR 2)
-+      set(RUBY_VERSION_MINOR 3)
-+   endif()
-+   # check whether we found 2.4.x
-+   if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?4")
-+      set(RUBY_VERSION_MAJOR 2)
-+      set(RUBY_VERSION_MINOR 4)
-+   endif()
-+   if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?5")
-+      set(RUBY_VERSION_MAJOR 2)
-+      set(RUBY_VERSION_MINOR 5)
-+   endif()
- endif()
-+
-+if(RUBY_VERSION_MAJOR)
-+   set(RUBY_VERSION "${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.${RUBY_VERSION_PATCH}")
-+   set(_RUBY_VERSION_SHORT "${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}")
-+   set(_RUBY_VERSION_SHORT_NODOT "${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}")
-+   set(_RUBY_NODOT_VERSION "${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}${RUBY_VERSION_PATCH}")
-+endif()
-+
-+find_path(RUBY_INCLUDE_DIR
-+   NAMES ruby.h
-+   HINTS
-+   ${RUBY_HDR_DIR}
-+   ${RUBY_ARCH_DIR}
-+   /usr/lib/ruby/${_RUBY_VERSION_SHORT}/i586-linux-gnu/ )
-+
-+set(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIR} )
-+
-+# if ruby > 1.8 is required or if ruby > 1.8 was found, search for the config.h dir
-+if( "${Ruby_FIND_VERSION_SHORT_NODOT}" GREATER 18  OR  "${_RUBY_VERSION_SHORT_NODOT}" GREATER 18  OR  RUBY_HDR_DIR)
-+   find_path(RUBY_CONFIG_INCLUDE_DIR
-+     NAMES ruby/config.h  config.h
-+     HINTS
-+     ${RUBY_HDR_DIR}/${RUBY_ARCH}
-+     ${RUBY_ARCH_DIR}
-+     ${RUBY_ARCHHDR_DIR}
-+     )
-+
-+   set(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIRS} ${RUBY_CONFIG_INCLUDE_DIR} )
-+endif()
-+
-+
-+# Determine the list of possible names for the ruby library
-+set(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} ruby${_RUBY_VERSION_SHORT_NODOT} ruby-${_RUBY_VERSION_SHORT} ruby-${RUBY_VERSION})
-+
-+if(WIN32)
-+   set( _RUBY_MSVC_RUNTIME "" )
-+   if( MSVC_VERSION EQUAL 1200 )
-+     set( _RUBY_MSVC_RUNTIME "60" )
-+   endif()
-+   if( MSVC_VERSION EQUAL 1300 )
-+     set( _RUBY_MSVC_RUNTIME "70" )
-+   endif()
-+   if( MSVC_VERSION EQUAL 1310 )
-+     set( _RUBY_MSVC_RUNTIME "71" )
-+   endif()
-+   if( MSVC_VERSION EQUAL 1400 )
-+     set( _RUBY_MSVC_RUNTIME "80" )
-+   endif()
-+   if( MSVC_VERSION EQUAL 1500 )
-+     set( _RUBY_MSVC_RUNTIME "90" )
-+   endif()
-+
-+   set(_RUBY_ARCH_PREFIX "")
-+   if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-+     set(_RUBY_ARCH_PREFIX "x64-")
-+   endif()
-+
-+   list(APPEND _RUBY_POSSIBLE_LIB_NAMES
-+               "${_RUBY_ARCH_PREFIX}msvcr${_RUBY_MSVC_RUNTIME}-ruby${_RUBY_NODOT_VERSION}"
-+               "${_RUBY_ARCH_PREFIX}msvcr${_RUBY_MSVC_RUNTIME}-ruby${_RUBY_NODOT_VERSION}-static"
-+               "${_RUBY_ARCH_PREFIX}msvcrt-ruby${_RUBY_NODOT_VERSION}"
-+               "${_RUBY_ARCH_PREFIX}msvcrt-ruby${_RUBY_NODOT_VERSION}-static" )
-+endif()
-+
-+find_library(RUBY_LIBRARY NAMES ${_RUBY_POSSIBLE_LIB_NAMES} HINTS ${RUBY_POSSIBLE_LIB_DIR} )
-+
-+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-+set(_RUBY_REQUIRED_VARS RUBY_EXECUTABLE RUBY_INCLUDE_DIR RUBY_LIBRARY)
-+if(_RUBY_VERSION_SHORT_NODOT GREATER 18)
-+   list(APPEND _RUBY_REQUIRED_VARS RUBY_CONFIG_INCLUDE_DIR)
-+endif()
-+
-+if(_RUBY_DEBUG_OUTPUT)
-+   message(STATUS "--------FindRuby.cmake debug------------")
-+   message(STATUS "_RUBY_POSSIBLE_EXECUTABLE_NAMES: ${_RUBY_POSSIBLE_EXECUTABLE_NAMES}")
-+   message(STATUS "_RUBY_POSSIBLE_LIB_NAMES: ${_RUBY_POSSIBLE_LIB_NAMES}")
-+   message(STATUS "RUBY_ARCH_DIR: ${RUBY_ARCH_DIR}")
-+   message(STATUS "RUBY_HDR_DIR: ${RUBY_HDR_DIR}")
-+   message(STATUS "RUBY_POSSIBLE_LIB_DIR: ${RUBY_POSSIBLE_LIB_DIR}")
-+   message(STATUS "Found RUBY_VERSION: \"${RUBY_VERSION}\" , short: \"${_RUBY_VERSION_SHORT}\", nodot: \"${_RUBY_VERSION_SHORT_NODOT}\"")
-+   message(STATUS "_RUBY_REQUIRED_VARS: ${_RUBY_REQUIRED_VARS}")
-+   message(STATUS "RUBY_EXECUTABLE: ${RUBY_EXECUTABLE}")
-+   message(STATUS "RUBY_LIBRARY: ${RUBY_LIBRARY}")
-+   message(STATUS "RUBY_INCLUDE_DIR: ${RUBY_INCLUDE_DIR}")
-+   message(STATUS "RUBY_CONFIG_INCLUDE_DIR: ${RUBY_CONFIG_INCLUDE_DIR}")
-+   message(STATUS "--------------------")
-+endif()
-+
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ruby  REQUIRED_VARS  ${_RUBY_REQUIRED_VARS}
-+                                        VERSION_VAR RUBY_VERSION )
-+
-+mark_as_advanced(
-+  RUBY_EXECUTABLE
-+  RUBY_LIBRARY
-+  RUBY_INCLUDE_DIR
-+  RUBY_CONFIG_INCLUDE_DIR
-+  )
-+
-+# Set some variables for compatibility with previous version of this file
-+set(RUBY_POSSIBLE_LIB_PATH ${RUBY_POSSIBLE_LIB_DIR})
-+set(RUBY_RUBY_LIB_PATH ${RUBY_RUBY_LIB_DIR})
-+set(RUBY_INCLUDE_PATH ${RUBY_INCLUDE_DIRS})
diff --git a/sys-fs/fatsort/fatsort-1.6.3.622.ebuild b/sys-fs/fatsort/fatsort-1.6.3.622.ebuild
index 4a24f9216942..f04b31692aa8 100644
--- a/sys-fs/fatsort/fatsort-1.6.3.622.ebuild
+++ b/sys-fs/fatsort/fatsort-1.6.3.622.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 src_prepare() {
 	default
diff --git a/sys-fs/inotify-tools/Manifest b/sys-fs/inotify-tools/Manifest
index e6e64742a003..587e6c4d3d6c 100644
--- a/sys-fs/inotify-tools/Manifest
+++ b/sys-fs/inotify-tools/Manifest
@@ -1,2 +1,3 @@
 DIST inotify-tools-3.20.1.tar.gz 79564 BLAKE2B 4b1235951f55ecb7c6c92b06b68dedebad8677c2265616dddd275bf627034b66b5756cf17a2f68f4201a78b043ec8a0800f115f3952c19875ae7f524b9b21382 SHA512 a97d27e6033036f0db5c0737bee3510206db9f4c843f0d18f1b2e179e838624ea33316c34fd9917c158dbb3580367908e90042fb1bfb146f150c32833b0b2ff2
+DIST inotify-tools-3.20.11.0.tar.gz 84827 BLAKE2B 1d3e25c4e213c9c6da74575677a6dc491405077b0544be79ee95e5ac2ee2ef2606ae2fd0264ad83228dc580447f15afd16e486bd5a8d51f6254ed805ed985260 SHA512 77b90e96efe0c90ab6ca4309c2f08303c2047ebddfad93ff62c616f30df8ca01102197867571047475b19b7dcc0fe369d9dd41425c2973cdc06467787098f672
 DIST inotify-tools-3.20.2.2.tar.gz 81006 BLAKE2B 7dd29985f68096fe2146a3ad84d619b3d1238b0db25eeb125f2fe9591fa678078351f00c7e09b526cf2251e4736201d5625ff0e477523cae370a307ccb667730 SHA512 72d6fdcc216d8083cd384c71c02dc8e800d3a9702613568b3c571f704aee3d42bf084c52f2141c9afb8d28e8b87ebb6391ed3d825b3d664ed51c552debeb1881
diff --git a/sys-fs/inotify-tools/inotify-tools-3.20.11.0.ebuild b/sys-fs/inotify-tools/inotify-tools-3.20.11.0.ebuild
new file mode 100644
index 000000000000..5e89f2bc1ca7
--- /dev/null
+++ b/sys-fs/inotify-tools/inotify-tools-3.20.11.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="a set of command-line programs providing a simple interface to inotify"
+HOMEPAGE="https://github.com/inotify-tools/inotify-tools"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86"
+IUSE="doc"
+
+DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND=""
+
+src_prepare() {
+	default
+
+	# Remove -Werror from CFLAGS (#745069)
+	find -name "Makefile.am" -print0 \
+		| xargs --null sed 's@ -Werror@@' -i || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# only docs installed are doxygen ones, so use /html
+	local myeconfargs=(
+		--disable-static
+		--docdir='$(datarootdir)'/doc/${PF}/html
+		$(use_enable doc doxygen)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-fs/inotify-tools/inotify-tools-3.20.2.2.ebuild b/sys-fs/inotify-tools/inotify-tools-3.20.2.2.ebuild
index ff0369a04dea..2f090dae45e8 100644
--- a/sys-fs/inotify-tools/inotify-tools-3.20.2.2.ebuild
+++ b/sys-fs/inotify-tools/inotify-tools-3.20.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ~sparc x86"
 IUSE="doc"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/sys-fs/mhddfs/files/mhddfs-0.1.39-segfault-fix.patch b/sys-fs/mhddfs/files/mhddfs-0.1.39-segfault-fix.patch
index 493a78396190..74132c158dc0 100644
--- a/sys-fs/mhddfs/files/mhddfs-0.1.39-segfault-fix.patch
+++ b/sys-fs/mhddfs/files/mhddfs-0.1.39-segfault-fix.patch
@@ -178,23 +178,6 @@ Thanks to Gabor Kovari <gabor.kovari@gmail.com>
  		" mhddfs dir1,dir2.. mountpoint [ -o OPTIONS ]\n"
 --- a/Makefile	2016-01-05 16:45:10.184105001 +0100
 +++ b/Makefile	2015-12-21 16:32:29.000000000 +0100
-@@ -22,13 +22,13 @@
- 
- TARGET	=	mhddfs
- 
--CFLAGS	+=	-Wall $(shell pkg-config fuse --cflags) \
--			-DFUSE_USE_VERSION=26 -MMD
-+CFLAGS	=	-Wall $(shell pkg-config fuse glib-2.0 --cflags) \
-+			-DFUSE_USE_VERSION=26 -MMD -g -rdynamic -O0
- ifdef WITHOUT_XATTR
- CFLAGS	+=	-DWITHOUT_XATTR
- endif
- 
--LIBS		=	$(shell pkg-config fuse --libs)
-+LDFLAGS	=	$(shell pkg-config fuse glib-2.0 --libs)
- 
- FORTAR	=	src COPYING LICENSE README Makefile \
- 		README.ru.UTF-8 ChangeLog mhddfs.1 \
 @@ -53,7 +53,7 @@
  ifeq ($(DEBVERSION), $(VERSION))
  all: $(TARGET)
diff --git a/sys-fs/mhddfs/files/mhddfs-respect-compiler-vars.patch b/sys-fs/mhddfs/files/mhddfs-respect-compiler-vars.patch
index 0c6f24f4d1a7..278c9876da73 100644
--- a/sys-fs/mhddfs/files/mhddfs-respect-compiler-vars.patch
+++ b/sys-fs/mhddfs/files/mhddfs-respect-compiler-vars.patch
@@ -5,14 +5,15 @@
  TARGET	=	mhddfs
  
 -CFLAGS	=	-Wall $(shell pkg-config fuse --cflags) \
-+CFLAGS	+=	-Wall $(shell pkg-config fuse --cflags) \
- 			-DFUSE_USE_VERSION=26 -MMD
+-			-DFUSE_USE_VERSION=26 -MMD
++CFLAGS	+=	-Wall $(shell pkg-config fuse glib-2.0 --cflags) \
++			-DFUSE_USE_VERSION=26 -MMD -rdynamic
  ifdef WITHOUT_XATTR
  CFLAGS	+=	-DWITHOUT_XATTR
  endif
  
 -LDFLAGS	=	$(shell pkg-config fuse --libs)
-+LIBS		=	$(shell pkg-config fuse --libs)
++LIBS	=	$(shell pkg-config fuse glib-2.0 --libs)
  
  FORTAR	=	src COPYING LICENSE README Makefile \
  		README.ru.UTF-8 ChangeLog mhddfs.1 \
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index dd78e5e9f42d..3791f6de0fa1 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,2 +1,3 @@
 DIST multipath-tools-0.8.3.tar.gz 465248 BLAKE2B 21a7a18c70150b4422bdd0ae02f26f491845eb06928ab74e631df8c6b3c110d10f43f75b9f8289a7134826c923b7ba58ce54c40497c3b7e6211e53902c8a1b5f SHA512 d9fdc2763f5a1efa15ee07c5d863008c9694623935f62a0e0b56f941df4e0d0ca3f86056fefc9b5ca828b47782127e3d55f2f925b1ed957e02b675bef36f4cae
 DIST multipath-tools-0.8.4.tar.gz 480994 BLAKE2B be8368df049218e2eaa1749e7b1c7a930da15f0311ab549b1bbba9c019dcfe39f90a05fd621e0703301ef1d55c98ac8cc74231d82950d9066f19d8764421704b SHA512 720823188c053c1c50269a30e34a9d69099098495bfd607076bcfa2c079565e3f0580c91783f19d42ed82290c0db98e4e19ef620eca4ee5ec7885c49c72d2307
+DIST multipath-tools-0.8.5.tar.gz 494750 BLAKE2B a42d17a47631107433a1d0a9da69a0bb10d2125cb242d2125d67da18f6bc6231c9233b163dc1d07d88dcba9f912830c047fdee5b42435f59ea2976598a72fd75 SHA512 f62a09107ccb18ffab97139fe2dba3dc22450836d8669c4381a8bce4072672a027a3a1e687f33e374429bffa49b3ba4a54d1e52294044d7bc1f82ed5d5aaf760
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.8.5-respect-flags.patch b/sys-fs/multipath-tools/files/multipath-tools-0.8.5-respect-flags.patch
new file mode 100644
index 000000000000..20d9fef6f3f1
--- /dev/null
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.8.5-respect-flags.patch
@@ -0,0 +1,12 @@
+--- multipath-tools-0.8.5-eecfcba/Makefile.inc
++++ multipath-tools-0.8.5-eecfcba/Makefile.inc
+@@ -98,7 +98,8 @@
+ 		  -Werror=implicit-function-declaration -Werror=format-security \
+ 		  $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS)
+ CPPFLAGS	:= -Wp,-D_FORTIFY_SOURCE=2 
+-CFLAGS		:= --std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe \
++CFLAGS		?= $(OPTFLAGS) $(WARNFLAGS) -pipe
++CFLAGS		+= --std=gnu99 \
+ 		   -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \
+ 		   -MMD -MP
+ BIN_CFLAGS	= -fPIE -DPIE
diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.5.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.5.ebuild
new file mode 100644
index 000000000000..cd850ca74aec
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.5.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
+
+DESCRIPTION="Device mapper target autoconfig"
+HOMEPAGE="http://christophe.varoqui.free.fr/"
+SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="systemd rbd"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="
+	dev-libs/json-c:=
+	dev-libs/libaio
+	dev-libs/userspace-rcu:=
+	>=sys-fs/lvm2-2.02.45
+	>=virtual/libudev-232-r3
+	sys-libs/readline:0=
+	rbd? ( sys-cluster/ceph )
+	systemd? ( sys-apps/systemd )
+"
+
+DEPEND="${RDEPEND}"
+
+CONFIG_CHECK="~DM_MULTIPATH"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.5-respect-flags.patch
+	"${FILESDIR}"/${PN}-0.8.3-no-gziped-docs.patch
+)
+
+get_systemd_pv() {
+	use systemd && \
+		$(tc-getPKG_CONFIG) --modversion systemd
+}
+
+src_prepare() {
+	default
+
+	# The upstream lacks any way to configure the build at present
+	# and ceph is a huge dependency, so we're using sed to make it
+	# optional until the upstream has a proper configure system
+	if ! use rbd ; then
+		sed \
+			-e "s/libcheckrbd.so/# libcheckrbd.so/" \
+			-e "s/-lrados//" \
+			-i libmultipath/checkers/Makefile \
+			|| die
+	fi
+}
+
+src_compile() {
+	# LIBDM_API_FLUSH involves grepping files in /usr/include,
+	# so force the test to go the way we want #411337.
+	emake \
+		CC="$(tc-getCC)" \
+		LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
+}
+
+src_install() {
+	dodir /sbin /usr/share/man/man{3,5,8}
+	emake \
+		DESTDIR="${D}" \
+		RUN=run \
+		SYSTEMD=$(get_systemd_pv) \
+		unitdir="$(systemd_get_systemunitdir)" \
+		libudevdir='${prefix}'/"$(get_udevdir)" \
+		pkgconfdir='${prefix}'/usr/'${LIB}'/pkgconfig \
+		install
+
+	newinitd "${FILESDIR}"/multipathd-r1.rc multipathd
+	newinitd "${FILESDIR}"/multipath.rc multipath
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "If you need multipath on your system, you must"
+		elog "add 'multipath' into your boot runlevel!"
+	fi
+}
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 05d349110fab..aa527c9891a9 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,3 +1,2 @@
 DIST zfs-0.8.5.tar.gz 9196381 BLAKE2B 8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab SHA512 3e6e70b76f7cc5b018adb78ce7c3009f88faf5b3da0a03170b03577cd84a2937b6056621c41fc819fd08bf59b28053caf8fec375cf375816a6786bb5646ed773
-DIST zfs-2.0.0-rc5.tar.gz 12892454 BLAKE2B 475fc2ce1d88b9c465157161f98e97c9bb4a868030a20e9c4364b2d5572a2516f213126f9a05050394764b44780f6e86359f13052c2a48a77d0efb029c1928e2 SHA512 4a3340d95982e82493b3a849d20e61d53d35a8f914027be951646d8b28c280a88a12a88829c46c454d26428a51316442ff305a4a936f8081374cc2f762f9ee92
 DIST zfs-2.0.0-rc6.tar.gz 12896465 BLAKE2B e7a91d980940998a7312d48a43c07561e3b1aa72cc6f88eb534cb39b5e18de4280964ba7f690b63f5e2dd3cfdeb57d718d7389f8ab2062ff7bb6e8bb4174801a SHA512 5daf8d39766f8c8f8bca340585ae36c39507e33642a7cd2dadb74bbe1d529d5be40420057edc95814c0b554121128c0ebde59c3fbed17259870b123a56acd2e8
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc5.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc5.ebuild
deleted file mode 100644
index 81328da6d290..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc5.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic linux-mod toolchain-funcs
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="https://github.com/openzfs/zfs"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
-else
-	MY_PV="${PV/_rc/-rc}"
-	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64"
-	S="${WORKDIR}/zfs-${PV%_rc?}"
-	ZFS_KERNEL_COMPAT="5.9"
-fi
-
-LICENSE="CDDL MIT debug? ( GPL-2+ )"
-SLOT="0"
-IUSE="custom-cflags debug +rootfs"
-
-DEPEND=""
-
-RDEPEND="${DEPEND}
-	!sys-kernel/spl
-"
-
-BDEPEND="
-	dev-lang/perl
-	virtual/awk
-"
-
-RESTRICT="debug? ( strip ) test"
-
-DOCS=( AUTHORS COPYRIGHT META README.md )
-
-pkg_setup() {
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		EFI_PARTITION
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		!TRIM_UNUSED_KSYMS
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	use debug && CONFIG_CHECK="${CONFIG_CHECK}
-		FRAME_POINTER
-		DEBUG_INFO
-		!DEBUG_INFO_REDUCED
-	"
-
-	use rootfs && \
-		CONFIG_CHECK="${CONFIG_CHECK}
-			BLK_DEV_INITRD
-			DEVTMPFS
-	"
-
-	kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
-
-	if [[ ${PV} != "9999" ]]; then
-		local kv_major_max kv_minor_max zcompat
-		zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
-		kv_major_max="${zcompat%%.*}"
-		zcompat="${zcompat#*.}"
-		kv_minor_max="${zcompat%%.*}"
-		kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
-			"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
-
-	fi
-
-	kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
-
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == "9999" ]]; then
-		eautoreconf
-	else
-		# Set module revision number
-		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
-	fi
-}
-
-src_configure() {
-	set_arch_to_kernel
-
-	use custom-cflags || strip-flags
-
-	filter-ldflags -Wl,*
-
-	local myconf=(
-		CROSS_COMPILE="${CHOST}-"
-		HOSTCC="$(tc-getBUILD_CC)"
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=kernel
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(use_enable debug)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	set_arch_to_kernel
-
-	myemakeargs=(
-		CROSS_COMPILE="${CHOST}-"
-		HOSTCC="$(tc-getBUILD_CC)"
-		V=1
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	set_arch_to_kernel
-
-	myemakeargs+=(
-		DEPMOD="/bin/true"
-		DESTDIR="${D}"
-		INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	# Remove old modules
-	if [[ -d "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" ]]; then
-		ewarn "${PN} now installs modules in ${EROOT}/lib/modules/${KV_FULL}/extra/zfs"
-		ewarn "Old modules were detected in ${EROOT}/lib/modules/${KV_FULL}/addon/zfs"
-		ewarn "Automatically removing old modules to avoid problems."
-		rm -r "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
-		rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon"
-	fi
-
-	if use x86 || use arm; then
-		ewarn "32-bit kernels will likely require increasing vmalloc to"
-		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
-	fi
-
-	ewarn "This version of OpenZFS includes support for new feature flags"
-	ewarn "that are incompatible with previous versions. GRUB2 support for"
-	ewarn "/boot with the new feature flags is not yet available."
-	ewarn "Do *NOT* upgrade root pools to use the new feature flags."
-	ewarn "Any new pools will be created with the new feature flags by default"
-	ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
-	ewarn "create a newpool that is backward compatible wih GRUB2, use "
-	ewarn
-	ewarn "zpool create -d -o feature@async_destroy=enabled "
-	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
-	ewarn "	-o feature@spacemap_histogram=enabled"
-	ewarn "	-o feature@enabled_txg=enabled "
-	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
-	ewarn "	..."
-	ewarn
-	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
-	ewarn "developers do a tag or the Gentoo developers find time to backport"
-	ewarn "support from GRUB2 HEAD."
-}
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 05d349110fab..aa527c9891a9 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,3 +1,2 @@
 DIST zfs-0.8.5.tar.gz 9196381 BLAKE2B 8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab SHA512 3e6e70b76f7cc5b018adb78ce7c3009f88faf5b3da0a03170b03577cd84a2937b6056621c41fc819fd08bf59b28053caf8fec375cf375816a6786bb5646ed773
-DIST zfs-2.0.0-rc5.tar.gz 12892454 BLAKE2B 475fc2ce1d88b9c465157161f98e97c9bb4a868030a20e9c4364b2d5572a2516f213126f9a05050394764b44780f6e86359f13052c2a48a77d0efb029c1928e2 SHA512 4a3340d95982e82493b3a849d20e61d53d35a8f914027be951646d8b28c280a88a12a88829c46c454d26428a51316442ff305a4a936f8081374cc2f762f9ee92
 DIST zfs-2.0.0-rc6.tar.gz 12896465 BLAKE2B e7a91d980940998a7312d48a43c07561e3b1aa72cc6f88eb534cb39b5e18de4280964ba7f690b63f5e2dd3cfdeb57d718d7389f8ab2062ff7bb6e8bb4174801a SHA512 5daf8d39766f8c8f8bca340585ae36c39507e33642a7cd2dadb74bbe1d529d5be40420057edc95814c0b554121128c0ebde59c3fbed17259870b123a56acd2e8
diff --git a/sys-fs/zfs/zfs-2.0.0_rc5-r1.ebuild b/sys-fs/zfs/zfs-2.0.0_rc5-r1.ebuild
deleted file mode 100644
index e5684e2ff427..000000000000
--- a/sys-fs/zfs/zfs-2.0.0_rc5-r1.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-
-inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="https://github.com/openzfs/zfs"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 linux-mod
-	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
-else
-	MY_P="${P/_rc/-rc}"
-	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64"
-	S="${WORKDIR}/${P%_rc?}"
-fi
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0/4" # just libzfs soname major for now. possible candidates: libuutil, libzpool, libnvpair
-IUSE="custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs"
-
-DEPEND="
-	net-libs/libtirpc[static-libs?]
-	sys-apps/util-linux[static-libs?]
-	sys-libs/zlib[static-libs(+)?]
-	virtual/awk
-	virtual/libudev[static-libs(-)?]
-	libressl? ( dev-libs/libressl:0=[static-libs?] )
-	!libressl? ( dev-libs/openssl:0=[static-libs?] )
-	!minimal? ( ${PYTHON_DEPS} )
-	pam? ( sys-libs/pam )
-	python? (
-		virtual/python-cffi[${PYTHON_USEDEP}]
-	)
-"
-
-BDEPEND="virtual/awk
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-"
-
-RDEPEND="${DEPEND}
-	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} )
-	!prefix? ( virtual/udev )
-	sys-fs/udev-init-scripts
-	rootfs? (
-		app-arch/cpio
-		app-misc/pax-utils
-		!<sys-kernel/genkernel-3.5.1.1
-	)
-	test-suite? (
-		sys-apps/kmod[tools]
-		sys-apps/util-linux
-		sys-devel/bc
-		sys-block/parted
-		sys-fs/lsscsi
-		sys-fs/mdadm
-		sys-process/procps
-	)
-"
-
-REQUIRED_USE="
-	!minimal? ( ${PYTHON_REQUIRED_USE} )
-	python? ( !minimal )
-	test-suite? ( !minimal )
-"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" )
-
-pkg_setup() {
-	if use kernel_linux && use test-suite; then
-		linux-info_pkg_setup
-
-		if  ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [X] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == "9999" ]]; then
-		eautoreconf
-	else
-		# Set revision number
-		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
-	fi
-
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_prepare
-		popd >/dev/null || die
-	fi
-
-	# prevent errors showing up on zfs-mount stop, #647688
-	# openrc will unmount all filesystems anyway.
-	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	use minimal || python_setup
-
-	local myconf=(
-		--bindir="${EPREFIX}/bin"
-		--enable-shared
-		--enable-systemd
-		--enable-sysvinit
-		--localstatedir="${EPREFIX}/var"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=user
-		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		--with-udevdir="$(get_udevdir)"
-		--with-pamconfigsdir="${EPREFIX}/unwanted_files"
-		--with-pammoduledir="$(getpam_mod_dir)"
-		--with-systemdunitdir="$(systemd_get_systemunitdir)"
-		--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
-		--with-vendor=gentoo
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable pam)
-		$(use_enable python pyzfs)
-		$(use_enable static-libs static)
-		$(usex minimal --without-python --with-python="${EPYTHON}")
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_compile
-		popd >/dev/null || die
-	fi
-}
-
-src_install() {
-	default
-
-	gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
-
-	use pam && { rm -rv "${ED}/unwanted_files" || die ; }
-
-	use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
-
-	if ! use static-libs; then
-		find "${ED}/" -name '*.la' -delete || die
-	fi
-
-	dobashcomp contrib/bash_completion.d/zfs
-	bashcomp_alias zfs zpool
-
-	# strip executable bit from conf.d file
-	fperms 0644 /etc/conf.d/zfs
-
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_install
-		popd >/dev/null || die
-	fi
-
-	# enforce best available python implementation
-	use minimal || python_fix_shebang "${ED}/bin"
-}
-
-pkg_postinst() {
-	if use rootfs; then
-		if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
-			elog "root on zfs requires initramfs to boot"
-			elog "the following packages known to provide one and tested on regular basis:"
-			elog "  sys-kernel/dracut"
-			elog "  sys-kernel/genkernel"
-		fi
-	fi
-
-	if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then
-		einfo "Adding ${P} to the module database to ensure that the"
-		einfo "kernel modules and userland utilities stay in sync."
-		update_moduledb
-	fi
-
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset"
-		einfo "for default zfs systemd service configuration"
-	else
-		[[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
-			einfo "You should add zfs-share to the default runlevel."
-		[[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-}
-
-pkg_postrm() {
-	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
-		remove_moduledb
-	fi
-}
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index e5684e2ff427..2be081bdbfbd 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript
 
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 6f4294503a88..5a595627df3a 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 9a182f869b7f..37404c767770 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -1,48 +1,9 @@
 DIST gentoo-kernel-5.4.72-1.amd64.xpak 61507115 BLAKE2B 7d8b21516126c550e06e335b886a02b314b1d6547efcfd788b8e44be3cfd308cac633b0b846bfe56aa093125a2a8afb1893cbcefb023312e121f9e598e53a248 SHA512 9b6446b4b1da1275d044316244c70f941c1ffc0c0128c1a8620921e9eccd9e6224cd19bc4b8e45388f6e41c6f7819647e727857af0a069e9c68b70a7d38d0704
 DIST gentoo-kernel-5.4.72-1.arm64.xpak 56655064 BLAKE2B 3b13004d69a7b74c076849fc872104fd4fe3f7e318ff0484fdbe6eff9d9f3235eed57265f52b5737febee6abbd3674c931a13feb2f38accb1114280ea2afb46f SHA512 5159ffaebae025766aa4742037a1d2fbc4fab220b0feea5da7705eb7b9e1e15e5b7a4c0a53e3032ce07b72e0e733a6a58029eb134d6583a9d9621a435ba07df1
 DIST gentoo-kernel-5.4.72-1.x86.xpak 53373842 BLAKE2B 2ea66aee50688fb5d28ac2295db78f97cd844f7be103f3d4d164a8ffe1e855a045118e24b0b62e213f6bfd93cbb44c79823817d5ae0f8ca286cffaf11b0cafee SHA512 8bc3d4b7cab6e5ca4448418c1c3f81b3f1efa7eabf4896ac18eef1a52f05b8fae3731a955ffadaa309a933843dfca235da58440848b03c5da6bc3537e686018c
-DIST gentoo-kernel-5.4.73-1.amd64.xpak 61492439 BLAKE2B 4781ef449d55052d10c1a5e8a676cc3ab3a1741b8b87931eae7a98b52e29c10d4e403485efb7970e09ac3af06e01aeb039f2cadbd03a2f0d0c4a3439c44a9b2e SHA512 16d9944a3199f03d690dc9e8c5b3727be6bc144d75a7563fa4fdb4064d0df68efa7c3b66e435eef8357ff505d40ecce18cfa2c567aa06cee8ee3b8b486ca110a
-DIST gentoo-kernel-5.4.73-1.arm64.xpak 56501830 BLAKE2B c45f1c8dab17b85c67ef13682e78b765e25cd1f5c476e682cd0e63cc4bf46f7f7bcd49c85287be92c061c20b8d69d51b4afded4ae1224e1006f7cb944fa06b0c SHA512 b860f1963d1d72c464df0a0ca0e2110b39e8e067837562c1d2995c9f6b3d90374b683e80cca4893d809fa115c7b1e4e73f7886b4a9b11cfe24f6e901ee11358b
-DIST gentoo-kernel-5.4.73-1.x86.xpak 53365942 BLAKE2B e481ca32a89463f5c77f154c4cabcacd25221f18e0011e168ea26226eb4cdc8cc1d5aafd80cb7ebd1dde59395a8ee3aa066511d70e36ad13aba44d145b6efbe6 SHA512 6503ac67aa068571d7c011156da045575663b5dbfaf945110a2a67d6d32ac3ae6159c6c2fc20cdd87e6c5fde9d7c1f7afa5b59fd7cfec5c3ccecb420196284af
-DIST gentoo-kernel-5.4.74-1.amd64.xpak 61504540 BLAKE2B 9476e1f090d7ae4e2f8d4bdfce5521cf4c79ba1b4bf9f603e4ca6098ae2d995f4e6d06eb975eb40fd3b4da68434bbe156b5b6d91f14d124650ec85ea322655d3 SHA512 a18d66f43150fc24799dcdc9a4f40ad375a0184867bac278fde14d612001ece9f17fe1a6eacd7cf77e469bf1626f44bdce464fece52c53311cbd340c219178d0
-DIST gentoo-kernel-5.4.74-1.arm64.xpak 56698158 BLAKE2B a20f9d97e1a843f3f958c965ddf2013346f449f225c6330dde36ed164e4d65f0c532382de8fef4eee4de0cd4608a19d7e4ad22cac31093b32d816b73bceec294 SHA512 1859242d55c9dfedb0dae98a25ffc859455b7a93a2f09381c90a3d7e1e6cc705b3764c3e7d56f059811436a542ffdb9b939513eaa3befc84c70ca23a70ec4da7
-DIST gentoo-kernel-5.4.74-1.x86.xpak 53372997 BLAKE2B 4543d083c44910d4d7c9b8d6c6602aa9b790e2f0c59099f86038c969b20bb6dbb54e04db7d9493c226ec92f63a51eaf6661c144a8fa857b82209e3b2cf470731 SHA512 61dc3c262317ff3b4811f3a3941c7a994265f61c2c44a98f5f42370ff4366ebc6201a41e91b6d37489aab2bbc2a57d6d699aa104b3c34783f4fc5ec840526c4c
-DIST gentoo-kernel-5.4.75-1.amd64.xpak 61510912 BLAKE2B 4915baefa8b5c5ad8fba43f810d412675eba3026cfce1229402e4fd5d2ffb7f2bb505419ec63dde350f69956a74c461d1a6b26d17cf200da59cf9afad174a594 SHA512 f0257a9f3f49753782e8ad9bb6084e7a00124aaad61a467e59fe8c2d8c7cf4cc43cca8bb1909e84b07d0448e9cd99adfbf54978b82788e12710f9410aa7ea42d
-DIST gentoo-kernel-5.4.75-1.arm64.xpak 56707386 BLAKE2B 98c8907dd5864b7f9a2d8d2101f10e6650856a8823be32785ef8c2bb74a511d97d0ab991cd154d66d33ea84a347002d3052cd7ce212c88dbe7233db03707bad2 SHA512 1150fa663705e88fd48d3fb7c83888a4b589eb3173e5cce8a6296a01e503116bd9deb664475747197685937ae561f7628b7d7a1654fa6538f00b504456c3da03
-DIST gentoo-kernel-5.4.75-1.x86.xpak 53376776 BLAKE2B 9c39cd0aae0b2c5d96f972bdbc2c41e97ce60c7aa19795f112ce2b1ce3566f4ca52918a38f71e97a032de9a43a91b377d6767cf6fb60b4734b61707c50c5c199 SHA512 f3a2e683d26baab32b6a2990a7a162af673ef93bd85e56e7776e1352fc23a48f245ae12634f1f56d12271ee154282fe3a927d56ff05f03cb1274d1848e8a16aa
-DIST gentoo-kernel-5.4.76-1.amd64.xpak 61508783 BLAKE2B 1e5bbb2772f7c496c189abd94aa01973f3d940127c2392fe947978f92a30c38a9c8739d597d3d854813f7c7a46e2b227dc0ef4f485ed0fc86a4509465ab7fb66 SHA512 22d8a00af064e153649f86ef64980c0513aa3b216f0903d3e234ac57a6872ab0a7971b28913c1961eeec281e0533a499e911fab9c9db2babf30c0682c5478140
-DIST gentoo-kernel-5.4.76-1.arm64.xpak 56721457 BLAKE2B 715ef4048f53d6f2600e9497395ab6783b14896b0268b3f489d58d1bb4028a8e9c1d8ff1e3a65efcb800ba0071aa2888455635ef4ebf9db470ad65b4155a8483 SHA512 25eb093beb049b36c775e008a23c1b96b15743f88db5cac2750849642d7d834cc0f6769d09ed3a60f5673ed0a397f206e26b2544c41f811ac7abe4e343812080
-DIST gentoo-kernel-5.4.76-1.x86.xpak 53378311 BLAKE2B df5066d53e759bd44c57f433ba447ee9f316d8abb26a3b905b1537c956cc2cfe141551bec9dad4b4e1f118cea8d952ec9152800c10ce938cb03ba6c89e61d91a SHA512 c0b0ff537fcc7a0a2f30bc912e41a1153c9a3ffc3a13c79ffc9d6aad333b288d45bf19b8777b0ad5fe705030490d9f4b5ca3307fe4e232ae4fcf3cf5658f249f
 DIST gentoo-kernel-5.4.77-1.amd64.xpak 61529981 BLAKE2B f0b39c3223cf7b82b512dc4d07f7aac33bdd4963215370683d6b6140105556b697e7f518490fc9a084670c4c4802992a8d0dd16e5c1f153927bb689ed9894548 SHA512 f808b03a205ef60fe3eb2bc387080010ef9e1603592eddff100666d62fbfee9de6ba611721c2af9ede77872829a2163e31b8e9b784a379ea570c339ce90881c2
 DIST gentoo-kernel-5.4.77-1.arm64.xpak 56694327 BLAKE2B 5e967b46ebf8ff653d46ae9836f5edb5c97c356a5605f494bd4410ab16a06df8be1eb76cc7be32a69afa2f3ee1c7abefa968b4b806c6e327b372a70360ac5633 SHA512 6483662cf0af6041dd1e2c8f6196eafc042bf2515a120f6b629d5b0bdd72728ecc57ddc23194aff42a38251109295c83c4da9e248a2a5785f7eb5cc59674800f
 DIST gentoo-kernel-5.4.77-1.x86.xpak 53384834 BLAKE2B 29b6748b3d9c292eedb9685a1dc78bc1e22afa3aaf6eec1411e42373cf5b0dfdcf09232280d82a7dc1c80fdc5cdb6771fd35ff0edf949fb8a87a1dd70294dce8 SHA512 afc82fe923d0f8e1794cbc5579545de08bff956440785794869a5249621e37c29409a9da0ae807cc95e71f76d6c7009b1ff03c7c742677f893ca335515ff6438
-DIST gentoo-kernel-5.8.16-1.amd64.xpak 64081440 BLAKE2B de02682e88d4abc53aa5e3269f2a702590408402f1c3e0ac5782639a84e0b0a1611b05276761ef3ae3feda12667e198193301c68f528b190005a1a380d908e14 SHA512 3f0bfa9cdadd81b25a2c550e741452c212c86a03ba05f6671033220a9ccec89d707942f651958c4a792fef9bd57c61a11d02df286b621f1544b51fec90c6487a
-DIST gentoo-kernel-5.8.16-1.arm64.xpak 60861338 BLAKE2B 6afaac594e6f25612dd04b8cfb2f2b36b005bc9331d5969b03dd952d4c0579d034ea9713ac54b58615c579a0d8fa9b4752bd188648f17b167722eb369c737a1f SHA512 d498dd0a7c0d49d54624cd15fada4a90b7aebe7517a3d7f087d9a4e428abab92b46d2df524fbd9112181729e19cde3077c1c60185c5a4ede50551f9c7af18003
-DIST gentoo-kernel-5.8.16-1.x86.xpak 56134510 BLAKE2B 39e2caa7bfdfc31311c7a4c8d7ede9ff3986e7d00c904d7e963f7c18ebac13dc78fe3a5d23451dfcbef0de88d0bea990c092462d4db2be3880e91e849425dbd4 SHA512 ca1b1323d024ebe2fc54cbc4cf0b601114c3ee963ad3c620efbf9e5016ba2270bb86c9fe20f2bad268d2a1f56d75eb40ca515852197f1490f45f633041d5f1fd
-DIST gentoo-kernel-5.8.17-1.amd64.xpak 64113991 BLAKE2B 9faa7335e0670ae71e927e24804258e0b3fa879303757667f982062ad24b99e711a807fe45ba04ff68d75d5cef6d9f9b0f524e001e426ac3b12a71e179d5dadc SHA512 8c3d66c5554a09b89f961262279c6e373a8cb433177b1cb372ca855b959ebba0e918a4e8efcd31ebd2cd79e489a19ef32cf174974f433609dbdb890e9083a896
-DIST gentoo-kernel-5.8.17-1.arm64.xpak 60595040 BLAKE2B 945c3742130a8fc8299d11aa3798a62b037818972a2027c4df9de04e66dea585e7436dc21075dad41ef66bd1c1a7a7fa7d5b6d7db775a394102b125b7de2be67 SHA512 3ebb00e416d1c7d29609295edf431cbc8dfd3a5569167b0b646be5bc000a4dea43f5c196431006c331e1dad577a31ae6645cd1bb3b2d97a4a7d36458d2e554e4
-DIST gentoo-kernel-5.8.17-1.x86.xpak 56137487 BLAKE2B ab9210f79bdc51fac243e73b0e77302cecef2c04eebb0ba74f5cc6c574e312aa48ede93b1bb4ce28cc1ec6bd2da77590e3ee998239f439a13345bcdc6204d4bd SHA512 e2b9374118b74c76d8e4c83199ae5bd182123b98067a67f879c33444eadba9bc2ee81c9e0904ca472620a417f203d66ef4556ff65dee61d8c7f15c42b55fe573
-DIST gentoo-kernel-5.8.18-1.amd64.xpak 64101584 BLAKE2B 5d98aa8fc02222cab9dcf73fd0cfc51a508e909eb5e35ff55114652b435778d26b72e4e3754616e0c28eb551177319eeb87bd703f107d58dff23afb57f104617 SHA512 13ca3a37fe772b7b20dfdc8f9d96ca5f490c9520e09281fbffaeab1674bc7e0b67bca4437ce18d76a0ab83ab16847ea37eb604fe2bac649e4e77b8dd1ccd9499
-DIST gentoo-kernel-5.8.18-1.arm64.xpak 60864686 BLAKE2B 403318a4567888f1e7988bf37b9ee1bf8e48de19dc7ed5c3a3baf4c324528a07dee4918e0206ea98214aff1a070906641281c7b5109f7db8494d4dedda5d9bf7 SHA512 9063983eca152b520da633095766f3fc4874235bbc014f89b986e7ea80c771fc8d37f4027d3c2df36009dd0e0e7cacd94fff56ff5985cc68c3595c8b0be65095
-DIST gentoo-kernel-5.8.18-1.x86.xpak 56162862 BLAKE2B b33c64f00bffd1fb3518d9a0c641c00eece62dfe701d59151b18ec40c376038c36e65c96cc75356a238139c650ae1691420d7ae70982a641746f29c9bf94839d SHA512 10c3122c3eb077a278a989b59b7c3fdd23065a543973c72a592d7ca5809ed246d4de6133371f1a0649ca0000ac395ec4a20ef9f09ce30561a87c2fb174558ece
-DIST gentoo-kernel-5.9.1-1.amd64.xpak 63373688 BLAKE2B 0161e6b680e2fe2461082f8cb7f297f20bdaee1bc3272baabd3bcfc2e1d0c027dd1bc33a6170217f26edcfadd3c26e4332d6fc9542b06207f58f999f68e0899d SHA512 054ae5247d0626b39aab8b029ac6bff3569200fbd3c80fb8f3d31a70c522def31e4a49ae49cc595d8a8ad4a5a3d0cdb3742d5371504129d1a00010ed7514fb35
-DIST gentoo-kernel-5.9.1-1.arm64.xpak 61465149 BLAKE2B 23f82ea52fa87f32db234dc90a3032f97943d2632f85de5276154297be0355562da01e383781fb192bc864bd1f1551c13afd4967d968ea84afd6312d25329665 SHA512 f784647fa7b646316dae6528729e4929dd355cc6e7d68c0a9db70fbd20d277291cd217f0eac23a98c18f8724f6e2cc24e95630faf84d0b1c68f662ab974ecdbb
-DIST gentoo-kernel-5.9.1-1.x86.xpak 56581941 BLAKE2B fefc6cad3931aba6cf55dc3427133cec05fac197f84124108657493f58b660531b49f53f6388a4da0a3f8a623c4bdc5815c7855f45f5d0b0ff6603b0bccc65cf SHA512 900b54a922e4a70f9bd200bfa8ef58492414cd53267f18461f72762ef7cd77f4d96b7750a175a70af9b283b0d28b7648bbf146a6610bf74fea93eb4338f678db
-DIST gentoo-kernel-5.9.2-1.amd64.xpak 63382067 BLAKE2B e1687240c4a74e066b9c447e58800772d9971744fc96f2a719013f996f3df388f1c218714eef9f324d3f8faca84934a83415b9e773d542294a3f36a7d5a56e2b SHA512 af06ece5596eff5e926b2320868dd2b95ed37eef95684204880fb9721057f1a2d4580f57d91afaf994590511e36cd646fd300f75057f43c55544a13136d96b08
-DIST gentoo-kernel-5.9.2-1.arm64.xpak 61203058 BLAKE2B 2b414266bb21144d11a68d9778b7f95dd7ce1b050c52ae331b94a89ac5e3cf4ef7aa0ddcf17c1c661034d9e6624152f3beb2366af8d8ed552a491559bc1fa356 SHA512 900599ee6e91bbbe9db71d0e2a858f304e69579a41f070d13d22393c8e57c5cd9a2325ec347f237ee40fab4cd12ff5e3706a169f0b37df5883dad7e21ade114a
-DIST gentoo-kernel-5.9.2-1.x86.xpak 56593873 BLAKE2B 239813d44998e629edfc0bc72da1145800130e1dec278eb32aebda7be7f6b210cb33728edd7a267edaf6c7cd9eba5dee1756f027923b524107a51ebc49a49695 SHA512 3ba4932b699436ee1738b1955807beedd725467bcfa0434533484ac40961571db965c787550bacf03d169f6af656bd406cd14336f1cb7a7e58412252f61989aa
-DIST gentoo-kernel-5.9.3-1.amd64.xpak 63399128 BLAKE2B ff393bff859ebbc90178f5023034086cb69547ea9dfcce9ce2e416863d413cdbf758cb4a6d8268d9459a59739433ec49da55baa7c7dfd239bb79ebcdec568ee3 SHA512 809f1c42e389967b1b12919bf8f658ef31b414131c2f77d15ef543ee2cc0eef2308084d77723883254eb4429723f665b6ca6bb5fea6309850f5afd86b347a26b
-DIST gentoo-kernel-5.9.3-1.arm64.xpak 61432464 BLAKE2B 0940f05e2ee26c8a46b583eac31dd6f15e8ff27b3d8362cb6e923b6b49b11982f664f0cf8fc49c7583446af8cf9319e0d3e83b6f723896b578da3690bb419ae3 SHA512 39217d6e872ee1129a661c6e31fa6acb907798026f5488b1b30881cb36bbd1b567ecea0ffce5efb77a0c7508d6f6aa987c8cba5e3b01f02a30ae265991635c23
-DIST gentoo-kernel-5.9.3-1.x86.xpak 56599345 BLAKE2B 3244037ce1df83ad8834c7ef47072c1f618a74d90dfefecfd54bfd84b84efd4c38895e92c2b6b9de870d294d4b06ae555ad5bc785a5acb8d1e712995bbcb5273 SHA512 da3eb324186050d57e12e7264d247de348e1bbb2d63da50974a53323709b9cc3f9ba075df6abd10550e04e7c768c28f366d40c0ad1f49c7256d374e5d6bb7397
-DIST gentoo-kernel-5.9.4-1.amd64.xpak 63394036 BLAKE2B edd598813b571961fab2232666a13ae915d255a2f0b49f499009aa8f6098d755ae10e8458c35d540569b9bb57cb2a5b240b0791be09f877896d7e9cbeb9221b6 SHA512 ca3539ff824c95b516227c0da67cacd7bb11a9752ffb7b14b7c32e257f878078000c62f80bc353aac313004271614cad1539d6587102f8dd93cdca3a4a5fce20
-DIST gentoo-kernel-5.9.4-1.arm64.xpak 61419964 BLAKE2B b2acaecc3092c6fefb522794810cc0519b38a2f550b4fc6afb97edb36ceecc2830deb07711501566f7823aa348c0c83f8d338ed38dae859cf84160e6b2189cef SHA512 21f8a520d064c06fe2fe645eabb221302ab27f73b559b4014e1c12da5fc7e35a30a74b6514d7d115997261e1ce652901e3a526fea898c8f5febf4da407a08d49
-DIST gentoo-kernel-5.9.4-1.x86.xpak 56602346 BLAKE2B 635381b4478e1e61954b11b32710c050f4861519018bb4b993a5b3da4c6d82859e2d6cc79ff30d1269c30119aa51b2043b2e8346c6cd5fb9f251de4ee0d59f8a SHA512 2df8f4f40bd10cc2e4187aa19cc5093445fcd08da8c2acbeb7785da6332cd59c235f385a3beff12ccdc1956251ec7860b2e0b6191ec1c090e0fa8452acb84e88
-DIST gentoo-kernel-5.9.6-1.amd64.xpak 63385088 BLAKE2B ecc78d04934a45d1212d273a0c94afb9bf5d8cad8c20023abec78d0b534c842e3d665df87ef06fa103a875bc773f867da209b99dbe2818ccfbc091ef83d9c55e SHA512 7988bb8847379bbbe6378ed8d278dc03ac49da3d11c23fa7c8a4b76cb5ca9d26a02d7d209e4ddce9e1a106268c973230300eac8807d3cb592aa97f454c213d34
-DIST gentoo-kernel-5.9.6-1.arm64.xpak 61472831 BLAKE2B 8ac36915092f66c092bd4b023a03bbdf177beacc82df8d6ea1200077833987bd432d40c6acff588c172a1df66063ffd910565239397431827aed6142497c5f2c SHA512 dbcb8619f831cf107286a8790fcd65f47a2e6c19068e0fc015e8dbea05f383adeee69d43da2469b23902aef225950f734881aa3b469d4460364a2d5225e0751a
-DIST gentoo-kernel-5.9.6-1.x86.xpak 56608737 BLAKE2B dab2c89399dbdfa9e0955b4d5138e6be9c2e196ff679f351e12657cdf2b539c90dee415069a410c3c1826232aac3e63f83efb00edc3f70877a237e34b2ded8ee SHA512 fcaeb41b67b738914bbcbb5d57cb60d48fddf1dd2231e01dfb3cfdd5a6f109835dcf5bcbc32ef24f2912503c6aa87bd53988e00e3e8701e3fc4ef30e23da5aa2
-DIST gentoo-kernel-5.9.7-1.amd64.xpak 63382309 BLAKE2B 4878ae73c4f55d9054ba2f313240ea4db8578d295d0f1ab5992f7e5648079fea773e9f8a39b77586b1321e03e3376e3335ae6999523751c722845f475a460658 SHA512 dbbd72fea440a94e4e832faa0dc48ff2adef4dbb4040b19e838b25ce90e010c4eb153196de6df68910793545429243e1e6ea61c45ad20cd2131c5febb0b506d9
-DIST gentoo-kernel-5.9.7-1.arm64.xpak 61484762 BLAKE2B 0b7adecf34b274eebc0dd891c989ce4435387dee0f62aaf4cf7cc42b8e4c6c1121f115a92edf415b011de72e4ad6be704de712785d82f3c7ca52a087d63951c6 SHA512 97c71065104feefb16b239725234b1bcab0eeabd6c02a23944c079c264c3b6a4e6ed1def4bc73784aa597147b3a28046d6abc46a1be9600ae407999ede0f2e67
-DIST gentoo-kernel-5.9.7-1.x86.xpak 56624689 BLAKE2B f7120f039ca049596af9eca98eac7abf6d4b24dc47b1a36c1d27b90a9a216c1ce9a2357b87d35b766d14945ffdd00867684873c5cd22ea246e13617a1ee0fbaa SHA512 f58eb8d42f892529e87db91254fec51abd54ad1a74b4155a45d4c05bf92bf07096375f5e3cea13a3c7f65e3baaf4b859a3e7dd7ac9f3f12208ac19242c28a708
 DIST gentoo-kernel-5.9.8-1.amd64.xpak 63386669 BLAKE2B 6ebe70d1085d0ea33361ab398d076ba5bb3cd21aab1769d8a106978d7b320b993878fd32a59800997a5832483a19b3bce2e396b09ed25c0f34d5786ae9b7f90d SHA512 61f4d150f8fb5cca735e09ca8021ae972d953b0297dc52d9d623d1ee3f3d4a3e5cd7f98d39f785e279891373c9719166a5dad624ea16a9300c7c3fa7b0777aaf
 DIST gentoo-kernel-5.9.8-1.arm64.xpak 61440507 BLAKE2B 4704fa85533e68763346f3b4ccd462473424404c1e8f0302a69300e48ccc265857c2911aa36b11b38a0fc908d5ba681c4d35038f5cee473172b83ab331075cff SHA512 0df3f58142b0015457de82134b4c3535f8826f6108ef8aa32e2097cc5294fab35a76135fd4a4fdaed50e2b52be149833bd3e9137546f5beca90c7861f3c0c579
 DIST gentoo-kernel-5.9.8-1.x86.xpak 56613649 BLAKE2B a43bec4bc59613576749cbb58b6eff8b4e120410ae2dbb3b38b3596eab0a4d5dd56e427d91e4ebe044be9794f36e11dd89174a9ac01678eb4f268813370fd444 SHA512 b1d0a1bae0adc8788d46e19bda9875c49a611da6e4fc786d5a79efc8a5a5bbcb8eafb9f8628029685650235d5ec853d7a40b2ec0dd367c9b2d4436618ce1f2c3
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.73.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.73.ebuild
deleted file mode 100644
index d6e61fa69369..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.73.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.74-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.74-r1.ebuild
deleted file mode 100644
index 2378adc3f352..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.74-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.arm64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.74.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.74.ebuild
deleted file mode 100644
index d6e61fa69369..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.74.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.75-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.75-r1.ebuild
deleted file mode 100644
index 2378adc3f352..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.75-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.arm64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.75.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.75.ebuild
deleted file mode 100644
index d6e61fa69369..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.75.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.76-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.76-r1.ebuild
deleted file mode 100644
index 2378adc3f352..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.76-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.arm64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.76.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.76.ebuild
deleted file mode 100644
index d6e61fa69369..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.76.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.73-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.77-r1.ebuild
similarity index 100%
rename from sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.73-r1.ebuild
rename to sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.77-r1.ebuild
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.77.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.77.ebuild
index 2378adc3f352..d6e61fa69369 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.77.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.77.ebuild
@@ -13,10 +13,6 @@ SRC_URI+="
 		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
 			-> ${MY_P}.amd64.xpak
 	)
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.arm64.xpak
-	)
 	x86? (
 		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
 			-> ${MY_P}.x86.xpak
@@ -24,7 +20,7 @@ SRC_URI+="
 S=${WORKDIR}
 
 LICENSE="GPL-2"
-KEYWORDS="~arm64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.16-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.16-r1.ebuild
deleted file mode 100644
index d5d78a106e7c..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.16-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.arm64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.16.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.16.ebuild
deleted file mode 100644
index dca6aedbd789..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.16.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.17-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.17-r1.ebuild
deleted file mode 100644
index d5d78a106e7c..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.17-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.arm64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.17.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.17.ebuild
deleted file mode 100644
index dca6aedbd789..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.17.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.18-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.18-r1.ebuild
deleted file mode 100644
index d5d78a106e7c..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.18-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.arm64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.18.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.18.ebuild
deleted file mode 100644
index dca6aedbd789..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.18.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.1-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.1-r1.ebuild
deleted file mode 100644
index ad9181bc4960..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.arm64.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.1.ebuild
deleted file mode 100644
index dca6aedbd789..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.2-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.2-r1.ebuild
deleted file mode 100644
index ad9181bc4960..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.2-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.arm64.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.2.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.2.ebuild
deleted file mode 100644
index dca6aedbd789..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.3-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.3-r1.ebuild
deleted file mode 100644
index ad9181bc4960..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.3-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.arm64.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.3.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.3.ebuild
deleted file mode 100644
index dca6aedbd789..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.4-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.4-r1.ebuild
deleted file mode 100644
index ad9181bc4960..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.4-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.arm64.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.4.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.4.ebuild
deleted file mode 100644
index dca6aedbd789..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.6-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.6-r1.ebuild
deleted file mode 100644
index ad9181bc4960..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.6-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.arm64.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.6.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.6.ebuild
deleted file mode 100644
index dca6aedbd789..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.7-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.7-r1.ebuild
deleted file mode 100644
index ad9181bc4960..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.7-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.arm64.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.7.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.7.ebuild
deleted file mode 100644
index dca6aedbd789..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.7.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index e71fe65c4674..e7e529297e20 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -1,51 +1,18 @@
 DIST genpatches-5.4-73.base.tar.xz 2527064 BLAKE2B 6e0b392681d6e5e709a02c1c8f15fe06ef1651f1530506982feec7fd436aa04ea75079eeb5d3a61c91bcbb46c59a232cb8cb67c62fa7b2e8b289591142dd9430 SHA512 db987b95895fc37243e3697f3ef8f33787489e173fefb84ad09a6600898b2b9b285d9113e6f867aab0c3d5b4c65398f4bcbc40a4220f3cf2b355da9def209dae
 DIST genpatches-5.4-73.extras.tar.xz 1772 BLAKE2B 7475a0907f287fef28ee8bf220932528107bbac0d612dc05de6ca8b2dd86ddf37d9acea31ab2977a677f6ea3a19c594737b23e504da405fa811c4d0faf00b94a SHA512 751898547b1f60070f1d8431cd89daff55e33473c8fe68415a15e3b8079ae2d3e44318815ba47a1ce9750feb1cac1812eb8eb7765426b204eb1357993cc68cb0
-DIST genpatches-5.4-74.base.tar.xz 2616380 BLAKE2B d79290a1a6aa3464fcb5ea31d5ec28adc3b9275b7240627e431a9cbc69735426434345f0259e08efdf10e3660d60f3d4b6f22e7883cca39c8136f2ee39fad646 SHA512 ac5df7e61f00659c01ad90a6e52e20a9860f154e899aaef7179d28d3fc311ec804d34c9ef15bf22903e0c0783d00d375019e7dbca58b94ab5c09da0b8a8214a8
-DIST genpatches-5.4-74.extras.tar.xz 1772 BLAKE2B 02086dddbfb1c41c2f0e0f693469ed18a870dfee1eb7305c464668a63fc29262e976c79078339691df1493280b8aececadb9bbf8398bf47d339ff06c14271c07 SHA512 ea43bb8a42dbcd63982a4350d287e222a945596f31a513cf6c61711e0e9d586171d8c319a51e63a465cc4fd69ff3fcfa36816d552d09dcd5831ea59473a73a0e
-DIST genpatches-5.4-75.base.tar.xz 2626680 BLAKE2B ff32045765e11e01c26a3a11d095940c94fc1774734104c73b0a014401464b97ca623f354e62fc46f8427ae440149e5738741c78e79dc014d4e12ca24470384d SHA512 8c5bc194525e352f4b2a7fd6f92a5344a8036f60440bdbcde0fcf0ed401c191921fa15066aeb368c91d40fb6d166c7bec1ea55f01e5c8ffc3e296c9dc0ee1e2d
-DIST genpatches-5.4-75.extras.tar.xz 1772 BLAKE2B 64073a8352dcd26668abacb591afc4f9452d071682619ad335cd77a71c6a82875a189e3d1e5a005da63b81038fe5b7667b282301b3d97f8f218c9ab7d37c02d7 SHA512 b43853961b1b60de1f1577de46d4bf1f650ffc96e46a64d6a37fbdebfd76cd5edc2847ae350ed6eb463f29cb55846cc322744918d5a59a21814c4a7c41b0d795
-DIST genpatches-5.4-76.base.tar.xz 2688764 BLAKE2B 1beffb1043246ec2e855e472da7c038b8a0d1a0e2dbf2b3a41e3139297d0fddffd31cba5338abb8494981f90f963a5f39623a3f638f85d1f10d8fe3901069bae SHA512 da3757d7a831cd9693a06bab9d0df4e9ab02d95fd8ad28ff725798a58a3b06aa036e3d9664ec1dc6f44bdc1292d0c77b57c75a1efceb63059a6640ae8c963bd6
-DIST genpatches-5.4-76.extras.tar.xz 1772 BLAKE2B e03408c3e8d8549ac150268df059c8a12c30bd80c591fa2fb3e9672d0a5df74c8d277ba4e2ca9afbd361fc9a59fc3cf934c634af4a56fb7d4c6c347d6e6efb71 SHA512 19c050f98ff36e27faf5404aea25b5d6fa8e4762a9ac69cee9e177a6e056f53c566dea44860e0428b833b48ff6ee4bae95a2057af4564f2877a4f1a6d2909830
-DIST genpatches-5.4-77.base.tar.xz 2712444 BLAKE2B 358bea510b894012d40bc4992ff04698c1bc5a9b3baf5eef7aee28bbafa8b8774f46d113134774f183d10e18ff7d57998989f11da068a06f0bbb4e437a8e6137 SHA512 a3fed2a4c2a547a7a97af94b68dc426e709bd1e7780fdaaf7d3167f81052062a6c9cd40bd6b78e4c97cecac1f3e02b1097a268f39453eed46a5f2dd85d06b11d
-DIST genpatches-5.4-77.extras.tar.xz 1772 BLAKE2B 8a33792ed12e88de1eac2908f0bbfb71085a1a6a5daa35e0904f23cab1ccbfff1ebead1b0a8c66331aef787aacd8d96765dbd5dde5de840a882012386b3646ef SHA512 69e36e134a9b635dd1b7eda48eb87eaf1f85456b7090bb7dc9e0cdd7cc80b1a840a68a77f0e42189fb3c9c584c64a0a58d6b8d1ed1c5eeb197df78b06744d2fb
 DIST genpatches-5.4-78.base.tar.xz 2710752 BLAKE2B caf08c588198fa9a364ec299c9918ef6cc51495df40cc875b0e60c4abd6f3195fcb67581b276cea0ed8150220f8b84c04344acbee71c26598cc1871e6520c1e2 SHA512 fc4bc267a20e8c7f5326893d89e45d064c9ca7372d13657a443432e47a34c4b835de885c8f3d93ee1aced43d5016886b774d55c29d6839921089bacc40a742c3
 DIST genpatches-5.4-78.extras.tar.xz 1772 BLAKE2B 2b1790308dfe3bcfbd74ff7293fb0819e3949f0eb3d6ee448e4f7770d9e282505238dfbf4cfc5fcd144df7091816cb7f1c7d3514e9f9741ce4891539ca63fa8c SHA512 1d5814c23702f562b2207a95901b9ac4c5160508a0ac4dfb45468e6500f0a750c7ac4982d86ebd9de8acd26e23974f2893b3961d9aaa30fcaa3be2a217bbe80b
-DIST genpatches-5.8-19.base.tar.xz 596728 BLAKE2B ceb6cd57b593b5a2c02f00cefc61035ea765c9bb2bb2f9f8721e7503a149c8ad2ee6b1b3765b6d038e5d34bef2f0e0278acb7f3a8168d31d341ac0a9b58b8590 SHA512 f36c11a008e7965e0e113c3a7d87dbf40b87d87c7a801970a73367dcaaa07e7fc3356a114d339d68f16342d9f3c6601cf4746b9aa96d01d0c5efe2dbfaafabff
-DIST genpatches-5.8-19.extras.tar.xz 1772 BLAKE2B c42390c17040a6557054835df177fe87ee124bcdcea91e1a63d50ed8e07a10044d639616497e02082fbb67a708ed408bd1e94a3c9d5b7c7b0c7daeca2bfc65df SHA512 3ba07566f1e721521676b862ca51654638400eeda4f216cdfb860b0639b7a611b2ff2e9659007486841e9a1afa8c05a9454abae87abbc7dff8af396bd0d7100a
-DIST genpatches-5.8-20.base.tar.xz 752808 BLAKE2B 6997bcd2b7dcf27f894e521fd95a77fc774ed23c3bf515a4dd3f633aa0d91feaf6f59850d56063bdb07ec7e01a720f17b61b6d32639d6c7b7cebd5cfb722b41e SHA512 59bdfcb2b74c343d673b14a1ede1bd8e726430fccc5b4f87d9edcd8986c5de7d8f473e10713fec5d922ba3949c9ce794438885b00cb125dd896f8e66eefe71ff
-DIST genpatches-5.8-20.extras.tar.xz 1772 BLAKE2B 2870067f79484d9c308dcc313ab38add3c577cdd29a718c5798ef3bf84867fe9dac12006bbc9343e82b08425aeb2100df44a9c607c4a28293c1c986683085384 SHA512 96bf218671a1fa8865e040cb9d5433b638f16689e975f892cff8c687f8963377d1c6d7e1face94bed8d3b21e2f87f28fbd55dcf027d185239721330b326c8aa3
-DIST genpatches-5.8-21.base.tar.xz 783528 BLAKE2B 8b4e64de64d97f069014d353e45aab7900b37f508ed8e99eb469797df4780f715e0c038fbeff4b8ebb34e81c935dfd7df3eb63324121e31c1dd07591b3159a3a SHA512 4485056f47723e14f5248854edcd4353562c5ec6cb95c926310815e5bf5514d5d8edce16a241dc3d881c57832333f950562b092c21f2555a6838b9106ff329a4
-DIST genpatches-5.8-21.extras.tar.xz 1768 BLAKE2B 238c16ed6628c2fd379fa46cf700038c08358e26af5fd4e7f1037626e2057fcbf224df72a6bd1df4b95fa896793539108294d3523118ee7a6cb7e39604e91112 SHA512 c14b718bf292707472edff04b022c722f45330b7750dd4b7b507347b0a9a29ebd236e16f01c03b6aa85bacc9220b420f5108f7728e88e6566dbb888efdbce714
-DIST genpatches-5.9-2.base.tar.xz 9332 BLAKE2B cfccc2ebc7e067c7326f95627470a01f818f3c64db87ca26406bd3fa71429593a4460cf82d5891961eee69cbce667c850439f512650131013025491804486510 SHA512 af9c158cf65c5aa5d678d4ffeb7395051a9706521684f3a984f47d6ad581652978eb8f0a4de0132a3603b63fa7f34fb8b18a76bca5d4d312672c89f3fa221fa8
-DIST genpatches-5.9-2.extras.tar.xz 1768 BLAKE2B 1e9312bc96d30b85ff628a67bed4bf2ded3eb2231d804158d343d64ce6a1be3d313bcdf84406cfa34045df9aa239ae1ed476f838ff466e0df96b60b28caa15b8 SHA512 58b19bd67b573657c44861d65792fb7fed0c430a554e95b2dc41a3f53ec8a50e68f89130a68ae0167de9ba98076326ae843264d76a178efaecece90121d0f337
-DIST genpatches-5.9-3.base.tar.xz 237460 BLAKE2B 44d94786733cb0b016448002e5ed8792285d7b53751d460d735f5175491f6530b15144daca1cf599a4cb492244eb74e252563433a1bc77dca34000e26a736c71 SHA512 84a0311d6c1c53c73d79409d43e6aebe600ffca76da077885d76ea7fced2c23f30cf06a5c60d8d8657d3e5988cc5cd0192f68d582f458ff3de3a90744e8d31b7
-DIST genpatches-5.9-3.extras.tar.xz 1768 BLAKE2B 4e2b8011a4c40878fa51b3155fc734c0b5bfc0db25c384d9e2b2f3136dc29c24c0ce547bdc304eec096f8350ba2e0775c501d5dd94d85ca8335deb5517f9b772 SHA512 6bd79230e0b7e1119cad942d74876d736140a4e3d228fbbbb736da5ac97977fb08720345c0de93b7cd03670d8cb074a0de44ec0a2fc4cf8d8befa408fe716bd0
-DIST genpatches-5.9-4.base.tar.xz 272152 BLAKE2B a923a35de860d55673d357ad03f8836096d91b5444b79d725c681d901b627a7ea8330ebff03475d404d50684ffa1cf7f36c23b91fb4a015dc6043b6486596c2a SHA512 77e52da63576dd3dd3ce56edd2f178a841697da1290136aec7d35487a37724add5058c94ba01400d06a54ab687e261a49bd94c74d38fd73cd62b2c81b5ccd35b
-DIST genpatches-5.9-4.extras.tar.xz 1768 BLAKE2B fd99486c51dbcdac888ea137885945f7a468886a47e3931ebe26ace3ca922c83e7081267804a6938d76d1e65335d431bcd6b06f6118901699f1ab17c109814a0 SHA512 c5c5265b0a61ef24dc2a596280c026a98b1898ac8dc535abbd213496a16afbca255955ab546a86527c6cddb693c491f5b108b1993297d1b768badd0157cd3b07
-DIST genpatches-5.9-5.base.tar.xz 272356 BLAKE2B 06f9967bdf454fd53aed3a0eddd800c07087e36f055817ad257268cc3cd521a9a9c78f45ef308c6301aaa3fecffc24c17737e4951f7e2bb2c47ba929db79817f SHA512 74dc74f32c332e8e7b0ecb7c9cda10664fb1df189d81b9602625e8805c2d9db4213cb673fd9ae3e03694ff6d47dbe0b3b79a1f21d01cd29f27c28ce8c98230cb
-DIST genpatches-5.9-5.extras.tar.xz 1768 BLAKE2B 1c72024bc375ef5b79043b0c3e48f790fba8450981143f8702e1fca34ac985275ae529bd545811a5933cdba47e73f50d95873653d4d45b68d06b8daf7ed3db62 SHA512 ccd73f6052b27f9a9da26539e811f31377e5ef90c1dd1adad2c69aa63b0ddc686da9b75df3ca0ffbbf1f2dfeec36cc15cfc68329bd531367a4d886d4e4e78d89
-DIST genpatches-5.9-6.base.tar.xz 406744 BLAKE2B 79052b91967819329a94b796ad72d6b7eec43d2e83615333abb7b9e0f3c7b737687de05e4ed8ebdb1db064ee16c2b45786ee3652f6f4b107b7e64ee309d9bb1a SHA512 2ae6a445936221337035b9d38336285c8dd2cd9cf2686bdfdd7dc229efb8f61d3088b834c8c63ee633ea197cd48455dffb24dcf11aef0955c42e4e271da76f42
-DIST genpatches-5.9-6.extras.tar.xz 1764 BLAKE2B 3ea79d40f67a97fe14c5adc7c0f5bab19ab28bf37778a334c50852cbbdd91f32ff696e65e9a8f703c8573be7714447a75913c1783118d7b8acaaedab8518075b SHA512 d0f470637202283ae8295bf822b86609f426023fa6f0c00b1a3c0cce461d005c3804bfc7cdbcf965ef9d6a2e68917c2fdbcd30329e551b91d50055106c4f5cc8
-DIST genpatches-5.9-7.base.tar.xz 442956 BLAKE2B 7ec729466553d58b07b6abd4c1aacf237c05e3993fe29f07c75e0800e2f7c7d821543bf39d6c31353b15107f645f60eebe6411507cc5eef414d1abcf0017a165 SHA512 980ff432cf5bafb6e0749bee0b0917e988b658575b60393b8074f70ceaa410950d01ee394f8f55a9d5a48fa75da619b9298e8810d6d3f28d809c067b9dbc3d25
-DIST genpatches-5.9-7.extras.tar.xz 1764 BLAKE2B c39d139cf19dd6b1af3f196d25c1d4840536c1f390d950a19489be11a45ef4c0ca26fcb0d516a6901c9e128c070f18ec46508ff2c60c8015159edf6b34fc057b SHA512 4c817a1969cd5efac3bced43c09ba206dfa6475e0ba3923bae7a0cd4d90127480acff8ac22703dcad33d43f78a60b3e5919891d1c9eae6597330f30028bfdf66
 DIST genpatches-5.9-8.base.tar.xz 443192 BLAKE2B 48c79a97fe1201bab87ba601feac1e05ce12f2db155e53e0a543c7994ba8dfcac75b17e315929c0b68b8136913fdf93005690ccb260640ccc31527088beb326b SHA512 c365018bcfe84ff64a8171951fd4f97bb89044633df137926d22bedc738cd17ebe72c26800eaf30171c3495ce2b1bfdc93866112756bdd2207e6e184b5f1fb6f
 DIST genpatches-5.9-8.extras.tar.xz 1768 BLAKE2B 96413f75c606fe4515d0facb8f0ca784702bb5d83591af87fb4bcf2b6c5e135eabcc55e0e84be9ecd3854ec108b8ed93cff11c41e7efba8c45aadefa291cacff SHA512 646efb1f6e0b9252b0220aa5922b0c0d8f093dba8edb7e40e127680c8a471aa49724f9591a3147925d7a4084af8d5e1cc5f78b0e72297072fd15bd13d1c93e40
-DIST kernel-aarch64-fedora.config.5.8.5 215148 BLAKE2B c71380f46c1b37e9e17bab6d78907114369b377bcbdb54afa2c35b6a222937fd061f25309d8de0cc78ef2329ede7192722270acceeaa3da4629a5f58d8fee809 SHA512 e86e2c60e88b1ea5968db1a471d7d928ccb3146fe850f8f2813ef315f2de0cbfa0daa2f6828dee71acb2299f65f05fc0b6f1572a82fb146ae9f53a905fe94e97
-DIST kernel-aarch64-fedora.config.5.9.0 217558 BLAKE2B 38e3c31b710c30d29dbf0b5304c2b9e0615af08ec11a01318bc0c4811b91a0803a96483e986f3dd83369b14e9329bdeb0e0d834761af9a644d831eba43eb910d SHA512 d38d05aef2a809207a186eacc365118d68e7ef82939b45ac5b9038cb493c771f8fa10009a0082f36c79c2e6b5b2ec193a6b1f50bc51a6190b77f57ab7cf237a1
+DIST gentoo-kernel-config-5.4.77-r1.tar.gz 1289 BLAKE2B 6612741cfbf458f4bd8915b476aac3aa6934e8bbab344da877fa4ad52b6133e01f5d44bf0e5d048e79e56c1a351774135ee55f1aa839b230e2418db7c5d9b123 SHA512 2a09dd85af37447b278847aeaad114ef47470726cec015ed5ee1b54b3080f4b2c48de8b2f7b817eeb4e27c753579cf0820053e22caa762cb1552116d8d69eba0
+DIST gentoo-kernel-config-5.9.8-r1.tar.gz 1198 BLAKE2B 8fc6d432e9d7e1f7f2be75c5741ab18be399066e9837a52023bebfbffe6299eabfa7e8e94822ef205bd443f6d75a75530cf0c3989dc0414a7c3e4ff06d4743bc SHA512 bc554f46ffb8a4422269e5d9b8e9e0c0f1ecd29fd008719f7ab027e87f4b4bb284d7854d1af2e1e5af0784043db79de058b38fd1ff0bf50d3086e8adc6254e1f
 DIST kernel-aarch64-fedora.config.5.9.2 217893 BLAKE2B 03a36c1fe81a16b434cd94bad3984bf8984808b2e7092089f9a23a565c6d9bc8a512baa4e5754633783ef47feb6cc67010a0093f096e5a15db0f13aaaf6d6426 SHA512 ebe29150ae625cf2f285649984c27246ef85cc13f0b5d4e40dd3ef479489aaa09b6ee4aee859d6e4361dd7e7b4432db8aec077a099a25e90609b9eac2d42802d
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
-DIST kernel-i686-fedora.config.5.8.5 199121 BLAKE2B f6e16e6faac6e730eb4c9c3edc1c173b2988b49fe677d34ef1540541911b8f76e5bdc166327d73237c78c1769d484de18864044c91b7da253795506c674d7303 SHA512 0a2c9abaae11ac1ec2e43da4b53fd1731a9bec983a7fda7b9e20f1d25b816e6b0bd217b255ca95b02a8b6530e923b4fc7de770f6a66411045712e7de61d431af
-DIST kernel-i686-fedora.config.5.9.0 201027 BLAKE2B 1939ffac8baf290e9c0ab6bff25a365af8c674b360e3adc5e9bfd710473abbd38a124f5279b2259cbc0c9345e0ca5b667c67324b194742693561c91528cf1793 SHA512 e5ba77e899360cef9dc45a5b5baf646aed04fdeb771727a6696f156bd0aa8aed4dbac13ffd78779e1b1ac657c1f9569bcb2d0c3bcd4be2063d7a1b68e6aab983
 DIST kernel-i686-fedora.config.5.9.2 201362 BLAKE2B 93e5dbbeec7761d777b8cf8795b38dd6a727f07c58176013dc5d18c60165af21c6e0e9140c7c7217fcc31f9b9a9c959be9d3ef0f853035986605fc513e7c70c1 SHA512 7bb41160333fa0f751c80ec9ad1e49ef991c26e05575a1e5fb41967bd984c91294629d91624eacbbdf2f307a28f9de8c994a9a7bef63cc933b0e13727dd33619
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
-DIST kernel-ppc64le-fedora.config.5.8.5 185766 BLAKE2B 27330c7806923eb4a3346df2abb5f253ca044a02afe72a89c6ce006d149966d65b4ba3e114b5ebefae987565279510c05d33dbc89c36c5e78e2e88732f5125f2 SHA512 8b621e0584624ccc24580951fc116478506a7465715449a53e70f46c99d0210bf08063a4fd5b87e4624f5ce179e6a6316f23723839c0e64e57a2ee58e4de59fe
-DIST kernel-ppc64le-fedora.config.5.9.0 187611 BLAKE2B 0fcf6d09edb2afbaac88e8588bf3f0daba4a6b810ab3d88121c1c55790b8dabe24ab02f9b042b775a909e29d3e43b7cded8120417823712409d3388a93ad5996 SHA512 cb76b2a140a8362c1925a4bb8d048990feb81c625da95f170d7ab986fc0d0cdfaef79acfdf4e5f167fc70efc42da80c1038ee37f7ce3bbcd3782c5beed6607f3
 DIST kernel-ppc64le-fedora.config.5.9.2 187957 BLAKE2B ae15f248000095a593ca67223818379eaec9dc878049eb36c5812ef70bd27bb5159ef16faffd4fa0f26ba5d4fdb907cb8658ff3fc34c93746f04f428d3598d98 SHA512 c331ec3301baeedaefe2e31e3fdc5e9ae48070e8e4f8e3469efb4a9907e4ceaa38748dc1fc99305b630e06c68993007182d3ada3cb9c518a81414b29c854fb88
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
-DIST kernel-x86_64-fedora.config.5.8.5 200052 BLAKE2B be804fd499527a6c6927365c0350b51b3351da9a4e3f75bcbcc44d1a1b21d001d4907e6028ceb7ec6d5c812ea190d369ca6de4ae2c21a293342b6af33b8e5e65 SHA512 40ba21b0597702d3cff9eb3c1fab98784229ba78702bbb0fae2264b145a2e433615522e300cff1f9c9c52067431116b80a8db92e1263bd1a9070adbbd068f982
-DIST kernel-x86_64-fedora.config.5.9.0 201958 BLAKE2B f210399099661f9f643b0b1fe6cfd82675fb71b4c63c8ee07645771960df2936370680e704b1494c6e66ff570a4a4dcd2c16ef521be4a29c21e1b12abbf71875 SHA512 f9c7ed7b9a8c351c841b527c352a72aeb36ed368dcf9060ff2c4c92364419cc256752d3fde76593d177cf40389a2b9dd9ac7bc05462539433d3829a429b74eca
 DIST kernel-x86_64-fedora.config.5.9.2 202282 BLAKE2B 5172fb3f682f912b14c4b2f15e04db4be6362d1291bc03b03352d00224aec387d4fe04150a617f9a8e84999aeabfda51f79e0978998ee232cc1c6f2ee130b74b SHA512 36375384215aef89b52b365a9ff82d732a42336c51e144ddc39b16f1fbafb858bdf0d1f5d06bb4927183bcaf8943caf15adfe2428fafa85db70a198e53854155
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
 DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.73.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.73.ebuild
deleted file mode 100644
index ff0e401cd76a..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.73.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-		# WireGuard was backported to 5.4 but we use old configs (#739128)
-		-e '$aCONFIG_WIREGUARD=m'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	[[ ${ARCH} == x86 ]] && config_tweaks+=(
-		# fix autoenabling 64bit
-		-e '2i\
-# CONFIG_64BIT is not set'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.74.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.74.ebuild
deleted file mode 100644
index ff0e401cd76a..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.74.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-		# WireGuard was backported to 5.4 but we use old configs (#739128)
-		-e '$aCONFIG_WIREGUARD=m'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	[[ ${ARCH} == x86 ]] && config_tweaks+=(
-		# fix autoenabling 64bit
-		-e '2i\
-# CONFIG_64BIT is not set'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.75.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.75.ebuild
deleted file mode 100644
index ff0e401cd76a..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.75.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-		# WireGuard was backported to 5.4 but we use old configs (#739128)
-		-e '$aCONFIG_WIREGUARD=m'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	[[ ${ARCH} == x86 ]] && config_tweaks+=(
-		# fix autoenabling 64bit
-		-e '2i\
-# CONFIG_64BIT is not set'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.76.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.76.ebuild
deleted file mode 100644
index ff0e401cd76a..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.76.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-		# WireGuard was backported to 5.4 but we use old configs (#739128)
-		-e '$aCONFIG_WIREGUARD=m'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	[[ ${ARCH} == x86 ]] && config_tweaks+=(
-		# fix autoenabling 64bit
-		-e '2i\
-# CONFIG_64BIT is not set'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.77-r1.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.77-r1.ebuild
new file mode 100644
index 000000000000..b32b759734b2
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.77-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.77-r1
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )"
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local merge_configs=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.16.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.16.ebuild
deleted file mode 100644
index 1527024779c4..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.16.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.8.5
-CONFIG_HASH=af8da8d54d21231fd8c7b943216bb985f0a4e223
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.17.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.17.ebuild
deleted file mode 100644
index 1527024779c4..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.17.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.8.5
-CONFIG_HASH=af8da8d54d21231fd8c7b943216bb985f0a4e223
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.18.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.18.ebuild
deleted file mode 100644
index 1527024779c4..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.18.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.8.5
-CONFIG_HASH=af8da8d54d21231fd8c7b943216bb985f0a4e223
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.1.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.1.ebuild
deleted file mode 100644
index e7a5b2ccc317..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.9.0
-CONFIG_HASH=aa6d9438d030fa4682d5d450481085c901503da5
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.2.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.2.ebuild
deleted file mode 100644
index 97741279d4bc..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.9.2
-CONFIG_HASH=94a4277f8827d1b2c911deabe56e7d929dc93146
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.3.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.3.ebuild
deleted file mode 100644
index 97741279d4bc..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.3.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.9.2
-CONFIG_HASH=94a4277f8827d1b2c911deabe56e7d929dc93146
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.4.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.4.ebuild
deleted file mode 100644
index 97741279d4bc..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.4.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.9.2
-CONFIG_HASH=94a4277f8827d1b2c911deabe56e7d929dc93146
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.6.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.6.ebuild
deleted file mode 100644
index 7c6993768c3c..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.6.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-${PV##*.}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.9.2
-CONFIG_HASH=94a4277f8827d1b2c911deabe56e7d929dc93146
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.7.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.7.ebuild
deleted file mode 100644
index 7c6993768c3c..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.7.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-${PV##*.}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.9.2
-CONFIG_HASH=94a4277f8827d1b2c911deabe56e7d929dc93146
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.8-r1.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.8-r1.ebuild
new file mode 100644
index 000000000000..2bbd08ab2819
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.8-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-${PV##*.}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.9.2
+CONFIG_HASH=94a4277f8827d1b2c911deabe56e7d929dc93146
+GENTOO_CONFIG_VER=5.9.8-r1
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local merge_configs=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 06128493263e..fda035ec2023 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,6 +1,3 @@
-DIST genpatches-4.14-208.base.tar.xz 4528048 BLAKE2B b87e20e9008edcba6e52bcc57d0dc4544273c3da0ced74d410441d8877be9d449c40b4a53a8880d178e7b1dc706d10b0bcf797d0271f6882d410f548114fb77d SHA512 012433cefb294896ea928d683e7c00514331c85a0e63e131b94b0119158abe3538d77d60b075a35178ef933b240c9a4aa1d70494dd6fc3da2cce112f3e935660
-DIST genpatches-4.14-208.experimental.tar.xz 6092 BLAKE2B 188eea7e5646bbdbb67e9af624e34e79481b18e5fe36cba5553ec1312c73f20c2ebef19589c10a8e9ff999a24a4dc6ceb24511d1e299aa5a8c6f330f7e6d3422 SHA512 3219a3dfab95ee5e8f8d5865b7cf57a742457331bf99760a481be224c2ca4fe74711660f337578ec879831a805616f54b409f9f07cc2e98150a64e38d99a13bb
-DIST genpatches-4.14-208.extras.tar.xz 17536 BLAKE2B a555b9c78d47323e78c10dc31fbf191ebf6613f264756cd65c9e26e262941a0f4cd64122f93701a66686398b722aeb251dfd1b88b60cd89257addcbe86e2f623 SHA512 9cc457946e4822d76a3be86c0a07b40930785fa45f445721a0969d3ff9fff3a2062ab154386f39924317a3dc5e9dd38ee4136229d5a7ebdeb9297af7afe0ddfb
 DIST genpatches-4.14-212.base.tar.xz 4611792 BLAKE2B 5d828c53d22cbc3ed6d0ed5109151c023d404c084c70dc84ec55f7207056f48a73dd4160989c17104ceff8e8aab66e7685bba89c404cdf6f250631c2ddd72a85 SHA512 f0a15184c8e71071edaf2e31127b0cab65b32005c0c42dc7988550043417ec107df9f625e95122309d635dbff54fe133055a1ed2dbdb0d73d145391594c2304b
 DIST genpatches-4.14-212.experimental.tar.xz 6084 BLAKE2B 25ac54be062187e12a17860380edce9db19f160dc4f6e92fd614c7df2f8a4d58fd60baad8bb84730ce58a14332eebf06001578c910dd45b082a4ad1c4eb3da84 SHA512 bd885b6bb007b53e03b069efaacda8af99e93d2eca204edd8a7b5f84b65cea4c6720be5b2e6f99aaa536c0ff59701419065c62d5811f2520f21bc37d13bd8b68
 DIST genpatches-4.14-212.extras.tar.xz 3340 BLAKE2B e3dd6da1efb30bfa22d3a971731dc438dddd2247bb9d2a645cda3454803fbce6a27698870d27e8160dcc062330fdc0b3ead889427b8db0fa2c59d8175cdcd4ac SHA512 6b018a670c5f28fce087eb7d694fae321fe912767965e397c496b1aca95598a0efdb2b611fdbc856d16c8d00652b58a8a29507570126af8c8706adaa15ed6a0b
@@ -16,12 +13,6 @@ DIST genpatches-4.14-215.extras.tar.xz 3340 BLAKE2B c808f466732b10b11fb795f71bfb
 DIST genpatches-4.14-216.base.tar.xz 4684292 BLAKE2B 03c819348e14195aa07e731111ffd95654dec323142bda99baa9bbf4ff4ee0401d18849a1b6588dd662c1dc4fc52ad97555d51670fdee696e34e7930c2bda9cc SHA512 54c3e03230ebfc8db5a48a9d291c3b8e2b4b06e2b762bfe0a3a80454a7da7df86adfaee6fd274aec25a74e12635045a116a843f6920a839f917c63f11ed86ccc
 DIST genpatches-4.14-216.experimental.tar.xz 6084 BLAKE2B bcd501a52fdba06fbd54a6e72441441b4eb8ae01295f09da1a7d7c1ed54de3bd639a8f9ed02144ff266a80edd1f18c5d2dec039980ae718e78e83578020bc399 SHA512 7ab5740f2bbafad425ff155426673b0f66c3131b32bf94ed784e3ecfc1072944f1ed76e8eb5048feab99c7a1dac0f6f5cb9cc1bd10e966481e02de8dfab125e9
 DIST genpatches-4.14-216.extras.tar.xz 3340 BLAKE2B 3beb784ec623f4b31cf5335280d063afd9256a1f0d6399f52b27aa515941dfb05750ca98b79cfbb23b3eab41fb52fa8a4f708902047684bae8078efc98e87146 SHA512 74907882c0d33b5b09d551523fd4c2327efb0caba38f5b795fa045b6190fc76a7114abc71fc93825da10ba440cc85e1e2c4a6769e71ed84f5202a59fe16df0cf
-DIST genpatches-4.19-145.base.tar.xz 3890268 BLAKE2B 6705feaa0dd76fab27a883c1ecdb325d00467fc50e051fa205c70c0fa07e62731406066589d3ea88bad2e1fb9d3aa3ffecacc0391348183a92097b8d69477c1c SHA512 6385ce0d318f988338c14aca095f2c054835a7e88ecf63829994eadee02bbf35beee39a3e366c4c445064c70be4ae5fc6105293fee36c6cdf81bb3206b0eeb6f
-DIST genpatches-4.19-145.experimental.tar.xz 6972 BLAKE2B fec91bdb34d9ab0d52f4ab920159f16cf43cc63e2ea8d079e61cd247c1bbaf8e57d183a484670d5e703542bf2c78d59029e09c0eefac7686392dd727671c40a0 SHA512 ae35835ed9b9854147a4b9f5111bcb37980f8664b59894654970ec7337c7114e86d639b0198144cfef87756740ef08ad7a08fb2bca6f78aa319bf662dcb92095
-DIST genpatches-4.19-145.extras.tar.xz 3316 BLAKE2B b8ea2c727280adcbc4cd30cce7a20f8ae22985c89d3749cabb3b5499b22dfd7f7297428e38b8881d2f3ce99c7786c50a2d181d9fb9de28321ff8416c7562fc8e SHA512 adf93acb5f86addcdaca9083da5a2ac0939654949a497b107bafb47ea35a8aff13e74906b93d9b40133082ab96339381a6addf2b1b6a6c2df7c9982cf031fac2
-DIST genpatches-4.19-148.base.tar.xz 3980648 BLAKE2B f0c9a65a1132e26a7b4ace1f982d97ed841f4c2ef13050bd20366417391c8b1800e7c00b2db5c8ae75ce8d6e95fcfe401facf2bc76d58df31e29608721e4d1dc SHA512 b75a42bb6eea9418d75e333b3304cd0a6a43a54a4758a8de3e3d69dca3f22c18c75da3347f46b0d188d52642306691237e19db53305f1a83888aa4f85bd92f40
-DIST genpatches-4.19-148.experimental.tar.xz 6972 BLAKE2B 5104106075756bcbc6aa6ea79910b96f7c9ba37457f07a61ddc2c0f81728e910a853707a9e21d6918d57ed2a16d777c2851c1e3888a18eaf9c813d4587def797 SHA512 95d8638a98baf7a2b2569d32c7aeedbe5c85153f1f22b8f3bee72ac9f47169b31c85e47e887068d95a4f9469baf76ac00c5957fea3582573a2de268b161ca120
-DIST genpatches-4.19-148.extras.tar.xz 3316 BLAKE2B 57546aae74073e440e043c4754b2f51bc48a0b24a4ff0a130797d2bd96a0128bd786310a79bcf13b03f20e14eaa8fd8ce10c597d9a7281173cd2debc6b042bb2 SHA512 2971335b2a9e3fb4a7477e8ff40e3170fe40a272a3ff33a99e18bfb58398fe5e6a798ec88e1d35b7bc895dbf68a30297e1956357b05c988b321f06111297f354
 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,9 +31,6 @@ DIST genpatches-4.19-155.extras.tar.xz 3316 BLAKE2B b882d1593bb5111db6ac893ff7b0
 DIST genpatches-4.19-156.base.tar.xz 4125856 BLAKE2B ffa5ba0b1eb7bbe11aa7873ec05425bcd2565d04c7c8014935ed967376180d42d21c2056ca73d0cb313d64003f83f13d2f660292eec4b612535dda406273ab04 SHA512 746b3ee2ae22b9a33d1a62968e23b0ba96063f9f517f7a38b610e0c9e8efce9b1070b1ed7af2e7007b4a80416f1f94ae934ce929f79b5026a257d686f1532b21
 DIST genpatches-4.19-156.experimental.tar.xz 6984 BLAKE2B aa25d49fce3a2710e9f0b4dc5b858a8f047e628befcd34f187eae802f4607e252db8d06d7f0ee9848b59c09dd4e3264f2247f24257e2712957d75e169ff0c601 SHA512 c873843b86a1d8dd345e20d4bcdc404a7e449758f2e5e5ffd336b949c5132e13160ef40f78e83ad9ba2318eefbb7c5c6d5df18b60454ae0a19b9158105b4f796
 DIST genpatches-4.19-156.extras.tar.xz 3316 BLAKE2B b09dd535332748d61bdf246b8f352dd528df2658dc61cd0459158997764bc89d483706851b29aca2516ddd8185734ec9880e1e2819c6d88b7901666a25c5f60d SHA512 5f4ddd5faa25bc159227163a8d4a3c341a05dbd1e06401e7380d84893870084cfc2258a19b47bcb560fa1669bf444fd5faeed20b4131575e9af4ace85aa921ba
-DIST genpatches-4.4-237.base.tar.xz 3832188 BLAKE2B 014d7612d383737adde6a30e454675ec1fd74c909756cefac5bc97af7dafa6850a85ad4a7f5b63328dfa135d01451f0f72e746b60f5520095859063879f81aa2 SHA512 98c2d176518858b1d63d86f937a68d05293005459c5728c4c992767f190234d6b5413ef97cecbcfb923ec236f93f4582bd34f2dedc31e811ae34efe45dd99590
-DIST genpatches-4.4-237.experimental.tar.xz 83284 BLAKE2B 4fd3fe9b097cd7b2b71d32efb623f495f235f5359068a40142b19c5f98d83620caf9feb58b9ed33f55c31954d246e716ba0c0ceee3acf24066b95509efe3c96c SHA512 0f2737e304dc4ba9a596e96b8b0af063c32db0879b3fe481b5c9cc5e8755e5b1684ec139373fe2ecd716944054a9b451e667bb0d8092405b5a41640a8c9963c8
-DIST genpatches-4.4-237.extras.tar.xz 16504 BLAKE2B d4a7f563f97dc81e56cccc49087b1bc702ba2ca46b622e73da726eb0cdff2bc444a831f233830981f36f1eda1be82627f70348aa209ee3f8f89ab7e60f5550ce SHA512 61b94b84efd62360d21f90474d6b176379bf58aa3541cf6d0d4ff47991966239822d9d6eec45a8f832b0bfd7fef79f03c3428795a3e3fd31d006ac0be49699c0
 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
@@ -55,9 +43,6 @@ DIST genpatches-4.4-244.extras.tar.xz 1788 BLAKE2B 7831a24528769549f702d933b63de
 DIST genpatches-4.4-245.base.tar.xz 3913968 BLAKE2B aaa2d84e0c442cbad81456ede5a86da8ee7d42a1fefa60d551386c6f9356ab10431cd45b002b0120f84bd477c26e8396096b9bdccd704f520875d9948f97894c SHA512 c1e0bc7c3edea2eca0e597d1f7205b8b0a2cb2014ecdaf529a67d031c844d56f4ff08d8c9368839ec4b33309e276e4abbc5b501095f9b292a0aab033d3b63486
 DIST genpatches-4.4-245.experimental.tar.xz 83296 BLAKE2B 4c7c80e11f78b0601f2248180de05b5de7924ea8d274a81e3f663523d0d8cc77667d1c6bae074f62dd04652055bc7d8120fbe6a6fe9ea4a41222b669717c669d SHA512 42913dd7b8467f0af20eb863dc04e20d916d06907b4aa1afb218652b9ff12b68e698787772150063c6035924a8c87cd91657c26c31ecd45dec8b9ee7a1cb596e
 DIST genpatches-4.4-245.extras.tar.xz 1788 BLAKE2B a581faf05ea1e67cffa42e090d093f7690a6947930b1a493b75111e82e2ec0bce9a5904ff7c057ce9314167c4340560446e1184b37f71c0f94afcc2ac604e79e SHA512 c68eb0dcc3c84b88b0797c4908b7f0afd039ab4ae28336197b172ae7ce7ccb2cfb37cebb44d6ccd4d7525935e9b667f573d0e34c7358f342378debfb3d56a57b
-DIST genpatches-4.9-240.base.tar.xz 4267036 BLAKE2B 899e0e4efb969478207c13f87deb7a8775f63cd55ae1fea5fd643f0a254a2258f787c5a6e90d9ba2cfc9f18c9b903c4c25a560df62d6eafcc57293c86bd74c28 SHA512 f36da8e466ab9415233859a1ea30f55b8bfad7a3d6a6ccf946860769900be45786ddbba24ee05039248e943db5686426c399eba5d33c791c9f487ca9bec30288
-DIST genpatches-4.9-240.experimental.tar.xz 106380 BLAKE2B 6c814606f8aecd426124c5d61562dab0042992e8cbef9f20cc1b647966412e955eedf4743df4b022c05bac51926a72786dd9311c6040f326944d4da8e181c27b SHA512 5fe75ec33c3295fccbac456472b5507e86da44fc3014a7cae019f4a8f293e2a5714f51a4044709123d1206806234bc445354ed1c10e08ba002707226df41219b
-DIST genpatches-4.9-240.extras.tar.xz 17396 BLAKE2B 4a22af944b224c879e1d4d56e6bcea33a462e3a914cf0d008ca24cd780bbe26449554436a04c4e2ac58a0cdfb90efce577b7d2d762102d48784f89aa4b385ad5 SHA512 fc72ae76069e75b5460a1d31710aac46c75e480655a9ebd5cbc1c3ff1151e574fd493064e551a64d089e2db64f58dedaece82401d6828de6bc5cbe5e2179d5b4
 DIST genpatches-4.9-244.base.tar.xz 4329708 BLAKE2B 564e2a065bf6e017419b74fb8485194ed4b4f4a0025dafefbe7c9feb0fcad78fe7f1fbfbf5c6b2f12a9953bfe91f98939f495f49052bd8a5cde67a4bd6df0443 SHA512 03d7599c0223162d33ca398807086bc5c5f7b56d08f7e82d32c17b630348f3c7fce3505d02d3ef3524e9b1ca85228196c989dc4cbb56e3398a56d5bffd18a111
 DIST genpatches-4.9-244.experimental.tar.xz 106376 BLAKE2B 22e39755ae9122137ea20037048fc493024f23cefc73d46fac6f41db903ca217c214592d9a3e178a0669f827c1a5ccd7d0bdf5a7fbe9046205b436ac2fffd224 SHA512 1e3f4ef55a3321964582c8ec6d81876977f2a6154bd1a880a31d25b1bd73ec6f51dd4ab3425717bad973bb886f376ffb65e58df4048a6d86823c665c98ab2c15
 DIST genpatches-4.9-244.extras.tar.xz 3340 BLAKE2B a04e319c89064205c0e8a5308fcf50e5bd6be6b77630cb4cd8b81fdb3dfe7020e78cedfd297125e9c7235b45291f6973fba53fe31cf75b200fee61f7a62ada2a SHA512 5750914ef1564766c3d27f3fcc814311b021690647c293ef58d40d09f8737559ecb235b3632bb18c307736dbc96cd9b39c53bb351c94d204295a273b60b73cb7
@@ -70,21 +55,9 @@ DIST genpatches-4.9-246.extras.tar.xz 3340 BLAKE2B b998addeb767cf0baf56b20c042cc
 DIST genpatches-4.9-247.base.tar.xz 4381704 BLAKE2B ec761ec22cc095cccad2ce1bcfc39544aee85a33c9dba0e09b3f281f36413705a1a9cd90d49ea2d7e237c76721b2c7ca7cf0ca9b0b6adef30463dfd590a353fe SHA512 faea6a290617e47adc61e1c3df6b6603e161930ea6ceb0dfb793fe8873f1f6fe70ad63316af5c713855fa17d02b57e02b31b35116c5965379040e8ed36fb4a52
 DIST genpatches-4.9-247.experimental.tar.xz 106400 BLAKE2B ee5864bfeeba64d62cf9ded356e745dfc0b1daace40cd5bdb3815cc988527098c82c44d6fb5c211f8bdec24970a19be9f1f12c46c927b057c9b8e3f137aa313d SHA512 63e1d01d5c67d4e8224eaaa5370e9d3444e61532bf300431575f1b22138b539290fefbe118178befb164bb76fc9847162549edc882d005d379c04db4d184d15b
 DIST genpatches-4.9-247.extras.tar.xz 3336 BLAKE2B 18e0dfefb59239acb2d6e1eb2dd764b7e224b0807e45c7fabd08c977d0fbfd0cbfd1d110b16f9cf249a690c4980df53774f2164b22d0decb694a68ca5c8ac187 SHA512 589216ffdcc472ecda885291fe38d4e18bef04d5ca8799c43ae8efc1c0e6241febe3d2bd8c77e81974c31e862e635cf5b23cbe02a0e55e1b111c4dcdde29b5b4
-DIST genpatches-5.4-67.base.tar.xz 2335352 BLAKE2B ae98701f88da8c3ab823499c6d5683c80adaface3b23d0e5671deb4e8005a6aa8f9ef3c4ff4b0fb1475ca33de7790c59c56571795122ac4bfed6f1c6e4ae8049 SHA512 1d039a98cb29a76f0b5d26cf2ef72cbeef469746e31afc513f6f5f88841e9fa4c96fe34e92748e61a6f6f5a6d8ac68783126e6bcc696bd0106747b8a93a9b940
-DIST genpatches-5.4-67.experimental.tar.xz 6696 BLAKE2B 0d3871c594f7a60311ace7bd7095fe7d10013fe817fad6e7c94f056db3505dc55ce0944ec56f5b1d24c2419d2fa810dbb9712ccf098ff92e1b352974eebab8bd SHA512 6cbfdd3e651fc95f0f929fd0fa239ff4494d0621b47f138d2b335d36b6ee33863b41436a57dfc456c4a47d0ef4b21af5be7a80078990664496b98632d8990e75
-DIST genpatches-5.4-67.extras.tar.xz 1768 BLAKE2B 6e6718c80465485c0271d46231d45412e4bb7e713caed3a333b27f1a655048c2ccea871d5331fc4d6413ddbeb2776df02acf00ad1c399a1d86e65615f05d5c69 SHA512 7da85f2ff8f50f43ae1eb814e34402fa8a55629c7b8e9b362ad657974be2ac60489157adf474f91c05587475d89deb1cb1511c5241b80885d695651bfb122af3
 DIST genpatches-5.4-73.base.tar.xz 2527064 BLAKE2B 6e0b392681d6e5e709a02c1c8f15fe06ef1651f1530506982feec7fd436aa04ea75079eeb5d3a61c91bcbb46c59a232cb8cb67c62fa7b2e8b289591142dd9430 SHA512 db987b95895fc37243e3697f3ef8f33787489e173fefb84ad09a6600898b2b9b285d9113e6f867aab0c3d5b4c65398f4bcbc40a4220f3cf2b355da9def209dae
 DIST genpatches-5.4-73.experimental.tar.xz 6696 BLAKE2B e722d747bcb24b501f3d63c8f6fdade889b620794bdd6fe0931c044147d32f5d9b3fe503fb9afe476cf1e791ca0d1247edb47df3a1d547c99e9a3107a2522139 SHA512 7ae9228a9677f3b7888ff8286b1db8ca5cad14fe829efbcb8da8dfe7e82bdeac95368a0dfb2e7bbf0ea82a2b103f5c2ee3c99826c89eec7e07f3be70bcd51430
 DIST genpatches-5.4-73.extras.tar.xz 1772 BLAKE2B 7475a0907f287fef28ee8bf220932528107bbac0d612dc05de6ca8b2dd86ddf37d9acea31ab2977a677f6ea3a19c594737b23e504da405fa811c4d0faf00b94a SHA512 751898547b1f60070f1d8431cd89daff55e33473c8fe68415a15e3b8079ae2d3e44318815ba47a1ce9750feb1cac1812eb8eb7765426b204eb1357993cc68cb0
-DIST genpatches-5.4-74.base.tar.xz 2616380 BLAKE2B d79290a1a6aa3464fcb5ea31d5ec28adc3b9275b7240627e431a9cbc69735426434345f0259e08efdf10e3660d60f3d4b6f22e7883cca39c8136f2ee39fad646 SHA512 ac5df7e61f00659c01ad90a6e52e20a9860f154e899aaef7179d28d3fc311ec804d34c9ef15bf22903e0c0783d00d375019e7dbca58b94ab5c09da0b8a8214a8
-DIST genpatches-5.4-74.experimental.tar.xz 6696 BLAKE2B 6ff0638c345763fb566406daa0a4fa7402219fa0cae95f39d3f06aa6c32546e4509ed7f5b948454bf72abeec6f8699f203e08298f092bb428710987da3996dab SHA512 4731032393050d1346282a22fd595a0d03c1e4702f2729e351ebeaf7f08da62d742a74fbb6ae2c9f1e455e26ac3ce1ce0379317160c0a9d264cecccc95998c59
-DIST genpatches-5.4-74.extras.tar.xz 1772 BLAKE2B 02086dddbfb1c41c2f0e0f693469ed18a870dfee1eb7305c464668a63fc29262e976c79078339691df1493280b8aececadb9bbf8398bf47d339ff06c14271c07 SHA512 ea43bb8a42dbcd63982a4350d287e222a945596f31a513cf6c61711e0e9d586171d8c319a51e63a465cc4fd69ff3fcfa36816d552d09dcd5831ea59473a73a0e
-DIST genpatches-5.4-75.base.tar.xz 2626680 BLAKE2B ff32045765e11e01c26a3a11d095940c94fc1774734104c73b0a014401464b97ca623f354e62fc46f8427ae440149e5738741c78e79dc014d4e12ca24470384d SHA512 8c5bc194525e352f4b2a7fd6f92a5344a8036f60440bdbcde0fcf0ed401c191921fa15066aeb368c91d40fb6d166c7bec1ea55f01e5c8ffc3e296c9dc0ee1e2d
-DIST genpatches-5.4-75.experimental.tar.xz 6696 BLAKE2B 104c48662e282262e6e4c97929a7f3f9af8f2d8adfc6ba9898cef3a56711be427db97caaf2594ed3b3d70f2e6ebeaa53015a9cd992fcaacc3fc1d0b7b3e550b1 SHA512 34238b27358485a3e44c9248a072f039126a0984354a7d51303521e9f48af660417a8fef0ef1357019a135c8660c490605f5d1eb7d0b235a45535201366541eb
-DIST genpatches-5.4-75.extras.tar.xz 1772 BLAKE2B 64073a8352dcd26668abacb591afc4f9452d071682619ad335cd77a71c6a82875a189e3d1e5a005da63b81038fe5b7667b282301b3d97f8f218c9ab7d37c02d7 SHA512 b43853961b1b60de1f1577de46d4bf1f650ffc96e46a64d6a37fbdebfd76cd5edc2847ae350ed6eb463f29cb55846cc322744918d5a59a21814c4a7c41b0d795
-DIST genpatches-5.4-76.base.tar.xz 2688764 BLAKE2B 1beffb1043246ec2e855e472da7c038b8a0d1a0e2dbf2b3a41e3139297d0fddffd31cba5338abb8494981f90f963a5f39623a3f638f85d1f10d8fe3901069bae SHA512 da3757d7a831cd9693a06bab9d0df4e9ab02d95fd8ad28ff725798a58a3b06aa036e3d9664ec1dc6f44bdc1292d0c77b57c75a1efceb63059a6640ae8c963bd6
-DIST genpatches-5.4-76.experimental.tar.xz 6696 BLAKE2B b46c09ad8afab285332bba1a67c3656d3ed5478af6273d1e5ce8525e9bad255b0979cb77f4b3927a472caa9760d3716c5be16f1bf5bc1fb9a2fa5571b1e7791f SHA512 2473c8c51bcf66db6fa69cca34e7bf58697aa5b360f14f65f38ecb40adc3e882f05bcbd350e4032710bb8592282c0be25b8b786c6563abf1aeb42e173ca9081e
-DIST genpatches-5.4-76.extras.tar.xz 1772 BLAKE2B e03408c3e8d8549ac150268df059c8a12c30bd80c591fa2fb3e9672d0a5df74c8d277ba4e2ca9afbd361fc9a59fc3cf934c634af4a56fb7d4c6c347d6e6efb71 SHA512 19c050f98ff36e27faf5404aea25b5d6fa8e4762a9ac69cee9e177a6e056f53c566dea44860e0428b833b48ff6ee4bae95a2057af4564f2877a4f1a6d2909830
 DIST genpatches-5.4-77.base.tar.xz 2712444 BLAKE2B 358bea510b894012d40bc4992ff04698c1bc5a9b3baf5eef7aee28bbafa8b8774f46d113134774f183d10e18ff7d57998989f11da068a06f0bbb4e437a8e6137 SHA512 a3fed2a4c2a547a7a97af94b68dc426e709bd1e7780fdaaf7d3167f81052062a6c9cd40bd6b78e4c97cecac1f3e02b1097a268f39453eed46a5f2dd85d06b11d
 DIST genpatches-5.4-77.experimental.tar.xz 6700 BLAKE2B 24aa7deb0240674f98c92c5139092d0f980e89bbe6f08ac929591a57e3c0b7b3232c1fb841681e5ab735cb6aab27108b42b6a97d2a0ba371fa71561028fd0381 SHA512 ac5c0d199dcf81d9bf4e92f89a269a177107fb2ec172a708919c3521f26446017df4af885e4e9bf574f1ba88591f851e05f9e644c170d3f67cfef8905f1fc6db
 DIST genpatches-5.4-77.extras.tar.xz 1772 BLAKE2B 8a33792ed12e88de1eac2908f0bbfb71085a1a6a5daa35e0904f23cab1ccbfff1ebead1b0a8c66331aef787aacd8d96765dbd5dde5de840a882012386b3646ef SHA512 69e36e134a9b635dd1b7eda48eb87eaf1f85456b7090bb7dc9e0cdd7cc80b1a840a68a77f0e42189fb3c9c584c64a0a58d6b8d1ed1c5eeb197df78b06744d2fb
@@ -94,21 +67,6 @@ DIST genpatches-5.4-78.extras.tar.xz 1772 BLAKE2B 2b1790308dfe3bcfbd74ff7293fb08
 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
-DIST genpatches-5.9-1.base.tar.xz 4004 BLAKE2B 8a4577d42262fa901186acc60d28221d00e5c9140886705f018d9989f818d96ee4d9a6586b292e7b1d945bea9e2408e3161a73e0999defe1b7f99d0a339eb7be SHA512 d6ba1051f9561aa30d7b196336c34930285d613e8119b152f1d6cc447cb22db5ac07c25f89d4ceddf58c9370c42699d0250a31449be2da3c591896b0c87d8718
-DIST genpatches-5.9-1.experimental.tar.xz 5832 BLAKE2B e30f5392a003c9849c10abd57a746366fb5f5523d7f9aa25fc0b9a3e514e2204979b99be0cd370aa04ddb3efe746e68e92bc58da9e2bd8194b0cfdf29237dd49 SHA512 c16bc42c7944ea43d8bfdf4866fdb0b3fc6615c0c26e5736b3e828b4214855f301e39ab27dca211675860ed3a05b7e1ecacc49cdfb6c7a3405fad6f11d762f99
-DIST genpatches-5.9-1.extras.tar.xz 1764 BLAKE2B 32d29f0448aef113ba9c9591c5d3b671d00d07abde9f35f365b48168887913bb2da95a8a52b852453307cabb111115a26178be4cbcc016e53a26a31f783a9df7 SHA512 df007dc98c1acdd31773f7dcf8aeb22812aa55e5593e8509b6a8762f2dcf06c95d69ad7cdce992e7a5fe730754bef26242acdc4e4da51ee29206fabb86c9cb0e
-DIST genpatches-5.9-2.base.tar.xz 9332 BLAKE2B cfccc2ebc7e067c7326f95627470a01f818f3c64db87ca26406bd3fa71429593a4460cf82d5891961eee69cbce667c850439f512650131013025491804486510 SHA512 af9c158cf65c5aa5d678d4ffeb7395051a9706521684f3a984f47d6ad581652978eb8f0a4de0132a3603b63fa7f34fb8b18a76bca5d4d312672c89f3fa221fa8
-DIST genpatches-5.9-2.experimental.tar.xz 5836 BLAKE2B 5a6d167e4a604dcb7828c05d638e90de8a6fbfe0fc549b545a96e31b8381d8eff9409e19240ac832f64e3796b307dc698d05e88f4081732c9955181329de98fe SHA512 829de84958b169b6ed870cd092ebb5251133a407e87a82d545a92ecd4513ce463915d67e8db4812d0620d2e372dd93c7a6b04ffb40b93faea6f2a1c8b53c227a
-DIST genpatches-5.9-2.extras.tar.xz 1768 BLAKE2B 1e9312bc96d30b85ff628a67bed4bf2ded3eb2231d804158d343d64ce6a1be3d313bcdf84406cfa34045df9aa239ae1ed476f838ff466e0df96b60b28caa15b8 SHA512 58b19bd67b573657c44861d65792fb7fed0c430a554e95b2dc41a3f53ec8a50e68f89130a68ae0167de9ba98076326ae843264d76a178efaecece90121d0f337
-DIST genpatches-5.9-3.base.tar.xz 237460 BLAKE2B 44d94786733cb0b016448002e5ed8792285d7b53751d460d735f5175491f6530b15144daca1cf599a4cb492244eb74e252563433a1bc77dca34000e26a736c71 SHA512 84a0311d6c1c53c73d79409d43e6aebe600ffca76da077885d76ea7fced2c23f30cf06a5c60d8d8657d3e5988cc5cd0192f68d582f458ff3de3a90744e8d31b7
-DIST genpatches-5.9-3.experimental.tar.xz 5836 BLAKE2B 6ad388a314edee4f65f451f0d0aa82751ae3373038f450d8b30f3d989a04ae73f6d1a1ffb87d41b96a8dd710483c33a38842d05250a38346d1d31f5336d2f039 SHA512 122441698217d4c704a0d3f17c6350d85fa1a9ec7a63c07400577554dd1a3b04581084d1720167a85d098cff2c41334850e885b9d3eea4baab8b9e6f0e7b2323
-DIST genpatches-5.9-3.extras.tar.xz 1768 BLAKE2B 4e2b8011a4c40878fa51b3155fc734c0b5bfc0db25c384d9e2b2f3136dc29c24c0ce547bdc304eec096f8350ba2e0775c501d5dd94d85ca8335deb5517f9b772 SHA512 6bd79230e0b7e1119cad942d74876d736140a4e3d228fbbbb736da5ac97977fb08720345c0de93b7cd03670d8cb074a0de44ec0a2fc4cf8d8befa408fe716bd0
-DIST genpatches-5.9-4.base.tar.xz 272152 BLAKE2B a923a35de860d55673d357ad03f8836096d91b5444b79d725c681d901b627a7ea8330ebff03475d404d50684ffa1cf7f36c23b91fb4a015dc6043b6486596c2a SHA512 77e52da63576dd3dd3ce56edd2f178a841697da1290136aec7d35487a37724add5058c94ba01400d06a54ab687e261a49bd94c74d38fd73cd62b2c81b5ccd35b
-DIST genpatches-5.9-4.experimental.tar.xz 5832 BLAKE2B 8e2f1476ad7d4837b0f1775022415e6a5c887329cc7a70fef1b5d2c83e4688a32b5fe4c154068e34d4963646096febde5aee8e0e639595c574434efbfbbdd11d SHA512 560402a888ae50703b3d34466cb238e7da7748ddb1903d9858f91ce6b958203ce00541469984ced5eca0e80229f597c35fa657e4e9bc1671ed188780a511ef7e
-DIST genpatches-5.9-4.extras.tar.xz 1768 BLAKE2B fd99486c51dbcdac888ea137885945f7a468886a47e3931ebe26ace3ca922c83e7081267804a6938d76d1e65335d431bcd6b06f6118901699f1ab17c109814a0 SHA512 c5c5265b0a61ef24dc2a596280c026a98b1898ac8dc535abbd213496a16afbca255955ab546a86527c6cddb693c491f5b108b1993297d1b768badd0157cd3b07
-DIST genpatches-5.9-5.base.tar.xz 272356 BLAKE2B 06f9967bdf454fd53aed3a0eddd800c07087e36f055817ad257268cc3cd521a9a9c78f45ef308c6301aaa3fecffc24c17737e4951f7e2bb2c47ba929db79817f SHA512 74dc74f32c332e8e7b0ecb7c9cda10664fb1df189d81b9602625e8805c2d9db4213cb673fd9ae3e03694ff6d47dbe0b3b79a1f21d01cd29f27c28ce8c98230cb
-DIST genpatches-5.9-5.experimental.tar.xz 5832 BLAKE2B e79888b9f3f30b01eb119d2196322086c214875a49323b12bfa6a6f9f46550d23b6803ac9351a743bea5ce1867a0d4ec11d73f9a64cd45afc58368cea778fa5b SHA512 1c82d0abe9aac5ef49fbe6e04d0f5e205c138662c30d37662e2247725588e696685f83a037a45e4e189594c2f9825bfaa0e94def2ff616265dad734e8790275b
-DIST genpatches-5.9-5.extras.tar.xz 1768 BLAKE2B 1c72024bc375ef5b79043b0c3e48f790fba8450981143f8702e1fca34ac985275ae529bd545811a5933cdba47e73f50d95873653d4d45b68d06b8daf7ed3db62 SHA512 ccd73f6052b27f9a9da26539e811f31377e5ef90c1dd1adad2c69aa63b0ddc686da9b75df3ca0ffbbf1f2dfeec36cc15cfc68329bd531367a4d886d4e4e78d89
 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.198.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.198.ebuild
deleted file mode 100644
index 69a778ba27b2..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.198.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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="208"
-
-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.146.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.146.ebuild
deleted file mode 100644
index ee5c91541baf..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.146.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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="145"
-
-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.149.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.149.ebuild
deleted file mode 100644
index 70298a97d08c..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.149.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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="148"
-
-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.4.236.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.236.ebuild
deleted file mode 100644
index c702807ed9a5..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.236.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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="237"
-
-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.9.236.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.236.ebuild
deleted file mode 100644
index bdc60669579c..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.236.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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="240"
-
-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.66.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.66.ebuild
deleted file mode 100644
index 269e1c091494..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.66.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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="67"
-
-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.73.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.73.ebuild
deleted file mode 100644
index 5dba2b8443f6..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.73.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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="74"
-
-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.74.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.74.ebuild
deleted file mode 100644
index a25c7b865671..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.74.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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="75"
-
-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.75.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.75.ebuild
deleted file mode 100644
index 5cbb604f8c2f..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.75.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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="76"
-
-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.0.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.9.0.ebuild
deleted file mode 100644
index fea2a5661dd0..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.9.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="1"
-
-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.1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.9.1.ebuild
deleted file mode 100644
index 10529437d25f..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.9.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="2"
-
-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.2.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.9.2.ebuild
deleted file mode 100644
index 94299509b1b1..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.9.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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="3"
-
-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.3.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.9.3.ebuild
deleted file mode 100644
index 06f9cbbc0300..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.9.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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="4"
-
-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.4.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.9.4.ebuild
deleted file mode 100644
index 395a65af17c2..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.9.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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="5"
-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/rt-sources/Manifest b/sys-kernel/rt-sources/Manifest
index 4ecb5d0970ba..d551658209c8 100644
--- a/sys-kernel/rt-sources/Manifest
+++ b/sys-kernel/rt-sources/Manifest
@@ -3,39 +3,40 @@ DIST deblob-4.19 145341 BLAKE2B fcef31cc3ff32f337ed247ce9b8066b4aac3943a9b9952ad
 DIST deblob-4.4 137370 BLAKE2B 05f96867d5e50e4bc6ea8073f6f0400c2af27bd920a7732f9a9b30e7d1181fe9de745de239b2c5cf12ef647adf1f169180627fd71eb2316d994488fb3e799ca4 SHA512 ea5f2f2cdbc97bdc90c2131f846761dc1630a53986db10d8e9d07d1ddee12a9d878c57790edd3ecc75ed9792d479b7b726c39d688a3926e850608c81b1b78a3a
 DIST deblob-4.9 146273 BLAKE2B 8bc593ca375e003183dc6260aab0b2f81675b0814ec50fae3afe5d4ce9ce41c1c1401ce80e1c285153f610f8f730f82d6ad03e2578c792fd4af8779f2d1e3079 SHA512 3654b28e72b343bafdb38de10ef0c3621db0539bc0e7434bc99bb8f8ed911d4c9e53ca4785fd193fcfec369328f014fa5c6f3bda51b6f1a8f98b8c37ece119a6
 DIST deblob-5.4 153051 BLAKE2B 270a82ab6a08c629eeaa8d728dd7a37333e502c285cd29db51f2a9d8aba76fc8f1fe7976deb8014a67749cfda94f6e3dcc7275fa25d955ddf0aa665b858416d0 SHA512 bbab9fbc49e470622316074abc193a50f8726e5cdaa4686813dfbfdbeecd26e841f6ffff83df642c8c033a3b892ad0a09b83fc0d104f37d324742c61545f8e66
-DIST deblob-5.6 156448 BLAKE2B 2525ebcb7ab71fa4b79fd278afcb9f86dcf8926132b99b0a3e60b94ddcec9ccb86bf1c8cf193dc8f29619bfc2a507b3943abb37909c926ff0e2811811116ab98 SHA512 2d60f695e7efc90ef6ba81b63620a12c64205f7b9452b05117b7748a5497deb12d3153b4f11c253b0b68bda8eb7f9a2aede8c48e4020946387cfc6ac6bc83869
+DIST deblob-5.9 161628 BLAKE2B abe1bf08b6b75d4c5a42cf6ebae3343875150ae1361bd584b2f605d590d058e47c9411d58afbbbf083e47a38fe6233e5967f76451c33f9670ec62ff8a90dd305 SHA512 c99ba3f6c82655f125630c2ae92a8871bbf0cbc4afb7121b0169018f518ff558f1b986f8d4f9a7ddc0556768566491bca092c30572ea1260bedc4df01e21e6aa
 DIST deblob-check-4.14 755969 BLAKE2B 5573bdf913554e23dba3d3c56227a2c8c3fcfad7f4a99e1ec9208171008b5d2d50bdc55000672af95e020ef8171325b9d1797a69c988b4df5b0f71bc2a186fad SHA512 09626864cea33804d3dc94ceb691b24b6c14d1b9531eee8e745276dbc403903d762b1f75d685bf831f42b942d6f7ea265efb0d4889fecc976d95b11faf843fd3
 DIST deblob-check-4.19 787042 BLAKE2B 16b96486ebd3c9ee23667212124cf6892d83dcde2e160695d62806d1e8a0815c7e6879cf6b75e5caa72c3d8f2c7d172092ca3bdcb834db834497e758bfad4682 SHA512 a12402061d97ab993f91f90ee03d5673343826b4f099514e2ffbd499cc730c6a8281029e4883d0b89d5181f26eb5085334a882b97fc7e04d7232a37b174807a4
 DIST deblob-check-4.4 694225 BLAKE2B 9369f81751bc80d97c37a07ce92628d212185a4ccd1b1d4ed3b21972f4a135e93910271f0e80a35bb8695d1b9ef6d30c8d303abe51814275115735a8043ddc21 SHA512 6554ae567566da4d30e94a37622f88343b8e96ab39a9204fee34de4ddb5dac8c4906b25843b63c2388d03a4441821c25d395b3c39fc875c498a69e677a4f0cb5
 DIST deblob-check-4.9 717834 BLAKE2B f2471b45f6953ce83c0819b9157ce638a1d93959ec4074a329766ecb0c3adf90fd3022307ea70c2cb3bd3c291f98d6153576cc6597c62ca97abae6524b98112e SHA512 46258698f1c574b44a8c5c78cc2b7fdbaca746976266974ee0f6787904531754b17ad15d542b68e07d4633ee91a8e2d9c32a991ea214292ac072c4f26deed9c9
 DIST deblob-check-5.4 553846 BLAKE2B ac834b6c4820c573c9c857c4281eef29c4721073e0d015e08ebca7de6b480b324255c6643c67f743bbdc799c57642b8bbc19d4f5068a835dffed447d86a45bd2 SHA512 2f2ca4bf08eb55cf3a1164917bd7a54b3133b43393da4ba030c397b5a8a65464c0becc2e44ae8683612876956ab9ec0db0b0be0df0dab3a08a1b57d3a3d1617c
-DIST deblob-check-5.6 568174 BLAKE2B bf77de1620b4b23aad5be27ad74385b47bf83c68a89f5419787bcbdfc8ec1cf8e0c6941e76fa1b3dbea2b91b0f15e690f0a1495adee333f42cc6afe3fc2f1787 SHA512 a0f10423eeeb7c0d13d7254fe73904a483eed089f1d64665848b1233ee80fd830f49d0b4ed45c48cbc020cfd9129ee495efaa86730f99ac86da2e76723490d0c
+DIST deblob-check-5.9 590308 BLAKE2B 58bbd5871478bd754a2aafcf3e5c0becfc615371b08dcc4ef4afeba4e8f66b33b1ae52a34a4a9a84389ff368f9363e25746a11e82fe4c970e9986cf28a0525be SHA512 b5f8917b3a72819d1527abe0e3cd0b1f0b756f9c034f0468f5acf8b46b4482c6997b5fa6286db21031edb7c8e7ab16b35828e9c10ee995e53ce167ee248ed824
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-DIST linux-5.6.tar.xz 111785252 BLAKE2B 8dbe02a8ca7fd3dcf512a15c5d8098c1e7f94257e65173fed43fcc45480e4ab790df8cd39bbbb4e2a21dc9a00385bc9bbe98215a31e7f7e1d9c8f21cd8ace69e SHA512 80846fe2b4e4a7ff471d2dde28a8216ae807a3209f959e93d39ea4fc9a189ea28ec3db9d303b3fe15a28c2cb90e7446876678e93e23353c2d6f262e364a06bc9
-DIST patch-4.14.192-rt91.patch.xz 238756 BLAKE2B 8b9e825004099de7ade0c6d001fa15729b9901f44f78e4633ba0b2f0b828dce6f881436e457c13bba302ae7a2b7e01fc0ce8f446119b9cd6133cdb30f0b8a8e0 SHA512 af25114dbbeb0afa6c8bc2988d9da75ec4fa8d567f1f2d566de1e2fa3b062762e25261c462b3b0ac55cfe557dfb072960797c85208b7cd5b5ebd2859df09c70a
-DIST patch-4.14.192.xz 3782532 BLAKE2B 92ac9769f5a571e46ef47dcb95ba0f7f879d446d0bdc52c73237088010879df071700a8a379911e440fd392b36419b7fe561e705d0d3d2094a980dc4502b2a27 SHA512 22baa0a3883808c35989e3a94fb33ff9f35e2bb8c4e0693540728f37d1ef6e0d58e825e16457a7f91bb35661aff2a42d8756239c02955c550bf93ed9466f5982
+DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
 DIST patch-4.14.198-rt96.patch.xz 239368 BLAKE2B fba8764f3a2329e4827299fcc434b43670853c6912245139c1dcabd6eca045bac7fa1ccb36c67a9e1536b92cd186875d4b376507e59100a60e7208779fc52565 SHA512 5acb0668671c6c6cdec4ee2dd538ede2b00d69a9e92bad9c281e541363c90c7d704cbb836bbe41be9c1b91137ebe3bd58d2a7f3949b1ce5d78901161d4b75e23
 DIST patch-4.14.198.xz 3875392 BLAKE2B 628d389904d9e3101749cdb207bd371f59cfa139124b48b10f854dfb1a4ceeadee870d8a9ed227b0508b9e9d41881f1a43168fef3b460b11c7832b1d48ddcd04 SHA512 1d0177cab6c17eaf5541027d373ee9f200237b22dae62611d96a7a65121bac770de6e9cd8098e221dcaf18fe77967c658c3c2283e1e03d212137008540a0458d
-DIST patch-4.19.135-rt60.patch.xz 166036 BLAKE2B ff4afa1e31a1e5ed1cdc15e8dfc5c9991546c2a58fd172a1222316ca94427fcfd140eae6a00659f7cfc4c84c3bd49998b62de1accd5bc8741369255ee49b1447 SHA512 7a230226ce1252dcab535c0d1d7cac5c0e100d7909f72384ea54c3677e6d15b390bb835cf844c0e187682ce6c4516e71582898a0ccb1a5c06ccf77238713122c
-DIST patch-4.19.135.xz 3269016 BLAKE2B a050e0058a62495d6ee78c72797dff092fc5eb27f6a3bfc2e7b3227869fd255b78feb3b47c8d3be0555a40f8f2f88e769b1a2390519109a69b67288fb82554a6 SHA512 5e69f2a36718f3fd2cc0a75cc7a0d3e67c52692af3c917c97ed248840191900257650e1d3fa0ca49365e071b4b20331dfcaa3cf5d390623af622b416618516a5
+DIST patch-4.14.202-rt97.patch.xz 239368 BLAKE2B 8d416cda86191cb6e94ec5285cb2d227fc017179f62ea9d1f959900154558941d3f28592b5c4ab1076887c4a76af8f11615b39bb791dfd657e3da5f55aba4289 SHA512 53d109cca4048331182c5748c34c0551ba7d1a073835b98ebeb19344368bb16928c5fddf2b44489523db0a126b8ebcaa2dce427a6d315b5bd7a9fee9d5ed8aa1
+DIST patch-4.14.202.xz 3939212 BLAKE2B 790547986096a295e289c317478b1c3f7437a6140186dfc9634b229952126142f32f08869d933b1ced325d5be196d761a7f6234b1f67123fc1baf60d00408389 SHA512 432ca3d6798d8dadc9cafe39aba838fff29c1ab6051320012bfc0e0f7301003b6795daef38498784867642b89e3f2ee8ff7fe60bb386079c3d15a2f5898136c8
+DIST patch-4.14.206-rt99.patch.xz 239588 BLAKE2B bb1147d18a5e3aaddb6f00acca00cc7f13fdd613c17ca73ba8dd758a151b0b2db893aa27e49ac7ef737a25e98794cfc010591aad48de373875cd390d5dd6a6bb SHA512 55313271d401cc74ed5b75866668f578e3bda9756748b30920e4c555407ef899717053f6936835fa95597235a477f462b8f6632c4d5e38324f766b3490f015fc
+DIST patch-4.14.206.xz 3995304 BLAKE2B 28b9577ee7bb1f0e935482023ea660f788f0aabbe0e3be743075cdfa4fe263c1d1c50e99a7f7a27fd670820756c5a8c60667a1687666a4b29df790dc37360481 SHA512 5382e138db14e9c6e053ac76ae3d3ce6114ebaf4d0b0588a297bcd358be8c60df35535cf97ac0ae62e9f58673a3ad3fd07de5c2ffb6f0a638624f05cea209bc6
 DIST patch-4.19.142-rt63.patch.xz 166960 BLAKE2B cecb50e9c97e7e836346269a6aa99e893c9f7f616974fcdad0d1ea66320819bf97ad67a3bfbd797d3e1ac256b476a23dca2b7bb2ea45163e81e4dcab894a5c64 SHA512 fd98c14775082867f01ea435c978ab6a6ea25f5e14242731c67e3f9a3cc1b1fe502baabd81575b876ff6914d131a9ff2dce2b9cf6c76d470df05d2aad0128c97
 DIST patch-4.19.142.xz 3352568 BLAKE2B 11b0bf1ceab34dbe71fa32aea4a5540aa693f35deca8a24a9950534b98706d087570d37861362298c2fa25be10ad9f22c0e1fe2680dcc324fc949d44ef192393 SHA512 8b491948d4cee3527eaed98d0e1c5a0d2a707461dc0dd6c658a8257772767780d397c8fbefbd012f564638c549bc658db0d3ee875945838147fd94c455b14fab
-DIST patch-4.4.231-rt202.patch.xz 195124 BLAKE2B 4eefc64ef491054092078edd764cc376793fec9fd6e1f88c1fd06abe69c59418e29f6b4c25668b711ad7683b8d8518db89a2eccb9785bd7f0731ee8340193abb SHA512 55c06564f0dea80dea8462be653c28bafba7fcdfd44c774f348aaeb6bf84cc9e88985713a4d8c48c8d257045f710fde46587ed336c62d3933b98c798e9f6c41f
-DIST patch-4.4.231.xz 3240736 BLAKE2B 75b0c92171ec12571a704f817c2d020f27dd945b68481936c0d3cd9332cfa44447aa85630f60685805477cee61c8c6ed894b70d5651afea1b8784a28eb0d32f3 SHA512 05884136475aca92e212866908afca8a5fffdfe7d1127fc64a5b60dc638955e92c94509d483d7e603ebdf466d85646083fc7ef468a60b4c096d48d5a38786f81
+DIST patch-4.19.148-rt64.patch.xz 166984 BLAKE2B 9697dd9c551c71a5727b9b6d8fcff6d8dd828f8c385e9d5f0e6254ac20132677787e9ab111e25be679e1b73f345683f5c4d78b99c24b8f92ffa3bb8176195131 SHA512 e73b346f0b89aa0c9ffcf7e525cd7505bbe4e139760e7ac9b0f85aab82e39ec7ae3191bf81642587b338b6f325f91701f0136f03d62262ba839effe6371f2ec3
+DIST patch-4.19.148.xz 3434156 BLAKE2B 8737101044c2dc5400b64c61f9589a10b0af3eb862cd439098eeb6d2cd0645676f93093549494584789e38786dc19d1843fc5136187797abe6b3bd6713aae721 SHA512 a8790ae1925d1622f469e975e5da3baaca6204d324f5c981159d19011f77df51a600ea76e1d6da6f2bac6e9c1c2cf1b64f0df5e7e288800ca7451195be6146a7
 DIST patch-4.4.236-rt207.patch.xz 195128 BLAKE2B 44ee1bbbb30fff893f39f4781c9749c659b744c3809d42f651aba32531c4395c4542128c4febfa3f253830379db0b11c993a3c251d258365d8eb10beccfe6a95 SHA512 234ae42293c04c770f4547ab67496851a14d9b1a4ce27ecb61d2489842553a0f61280b49729bfe9b07451c6968398fa7484979dc2a2e20d379ef8075b3da1213
 DIST patch-4.4.236.xz 3307884 BLAKE2B 6b8dcdf38d069a77204af85788bc3307ad022f6511802ac26b3f3aef3245852849d124bfea87ebb7c7226fbd9ffd17d5e3eb1c3e04ef049559b945b27b7e44ec SHA512 9f2d99302641cdabf1a99b710bf4f944ff9d8fcdc4d9add4aebd1250ec559a38ff09352b87250cb216ef052cfabaf7c03afd1636bf7cf5e4f400174b97c81994
-DIST patch-4.9.232-rt150.patch.xz 175296 BLAKE2B c4b0e268e6dda8d93271a895dbf7f85e30fe3940b5cf8074b6c12540d7174462a451a8e0309252df013cfe1b4f221d50825b4c669318028f6bc19b4c401cbef8 SHA512 7e71b6ed69f1f8bdb21a07ca7a62e731264965b34d68f35ac8cca62a4ba8e8f26e18929dff5ab0a50f2732dfb047e87789774376c7fec890f4e368ea61d0f241
-DIST patch-4.9.232.xz 3578076 BLAKE2B a1573d0953607b53fa4cab7246ec38da7d9dd4d45aab7bf8b46b54fc460f57b5de2a423d3fb8784ed1b9d6c753a6d6e7842739d010ac82e009b954f0098fe187 SHA512 4058a3f6dcdd11a89fda652f311a5bdc9d64484a735d334fcb604ef8b71fa9fda373433d14bfc6680065c0143c55d571f20d8bcab078742b5eb3eedb81e27810
+DIST patch-4.4.240-rt209.patch.xz 195156 BLAKE2B e05926078feb42e2ffe399322f5af983c65cde172b125e9d48fe6c48fada9d3574306b82e584a74adc2375cc666a45e0aa820c94b6d88489a3926538335fb301 SHA512 1396b23ac6e354d9b98edf75aea6c8000b059c4249ee391829179e88852152780c23087b814b550c184940cbcd236dc2e4b43ff13c02e8c1aa04a1ea124556cb
+DIST patch-4.4.240.xz 3341984 BLAKE2B f4f2cb343e399236a93bbfdc5b9bd033bcb5fac99aaaa3f23bedf2b9e5f00e21d82b741dc4005dbb088da1980dbd4e671c5627bdf87c6c61b9981f442d1d83d9 SHA512 b45fe43ac354f2bb70db06948b3ddc8555f28bcacfdd86534482ae379654f91008fbb03c65ee3850d117b2d7b2f655d93352f08b7c289c0142e5fd584b7aad06
 DIST patch-4.9.236-rt154.patch.xz 175384 BLAKE2B 789f388c3ab7bb86153191fb69bd75efa433537a6a1a1d1e13e2ca4807a65529f0760d3572e8d078662ee2663d4fde2081e9c443c076aa23e5152b5c3d3e9ba1 SHA512 9039b7346dae6f55cb4f1a029e08919cdedac00320bdf81288c9366ab17f6b1c2258765e30e1fb2b1d5df97d8daf982a3f43cf39133c8a03fe8a3915f11418e8
 DIST patch-4.9.236.xz 3659472 BLAKE2B e874b1d68b707e93a1b34f878df86dc51b8cdfa0c1700aa1ebafbabf0069555f5f7cce0c07805024c87da19d71700fba9a6c49d28a7c4448a17d0d9929d3599b SHA512 9c22da1895a6dda8de4857b739c9d12a9c1b73ab0c4b29a2b6c8793655ddc67b0d0c96ec2cbafa4ad86eda93382a47f67334b48e438c562e264b56718bd7069f
-DIST patch-5.4.54-rt33.patch.xz 182260 BLAKE2B 82e334ed77aae742974d3b121b9e787efbe17f5bd32949d1fce4afbb58a14ccc8b9c8f0a92949c2de907032051e274d56134743aa81354daab06a62a69beaab9 SHA512 bcebba6e88ed0dacfb8c7aeed8e8a822316ecb05112674fd6195dd5e210345e4bfd42683748bf676b8238fa0357b2bb49a25b877876c7097ee941e500b07b607
-DIST patch-5.4.54.xz 1730872 BLAKE2B aa736c718423c7c6f884b9a76fdb1b24ed587d9b2c103c39f312ae1910510f592c43bb41d4273904878f5aa40e907674bc162466f719250ef38923ad896cfde8 SHA512 bd365f01e5aace4fe6322d7ab7d93df93779c1e1520e650d39fd49802dc3554b89c889830d112e19b6ce531d00bcef77f55f4a4d36e5e84224a11a1205e43789
+DIST patch-4.9.240-rt155.patch.xz 175372 BLAKE2B 807205cf1b22c5da138fac0772c881e1c162ff66f6872fe497b643105573db5bc48c98947f65e6e945b46ffb865c4abe9c2ce9aacb093d7a4ccdd686e6573e04 SHA512 b50feb8ee9aa7dd8af1fd01dc0beda4a0a71305229145a6b21797bd63e3683085c2893c4ccdd67ac451c66c44c758303b2792516413b69f844441956280df4ae
+DIST patch-4.9.240.xz 3707752 BLAKE2B 58cf04060dc286f38895bea9339d124983a37878f687b71d38c28aa1123a3e0889f46d4e96605d3ae69257a8d7ec824b85a835e463214445c363065c4be5ae8e SHA512 b18824b1cc70020ef0f4000b4c152297a7424b31075aa001274319a0b8e3d6b6407193a903b3af56bfe8b0dc12be68673188de90aaa14ba13670c0669a8e7557
 DIST patch-5.4.66-rt38.patch.xz 182228 BLAKE2B a601bd527cb3c7d1fadb93a97a428feac01263b169ec3b5145880702763e93dfd8879784caa1e8e75604947794bf8283c62b94bba9fa684e55ac164f78bdf354 SHA512 5f47bce8d40389cb0ee5b30211d870afe165e19e315717636fcf5f5ce9e12148cde08fdc9d04755e5ebadeabe0b6dfd589d3de137c7fed303552300d6079e8b2
 DIST patch-5.4.66.xz 1986812 BLAKE2B 8b3ef7187ada5046ea6c96c20352da42b97ad42f6b85aea9c81415432a04d11b62053c35469f7e109402fecd224cdbc1699498edd23831f424fca2bab0cc2841 SHA512 df326e30c763617cbe4be972c4a17159cd22028c5b0f8de788ab89ba98af728db036effb6531237285576d82d7557cf7fcefe5276f54b6cf13a252fc395fe949
-DIST patch-5.6.19-rt11.patch.xz 169352 BLAKE2B ab6de55cac59c2bd2d29009aea8db129c85ac0c816186b1c8561062f49eb91fc384dbad6003e4f4b63989eed6e614116ce189270d2fc7081b89d031c8af1a0ee SHA512 522bae99bbfb272deb71700b0e3bb5bb8b43253e8c94ff6fb902d6584ea54700722afede9a6ccb3ba1a6b99eb7f6a82e4872ee807aa0b28cc8d75ab7fc5f3fa4
-DIST patch-5.6.19-rt12.patch.xz 170132 BLAKE2B f41194b4311f68f27cd58e4adadf510e9ddb68fde824e6cf31af9331a3dd3adc5284097226158d4ceadf4c738896fff347d9877e54bb7998e86f44d94025ad7a SHA512 5b6497b1c798358ae75f15b6c649e06a8db6200ce618776ac8cafc4a24e92ad4d257b10f72b8c03ba471549a3320f9a127f85530ad912ccf691538c068a07481
-DIST patch-5.6.19.xz 518428 BLAKE2B f99d824ecf8be4b984cdab43d5ef838bf9da017ee800a1cc09eaf19596add9c1199ea68b0b581e8560a56a8f94ca35b5914a26d1340f5c42c1bc699708e77ce5 SHA512 f967f9ffc12249db757bd38fd890ac69d327f23bcb767ffa0c178aa7e541bb4a10715664d703315ac3b96ed35909046350f97752c2a4691526ad55a9f03f2c24
+DIST patch-5.4.70-rt40.patch.xz 182032 BLAKE2B 0f911652bedb74d40bfd42a2ef0e0b7309c31152f6d94a8cb6c91e0a16e8f5af007de6f3e41145b8c1248aba34f3ee90e024b40558de073419bb70e4d12749d9 SHA512 9a325cbeaa783ddfc3e0ceafecebcf55caf65245d3beeac652db9793af064a0ab49608b2c39371ea33b058ae90fc427aeb6a300e27a716482f31a1c2226b6439
+DIST patch-5.4.70.xz 2131576 BLAKE2B 6d9dab0ec5dc84f1487d179355cf497ad9e16b7a22b69a931dab206e8617cfe52fd09a88ec8fe9070f9735c9f5cbb825c61aa6501d3851c8d2925f849146629a SHA512 a87fffe500b7f0355fe49077b4d80359b31e0721d824ba95135ba851d1b1b747ea9dfd0bc15e6133bc93132df60c4ca9ee99830acb0309866f02f9c88b7784f9
+DIST patch-5.9.1-rt20.patch.xz 162676 BLAKE2B fcfc34bceb60e6d0508355818d8595bd70202e435efecb6e93f87c3bb220507e37e19bfa40e8181cd369a540d5541f7f8d9171b9d6f0cc5b71158366d697a6b1 SHA512 bcafb96c6fdba2788c436701190da21f78159f8f6fb3e0aa082d75e6641f10a5e7c0d3ebd65b5f77e2dc832e0a8cf52f47af9d3e649713a1030168ce6df789a1
+DIST patch-5.9.1.xz 5652 BLAKE2B 02daa4610b58b5af726b84788702ece2db278c8f2afc0e2de11c465d5e827e745cbb952fc3f55074833d8cf31b4d05f5ae1b2a4ae324b171950090fbc712e3de SHA512 0e0738df04d306c141ac950f0ff95eaea06c65024a30b4f1e3b5f3867b5b022b3ed36898302c26046d1ec1567eb314474fcb2a6aac6d4bcd79d3ba9266d9e244
diff --git a/sys-kernel/rt-sources/rt-sources-4.14.192_p91.ebuild b/sys-kernel/rt-sources/rt-sources-4.14.202_p97.ebuild
similarity index 100%
rename from sys-kernel/rt-sources/rt-sources-4.14.192_p91.ebuild
rename to sys-kernel/rt-sources/rt-sources-4.14.202_p97.ebuild
diff --git a/sys-kernel/rt-sources/rt-sources-4.19.135_p60.ebuild b/sys-kernel/rt-sources/rt-sources-4.14.206_p99.ebuild
similarity index 100%
rename from sys-kernel/rt-sources/rt-sources-4.19.135_p60.ebuild
rename to sys-kernel/rt-sources/rt-sources-4.14.206_p99.ebuild
diff --git a/sys-kernel/rt-sources/rt-sources-4.4.231_p202.ebuild b/sys-kernel/rt-sources/rt-sources-4.19.148_p64.ebuild
similarity index 100%
rename from sys-kernel/rt-sources/rt-sources-4.4.231_p202.ebuild
rename to sys-kernel/rt-sources/rt-sources-4.19.148_p64.ebuild
diff --git a/sys-kernel/rt-sources/rt-sources-4.9.232_p150.ebuild b/sys-kernel/rt-sources/rt-sources-4.4.240_p209.ebuild
similarity index 100%
rename from sys-kernel/rt-sources/rt-sources-4.9.232_p150.ebuild
rename to sys-kernel/rt-sources/rt-sources-4.4.240_p209.ebuild
diff --git a/sys-kernel/rt-sources/rt-sources-5.6.19_p12.ebuild b/sys-kernel/rt-sources/rt-sources-4.9.240_p155.ebuild
similarity index 96%
rename from sys-kernel/rt-sources/rt-sources-5.6.19_p12.ebuild
rename to sys-kernel/rt-sources/rt-sources-4.9.240_p155.ebuild
index 12c5881dd444..8cec2aef7c8f 100644
--- a/sys-kernel/rt-sources/rt-sources-5.6.19_p12.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-4.9.240_p155.ebuild
@@ -36,7 +36,7 @@ src_prepare() {
 
 	# 627796
 	sed \
-		"s/default PREEMPT_NONE/default PREEMPT_RT/g" \
+		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
 		-i "${S}/kernel/Kconfig.preempt" || die "sed failed"
 }
 
diff --git a/sys-kernel/rt-sources/rt-sources-5.4.54_p33.ebuild b/sys-kernel/rt-sources/rt-sources-5.4.70_p40.ebuild
similarity index 100%
rename from sys-kernel/rt-sources/rt-sources-5.4.54_p33.ebuild
rename to sys-kernel/rt-sources/rt-sources-5.4.70_p40.ebuild
diff --git a/sys-kernel/rt-sources/rt-sources-5.6.19_p11.ebuild b/sys-kernel/rt-sources/rt-sources-5.9.1_p20.ebuild
similarity index 100%
rename from sys-kernel/rt-sources/rt-sources-5.6.19_p11.ebuild
rename to sys-kernel/rt-sources/rt-sources-5.9.1_p20.ebuild
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 8d16aed6b6b3..503221381a85 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -1,42 +1,13 @@
-DIST kernel-aarch64-fedora.config.5.8.5 215148 BLAKE2B c71380f46c1b37e9e17bab6d78907114369b377bcbdb54afa2c35b6a222937fd061f25309d8de0cc78ef2329ede7192722270acceeaa3da4629a5f58d8fee809 SHA512 e86e2c60e88b1ea5968db1a471d7d928ccb3146fe850f8f2813ef315f2de0cbfa0daa2f6828dee71acb2299f65f05fc0b6f1572a82fb146ae9f53a905fe94e97
-DIST kernel-aarch64-fedora.config.5.9.0 217558 BLAKE2B 38e3c31b710c30d29dbf0b5304c2b9e0615af08ec11a01318bc0c4811b91a0803a96483e986f3dd83369b14e9329bdeb0e0d834761af9a644d831eba43eb910d SHA512 d38d05aef2a809207a186eacc365118d68e7ef82939b45ac5b9038cb493c771f8fa10009a0082f36c79c2e6b5b2ec193a6b1f50bc51a6190b77f57ab7cf237a1
 DIST kernel-aarch64-fedora.config.5.9.2 217893 BLAKE2B 03a36c1fe81a16b434cd94bad3984bf8984808b2e7092089f9a23a565c6d9bc8a512baa4e5754633783ef47feb6cc67010a0093f096e5a15db0f13aaaf6d6426 SHA512 ebe29150ae625cf2f285649984c27246ef85cc13f0b5d4e40dd3ef479489aaa09b6ee4aee859d6e4361dd7e7b4432db8aec077a099a25e90609b9eac2d42802d
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
-DIST kernel-i686-fedora.config.5.8.5 199121 BLAKE2B f6e16e6faac6e730eb4c9c3edc1c173b2988b49fe677d34ef1540541911b8f76e5bdc166327d73237c78c1769d484de18864044c91b7da253795506c674d7303 SHA512 0a2c9abaae11ac1ec2e43da4b53fd1731a9bec983a7fda7b9e20f1d25b816e6b0bd217b255ca95b02a8b6530e923b4fc7de770f6a66411045712e7de61d431af
-DIST kernel-i686-fedora.config.5.9.0 201027 BLAKE2B 1939ffac8baf290e9c0ab6bff25a365af8c674b360e3adc5e9bfd710473abbd38a124f5279b2259cbc0c9345e0ca5b667c67324b194742693561c91528cf1793 SHA512 e5ba77e899360cef9dc45a5b5baf646aed04fdeb771727a6696f156bd0aa8aed4dbac13ffd78779e1b1ac657c1f9569bcb2d0c3bcd4be2063d7a1b68e6aab983
 DIST kernel-i686-fedora.config.5.9.2 201362 BLAKE2B 93e5dbbeec7761d777b8cf8795b38dd6a727f07c58176013dc5d18c60165af21c6e0e9140c7c7217fcc31f9b9a9c959be9d3ef0f853035986605fc513e7c70c1 SHA512 7bb41160333fa0f751c80ec9ad1e49ef991c26e05575a1e5fb41967bd984c91294629d91624eacbbdf2f307a28f9de8c994a9a7bef63cc933b0e13727dd33619
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
-DIST kernel-ppc64le-fedora.config.5.8.5 185766 BLAKE2B 27330c7806923eb4a3346df2abb5f253ca044a02afe72a89c6ce006d149966d65b4ba3e114b5ebefae987565279510c05d33dbc89c36c5e78e2e88732f5125f2 SHA512 8b621e0584624ccc24580951fc116478506a7465715449a53e70f46c99d0210bf08063a4fd5b87e4624f5ce179e6a6316f23723839c0e64e57a2ee58e4de59fe
-DIST kernel-ppc64le-fedora.config.5.9.0 187611 BLAKE2B 0fcf6d09edb2afbaac88e8588bf3f0daba4a6b810ab3d88121c1c55790b8dabe24ab02f9b042b775a909e29d3e43b7cded8120417823712409d3388a93ad5996 SHA512 cb76b2a140a8362c1925a4bb8d048990feb81c625da95f170d7ab986fc0d0cdfaef79acfdf4e5f167fc70efc42da80c1038ee37f7ce3bbcd3782c5beed6607f3
 DIST kernel-ppc64le-fedora.config.5.9.2 187957 BLAKE2B ae15f248000095a593ca67223818379eaec9dc878049eb36c5812ef70bd27bb5159ef16faffd4fa0f26ba5d4fdb907cb8658ff3fc34c93746f04f428d3598d98 SHA512 c331ec3301baeedaefe2e31e3fdc5e9ae48070e8e4f8e3469efb4a9907e4ceaa38748dc1fc99305b630e06c68993007182d3ada3cb9c518a81414b29c854fb88
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
-DIST kernel-x86_64-fedora.config.5.8.5 200052 BLAKE2B be804fd499527a6c6927365c0350b51b3351da9a4e3f75bcbcc44d1a1b21d001d4907e6028ceb7ec6d5c812ea190d369ca6de4ae2c21a293342b6af33b8e5e65 SHA512 40ba21b0597702d3cff9eb3c1fab98784229ba78702bbb0fae2264b145a2e433615522e300cff1f9c9c52067431116b80a8db92e1263bd1a9070adbbd068f982
-DIST kernel-x86_64-fedora.config.5.9.0 201958 BLAKE2B f210399099661f9f643b0b1fe6cfd82675fb71b4c63c8ee07645771960df2936370680e704b1494c6e66ff570a4a4dcd2c16ef521be4a29c21e1b12abbf71875 SHA512 f9c7ed7b9a8c351c841b527c352a72aeb36ed368dcf9060ff2c4c92364419cc256752d3fde76593d177cf40389a2b9dd9ac7bc05462539433d3829a429b74eca
 DIST kernel-x86_64-fedora.config.5.9.2 202282 BLAKE2B 5172fb3f682f912b14c4b2f15e04db4be6362d1291bc03b03352d00224aec387d4fe04150a617f9a8e84999aeabfda51f79e0978998ee232cc1c6f2ee130b74b SHA512 36375384215aef89b52b365a9ff82d732a42336c51e144ddc39b16f1fbafb858bdf0d1f5d06bb4927183bcaf8943caf15adfe2428fafa85db70a198e53854155
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.4.72.tar.xz 109606972 BLAKE2B 90dfea3370a78742c851d7c9ee21c6fe17204f6c6825f82ebef4bf9c23bb59ae62bafc71cd4bdccad151c6042a33c43df8449d10e93f71d41bdfe3006255b5ba SHA512 6f8b191732b1f73249f8d350500ade946f61309791b3c4021deec80e4781738141afd5e4a11d071d329ec792fc87ce2e6386e151417db0fbf344b6a5659bddf7
-DIST linux-5.4.73.tar.xz 109611940 BLAKE2B df2e3af9e3d6605769de7d4fb0a6fe24d259d59e48a6cc4d4eea2dbcca7cd6cdcf36370401fd12a1ecf3da5887e98b20176fb551758c41ecdb737c6e7813e8f6 SHA512 c5b285d5511888576ed775810294f53612f68b834f119b41127bfcbd6fa3fdfd710f56a5589af8a933e6148fed93f4a23ff48ca9c4b9682d6de2e9039c4bd3bc
-DIST linux-5.4.74.tar.sign 989 BLAKE2B 5aa44c868beeb50f49ee0a4be705da864b991d8cf220084106d962ef28038a53edf8f52117e446d68e36987460235209c0f830c5f205732c5de672d1074413cf SHA512 7cb4608aead5b9da74bb05d3d8691ffb5c53842daa7010208cf8750e2733ec7ae2bff1f13f12b240b1e50724c204f230d145cb1038d248f097e5151266463c89
-DIST linux-5.4.74.tar.xz 109609988 BLAKE2B 4bec2074e2f3ac587b35f67531d2a2feaf1c6e76b7c1325a43cc4c7d7171f1a21f2c3f6e3b7bc4ffc64dcfa65633f9f05c600c275063f3828c41028f044714e9 SHA512 1085e2a773ba9d3aa013673c5ee1bd0769f48e3791d0c964d56854f7a8566671147454450600738c83b7443fc1e2546b0dacd3ee92c7572240a92c49b9784790
-DIST linux-5.4.75.tar.sign 989 BLAKE2B b2cee7f5ee53fb4c066d7391ff0e29324962e568fe87de3025974ed42f8995105c8f6a4e189287175b9f948f54474442a002c62a4a82a56ee54246ec2e67daaa SHA512 c9796a7f2703700838b930aeb732b110616ab836d57f13b75f77895c696d2d6098770fc1b928671aadd15b79b8cf87f9937720e69e65e3cee8563593360c9041
-DIST linux-5.4.75.tar.xz 109625656 BLAKE2B cbbf92617f92fcea597c23150527f2c9a73b30b42864c49df4e0fd75c711d355ae3674ea5e2a09f33e24afc95112203134e031bc084280524703b5ce30b356c1 SHA512 532848826931b972fa829b7fb4573f629165e74e2a8257f1eb203097485852aebdab484fe49c46f04c5c6bd2d7e9e522d4204fcf3768e8b40f250b1a4c32ba45
-DIST linux-5.4.76.tar.sign 989 BLAKE2B 0eb77018c8531edd1e47dfbb61d030d52ae3a2927805f02b612d83d5ed98d00aee5d4f0a58f3517fc1b2b6a75b102b232aca2905299499b00f00ffb102e3799a SHA512 723e9bec043e9ecc66dd588a10f3e14f2af1df70ac157aed7ec6a6e9a8551eab96b1da228680be9dac837220b37ebcbfcc3b95dd1a2c30801227d287efb58d35
-DIST linux-5.4.76.tar.xz 109619252 BLAKE2B 9e2bb643dcfbb831c5d725717c8e80922a5f6876c3e02b502971a04ab4fa35819bbb22ab58fabdacf4e288b84bed964780fb104ca954174e2a8547c80bca3379 SHA512 94ba200a528cf98d763bba5839acf28255292ade8305f1d2665f1720a0b6b5d54f2c6594b50357ab59aa6c0a48b065788174b21ca5a8572165ce3c0c1e947af6
 DIST linux-5.4.77.tar.sign 989 BLAKE2B d79c13fa311bd79dd690673f6f75cc308c28aea15ffb5c91b22717cc9c538eb7980dcada74e811939ea440f6b9a4843f9259f9f7d5be9521af2fd52ea676dcad SHA512 c7df7e53d4e463c4c776f3996ce7856f34bc63f1c4e32c58f1518d33e784d496945e394c5488807e9d02e3f51aa21e45bdd12a9a2377ea3ab9ea779aeed1ee1f
 DIST linux-5.4.77.tar.xz 109619220 BLAKE2B a89f698636cb913574dda1be8794955c79ae6e221a05bd16afdf555a3a142679309b0c494912b0020bc59c315e0e793042bd504ff076cd910d36e62c943a4661 SHA512 f8501bac63b8d5d9d263eaebf6ab3d9a70a7c26fa39c186c31ce1936647bb08efb19bdbe4a8f2912c37616d370bbdd05bec395d6d818fad235c38832b9d9cb87
-DIST linux-5.8.16.tar.xz 114513732 BLAKE2B 3f75ba3272a066c55845cf7d5e33f340d76e9b9d024b1d182be4067ba1d621bd44c78ee89bea1f7329b7e83933a23e8ed34e2eda0e415cc3a4b4e6863da2dfde SHA512 7d191257a70d2eeccd5db80ff03a8356bb5a2a5eba1f04acf2558d81fa764d18ef025315e992fe64b62b8ccdcdf4d9d9efe3b35ecf57ebc55746c976b391df0e
-DIST linux-5.8.17.tar.xz 114533684 BLAKE2B de4a89df5ad9d7624b604ae66371a0e799ef2c2c0d23f37eed657bfdfbd772d3499a9b79eb27b28987e1d9a6e7fa757c78d4253a442daa5051dc4d178919ded3 SHA512 6b87381c02612c878d49cdee5afaf4ba986d56dc3d64c024c25f9fe66ab2911ef29de6e45cf2d4c0aa7a417e849df59d34d74ec0a3702f812705779e3d7462e4
-DIST linux-5.8.18.tar.sign 989 BLAKE2B 9f1bc3e72ef5559ad4a473ea6caf51b2ecedb033b2972ab74a293a839f17da7adac80ac55bf84ce81405b21da511a5537ac40271b96a116bd92e3e067fe1c95c SHA512 c1c1dd87f7305ee20ef6e06b89342865aeab672ae725b5f349528ac09b07b9e15816075e37fb5b62a2d0933882b0aec7e835ed96eb43a58872bcaca3ecb03158
-DIST linux-5.8.18.tar.xz 114530192 BLAKE2B 0c5b631b3ab1e00cbec4dc1cf477b634475ed187e19324dfc54f38c36291186a5c3e46fb7495e5421463973fccb98539e39bc06c782f11a018ca7cea21453a3f SHA512 77429204cfb88c6775d911f03b658b62095b6f592421d985daae5da25e9deef51dfb463c3394ea69e5d0861f5c7f14496037cfad3862c9445cc54a7878e9af9b
-DIST linux-5.9.1.tar.xz 115502916 BLAKE2B 65eeccf077194ce03d5dbc1e8ea8f6022d709bc930945a49880fb87d71992e0614cf5ee92eb1b60fe2e3ed41fe17f0c176bbbad5f2cf0a2a349e1b08e6236558 SHA512 96af08c1dc964e5dbb3d221880ef8ca246f13370d2dc2f5ae64039f0352efc687c7446a2b4f86dad553b776ee75f78bbf58bb9bc845c9b57a9013ece63264874
-DIST linux-5.9.2.tar.xz 115519708 BLAKE2B 22ba992df3a1d73fa16efb31bb0d62eacd106fb6f4d6dd1ebe522dc09b94c8df689cdb594ed105076ab5e1be4bd00eb834019dc19b6f58f6bee04f53e5de961e SHA512 98efc0d10e76685eb3280546d8d9b0251062a8ede05959d0de95df18414d2a07ced0a585ba58dd5aad188ad2761d7c5150cd8a8435a6bb53d692702f434732a9
-DIST linux-5.9.3.tar.sign 987 BLAKE2B 9419f8d7a592ea26ced8022b61d04fbc7df8fac8fb5b0df58e97cf63d3ded29653ff950092d61be1211a23b91311fb7bacad7ed54fa6fd3e6823b9180c6adc50 SHA512 74e82b6e495ece56c3300d4362c55b91274dfd97121ce7290901c98b95ddf53c839cd45a04e8f5820865a12462286dd3105066013734e20d851a1498fe26443f
-DIST linux-5.9.3.tar.xz 115525348 BLAKE2B 9f739fe4eb5d6ba38df54cee41d7342076fbd757fd25f50614ff3681ec9ed9afd9a5e134831a64e1fbcf4c31d2436ad2892cd6e9c50f664abbe6dbaa7ef2856e SHA512 5207dfb30803e1daeb4025dbf2887ebd4fa37f1b5ddadb2dda1f2ab1815309ec9d4a9fad61922b0ce28c422f61ef94b88de16c911956734634cc47c4f5031b3d
-DIST linux-5.9.4.tar.sign 987 BLAKE2B ef16d6d1adabac9de4126e125c015cdde190585e338cda2ad9f51dc91c3efe3cef80545c9b2a8f9157ad73ac447d53d48937df6170a62e51db71b48684eb694b SHA512 8b796fcf8cf751ff5d97062b9d12f5750e516e766b1d22d74d2c7c08d7bc02b3d292eb4f81797e76e684f473f9fc13c9b42ee7fda0615a0613d4800aade3c044
-DIST linux-5.9.4.tar.xz 115517728 BLAKE2B 5c1e15c5a31cc80be69f9904fcc2a1ac0eb0d4d75095047698cb2ecf196efc7528efe6be91b6670b27a25eae1ee2065493c4e25ccd7537d73571975b83856c0a SHA512 911e9b437df70f9c092e14f7daf22a62026f6aaadfcb599d27c88aaf8bbedc87cc917cff5a84c3ea3dca9f9a9e094a4228ed4480131bfa8adcf895f77518358b
-DIST linux-5.9.6.tar.sign 987 BLAKE2B c6d3bb933ea3da8e71bf7f954ef7a39cf4172571a0de2126b0270f9b9a30eaba6a8b28df37a828146c1636919214b4fe7258fd0fa34d73a2183ca2112158e1b1 SHA512 21961cc9450f420c7f541b0955bc1a19b5b640a2a3c7945b69be763884aa273e2ec9296dfac93cb9729167f4ac510d356c0e807211a881e82d7d1d711dbef8e3
-DIST linux-5.9.6.tar.xz 115547768 BLAKE2B c1a547d4af558bf364f2c1699e529deefeb5bd9322b7cfe8c034a0414d9e69dc96e27bd4011ce105f02d9787ca0e18e4c3d9c7581ccc486e45995f4fc493d932 SHA512 0a01d7d503959c20a8dd62a3fa1b44b5b4650aac2fdb8f481b81a1321fcf2565049927418422dd1013e2d54af2a0b27a82cfbe8c1cb0843d8b840adef45d5db1
-DIST linux-5.9.7.tar.sign 987 BLAKE2B eb062daf9e49814c36b89f851d42be11f3527f0c6ed35df4baa660370056936fcb67951fe6a494f59d4a0f4f2a73c195e9e092b0b66ecf4bc10cda39faa1fe6e SHA512 986991d2b13df63b2c09e4b86329d48f243a256ecbfa8308fb23ea9680b904216fa68ff93c763a70290c3c0f90e5d95419af9db63c029afee7d0897ac46ccfd6
-DIST linux-5.9.7.tar.xz 115538096 BLAKE2B 27fa82f1b174a43e1771ec322521c1f1425a042da2cbf1aa4b76bf0ac66172c8e104c1bf942ee0ecf3c3da1b16906c4d007bf45dbb7d2013b2326a592da3547e SHA512 1b47a90a8d3a66499417a1fc2275b4b1c4d095d1ee5d29089f22c3f078a96760b6293b51a5db3245111e4e41e1b781d692f2994fb07009afd46b5158e689c554
 DIST linux-5.9.8.tar.sign 987 BLAKE2B bbe7c04acb6b3f61333e96582fc3d64834bb51c79f7f1d1eac455d6b89b62b614e8975adf01d2dda0b3a43813b32abe51f65f111e4ef68a0b4da9b26e22dafc8 SHA512 1e3ba4a90414372790718adabf3d8311cc6cca91601f048c8c7b2efdad6cd7ab9628a906407168df92aa6cfdf6ad93a9d9341a9f31bd8d46d9e808f4c9edf848
 DIST linux-5.9.8.tar.xz 115540828 BLAKE2B 27b8820bbd7ea278b47e1c208efeeb41c890276ae59d33971ab0d8ba0081d45e57c579f9390c5e3019a4f3beebaf17a29a959e1b6cadb9e1824ea4e568f90205 SHA512 063e853ccebe3e9422407dd4ed7f74a6202546761d4eb542035b3d71d0478efba9daa6eaeb1e2452c13d3093dd64729d9fd2df17945319b9535724d95be94a69
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.73.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.73.ebuild
deleted file mode 100644
index ee1e12c459a7..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.73.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-		# WireGuard was backported to 5.4 but we use old configs (#739128)
-		-e '$aCONFIG_WIREGUARD=m'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	[[ ${ARCH} == x86 ]] && config_tweaks+=(
-		# fix autoenabling 64bit
-		-e '2i\
-# CONFIG_64BIT is not set'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.74.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.74.ebuild
deleted file mode 100644
index 044218e07529..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.74.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-		# WireGuard was backported to 5.4 but we use old configs (#739128)
-		-e '$aCONFIG_WIREGUARD=m'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	[[ ${ARCH} == x86 ]] && config_tweaks+=(
-		# fix autoenabling 64bit
-		-e '2i\
-# CONFIG_64BIT is not set'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.75.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.75.ebuild
deleted file mode 100644
index 044218e07529..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.75.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-		# WireGuard was backported to 5.4 but we use old configs (#739128)
-		-e '$aCONFIG_WIREGUARD=m'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	[[ ${ARCH} == x86 ]] && config_tweaks+=(
-		# fix autoenabling 64bit
-		-e '2i\
-# CONFIG_64BIT is not set'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.76.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.76.ebuild
deleted file mode 100644
index 044218e07529..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.76.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-		# WireGuard was backported to 5.4 but we use old configs (#739128)
-		-e '$aCONFIG_WIREGUARD=m'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	[[ ${ARCH} == x86 ]] && config_tweaks+=(
-		# fix autoenabling 64bit
-		-e '2i\
-# CONFIG_64BIT is not set'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.16.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.16.ebuild
deleted file mode 100644
index 540a5ea3c744..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.16.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.8.5
-CONFIG_HASH=af8da8d54d21231fd8c7b943216bb985f0a4e223
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.17.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.17.ebuild
deleted file mode 100644
index 540a5ea3c744..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.17.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.8.5
-CONFIG_HASH=af8da8d54d21231fd8c7b943216bb985f0a4e223
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.18.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.18.ebuild
deleted file mode 100644
index d59b9d257458..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.18.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.8.5
-CONFIG_HASH=af8da8d54d21231fd8c7b943216bb985f0a4e223
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.1.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.1.ebuild
deleted file mode 100644
index ccd3e3d3e79d..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.9.0
-CONFIG_HASH=aa6d9438d030fa4682d5d450481085c901503da5
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.2.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.2.ebuild
deleted file mode 100644
index 634d6fe9b8ee..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.9.2
-CONFIG_HASH=94a4277f8827d1b2c911deabe56e7d929dc93146
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.3.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.3.ebuild
deleted file mode 100644
index 63c2f94bed05..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.3.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.9.2
-CONFIG_HASH=94a4277f8827d1b2c911deabe56e7d929dc93146
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.4.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.4.ebuild
deleted file mode 100644
index 63c2f94bed05..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.4.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.9.2
-CONFIG_HASH=94a4277f8827d1b2c911deabe56e7d929dc93146
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.6.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.6.ebuild
deleted file mode 100644
index 63c2f94bed05..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.6.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.9.2
-CONFIG_HASH=94a4277f8827d1b2c911deabe56e7d929dc93146
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.7.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.7.ebuild
deleted file mode 100644
index 63c2f94bed05..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.7.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.9.2
-CONFIG_HASH=94a4277f8827d1b2c911deabe56e7d929dc93146
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.206.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.206.ebuild
index 26a9a84f3519..4ffca0e91d5d 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.206.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.14.206.ebuild
@@ -13,4 +13,4 @@ DESCRIPTION="Full sources for the Linux kernel"
 HOMEPAGE="https://www.kernel.org"
 SRC_URI="${KERNEL_URI}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.157.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.157.ebuild
index 26a9a84f3519..4ffca0e91d5d 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.19.157.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.19.157.ebuild
@@ -13,4 +13,4 @@ DESCRIPTION="Full sources for the Linux kernel"
 HOMEPAGE="https://www.kernel.org"
 SRC_URI="${KERNEL_URI}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.77.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.77.ebuild
index 26a9a84f3519..4ffca0e91d5d 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.4.77.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.4.77.ebuild
@@ -13,4 +13,4 @@ DESCRIPTION="Full sources for the Linux kernel"
 HOMEPAGE="https://www.kernel.org"
 SRC_URI="${KERNEL_URI}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.8.17.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.8.17.ebuild
index 26a9a84f3519..4ffca0e91d5d 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.8.17.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.8.17.ebuild
@@ -13,4 +13,4 @@ DESCRIPTION="Full sources for the Linux kernel"
 HOMEPAGE="https://www.kernel.org"
 SRC_URI="${KERNEL_URI}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.9.8.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.9.8.ebuild
index 26a9a84f3519..4ffca0e91d5d 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.9.8.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.9.8.ebuild
@@ -13,4 +13,4 @@ DESCRIPTION="Full sources for the Linux kernel"
 HOMEPAGE="https://www.kernel.org"
 SRC_URI="${KERNEL_URI}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/sys-kernel/zen-sources/Manifest b/sys-kernel/zen-sources/Manifest
index 31a8b88c141b..920c2a5c353c 100644
--- a/sys-kernel/zen-sources/Manifest
+++ b/sys-kernel/zen-sources/Manifest
@@ -1,8 +1,4 @@
-DIST genpatches-5.4-1.base.tar.xz 4564 BLAKE2B 0282bad95cd003c90e92d33d2f114ca9e752f09fdbf1930c322bed578e8a71a16d48aeddd943f0a7e59df47c07ad95dd401251a1a5828eefe07c8e927cf021ef SHA512 0726fa7768c4ddf7ba73ef5eb0ea73b71ba03dab1252b7114864ea60af84d50b8354f1c1d70a0abf0c8c7460361417b14183f11f49aa9654808025a9d979da6d
-DIST genpatches-5.4-1.extras.tar.xz 1736 BLAKE2B 57df5cf8b4d96378408460be4be64900771b876a23d1e5798c97449bfcd28bea8aaf31482c614e7844106f29c9ae376c6ebef26e6c18e00a3f64bcb4e360d944 SHA512 5b9b6276f6ad6ad7ac33e14c3b06dbe943c57019332b0ee545ebf7325b7d6313db3ed6d35c46434c3c38420fb372141e63528e980aca87b90c4a39339851e80f
-DIST genpatches-5.8-1.base.tar.xz 4268 BLAKE2B c1c4959758d0bc28213e4fa5c73014bad00144a92d37ed4f576f45d4d578c470c61080d941358d16b426aa17893bd80c88734b65beaa0afd90baf5d78cd078f2 SHA512 534e92071e33fe03049b0f1f3ec7d3e670155a2fa6e93dd1bb8cd5ca0f817549fa9c0b6c5ca06020d7b3733d53204ad79d909d5fbcbc748f218a9f799cc3be6e
-DIST genpatches-5.8-1.extras.tar.xz 1764 BLAKE2B 35c7218e356715ab544b41a7a91e90ef8ab3ad6f318e0026e835eb007f07a48c82164928750d337d238c2717ebd609a075caa03acad92b538e70bacc131d772c SHA512 823feb9f57eef7b72f899c9655ccc2da285d66fba5ecb8e904f991d9d846f5894ae24b254917a430ad7b2358c8bb6aba8b82fb5d63081c8b54eb5c96f4c3354c
-DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
-DIST v5.4.15-zen1.patch.xz 908592 BLAKE2B 93a1b8e46e28b20d2f465df04c597b7da9c368532a89fc02a8059769b5f39b24b6d64acbcc88dabaa7f320c9c89705a01b3a96f8b3baa287ec60e3db4d9e1dcd SHA512 5aa5a4435e125d09a463d692bba95f247498818db157d68d75899d9031deb2aaa053a352831a843afad1241e83c25dcc5caf0243ee132696328a0d5ddcaab428
-DIST v5.8.10-zen1.patch.xz 624720 BLAKE2B 37c8853799aecba279b1e68f9de732e7ed03fe2a064017cf47c9ca8e7ff5156e94fb8c4a9502007ce93c52d022a0de1f2ee96b4edd9a95520f06192dd88b8d4a SHA512 4ad6d4db4233896c29a5785be76280f0ca07cfc5db8c8b6519b74238d6cddec3cb7cdd3cf2d0ba3d440df2411a917b5a2ed0933e72ea81beab163d1cae3bd11d
+DIST genpatches-5.9-1.base.tar.xz 4004 BLAKE2B 8a4577d42262fa901186acc60d28221d00e5c9140886705f018d9989f818d96ee4d9a6586b292e7b1d945bea9e2408e3161a73e0999defe1b7f99d0a339eb7be SHA512 d6ba1051f9561aa30d7b196336c34930285d613e8119b152f1d6cc447cb22db5ac07c25f89d4ceddf58c9370c42699d0250a31449be2da3c591896b0c87d8718
+DIST genpatches-5.9-1.extras.tar.xz 1764 BLAKE2B 32d29f0448aef113ba9c9591c5d3b671d00d07abde9f35f365b48168887913bb2da95a8a52b852453307cabb111115a26178be4cbcc016e53a26a31f783a9df7 SHA512 df007dc98c1acdd31773f7dcf8aeb22812aa55e5593e8509b6a8762f2dcf06c95d69ad7cdce992e7a5fe730754bef26242acdc4e4da51ee29206fabb86c9cb0e
+DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
+DIST v5.9.7-zen1.patch.xz 603716 BLAKE2B 578f29e72c1dd290e2889ff507e19de2284f323f7ef0d5f27ea3d6a9ddfe694619e85c4f8913f513167a4935fc62394d4f8c22254305eaf11c276fc55105ec45 SHA512 dd60b33dd6ae9896489c1dea74c79e794c23120fd143f6fe328303e20e59a146e471c9ca8eec1451893424a6be53afb3c9a0318c0dae388bea0bbda0ecdd429f
diff --git a/sys-kernel/zen-sources/files/CVE-2020-8694.patch b/sys-kernel/zen-sources/files/CVE-2020-8694.patch
new file mode 100644
index 000000000000..f67ee3a3eaa1
--- /dev/null
+++ b/sys-kernel/zen-sources/files/CVE-2020-8694.patch
@@ -0,0 +1,45 @@
+From 949dd0104c496fa7c14991a23c03c62e44637e71 Mon Sep 17 00:00:00 2001
+From: Len Brown <len.brown@intel.com>
+Date: Tue, 10 Nov 2020 13:00:00 -0800
+Subject: powercap: restrict energy meter to root access
+
+Remove non-privileged user access to power data contained in
+/sys/class/powercap/intel-rapl*/*/energy_uj
+
+Non-privileged users currently have read access to power data and can
+use this data to form a security attack. Some privileged
+drivers/applications need read access to this data, but don't expose it
+to non-privileged users.
+
+For example, thermald uses this data to ensure that power management
+works correctly. Thus removing non-privileged access is preferred over
+completely disabling this power reporting capability with
+CONFIG_INTEL_RAPL=n.
+
+Fixes: 95677a9a3847 ("PowerCap: Fix mode for energy counter")
+
+Signed-off-by: Len Brown <len.brown@intel.com>
+Cc: stable@vger.kernel.org
+---
+ drivers/powercap/powercap_sys.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
+index f808c5fa9838c..3f0b8e2ef3d46 100644
+--- a/drivers/powercap/powercap_sys.c
++++ b/drivers/powercap/powercap_sys.c
+@@ -367,9 +367,9 @@ static void create_power_zone_common_attributes(
+ 					&dev_attr_max_energy_range_uj.attr;
+ 	if (power_zone->ops->get_energy_uj) {
+ 		if (power_zone->ops->reset_energy_uj)
+-			dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
++			dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUSR;
+ 		else
+-			dev_attr_energy_uj.attr.mode = S_IRUGO;
++			dev_attr_energy_uj.attr.mode = S_IRUSR;
+ 		power_zone->zone_dev_attrs[count++] =
+ 					&dev_attr_energy_uj.attr;
+ 	}
+-- 
+cgit 1.2.3-1.el7
+
diff --git a/sys-kernel/zen-sources/zen-sources-5.8.10.ebuild b/sys-kernel/zen-sources/zen-sources-5.8.10.ebuild
deleted file mode 100644
index c3dce435487e..000000000000
--- a/sys-kernel/zen-sources/zen-sources-5.8.10.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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"
-K_GENPATCHES_VER="1"
-K_SECURITY_UNSUPPORTED="1"
-K_NOSETEXTRAVERSION="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://github.com/zen-kernel"
-IUSE=""
-
-DESCRIPTION="The Zen Kernel Live Sources"
-
-ZEN_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-zen1/v${PV}-zen1.patch.xz"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${ZEN_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/v${PV}-zen1.patch.xz"
-UNIPATCH_STRICTORDER="yes"
-
-K_EXTRAEINFO="For more info on zen-sources, and for how to report problems, see: \
-${HOMEPAGE}, also go to #zen-sources on freenode"
-
-pkg_setup() {
-	ewarn
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the zen developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn
-	kernel-2_pkg_setup
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/zen-sources/zen-sources-5.4.15.ebuild b/sys-kernel/zen-sources/zen-sources-5.9.7.ebuild
similarity index 92%
rename from sys-kernel/zen-sources/zen-sources-5.4.15.ebuild
rename to sys-kernel/zen-sources/zen-sources-5.9.7.ebuild
index c3dce435487e..c4003834b93e 100644
--- a/sys-kernel/zen-sources/zen-sources-5.4.15.ebuild
+++ b/sys-kernel/zen-sources/zen-sources-5.9.7.ebuild
@@ -37,6 +37,13 @@ pkg_setup() {
 	kernel-2_pkg_setup
 }
 
+src_prepare() {
+	default
+
+	kernel-2_src_prepare
+	eapply $"${FILESDIR}/CVE-2020-8694.patch"
+}
+
 pkg_postrm() {
 	kernel-2_pkg_postrm
 }
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index b0a4f19f3bce..5f699354d6be 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild b/sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild
index ee2227b21b79..dfcf868d436a 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0/${PV}"
 IUSE="64-bit-bfd multitarget nls static-libs"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="nls? ( sys-devel/gettext )"
 DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
diff --git a/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild b/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild
index 0a1c428f7d42..44d10fd4a4bb 100644
--- a/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild
+++ b/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gdbm/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/6" # libgdbm.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+berkdb nls +readline static-libs"
 
 DEPEND="
diff --git a/sys-libs/glibc/glibc-2.31-r7.ebuild b/sys-libs/glibc/glibc-2.31-r7.ebuild
index 2e58b52204b1..dce72823d143 100644
--- a/sys-libs/glibc/glibc-2.31-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.31-r7.ebuild
@@ -22,7 +22,7 @@ PATCH_DEV=dilfridge
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
-	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"
 fi
diff --git a/sys-libs/glibc/glibc-2.32-r2.ebuild b/sys-libs/glibc/glibc-2.32-r2.ebuild
index b177381e635d..e34d1e0310c0 100644
--- a/sys-libs/glibc/glibc-2.32-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.32-r2.ebuild
@@ -22,7 +22,7 @@ PATCH_DEV=dilfridge
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
-	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 )"
diff --git a/sys-libs/gwenhywfar/Manifest b/sys-libs/gwenhywfar/Manifest
index 447a75de0d49..d7685261487e 100644
--- a/sys-libs/gwenhywfar/Manifest
+++ b/sys-libs/gwenhywfar/Manifest
@@ -1,2 +1 @@
-DIST gwenhywfar-5.1.2.tar.gz 2354910 BLAKE2B e73519d33da9268f90ae2924b177c4ef684c9d991faa1f788f8c30ea669fa27d645481e6e41673b22d2796376aaab9cec72de6874b89c2fe141102cfbac2d2e4 SHA512 20374ed6c134b310f375eb286d83bf6074e397e3c6e22b0370d06fb870b9506f171a9276cad9a809331d8917e3bca1eca30a5d5776818ca7f5b06100474a7e0f
 DIST gwenhywfar-5.4.1.tar.gz 2373780 BLAKE2B bc2666145d958c5ab9c5600be65bcdd4a2ea6e35f3bd83a5ba9a2380dcc8788e91038733c49c1c16ff00d27eea999a0c0f4a02a70f30180d54a1541dbb951131 SHA512 78ec815374410bb3ebbbcc5c18120b47bbc2460aa8a620fae068f3c6aaeb16351139fe0e28e8dc7037ffb9eaa449011d2483dde3c99ecd0fed7bb2c9f97f89a0
diff --git a/sys-libs/gwenhywfar/gwenhywfar-5.1.2.ebuild b/sys-libs/gwenhywfar/gwenhywfar-5.1.2.ebuild
deleted file mode 100644
index cfb7644453e1..000000000000
--- a/sys-libs/gwenhywfar/gwenhywfar-5.1.2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P/_rc/rc}"
-inherit qmake-utils
-
-DESCRIPTION="Multi-platform helper library for other libraries"
-HOMEPAGE="https://www.aquamaniac.de/sites/aqbanking/index.php"
-SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/234/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/79" # correspond with libgwenhywfar.so version
-KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
-IUSE="debug designer doc fox gtk libressl qml qt5 sensors serialport test webkit"
-
-REQUIRED_USE="designer? ( qt5 ) qml? ( qt5 ) sensors? ( qt5 ) serialport? ( qt5 ) webkit? ( qt5 )"
-
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-COMMON_DEPEND="
-	dev-libs/libgcrypt:0=
-	dev-libs/libgpg-error
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	net-libs/gnutls:=
-	virtual/libiconv
-	virtual/libintl
-	virtual/opengl
-	designer? ( dev-qt/designer:5 )
-	fox? ( x11-libs/fox:1.6 )
-	gtk? ( x11-libs/gtk+:3 )
-	qml? ( dev-qt/qtdeclarative:5 )
-	qt5? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qthelp:5
-		dev-qt/qtmultimedia:5[widgets]
-		dev-qt/qtnetwork:5
-		dev-qt/qtopengl:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtscript:5
-		dev-qt/qtsql:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		dev-qt/qtxml:5
-		dev-qt/qtxmlpatterns:5
-	)
-	sensors? ( dev-qt/qtsensors:5 )
-	serialport? ( dev-qt/qtserialport:5 )
-	webkit? ( dev-qt/qtwebkit:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	gtk? ( !<app-office/gnucash-3.7[aqbanking] )
-"
-
-# broken upstream, reported but got no reply
-RESTRICT+=" test"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	disableQtModule() {
-		local module
-		for module in ${@}; do
-			sed -e "/qtHaveModule(${module})/s|^|#DONT|" -i configure || die
-		done
-	}
-
-	use designer || disableQtModule designer uitools
-	use qml || disableQtModule qml qmltest
-	use sensors || disableQtModule sensors
-	use serialport || disableQtModule serialport
-	use test || disableQtModule testlib
-	use webkit || disableQtModule webkit webkitwidgets
-
-	local guis=()
-	use fox && guis+=( fox16 )
-	use gtk && guis+=( gtk3 )
-	use qt5 && guis+=( qt5 )
-
-	local myeconfargs=(
-		--enable-ssl
-		--with-docpath="${EPREFIX}/usr/share/doc/${PF}/apidoc"
-		$(use_enable debug)
-		$(use_enable doc full-doc)
-	)
-	use qt5 && myeconfargs+=(
-		--with-qt5-moc="$(qt5_get_bindir)/moc"
-		--with-qt5-qmake="$(qt5_get_bindir)/qmake"
-	)
-
-	guis_config="--with-guis=${guis[@]}"
-	econf "${myeconfargs[@]}" "${guis_config}"
-}
-
-src_compile() {
-	emake
-	use doc && emake srcdoc
-}
-
-src_install() {
-	default
-	use doc && emake DESTDIR="${D}" install-srcdoc
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/sys-libs/gwenhywfar/gwenhywfar-5.4.1-r1.ebuild b/sys-libs/gwenhywfar/gwenhywfar-5.4.1-r1.ebuild
index db5851ac1ca8..6b3526e8dbcf 100644
--- a/sys-libs/gwenhywfar/gwenhywfar-5.4.1-r1.ebuild
+++ b/sys-libs/gwenhywfar/gwenhywfar-5.4.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/344/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/79" # correspond with libgwenhywfar.so version
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="debug doc gtk libressl qt5 test"
 
 BDEPEND="
diff --git a/sys-libs/gwenhywfar/metadata.xml b/sys-libs/gwenhywfar/metadata.xml
index dbdb950a22e6..7a38bb900964 100644
--- a/sys-libs/gwenhywfar/metadata.xml
+++ b/sys-libs/gwenhywfar/metadata.xml
@@ -2,12 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<use>
-		<flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
-		<flag name="fox">Use <pkg>x11-libs/fox</pkg> graphical toolkit</flag>
-		<flag name="qml">Enable support for plugins using QML</flag>
-		<flag name="sensors">Enable support for <pkg>dev-qt/qtsensors</pkg> module</flag>
-		<flag name="serialport">Enable support for <pkg>dev-qt/qtserialport</pkg> module</flag>
-		<flag name="webkit">Enable support for <pkg>dev-qt/qtwebkit</pkg></flag>
-	</use>
 </pkgmetadata>
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 765139758ed4..e327185d0060 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -1,2 +1,4 @@
-DIST pam-1.4.0_p20200809-doc.tar.xz 42680 BLAKE2B e8371bd76b589db06ce95f2d10343be163aa5149f566f7d9bd5e9cd0340b95eecedb6a7d20d299fd2188c736fca3c69c0bd2f8eea4541dfd3312227c3dcf4e2d SHA512 5007aaa811b6321f124245493c6a4bc9ae07ab4ff651fc817843e8b4a74661c07418e2479363a72c35320f0f1cb469a2494c5d354dc819b920de7d1918e6ce5e
+DIST Linux-PAM-1.5.0-docs.tar.xz 441644 BLAKE2B 00dfefdc98cac438c2e4b3faff880b8c1d452884c40d70aa21182d33585b24a4dc98af1b4ec80c635c0659c4dca1b039b9b118a28bfb3f811c6025302fb3aff9 SHA512 d41027a8a19a944278ad22db6f8df3562188166eec135882f44503a64b69224336964b2129c8e895642af5b3f69221d0af21d8da3283098db395b8f8b64f5d4b
+DIST Linux-PAM-1.5.0.tar.xz 972228 BLAKE2B f4baf22f391284f5ad04e1919f172827e57781561cc7e685b72ba37567639214ffb246aca408767b02ecfab964bbf2eea8667fd0a11ea83684ba6672c44c371e SHA512 27be57465371f86c101f93c15f4475e63867c02f8f5af40d3f83b2106bfc8a46b8079302214e17f198ef903dc35b72d00b0e9bdff63ed2ecd8c69543e278f4bf
+DIST pam-doc-20201113.tar.gz 79239 BLAKE2B 40acf4460bff7f50874117765f47eaab3565dec31575f97772c42880cddd01f01f6143da39e8fc94e573916950e9662d500f5e8aa57f9283b9f46ee9862ddf2a SHA512 0a3bdbd8e88fc930ea1ab40634df65cca7694932c12e92dee64c7acc230039126c9567d5b76757ef64014a02fcc833428adb2c94da127032e4bd6a2c5376d3b7
 DIST pam-e42e178c71c11bb25740a5177eed110ee17b8af2.tar.gz 810595 BLAKE2B 897f64a7f55c033601665b0ecc292cdcbd0d9b2f24199ed6ca5fc69c2da4da7401677493bed09a118b1fc0a475dc016fc7a3a318787c650212b056064ed0b817 SHA512 3c2bc401df51dbd4118698afc80a0448559bc6b5d8c7c45c800c2f6421034a131c0bee971f9640aec6b0d77f8a31ec055c7a84a646d9a11690dfda4af4e1068a
diff --git a/sys-libs/pam/pam-1.4.0_p20200829.ebuild b/sys-libs/pam/pam-1.4.0_p20200829-r1.ebuild
similarity index 95%
rename from sys-libs/pam/pam-1.4.0_p20200829.ebuild
rename to sys-libs/pam/pam-1.4.0_p20200829-r1.ebuild
index f34326b6b54c..be700463f91b 100644
--- a/sys-libs/pam/pam-1.4.0_p20200829.ebuild
+++ b/sys-libs/pam/pam-1.4.0_p20200829-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/linux-pam/linux-pam"
 
 COMMIT_HASH="e42e178c71c11bb25740a5177eed110ee17b8af2"
 SRC_URI="https://github.com/linux-pam/linux-pam/archive/${COMMIT_HASH}.tar.gz#/${PN}-${COMMIT_HASH}.tar.gz
-	https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${PN}-1.4.0_p20200809-doc.tar.xz"
+	https://github.com/Zlogene/pam-docs/archive/${PN}-doc-20201113.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
@@ -110,8 +110,10 @@ multilib_src_install_all() {
 		d /run/sepermit 0755 root root
 	_EOF_
 
-	for i in "${WORKDIR}"/${PN}-1.4.0_p20200809-doc/*; do
-		doman ${i}
+	local page
+
+	for page in "${WORKDIR}"/${PN}-docs-${PN}-doc-20201113/*; do
+		doman ${page}
 	done
 }
 
diff --git a/sys-libs/pam/pam-1.5.0.ebuild b/sys-libs/pam/pam-1.5.0.ebuild
new file mode 100644
index 000000000000..59a26d7ef9e7
--- /dev/null
+++ b/sys-libs/pam/pam-1.5.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="Linux-${PN^^}-${PV}"
+
+inherit autotools db-use fcaps toolchain-funcs usr-ldscript multilib-minimal
+
+DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
+HOMEPAGE="https://github.com/linux-pam/linux-pam"
+
+SRC_URI="https://github.com/linux-pam/linux-pam/releases/download/v${PV}/${MY_P}.tar.xz
+	https://github.com/linux-pam/linux-pam/releases/download/v${PV}/${MY_P}-docs.tar.xz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit berkdb debug nis +pie selinux"
+
+BDEPEND="
+	dev-libs/libxslt
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	virtual/yacc
+"
+
+DEPEND="
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	>=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
+	audit? ( >=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] )
+	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
+	nis? ( net-libs/libnsl[${MULTILIB_USEDEP}]
+	>=net-libs/libtirpc-0.2.4-r2[${MULTILIB_USEDEP}] )"
+
+RDEPEND="${DEPEND}"
+
+PDEPEND=">=sys-auth/pambase-20200616"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	touch ChangeLog || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# Do not let user's BROWSER setting mess us up. #549684
+	unset BROWSER
+
+	# Disable automatic detection of libxcrypt; we _don't_ want the
+	# user to link libxcrypt in by default, since we won't track the
+	# dependency and allow to break PAM this way.
+
+	export ac_cv_header_xcrypt_h=no
+
+	local myconf=(
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+		--with-db-uniquename=-$(db_findver sys-libs/db)
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog
+		--enable-securedir="${EPREFIX}"/$(get_libdir)/security
+		--includedir="${EPREFIX}"/usr/include/security
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--exec-prefix="${EPREFIX}"
+		--enable-unix
+		--disable-prelude
+		--disable-doc
+		--disable-regenerate-docu
+		--disable-static
+		--disable-Werror
+		$(use_enable audit)
+		$(use_enable berkdb db)
+		$(use_enable debug)
+		$(use_enable nis)
+		$(use_enable pie)
+		$(use_enable selinux)
+		--enable-isadir='.' #464016
+		)
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake sepermitlockdir="${EPREFIX}/run/sepermit"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install \
+		sepermitlockdir="${EPREFIX}/run/sepermit"
+
+	gen_usr_ldscript -a pam pam_misc pamc
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	# tmpfiles.eclass is impossible to use because
+	# there is the pam -> tmpfiles -> systemd -> pam dependency loop
+
+	dodir /usr/lib/tmpfiles.d
+
+	cat ->>  "${D}"/usr/lib/tmpfiles.d/${CATEGORY}-${PN}.conf <<-_EOF_
+		d /run/faillock 0755 root root
+	_EOF_
+	use selinux && cat ->>  "${D}"/usr/lib/tmpfiles.d/${CATEGORY}-${PN}-selinux.conf <<-_EOF_
+		d /run/sepermit 0755 root root
+	_EOF_
+
+	local page
+
+	for page in doc/man/*.{3,5,8} modules/*/*.{5,8} ; do
+		doman ${page}
+	done
+}
+
+pkg_postinst() {
+	ewarn "Some software with pre-loaded PAM libraries might experience"
+	ewarn "warnings or failures related to missing symbols and/or versions"
+	ewarn "after any update. While unfortunate this is a limit of the"
+	ewarn "implementation of PAM and the software, and it requires you to"
+	ewarn "restart the software manually after the update."
+	ewarn ""
+	ewarn "You can get a list of such software running a command like"
+	ewarn "  lsof / | egrep -i 'del.*libpam\\.so'"
+	ewarn ""
+	ewarn "Alternatively, simply reboot your system."
+
+	# The pam_unix module needs to check the password of the user which requires
+	# read access to /etc/shadow only.
+	fcaps cap_dac_override sbin/unix_chkpwd
+}
diff --git a/sys-libs/pinktrace/pinktrace-0.9.3.ebuild b/sys-libs/pinktrace/pinktrace-0.9.3.ebuild
index 52e6628349fe..5a6bc3e8662f 100644
--- a/sys-libs/pinktrace/pinktrace-0.9.3.ebuild
+++ b/sys-libs/pinktrace/pinktrace-0.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,6 +18,7 @@ src_configure() {
 		--disable-doxygen
 		--disable-python
 		--disable-python-doc
+		--disable-static
 	)
 
 	econf "${myconf[@]}"
@@ -25,5 +26,5 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index da5c2bc5485b..f440d854133f 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/jack/jack-0.ebuild b/virtual/jack/jack-0.ebuild
deleted file mode 100644
index a97cf5a258b9..000000000000
--- a/virtual/jack/jack-0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib-build
-
-DESCRIPTION="Virtual for JACK Audio Connection Kit"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-
-RDEPEND="
-	|| (
-		>=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}]
-		media-sound/jack2[${MULTILIB_USEDEP}]
-	)"
diff --git a/virtual/jack/jack-1.ebuild b/virtual/jack/jack-1.ebuild
index 2e2a526760cc..a229491a72ff 100644
--- a/virtual/jack/jack-1.ebuild
+++ b/virtual/jack/jack-1.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for JACK Audio Connection Kit"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 arm arm64 ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 
 RDEPEND="
 	|| (
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 7e3929e00287..0803dfcd9ae6 100644
Binary files a/www-apache/Manifest.gz and b/www-apache/Manifest.gz differ
diff --git a/www-apache/mod_qos/Manifest b/www-apache/mod_qos/Manifest
index f534059e406f..d5775db34adf 100644
--- a/www-apache/mod_qos/Manifest
+++ b/www-apache/mod_qos/Manifest
@@ -1,2 +1,3 @@
 DIST mod_qos-11.61.tar.gz 1242978 BLAKE2B d784538e516abda338230ae9f2580217e3727f8aa22e5d1e881d605ade06444753c9f393a16ef8c683422bb989434b1152aa06955c3f5ba5b38e486d3cc4571b SHA512 c34a970e869238a1340a4bf32f3b21ac3e19cfb65a809989c45100aa1c3559ce0a5f5c30e6366f6d65ef04ad6fc1be73f80a9fc18b7a6a164912618cce6383a8
 DIST mod_qos-11.65.tar.gz 1247087 BLAKE2B 145af39814f974855520415c3bf114aa11ac9002784feace877c9777311fb77fa798fe5f61c7b63201ab5dd6d9582a1d141f421c7215ba3271a29cece13d02b0 SHA512 7a4363b7b5e31968188f2668003d88538134456c3e6eeaff7d200ebf46064139561da6adf9b96678f349bd296f2c502a2d2c9bfb8ae12f7c78e3edbe5c13de3b
+DIST mod_qos-11.66.tar.gz 1247819 BLAKE2B a835722363a816637411b434eba60bc91f04fe48efd1dd5a3b63f046feb2fb60d776a64d0a4e889c8f827f6a3002fa731743d079b5f3ebd3bde3edf2023c983c SHA512 19541c72d72cd9c4f055f6c0908e1ddbfa0b27f33e13edbecf9abcf61c2fe334ef797e3ad44c7d8343d5d2df714744b4f1a3f0f96a6de02ff7d7999385393db6
diff --git a/www-apache/mod_qos/metadata.xml b/www-apache/mod_qos/metadata.xml
index 232c098fae32..d74f243bf5d8 100644
--- a/www-apache/mod_qos/metadata.xml
+++ b/www-apache/mod_qos/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>candrews@gentoo.org</email>
+		<name>Craig Andrews</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mod-qos</remote-id>
 	</upstream>
diff --git a/www-apache/mod_qos/mod_qos-11.66.ebuild b/www-apache/mod_qos/mod_qos-11.66.ebuild
new file mode 100644
index 000000000000..5a36fe7b7c06
--- /dev/null
+++ b/www-apache/mod_qos/mod_qos-11.66.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools apache-module
+
+DESCRIPTION="A QOS module for the apache webserver"
+HOMEPAGE="http://mod-qos.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mod-qos/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/libpcre:3
+	dev-libs/openssl:0=
+	media-libs/libpng:0=
+	sys-libs/zlib:0=
+"
+DEPEND="${DEPEND}"
+
+APXS2_S="${S}/apache2"
+APACHE2_MOD_CONF="10_${PN}"
+APACHE2_MOD_DEFINE="QOS"
+DOCFILES="${S}/doc/*.txt ${S}/README.TXT"
+
+need_apache2
+
+pkg_setup() {
+	_init_apache2
+	_init_apache2_late
+}
+src_prepare() {
+	default
+
+	pushd "${S}"/tools &>/dev/null || die
+	eautoreconf
+	popd &>/dev/null || die
+}
+
+src_configure() {
+	pushd "${S}"/tools &>/dev/null || die
+	econf
+	popd &>/dev/null || die
+}
+
+src_compile() {
+	apache-module_src_compile
+	emake -C "${S}"/tools
+}
+
+src_install() {
+	einfo "Installing Apache module ..."
+	pushd "${S}"/tools &>/dev/null || die
+	apache-module_src_install
+	popd &>/dev/null || die
+
+	einfo "Installing module utilities ..."
+	emake -C "${S}"/tools install DESTDIR="${D}"
+}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 7369ddebe92d..c29e5f713317 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index c4c1ca392fd4..609291cc9bb8 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -1,10 +1,10 @@
-DIST kibana-6.8.11-linux-x86_64.tar.gz 188165733 BLAKE2B 719b022ad87769d129e7c6e7c6c4aec09da2bd51d079dab203573531d12df1ced9c45bc25fdc0db51d9ac178ef48183a9899ca1f2fcc6b1d3913efa4140c3321 SHA512 f353949af48d1f4a0c6365425cbdc10972a5b7dc1207231f7e6100563af66d40ad78c8904c32ec2b834d7e2e7d7e597deafc0a9be51749afbb00333280a29789
-DIST kibana-6.8.12-linux-x86_64.tar.gz 188208087 BLAKE2B f03be0c4ad6c3ddd9b3b11421f3dd8e83893d44ad47c2df92c97765949f2cf4b9bb6a4ea18022c596ec9a13946028d5425edff9910fd5e883c0497d1a9ccd2e0 SHA512 ebbe616899fccda2c6a04bb2bddfba2dbd54c0a91bbf111c2f74e78c5f9d0ccd692d1bea861ff4bd5ed5c34cacf8f92b75b635a41bea7958abb7511735afdffa
+DIST kibana-6.8.13-linux-x86_64.tar.gz 188072148 BLAKE2B 452a09bc7d876b57b36a50feb38731ded18b959f48861da259d75234614dbf072ff9cfd817fe4c21a2c83515934f42f5ddc7e7e634dfc9e2b327ee9d4b2ac730 SHA512 14144900eac8985de0982eda88e44474ebbd828bf9efa0b6f02ae0627c711e145e28cfbc931f63d7bb5dc5b3ad1056cdc972990cddc36f7050a29a34d9472508
+DIST kibana-7.10.0-linux-x86_64.tar.gz 252795226 BLAKE2B a8a390c8a8fbc0a592d494b3807cf8d7e4f7c066dde0a297d0596ace31d2302639ac935ed44dea12c747a8050209a895deb8f283023563aba957ae4a35987803 SHA512 385fe5d875ba074e0931a1e9ebbac8e3d91d300ca478f589da06b01c68e4694c5953a538afd6c385bdccec0f0d3cda1a5dc39f1b56e41d584cdcab8fba466677
 DIST kibana-7.8.1-linux-x86_64.tar.gz 337517217 BLAKE2B 208933ef5efccea3e718ff5ef1bfa28a08c75ba3a1a91b1eb00020d33ec1df2c17e299d423be4d2f3c2c5bfcb6189a80ebade26753379148aa72d9f7901a2e8d SHA512 92f3717b2f9ea915570ee8587f1ad0c2a428c266e1cd7dcda485b8b81191c5c1b3155872299c56dbba8de93807b2cc67a0d197ecb2e8df44e09060d4fac1d759
-DIST kibana-7.9.1-linux-x86_64.tar.gz 296105200 BLAKE2B fbddbedf8075cd6f2c03c7c351e3d06f95f85296bc169e7767d6224ab5f500f97549a3a7e412faa86b0133e9cbe6bc94431731156c07b0025d3d4290a0c1531a SHA512 50d6c817fe231f5f7d632e39930e7c25fc318819ad51d0d73718fed24e2a7fd6e2b3e90a13539fbd9120aa53aba4e22c08f7b53d2a089d84953c7b7530528300
 DIST kibana-7.9.2-linux-x86_64.tar.gz 295714192 BLAKE2B 74ddb493013a097b1501a27f3ddb06e2081a3ebeaa06c5340d2229bcad936e8ae2249530f487ed1b42e697f2fd04ed6cea5c784f35d68e06b0ea3036f9f25cad SHA512 79d7b836a93b496fa9dc58d3d2286ca6f6ad4d5c66558047a24841085b41c8beeae2a4f68a8883013b93e3036e029f76ebcb6e30080fc0b1979377b1f6d2b19a
-DIST kibana-oss-6.8.11-linux-x86_64.tar.gz 70602922 BLAKE2B 2c435daaa855f1e7961fe933896d96779ada1a49b7dd3d303f8dad5eb020f77a0afb6a6c72f99e00c94a75abfc4a838eff78b381ac646f5b86089b54070921d1 SHA512 4403fa01facddbbd8f56463f80cd588f2f3788b696272f3ad45127d75d589cbc97c62f4dad806ae25901fa3ab195d9e8aa96103bed7c5c76c52c7065c19ea6d2
-DIST kibana-oss-6.8.12-linux-x86_64.tar.gz 70621824 BLAKE2B 474ad88dc19e727d6716eeacdd18e799053110f91ac56bbdbbc9dd2c9f007fba450108c914d95abf03d4240757d68303833e52dc9358f15fdee81930565d119f SHA512 b8fd1fd2617163069a4f6ebb5f04bfd04d6ef39e859476430e42b07ecd209f69c6535b5db731604f2cc1360f62214145be37817509d35d7e4eda22a7085b0541
+DIST kibana-7.9.3-linux-x86_64.tar.gz 295755102 BLAKE2B e803d92c396684ce56b8b1a82eabfb6c1a88344d07b46d8770ab93ced14cc02fc22fdefec9fa3dbf1e893d02078dd27f7f2fbf1a2445d9d4942dfb1caba92a8e SHA512 c82b0dc91f2e6e585c6187b357ad8da6078a9b17974f6574628161a54981ea64b2f0b6c2e85bb052d20d5d5f64210fae7fbc3f78d7f30722d6f1e5d095b0a2f7
+DIST kibana-oss-6.8.13-linux-x86_64.tar.gz 70392218 BLAKE2B 752119ec4251005dc13acc9c707df6c3d8975d32b610cfaff65884d07a232712fa90ae6dfa46bc0394e98efb94f7e1a1f974b4dcb76b1da5cd6cadded7ae15ba SHA512 58e3d52616ca306739642e7932ec2f6388231c966e6fd5ce3431fc39e46183745f90ae069d659ad6c59f5c1361220e012723ccccd7dc47f61f53bf6d14705cde
+DIST kibana-oss-7.10.0-linux-x86_64.tar.gz 110358556 BLAKE2B 0221699cd5f07db4223574b3b946ec25bb3f1a756cca350509ff8e61458d26cf328042a1383d0d8eee42af7071780ba3d57d063541e05413cff1672a0e6b985a SHA512 477d3a79319a0f14f3c844d52e23d997c736ba5acc0184ed1c1c853b3795fa2890ba692efa23d882ab09275bc03708c9a1a63d80fd13f7844d1fc8a48c0f2f75
 DIST kibana-oss-7.8.1-linux-x86_64.tar.gz 154344863 BLAKE2B 19fefe509efd2c803a017d5cc7ea262cfc3065c71a8dae04bbe99f7c2421a1b1a6ee0cbf298d2e7ab8b7283ef67b9f8f2c1db876136dbad7abedcc843b287db4 SHA512 381e467cb6f18892a5d5403e6eab640ffaf6ae2b76bc3e52eb94a377bf773e7dee631d0dc72162e276eafbc10c9c70629c106d25707921b32d2ebb18f69315ba
-DIST kibana-oss-7.9.1-linux-x86_64.tar.gz 137432277 BLAKE2B 7977c46355d7e78b92cffe3a56318a853e1a1710e207f6fcaf9693622cfaaeae6444e90dc461a4f80f247a1ac8e22ae5b1e3f36efc19921c53037014b9166798 SHA512 914aff3cdb69d769d466cbaf7b736cd74317643e6e328e8f9fcdcdb12fd0a40581bdccdd4993b9a8b1b5792b918b369a9976b500057bf75c0e09c448178cc5b7
 DIST kibana-oss-7.9.2-linux-x86_64.tar.gz 137021505 BLAKE2B 6e27e40e94a925fe0b6e5fa94050f69088c9d4092428ec8024cfa5d1665f5f0cdc6bb1c3910360808bb4fd28d76bc1150d51aa7f9003121aeb2aef9f929233db SHA512 39d796324b744f0b34548f1d97e042c5aaa66004f052627cfe7cb5ac998ac45df510b76692c297443af1cdd36a75ffd172810969b788df0fa972feedd78c1719
+DIST kibana-oss-7.9.3-linux-x86_64.tar.gz 136992027 BLAKE2B c39b7325461780878cdd06f2f1abd5c3585f7014d6a6703c5ada429dc90686f1d065c9aa2b5bfd6735d609bed3bd2d4a31a6787ee644e63dd0b01b563dc7c900 SHA512 11b9ecaf5e8866b1b4d8bdd2004f3bfe801c2f5ee9bad8c83cd1a368ba2cfe46b357aabf1b1a50f5aef7852b2fd885642384327b3fd53977ec3fc404cf0e6eb8
diff --git a/www-apps/kibana-bin/kibana-bin-6.8.11.ebuild b/www-apps/kibana-bin/kibana-bin-6.8.13.ebuild
similarity index 100%
rename from www-apps/kibana-bin/kibana-bin-6.8.11.ebuild
rename to www-apps/kibana-bin/kibana-bin-6.8.13.ebuild
diff --git a/www-apps/kibana-bin/kibana-bin-6.8.12.ebuild b/www-apps/kibana-bin/kibana-bin-7.10.0.ebuild
similarity index 76%
rename from www-apps/kibana-bin/kibana-bin-6.8.12.ebuild
rename to www-apps/kibana-bin/kibana-bin-7.10.0.ebuild
index 43ac4ff48dfc..1d7408d575ba 100644
--- a/www-apps/kibana-bin/kibana-bin-6.8.12.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-7.10.0.ebuild
@@ -22,28 +22,35 @@ IUSE="x-pack"
 RDEPEND="
 	acct-group/kibana
 	acct-user/kibana
-	>=net-libs/nodejs-10.15.2
+	>=net-libs/nodejs-10.21.0
 	x-pack? (
 		dev-libs/expat
 		dev-libs/nss
 	)"
 
+# Do not complain about CFLAGS etc since we don't use them
+QA_FLAGS_IGNORED='.*'
+
 S="${WORKDIR}/${MY_P}-linux-x86_64"
 
 src_prepare() {
 	default
 
-	# remove empty unused directory
-	rmdir data || die
+	# remove unused directory
+	rm -r data || die
 
 	# remove bundled nodejs
 	rm -r node || die
+	sed -i 's@\(^NODE="\).*@\1/usr/bin/node"@g' \
+		bin/kibana || die
 
-	# move optimize/plugins to /var/lib/kibana
-	rm -r optimize plugins || die
+	# move plugins to /var/lib/kibana
+	rm -r plugins || die
 
 	# handle node.js version with RDEPEND
-	sed -i /node_version_validator/d src/setup_node_env/index.js || die
+	sed -i /node_version_validator/d \
+		src/setup_node_env/index.js \
+		src/setup_node_env/no_transpilation.js || die
 }
 
 src_install() {
@@ -64,19 +71,13 @@ src_install() {
 	fperms -R +x /opt/${MY_PN}/bin
 
 	diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
-	keepdir /var/lib/${MY_PN}/optimize
 	keepdir /var/lib/${MY_PN}/plugins
 	keepdir /var/log/${MY_PN}
 
-	dosym ../../var/lib/kibana/optimize /opt/kibana/optimize # Bug 667214
 	dosym ../../var/lib/kibana/plugins /opt/kibana/plugins
 }
 
 pkg_postinst() {
-	ewarn "Kibana optimize/plugins directories were moved to /var/lib/kibana."
-	ewarn "In case of startup failures (FATAL Error: Cannot find module...),"
-	ewarn "please remove the optimize directory content:"
-	ewarn "rm -r /var/lib/kibana/optimize/*"
 	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
 	elog "Node.js 10. Some plugins may fail with other versions of Node.js (Bug #656008)."
 	elog
diff --git a/www-apps/kibana-bin/kibana-bin-7.9.1.ebuild b/www-apps/kibana-bin/kibana-bin-7.9.3.ebuild
similarity index 96%
rename from www-apps/kibana-bin/kibana-bin-7.9.1.ebuild
rename to www-apps/kibana-bin/kibana-bin-7.9.3.ebuild
index ca4ca3a9ac60..5e7fe2884cef 100644
--- a/www-apps/kibana-bin/kibana-bin-7.9.1.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-7.9.3.ebuild
@@ -28,6 +28,9 @@ RDEPEND="
 		dev-libs/nss
 	)"
 
+# Do not complain about CFLAGS etc since we don't use them
+QA_FLAGS_IGNORED='.*'
+
 S="${WORKDIR}/${MY_P}-linux-x86_64"
 
 src_prepare() {
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index c1eb48707187..2f104ce58c53 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,2 +1 @@
-DIST mediawiki-1.34.4.tar.gz 40739239 BLAKE2B a8f413c0797daa549891ea6909cfc65a51b8f7d5aec87a82aba4c4395b6d960eb1fe41e432610d28b74a9e4ae716e71f15522ef86d1a17c896a45c4851ab8044 SHA512 0caa85c00bce4640710aba865bb17674ff3efa8413c5fb2139f6c570c303c585046fa88bd6552061532e88b221505a45e8d836bbeba2da2ac0162901749353f9
 DIST mediawiki-1.35.0.tar.gz 48039474 BLAKE2B 54d4e5edd4d7531815840d180a92bdaf008e28df3ea9ad26ba27673e4c6f904f5643c0ff333efd5a7e03512b54514c9eb74c5ed1774ef7f4085dbc50dcf42f4d SHA512 0d3d5b464abc2fdea2aa798bdf7fc53d5269852d9ed3f787710528505bbccfed2796b0e2459f5776929f3f0f207a145ae4a8f13e3040322e22d59481a71cfcde
diff --git a/www-apps/mediawiki/mediawiki-1.34.4.ebuild b/www-apps/mediawiki/mediawiki-1.34.4.ebuild
deleted file mode 100644
index f8b511b8a3d6..000000000000
--- a/www-apps/mediawiki/mediawiki-1.34.4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit webapp
-
-MY_BRANCH=$(ver_cut 1-2)
-
-DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
-HOMEPAGE="http://www.mediawiki.org"
-SRC_URI="http://releases.wikimedia.org/${PN}/${MY_BRANCH}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc x86"
-IUSE="imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND="dev-lang/php[ctype,fileinfo,iconv,json,postgres?,session,ssl,unicode,xml,xmlreader]
-	imagemagick? ( virtual/imagemagick-tools )
-	!imagemagick? ( dev-lang/php[gd] )
-	mysql? ( dev-lang/php[mysql,mysqli] )
-	sqlite? (
-		dev-db/sqlite[fts3(+)]
-		dev-lang/php[pdo,sqlite]
-	)
-	virtual/httpd-php"
-
-need_httpd_cgi
-
-RESTRICT="test"
-
-src_unpack() {
-	default
-
-	# remove lua binaries (bug #631554)
-	rm -fr "${S}"/extensions/Scribunto/includes/engines/LuaStandalone/binaries || die "Failed to remove lua binaries"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	# First we install docs and then copy everything left into htdocs dir
-	# to avoid bugs like #236411.
-
-	# We ensure the directories are prepared for writing.  The post-
-	# install instructions guide the user to enable the feature.
-	local DOCS="FAQ HISTORY INSTALL README RELEASE-NOTES-${PV:0:4} UPGRADE"
-	dodoc ${DOCS} docs/*.txt
-	docinto databases
-	dodoc docs/databases/*
-	# Clean everything not used at the site...
-	rm -rf ${DOCS} COPYING tests docs || die
-	find . -name Makefile -delete || die
-	# and install
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	# If imagemagick is enabled then setup for image upload.
-	# We ensure the directory is prepared for writing.
-	if use imagemagick ; then
-		webapp_serverowned "${MY_HTDOCSDIR}"/images
-	fi
-
-	webapp_postinst_txt en "${FILESDIR}/postinstall-1.18-en.txt"
-	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-1.16-en.txt"
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		echo
-		elog "=== Consult the release notes ==="
-		elog "Before doing anything, stop and consult the release notes"
-		elog "/usr/share/doc/${PF}/RELEASE-NOTES-${PV:0:4}.bz2"
-		echo
-		elog "These detail bug fixes, new features and functionality, and any"
-		elog "particular points that may need to be noted during the upgrade procedure."
-		echo
-		ewarn "Back up existing files and the database before upgrade."
-		ewarn "http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki"
-		ewarn "provides an overview of the backup process."
-		echo
-	fi
-}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 1901478141b5..bbb2fe697838 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 0fa30e0bcdbb..2ff314bf0ed7 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,7 +1,7 @@
 DIST chromium-86-patchset-7.tar.xz 7560 BLAKE2B b7efc559bebe048e7c1a8ff7e3a88f4c47889976d7f573ed48562cc0b70a9282751145e1f5b90cb651c34fe7c43f8f414c42cc8c78cf70e5ffa8eaff13334630 SHA512 cbcee766a2aea1c339ef9589828875dc431aba002d77fa9531731514cbb219437dfc1d766ebc184ac477990589386070cf3d0f68ceb3211f8dac6c6be7da3a09
 DIST chromium-86.0.4240.198.tar.xz 825538884 BLAKE2B 86da563cfd3c429d44ea1629ab25072135323c5f84f9966b38f2558c0fb88899fa1c462efca1852f89a8ff082834385ae5c2e07798929ba8e7c536ae58e778e3 SHA512 179f43b1444b805b8939098c71d542276985d65ef03bd1bf2303b21bf26b431e790a42310b2749c1901f0f8514e9ccadb776b7d39b7833a8154624557fbcf423
-DIST chromium-87-patchset-8.tar.xz 5484 BLAKE2B 732fe9b293a0956478ca8fc7a8b09a4ae7b618cffa193cc886c2a618adb33eccdc15bcf5cb4b878f970385d93c025129a6048ac3e9de62acc0021f0c5e6cabee SHA512 9fd7057341d35c23577f48fc0c95ca96d723dd11a7c24aa91de90898c0a4958b3f2c699594b5d32d59e8c587018da2be83caf1a1746656e5c24d14045b1d2c2a
-DIST chromium-87.0.4280.47.tar.xz 856391876 BLAKE2B 892f3083d783fec200aba60e8181162615f055af118a5b7538a277f2f411c937e0c7fbc23b3a20359396bfa97b361d6c2fb91706fcd024eefd7d29f45b800caf SHA512 5ac841c82999afa4d283bef693c9929f59b85e9f39e1e703393298427ddd70a73f1cd0c535066cf46c894092fb42ade6925ca312836aea2293f51611de350702
+DIST chromium-87-patchset-9.tar.xz 6036 BLAKE2B 4dd9aa0e88f11a9104cb13e73607c3b4fcd7e9cb556034472e2fd46158db6e7505b22c098df1c7cab6c7ff06ba6dc45914dcab58a405e0eafffa58d8b0cafbbf SHA512 c036ee20b4906bdb1b3104ecacf30a092ee3662ec10754bf2b168f1b7e1dbf593216e4dc70f8264540fadf91a33b48a8b8040028966dfcc8d8be99807b5f1b99
+DIST chromium-87.0.4280.60.tar.xz 856433576 BLAKE2B b6de4e90c9c70923c258af2371d34fbbf9e3945014b7fff2e6f60cd9292e2e93b029fdc31a71110b7c25fb873894522d16508fed934200315eba5e14ddbcc2c5 SHA512 f3a21320c8147743f3bd838a038f1525d08768fce44daf2bfa74e5d23351bff588de92a9b654da2341c9a19bd37a58b8dfd9806810a8a7794b168ae64380011d
 DIST chromium-88-patchset-2.tar.xz 6832 BLAKE2B 5ef8a3ce491c96d71ab7ed41d188dcff929c146f2c412bda1035b52fda09dc2bdeb3266eb3e1d046398deb59f440e69ee255a61ced3c2ab409e99ffd36b769e7 SHA512 e83564dfb4367867494868b53d171c276ee9d6827a60a80ac6ab06b410ed79c64c79b60b5be6e44d25987029ebed997b2779ab019d23908df8d14f2decad51be
 DIST chromium-88.0.4315.5.tar.xz 845479952 BLAKE2B 78021935cbf7b3ceaedda1d1e4f355e4fe95795f5c793b46311ccc3c9dda53eb1518fe6472dc761790a9ea37a57c2f554fe442aff5d82bb133a028ff491b6099 SHA512 586fabb0759a880a010d6f80b3c5ec0f6477524b7d110cf05767cf2a8b48d81ad1e5161ebcd0e045f18006cf626413188dc6247a08b7ea57db53422b0708d4d3
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
diff --git a/www-client/chromium/chromium-87.0.4280.47.ebuild b/www-client/chromium/chromium-87.0.4280.60.ebuild
similarity index 99%
rename from www-client/chromium/chromium-87.0.4280.47.ebuild
rename to www-client/chromium/chromium-87.0.4280.60.ebuild
index b334bffc88cf..8d4ef7e9afcd 100644
--- a/www-client/chromium/chromium-87.0.4280.47.ebuild
+++ b/www-client/chromium/chromium-87.0.4280.60.ebuild
@@ -13,7 +13,7 @@ inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-util
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://chromium.org/"
-PATCHSET="8"
+PATCHSET="9"
 PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
 	https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip
diff --git a/www-client/firefox/firefox-83.0_rc2.ebuild b/www-client/firefox/firefox-83.0_rc2.ebuild
index 968f708f8c63..5a78bea0e5c2 100644
--- a/www-client/firefox/firefox-83.0_rc2.ebuild
+++ b/www-client/firefox/firefox-83.0_rc2.ebuild
@@ -66,7 +66,8 @@ IUSE="clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate
 	+system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
 	+system-libvpx +system-webp wayland wifi"
 
-REQUIRED_USE="screencast? ( wayland )"
+REQUIRED_USE="debug? ( !system-av1 )
+	screencast? ( wayland )"
 
 BDEPEND="${PYTHON_DEPS}
 	app-arch/unzip
@@ -373,9 +374,9 @@ pkg_pretend() {
 
 		# Ensure we have enough disk space to compile
 		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13G"
+			CHECKREQS_DISK_BUILD="13500M"
 		else
-			CHECKREQS_DISK_BUILD="5600M"
+			CHECKREQS_DISK_BUILD="6400M"
 		fi
 
 		check-reqs_pkg_pretend
@@ -392,9 +393,9 @@ pkg_setup() {
 
 		# Ensure we have enough disk space to compile
 		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13G"
+			CHECKREQS_DISK_BUILD="13500M"
 		else
-			CHECKREQS_DISK_BUILD="5600M"
+			CHECKREQS_DISK_BUILD="6400M"
 		fi
 
 		check-reqs_pkg_setup
diff --git a/www-client/netsurf/netsurf-3.10-r3.ebuild b/www-client/netsurf/netsurf-3.10-r4.ebuild
similarity index 99%
rename from www-client/netsurf/netsurf-3.10-r3.ebuild
rename to www-client/netsurf/netsurf-3.10-r4.ebuild
index ff68d956965c..1c1672618723 100644
--- a/www-client/netsurf/netsurf-3.10-r3.ebuild
+++ b/www-client/netsurf/netsurf-3.10-r4.ebuild
@@ -38,7 +38,7 @@ RDEPEND="
 		x11-libs/gtk+:2 )
 	javascript? (
 		>=dev-libs/nsgenbind-0.7
-		duktape? ( dev-lang/duktape )
+		duktape? ( dev-lang/duktape:= )
 		!duktape? ( dev-lang/spidermonkey:0= )
 	)
 	jpeg? ( >=virtual/jpeg-0-r2:0 )
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 2bd43afee05b..e5014fea0d2e 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -2,8 +2,7 @@ DIST seamonkey-2.53.3-system_libvpx-1.8.patch.xz 3128 BLAKE2B f73802d2715a11964a
 DIST seamonkey-2.53.4.source-l10n.tar.xz 12110188 BLAKE2B 6bf25f25bd72e35252824221d6ecf43f910cae65e21e2e15b628d9340256a3196b11a20522ce6284cee28a92141907ddcd5366427c356e57fb1a0015a064a2c2 SHA512 a5ac165412d3391206b7bcb2e7112693ce272e47e6cd2da321a60f52799fb04ac0d1ea84fb535ba73ef8d9faf5d582b314d2890768fd440136c830f3c88777cd
 DIST seamonkey-2.53.4.source.tar.xz 294513316 BLAKE2B 79425b0d15f99e30bd70871c28636ed8c567703b7048a46534fa971debbfeb90dd05880feca49354cb818c4a127cbc1f3ff17729784f90de91ba82db6da5fa59 SHA512 3450d6251f309bee96aa792cdce66b946d841089e0031ccbcf606845b1e0c951d58a8117a9e61e2d2435c1df614110944e5eac7ae9bd08429146bfe7334137fb
 DIST seamonkey-2.53.4_beta1-patches-01.tar.xz 39676 BLAKE2B de7742e6c286ca21403d003e22e3eba56e4d59c3f628c9768b47bac148abefbabfcd0510c89cc319c29e0775e316922c680d3de3dbfc542cae4f1f4942773124 SHA512 e97d6de074041f17cfe935995ce7116dee4249dc736315c82ed3878a92189d09542f141f65499ecdfd8621638d130b6d5786ab6033f3f794a805e136acefec3d
-DIST seamonkey-2.53.5_beta1-patches-01.tar.xz 43068 BLAKE2B 15c555d5c4abca6fc34a029dd85602618a26fa42d7b4960c664f64f685e0e22547bd4611c1ac60040840584c0a02bc7bf04e47f0c09b1f996258ae2e97572757 SHA512 f8e5e0c8660c60bbf9a6da843ea82136ab47744d2b68eaa767d5d688e21c773a47e36fdaa3fbd17061609cae7ab0433cd265e0dfe72cc75108017d6e5b2534f6
+DIST seamonkey-2.53.5.source-l10n.tar.xz 12108000 BLAKE2B f8e3b3bcdadf92decaa2cffacac937a6c219017a205385136e98fa6fa13d5176dc000ee00ac910951d1e623c82241b1ed3d0b0b6754c5c5e0d2cf315c9bd097a SHA512 6532465d0ffbe2f36e5db0b54a801bf3b5d5481a1f39933620bea641e7faf8fcc0a04f5ff1e72272f119954835663e6d1fdb3d0595468a2fbb336b71d0290ce6
+DIST seamonkey-2.53.5.source.tar.xz 285387556 BLAKE2B 34f0a0b24f15f13bd8b7975a863a9351e2d29494bc374f5d525d3c2720a834fe328320aaea88556abb76e6b131c756a107c3ee9275c2a65da582a6beecdc94f8 SHA512 d2722a8864bcdb58851447802576877198e1b71a76a0be04df9ccabd449bdbdd200402ca10041bcab21eca757edc8e6a1c3dc7ec3244cca119f2d1c8979d3a9b
 DIST seamonkey-2.53.5_beta1-patches-02.tar.xz 44096 BLAKE2B e0c31af11b3bf88f572703403f186bda71af0c26cd52a99b773dfd765961c430f2d516bba266871b28e5848d5c0f9e9df1a074b05f4b5da7323fd9042c25054e SHA512 434e4cad74d659f46a051207bf43087ad780e40c29b465a9c4c8e7366e9d8b197da20e5ffbafadb8ddb3f1754ad81b75f3d7a899adadd3bb8a7b83e501cfaf9a
 DIST seamonkey-2.53.5_beta1-perf-guide_checksum.patch 40647 BLAKE2B e94e892e5b696a57087a91060c79de649bd0bc053ad5d9158017870e37b3b478e5e30cace2fb07c72d6e29954c7678dcfea7f2039369c78a390b6e29d7419d07 SHA512 1f77ca1109d454db3065fe0af7ad87f7bc69995ec9f4141858746019623608f09f3c30510bd5a1a9123cafdaa328fdbc98750875daa727a98590cb0537343b51
-DIST seamonkey-2.53.5_beta1.source-l10n.tar.xz 12108000 BLAKE2B f8e3b3bcdadf92decaa2cffacac937a6c219017a205385136e98fa6fa13d5176dc000ee00ac910951d1e623c82241b1ed3d0b0b6754c5c5e0d2cf315c9bd097a SHA512 6532465d0ffbe2f36e5db0b54a801bf3b5d5481a1f39933620bea641e7faf8fcc0a04f5ff1e72272f119954835663e6d1fdb3d0595468a2fbb336b71d0290ce6
-DIST seamonkey-2.53.5_beta1.source.tar.xz 285415424 BLAKE2B 72b3348b347c293244f7c6bd62113725f640d3e39506be03c8e74170e255167ff63bc169eb506814bdf8cb05d410f851a94e947b008118582cfa1be413f6f842 SHA512 ea67917d90dc5119ff6cdd81ae5a1ef067deea770bf80cef0a6415b3e30c53c43b97e1c2d14f8b5e7e0ee8015e9a658012203f01d977f2a94cab8e7d4ed7e366
diff --git a/www-client/seamonkey/seamonkey-2.53.5_beta1-r1.ebuild b/www-client/seamonkey/seamonkey-2.53.5.ebuild
similarity index 99%
rename from www-client/seamonkey/seamonkey-2.53.5_beta1-r1.ebuild
rename to www-client/seamonkey/seamonkey-2.53.5.ebuild
index 50f376593f47..4043d78b6ead 100644
--- a/www-client/seamonkey/seamonkey-2.53.5_beta1-r1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.53.5.ebuild
@@ -184,6 +184,7 @@ src_prepare() {
 	# Apply our patches
 	eapply "${WORKDIR}"/seamonkey
 
+	rm "${WORKDIR}"/firefox/4000_sysctl.patch || die
 	# browser patches go here
 	pushd "${S}"/mozilla &>/dev/null || die
 	eapply "${WORKDIR}"/firefox
diff --git a/www-client/seamonkey/seamonkey-2.53.5_beta1.ebuild b/www-client/seamonkey/seamonkey-2.53.5_beta1.ebuild
deleted file mode 100644
index 0f4f3229e2f8..000000000000
--- a/www-client/seamonkey/seamonkey-2.53.5_beta1.ebuild
+++ /dev/null
@@ -1,531 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WANT_AUTOCONF="2.1"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
-
-# This list can be updated with scripts/get_langs.sh from the mozilla overlay
-# note - could not roll langpacks for: ca fi
-#MOZ_LANGS=(ca cs de en-GB es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT
-#	    ru sk sv-SE tr uk zh-CN zh-TW)
-MOZ_LANGS=(cs de en-GB es-AR es-ES fr hu it ja lt nl pl pt-PT
-	    ru sk sv-SE zh-CN zh-TW)
-
-MOZ_PV="${PV/_pre*}"
-MOZ_PV="${MOZ_PV/_alpha/a}"
-MOZ_PV="${MOZ_PV/_beta/b}"
-MOZ_PV="${MOZ_PV/_rc/rc}"
-MOZ_P="${P}"
-MY_MOZ_P="${PN}-${MOZ_PV}"
-
-if [[ ${PV} == *_pre* ]] ; then
-	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}"
-else
-	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
-fi
-
-S="${WORKDIR}/${MY_MOZ_P}"
-SRC_URI="${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz
-	${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source-l10n.tar.xz -> ${P}.source-l10n.tar.xz"
-
-MOZ_GENERATE_LANGPACKS=1
-MOZ_L10N_SOURCEDIR="${S}/${P}-l10n"
-inherit autotools check-reqs flag-o-matic mozcoreconf-v6 mozextension mozlinguas-v2 nsplugins pax-utils toolchain-funcs xdg-utils
-
-PATCH="${PN}-2.53.5_beta1-patches-01"
-
-DESCRIPTION="Seamonkey Web Browser"
-HOMEPAGE="http://www.seamonkey-project.org"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+calendar +chatzilla +crypt dbus debug +gmp-autoupdate +ipc jack minimal
-neon pulseaudio +roaming selinux startup-notification system-harfbuzz system-icu
-system-jpeg system-libevent system-sqlite system-libvpx test wifi"
-RESTRICT="!test? ( test )"
-
-SRC_URI+="
-	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
-	https://dev.gentoo.org/~polynomial-c/mozilla/${PN}-2.53.5_beta1-perf-guide_checksum.patch
-	system-libvpx? ( https://dev.gentoo.org/~polynomial-c/mozilla/${PN}-2.53.3-system_libvpx-1.8.patch.xz )
-"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-DEPEND="
-	>=app-text/hunspell-1.5.4:=
-	dev-libs/atk
-	>=dev-libs/glib-2.26:2
-	>=dev-libs/libffi-3.0.10:=
-	>=dev-libs/nspr-4.23
-	>=dev-libs/nss-3.47.1
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	>=media-libs/libpng-1.6.31:0=[apng]
-	>=media-libs/mesa-10.2:=
-	>=sys-libs/zlib-1.2.3
-	>=x11-libs/cairo-1.10[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.4.0:3
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/pango-1.22.0
-	>=x11-libs/pixman-0.19.2
-	media-video/ffmpeg
-	virtual/freedesktop-icon-theme
-	dbus? (
-		>=dev-libs/dbus-glib-0.72
-		>=sys-apps/dbus-0.60
-	)
-	jack? ( virtual/jack )
-	crypt? ( <x11-plugins/enigmail-2.1.0 )
-	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-	pulseaudio? ( || (
-		media-sound/pulseaudio
-		>=media-sound/apulse-0.1.9
-	) )
-	startup-notification? ( >=x11-libs/startup-notification-0.8 )
-	system-harfbuzz? (
-		>=media-gfx/graphite2-1.3.9-r1
-		>=media-libs/harfbuzz-1.3.3:0=
-	)
-	system-icu? ( >=dev-libs/icu-59.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0= )
-	system-libvpx? ( >=media-libs/libvpx-1.8.0:0=[postproc] )
-	system-sqlite? ( >=dev-db/sqlite-3.19.3:3[secure-delete,debug=] )
-	wifi? (
-		kernel_linux? (
-			>=dev-libs/dbus-glib-0.72
-			net-misc/networkmanager
-			>=sys-apps/dbus-0.60
-		)
-	)
-"
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-mozilla )
-"
-# Convert to BDEPEND once the ebuild goes EAPI-7
-DEPEND+="
-	app-arch/unzip
-	app-arch/zip
-	dev-lang/perl
-	sys-apps/findutils
-	>=sys-devel/binutils-2.16.1
-	virtual/pkgconfig
-	>=virtual/rust-1.34.0
-	amd64? (
-		${ASM_DEPEND}
-		virtual/opengl
-	)
-	x86? (
-		${ASM_DEPEND}
-		virtual/opengl
-	)
-"
-
-# allow GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z $GMP_PLUGIN_LIST ]] ; then
-	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-BUILD_OBJ_DIR="${S}/seamonk"
-
-pkg_setup() {
-	if [[ ${PV} == *_beta* ]] || [[ ${PV} == *_pre* ]] ; then
-		ewarn "You're using an unofficial release of ${PN}. Don't file any bug in"
-		ewarn "Gentoo's Bugtracker against this package in case it breaks for you."
-		ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
-	fi
-
-	moz_pkgsetup
-}
-
-pkg_pretend() {
-	# Ensure we have enough disk space to compile
-	if use debug || use test ; then
-		CHECKREQS_DISK_BUILD="16G"
-	else
-		CHECKREQS_DISK_BUILD="12G"
-	fi
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	local l10n_sources="${P}.source-l10n.tar.xz"
-	unpack ${A/ ${l10n_sources}}
-
-	mkdir "${S}/${P}-l10n" || die
-	cd "${S}/${P}-l10n" || die
-	unpack ${l10n_sources}
-}
-
-src_prepare() {
-	# Apply our patches
-	eapply "${WORKDIR}"/seamonkey
-
-	# browser patches go here
-	pushd "${S}"/mozilla &>/dev/null || die
-	eapply "${WORKDIR}"/firefox
-	popd &>/dev/null || die
-
-	# Shell scripts sometimes contain DOS line endings; bug 391889
-	grep -rlZ --include="*.sh" $'\r$' . |
-	while read -r -d $'\0' file ; do
-		einfo edos2unix "${file}"
-		edos2unix "${file}"
-	done
-
-	use system-libvpx && eapply "${WORKDIR}/${PN}-2.53.3-system_libvpx-1.8.patch"
-	eapply "${DISTDIR}/${PN}-2.53.5_beta1-perf-guide_checksum.patch"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	local ms="${S}/mozilla"
-
-	# Don't error for format with gcc-9
-	grep -rl -- '-Werror=format' | xargs sed -i 's/error=format/no-&/' || die "sed failed"
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${ms}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Ensure that are plugins dir is enabled as default
-	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
-		"${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
-	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
-		"${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/suite/installer/Makefile.in || die
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${ms}"/toolkit/mozapps/installer/packager.mk || die
-
-	# Don't build libs-% locale files for chatzilla if we are not building chatzilla
-	# (this is hard-coded in the build system at present rather than being based on configuration)
-	if ! use chatzilla ; then
-		sed '/extensions\/irc\/locales libs-/s@^@#@' \
-			-i "${S}"/suite/locales/Makefile.in || die
-	fi
-
-	eautoreconf old-configure.in
-	cd "${S}"/mozilla || die
-	eautoconf old-configure.in
-	cd "${S}"/mozilla/js/src || die
-	eautoconf old-configure.in
-}
-
-src_configure() {
-	MEXTENSIONS="default"
-	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-	# get your own set of keys.
-	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-
-	##################################
-	# Former mozconfig_config() part #
-	##################################
-
-	# Migrated from mozcoreconf-2
-	mozconfig_annotate 'system_libs' --with-system-bz2
-	mozconfig_annotate 'system_libs' --with-system-zlib
-
-	# Disable for testing purposes only
-	mozconfig_annotate 'Upstream bug 1341234' --disable-stylo
-
-	# Must pass release in order to properly select linker via gold useflag
-	mozconfig_annotate 'Enable by Gentoo' --enable-release
-
-	# Must pass --enable-gold if using ld.gold
-	if tc-ld-is-gold ; then
-		mozconfig_annotate 'tc-ld-is-gold=true' --enable-gold
-	else
-		mozconfig_annotate 'tc-ld-is-gold=false' --disable-gold
-	fi
-
-	# Enable position independent executables
-	mozconfig_annotate 'enabled by Gentoo' --enable-pie
-
-	mozconfig_use_enable debug
-	mozconfig_use_enable debug tests
-	if ! use debug ; then
-		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
-	else
-		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
-	fi
-
-	mozconfig_use_enable startup-notification
-
-	# wifi pulls in dbus so manage both here
-	mozconfig_use_enable wifi necko-wifi
-	if use kernel_linux && use wifi && ! use dbus ; then
-		echo "Enabling dbus support due to wifi request"
-		mozconfig_annotate 'dbus required by necko-wifi on linux' --enable-dbus
-	else
-		mozconfig_use_enable dbus
-		mozconfig_annotate 'disabled' --disable-necko-wifi
-	fi
-
-	# These are enabled by default in all mozilla applications
-	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
-	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
-	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include --x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
-	if use system-libevent ; then
-		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
-	fi
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate 'Gentoo default' --enable-system-hunspell
-	mozconfig_annotate '' --disable-crashreporter
-	mozconfig_annotate 'Gentoo default' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-	mozconfig_annotate '' --disable-gconf
-	mozconfig_annotate '' --with-intl-api
-
-	# skia has no support for big-endian platforms
-	if [[ $(tc-endian) == "big" ]] ; then
-		mozconfig_annotate 'big endian target' --disable-skia
-	else
-		mozconfig_annotate '' --enable-skia
-	fi
-
-	# default toolkit is cairo-gtk3, optional use flags can change this
-	mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
-
-	# Instead of the standard --build= and --host=, mozilla uses --host instead
-	# of --build, and --target intstead of --host.
-	# Note, mozilla also has --build but it does not do what you think it does.
-	# Set both --target and --host as mozilla uses python to guess values otherwise
-	mozconfig_annotate '' --target="${CHOST}"
-	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
-
-	mozconfig_use_enable pulseaudio
-	# force the deprecated alsa sound code if pulseaudio is disabled
-	if use kernel_linux && ! use pulseaudio ; then
-		mozconfig_annotate '-pulseaudio' --enable-alsa
-	fi
-
-	# For testing purpose only
-	mozconfig_annotate 'Sandbox' --enable-content-sandbox
-
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-
-	# Modifications to better support ARM, bug 553364
-	if use neon ; then
-		mozconfig_annotate '' --with-fpu=neon
-		mozconfig_annotate '' --with-thumb=yes
-		mozconfig_annotate '' --with-thumb-interwork=no
-	fi
-	if [[ ${CHOST} == armv* ]] ; then
-		mozconfig_annotate '' --with-float-abi=hard
-		if ! use system-libvpx ; then
-			sed -i -e "s|softfp|hard|" \
-				"${S}"/mozilla/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-	##################################
-	# Former mozconfig_config() end  #
-	##################################
-
-	# enable JACK, bug 600002
-	mozconfig_use_enable jack
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Linking fails without this due to memory exhaustion
-	use x86 && append-ldflags "-Wl,--no-keep-memory"
-
-	if ! use chatzilla ; then
-		MEXTENSIONS+=",-irc"
-	fi
-	if ! use roaming ; then
-		MEXTENSIONS+=",-sroaming"
-	fi
-
-	# Setup api key for location services
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
-	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-
-	# sm-specific settings
-	mozconfig_use_enable calendar
-
-	# Use an objdir to keep things organized.
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
-
-	mozlinguas_mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# Required until mozcoreconf-v?.eclass-es are finally fixed...
-	sed \
-		-e '/--enable-application/s@comm/suite@suite@' \
-		-i .mozconfig || die
-
-	# Work around breakage in makeopts with --no-print-directory
-	MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
-
-	if [[ $(gcc-major-version) -lt 4 ]] ; then
-		append-cxxflags -fno-stack-protector
-	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]] ; then
-		if use amd64 || use x86 ; then
-			append-flags -mno-avx
-		fi
-	fi
-
-	# workaround for funky/broken upstream configure...
-	SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
-	emake V=1 -f client.mk configure
-}
-
-src_compile() {
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
-	emake V=1 -f client.mk
-
-	mozlinguas_src_compile
-}
-
-src_install() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
-
-	local emid
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}/dist/bin/xpcshell"
-
-	# Copy our preference before omnijar is created.
-	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	# Set default path to search for dictionaries.
-	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
-		>> "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	echo 'pref("extensions.autoDisableScopes", 3);' >> \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	local plugin
-	if ! use gmp-autoupdate ; then
-		for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
-			echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-				"${S}/${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-				|| dir
-		done
-	fi
-
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
-	emake DESTDIR="${D}" install
-	MOZ_P="${MY_MOZ_P}" mozlinguas_src_install
-	cp "${FILESDIR}"/${PN}.desktop "${T}" || die
-
-	sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
-		-i "${T}"/${PN}.desktop || die
-	sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
-		|| die
-
-	# Install icon and .desktop for menu entry
-	newicon "${S}"/suite/branding/${PN}/default64.png ${PN}.png
-	domenu "${T}"/${PN}.desktop
-
-	# Required in order to use plugins and even run seamonkey on hardened.
-	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
-
-	if use minimal ; then
-		rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk}
-	fi
-
-	if use chatzilla ; then
-		local emid='{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}'
-
-		# remove the en_US-only xpi file so a version with all requested locales can be installed
-		if [[ -e "${ED}"${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi ]]; then
-			rm -f "${ED}"${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
-		fi
-
-		# merge the extra locales into the main extension
-		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/chatzilla
-
-		# install the merged extension
-		mkdir -p "${T}/${emid}" || die
-		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/chatzilla/* || die
-		insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
-		doins -r "${T}/${emid}"
-	fi
-
-	# Handle plugins dir through nsplugins.eclass
-	share_plugins_dir
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> ${T}/11${PN}
-	doins "${T}"/11${PN}
-}
-
-pkg_preinst() {
-	MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}"
-
-	if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then
-		rm ${MOZILLA_FIVE_HOME}/plugins -rf
-	fi
-}
-
-pkg_postinst() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# Update mimedb for the new .desktop file
-	xdg_desktop_database_update
-
-	if ! use gmp-autoupdate ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
-	fi
-
-	if use chatzilla ; then
-		elog "chatzilla is now an extension which can be en-/disabled and configured via"
-		elog "the Add-on manager."
-	fi
-}
diff --git a/www-client/vivaldi/vivaldi-3.4.2066.106_p1.ebuild b/www-client/vivaldi/vivaldi-3.4.2066.106_p1.ebuild
index 446810090bdd..f807af0fd17c 100644
--- a/www-client/vivaldi/vivaldi-3.4.2066.106_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-3.4.2066.106_p1.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="-* amd64 ~arm ~arm64 x86"
 RESTRICT="bindist mirror"
 
 DEPEND="
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 76d563f1c6a2..b837b428dd84 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index be68a6d0993f..168bd90e6b67 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,5 +1,4 @@
 DIST apache-tomcat-7.0.106-src.tar.gz 5302091 BLAKE2B f60975ef5570501b03e71645969170c44450f2b56f37688001ad1b4dce3a394f6800e9b28a8fabf59241116345fb7e2a287441f3eace020bc5c0203d57630c91 SHA512 5ce5a5af93c58e69c4758c2c0dedeadeceb6be920421b9d3b3d071d32fc8eb59ba8312c98d037b8434fe43d57a9f720ad8790de29a26ed2959f6c761fe1fd573
-DIST apache-tomcat-8.5.58-src.tar.gz 5773000 BLAKE2B e361cc359f86bb02fa4c39ebd51b52b4552aa78603c4d8fa5c5c8d87bcb89f6ed391408e3713a5011b7b8cc29506ad65f25b6047ec1009267ce8a68d396b3bc6 SHA512 f9e21c0c60b80e1a15049ff4ee6a4914036d19ed171c40bc614fc999c81c59c394c0a6595ac969a5b86662fa6c366676e7ecb2695c28518473b3f6c79e9a0e05
 DIST apache-tomcat-8.5.59-src.tar.gz 5787634 BLAKE2B 8ca1aa8b4d12d0e73c0d7937e906530037168ac349b196e172935332e632b1e9ab15379f532cb8fb1b2f853d01567332af9c031393882c833dcea65f9e626b09 SHA512 bed80e86c4dc972fd6ad414a804ed2bffc797e22b0a5e0e6e93c8540fb87cffb2fd2f1f8d97873a3ee24397f7961a8fdeb6756c542a532e4b73468bccec6e626
 DIST apache-tomcat-9.0.38-src.tar.gz 5948083 BLAKE2B ac076684f10a51bf0e0b5b0dbf18ee476ec900bead0089010de7b4a7d380a1e18035eaa0d0f661c863aa53491e51f719c2a5985e4791bcc9dada4c421db39fe7 SHA512 13c79abed71ead564b108ec8a046e78374611acd906f4b6e775ac0427446117192be6b25f29894e625e2dc13f79abbc97bc52b32120ce5701cbe0f5ae05bc57b
 DIST biz.aQute.bnd-5.1.1.jar 16088761 BLAKE2B 59906cc39ea27ef20cbf82de1ba78096f34dc417da6dc5c28e21f6e92c0625efecf14cec6c5faf0ab17551c31a6c87a24614c2ac75ac902cfea30199ecc0d39f SHA512 8092b083e7b86e75bf27233964763b88bee74d8ae141c85e387c1cc8bd0cbf3a54be27afea29931fb3ae950700a515fd4a28cfe8e7f26cbaaec506aa06357a37
diff --git a/www-servers/tomcat/tomcat-8.5.58.ebuild b/www-servers/tomcat/tomcat-8.5.58.ebuild
deleted file mode 100644
index 3e285a9aaac4..000000000000
--- a/www-servers/tomcat/tomcat-8.5.58.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8.5"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.5"
-SAPI_SLOT="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
-	virtual/jre"
-DEPEND="${COMMON_DEP}
-	app-admin/pwgen
-	>=dev-java/ant-core-1.9.13
-	virtual/jdk:1.8
-	doc? (
-		dev-java/glassfish-xmlrpc-api:0
-		dev-java/wsdl4j:0
-	)
-	test? (
-		>=dev-java/ant-junit-1.9:0
-		dev-java/easymock:3.2
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
-	default
-
-	find -name '*.jar' -type f -delete -print || die
-
-	# Remove bundled servlet-api
-	rm -rv java/javax/{el,servlet} || die
-
-	eapply "${FILESDIR}/${PN}-8.5.57-build.xml.patch"
-
-	# For use of catalina.sh in netbeans
-	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
-		bin/catalina.sh || die
-
-	java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
-	use doc && EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only glassfish-xmlrpc-api glassfish-xmlrpc-api.jar):$(java-pkg_getjar --build-only wsdl4j wsdl4j.jar)"
-	java-pkg-2_src_compile
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	# add missing docBase
-	local apps="host-manager manager"
-	for app in ${apps}; do
-		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
-			output/build/webapps/${app}/META-INF/context.xml || die
-	done
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# create "logs" directory in $CATALINA_BASE
-	# and set correct perms, see #458890
-	dodir "${dest}"/logs
-	fperms 0750 "${dest}"/logs
-
-	# replace the default pw with a random one, see #92281
-	local randpw="$(pwgen -s -B 15 1)"
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	# prepend gentoo.classpath to common.loader, see #453212
-	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
-	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
-	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
-	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
-	elog "To manage Tomcat instances, run:"
-	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
-	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.5.59.ebuild b/www-servers/tomcat/tomcat-8.5.59.ebuild
index cb1cc0e1c51c..3e285a9aaac4 100644
--- a/www-servers/tomcat/tomcat-8.5.59.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.59.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="8.5"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index da3dcb28b4c8..326975b48e08 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/gdk-pixbuf-xlib/Manifest b/x11-libs/gdk-pixbuf-xlib/Manifest
new file mode 100644
index 000000000000..228d7944b43b
--- /dev/null
+++ b/x11-libs/gdk-pixbuf-xlib/Manifest
@@ -0,0 +1 @@
+DIST gdk-pixbuf-xlib-2.40.2.tar.bz2 52418 BLAKE2B 95c01aef9cafa80171e1ca2d6eb372a3d4e13bdb8d098a1da9259d6cc881494da1954936d20c24d06a38ec5258323e3fc4f6dc4cfc5a9f1ad6e50bc5861e65c6 SHA512 b9831bd1b4db8718b35ed96057496824696e311ce1661394397306ea9d544e6113aaa6865cdd1c1a250bc3617515fd81e3f45d997531507d2592fe294cbde01c
diff --git a/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild b/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild
new file mode 100644
index 000000000000..e846536da7e5
--- /dev/null
+++ b/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson multilib-minimal
+
+DESCRIPTION="Deprecated Xlib integration for GdkPixbuf"
+HOMEPAGE="https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib"
+SRC_URI="https://gitlab.gnome.org/Archive/${PN}/-/archive/${PV}/${P}.tar.bz2"
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="gtk-doc"
+
+RDEPEND="
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.42.0[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.3
+		>=dev-util/gtk-doc-1.20
+	)
+"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgtk-doc="$(multilib_native_usex gtk-doc true false)"
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/x11-libs/gdk-pixbuf-xlib/metadata.xml b/x11-libs/gdk-pixbuf-xlib/metadata.xml
new file mode 100644
index 000000000000..b92ed12f95c8
--- /dev/null
+++ b/x11-libs/gdk-pixbuf-xlib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnome:gdk-pixbuf-xlib</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/x11-libs/gtk+/gtk+-3.24.22.ebuild b/x11-libs/gtk+/gtk+-3.24.22.ebuild
index 1712a3eb84a3..ed300aa27ff8 100644
--- a/x11-libs/gtk+/gtk+-3.24.22.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.22.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/libast/libast-0.7-r2.ebuild b/x11-libs/libast/libast-0.7-r2.ebuild
index 1d705a9e46f5..15f7036f2454 100644
--- a/x11-libs/libast/libast-0.7-r2.ebuild
+++ b/x11-libs/libast/libast-0.7-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="LIBrary of Assorted Spiffy Things"
 HOMEPAGE="http://www.eterm.org/download/"
@@ -22,22 +22,19 @@ RDEPEND="
 	media-libs/freetype
 	imlib? ( media-libs/imlib2 )
 	pcre? ( dev-libs/libpcre )"
-
 DEPEND="${RDEPEND}"
 
-DOCS=( README DESIGN ChangeLog )
-
-src_prepare() {
-	default
-	local myregexp="posix"
-	use pcre && myregexp="pcre"
+src_configure() {
 	econf \
 		$(use_with imlib) \
 		$(use_enable cpu_flags_x86_mmx mmx) \
-		--with-regexp="${myregexp}"
+		--with-regexp=$(usex pcre pcre posix) \
+		--disable-static
 }
 
 src_install() {
 	default
-	emake DESTDIR="${D}" install
+	dodoc DESIGN
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild b/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
index cf5551a641aa..547227d7959f 100644
--- a/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
+++ b/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Athena Widgets with N*XTSTEP appearance"
 HOMEPAGE="http://siag.nu/neXtaw/"
@@ -10,9 +10,9 @@ SRC_URI="http://siag.nu/pub/neXtaw/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE=""
 
-RDEPEND="x11-base/xorg-proto
+RDEPEND="
+	x11-base/xorg-proto
 	x11-libs/libICE
 	x11-libs/libXext
 	x11-libs/libXt
@@ -24,7 +24,11 @@ RDEPEND="x11-base/xorg-proto
 	!<x11-libs/neXtaw-0.15.1-r1"
 DEPEND="${RDEPEND}"
 
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+	default
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 05c2983e36d0..c4ca13da30ca 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/clipmenu/Manifest b/x11-misc/clipmenu/Manifest
new file mode 100644
index 000000000000..684bce97fb41
--- /dev/null
+++ b/x11-misc/clipmenu/Manifest
@@ -0,0 +1,2 @@
+DIST clipmenu-6.0.1.tar.gz 7219 BLAKE2B 85d61c34e3b964e0a39051a1443b1498fedab1f5b45c61f3a8b6c0a63058642ff4fcfabc7d4913893320b5196edac2c5a9ad5a84b71a9d2191a3e147283a816c SHA512 0c91ad3a873081a6f9abfcc7a4a9be7cbd4ca5017f447dac204042ae3f051c550111c73d9d06f1d2a7a6783cfda631154373a932ea40315e72907d52120d4801
+DIST clipmenu-6.1.0.tar.gz 8711 BLAKE2B a37f0f52343a4f22fdf4a37a57a2c715edd47aa1b77c90cf95f9af11a8107967eb24410ed43cee52ec5db5a1276c5e9bdf082668795f3054840b4f30e511ac55 SHA512 1392b08025b564dc17ca44e43847fdea85886b89fdd5426635c9c16d204610c6a9cc19297a20cdbc2eeef2c878adbfe994a2cfd05176457ca6fcbc75bc036acc
diff --git a/x11-misc/clipmenu/clipmenu-6.0.1.ebuild b/x11-misc/clipmenu/clipmenu-6.0.1.ebuild
new file mode 100644
index 000000000000..08751d666899
--- /dev/null
+++ b/x11-misc/clipmenu/clipmenu-6.0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Clipboard management using dmenu"
+HOMEPAGE="https://github.com/cdown/clipmenu"
+SRC_URI="https://github.com/cdown/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	x11-misc/clipnotify
+	x11-misc/dmenu
+	x11-misc/xsel
+"
+
+src_install() {
+	local binfile
+	for binfile in clipdel clipfsck clipmenu clipmenud; do
+		dobin ${binfile}
+	done
+
+	systemd_douserunit "init/clipmenud.service"
+}
diff --git a/x11-misc/clipmenu/clipmenu-6.1.0.ebuild b/x11-misc/clipmenu/clipmenu-6.1.0.ebuild
new file mode 100644
index 000000000000..47494c5e02a0
--- /dev/null
+++ b/x11-misc/clipmenu/clipmenu-6.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Clipboard management using dmenu"
+HOMEPAGE="https://github.com/cdown/clipmenu"
+SRC_URI="https://github.com/cdown/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	x11-misc/clipnotify
+	x11-misc/dmenu
+	x11-misc/xsel
+"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local binfile
+	for binfile in clipdel clipfsck clipmenu clipmenud; do
+		dobin ${binfile}
+	done
+
+	systemd_douserunit "init/clipmenud.service"
+}
diff --git a/x11-misc/clipmenu/metadata.xml b/x11-misc/clipmenu/metadata.xml
new file mode 100644
index 000000000000..b99ff18165e9
--- /dev/null
+++ b/x11-misc/clipmenu/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>erkiferenc@gmail.com</email>
+		<name>Ferenc Erki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-misc/clipnotify/Manifest b/x11-misc/clipnotify/Manifest
new file mode 100644
index 000000000000..222a5982b580
--- /dev/null
+++ b/x11-misc/clipnotify/Manifest
@@ -0,0 +1 @@
+DIST clipnotify-1.0.2.tar.gz 1318 BLAKE2B a418a1a25f43c033fd6457eabe926b0ebf911b233f9dd1cf6ff7a8399ab2660083bec969aef1f44edd583ee2cd1d097b71e7014b620efcdcb8c544a63612a17b SHA512 52277099d9543e0f550de63ff2e15e3e7ba63ea38f3928006e2b570bb1bcdd3f2f09892bd4efecc1f36fb5131e0567c28c2b0597123c90b9f78ab6fbd02dfc49
diff --git a/x11-misc/clipnotify/clipnotify-1.0.2.ebuild b/x11-misc/clipnotify/clipnotify-1.0.2.ebuild
new file mode 100644
index 000000000000..f3047ebe20ed
--- /dev/null
+++ b/x11-misc/clipnotify/clipnotify-1.0.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Notify on new X clipboard events"
+HOMEPAGE="https://github.com/cdown/clipnotify"
+SRC_URI="https://github.com/cdown/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	x11-libs/libX11
+	x11-libs/libXfixes
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dobin clipnotify
+}
diff --git a/x11-misc/clipnotify/metadata.xml b/x11-misc/clipnotify/metadata.xml
new file mode 100644
index 000000000000..b99ff18165e9
--- /dev/null
+++ b/x11-misc/clipnotify/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>erkiferenc@gmail.com</email>
+		<name>Ferenc Erki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-misc/j4-dmenu-desktop/Manifest b/x11-misc/j4-dmenu-desktop/Manifest
index e6b92c2ca983..0f75d6cf1999 100644
--- a/x11-misc/j4-dmenu-desktop/Manifest
+++ b/x11-misc/j4-dmenu-desktop/Manifest
@@ -1,2 +1 @@
-DIST j4-dmenu-desktop-2.17.tar.gz 33531 BLAKE2B c1dd82a444efdbbf2af644ee6cdba6746a81228c5f6b2d212d5ea248628855f1cd1c4dff091ae278eb8c6458db4934b60acd8e2dd9a9c88b32537e76878824b3 SHA512 7a41bb60a6b3afa7bf6229f08674d5f31e0152d0788a17edc210986d1b1f0d4fad13ffaa13c58ed7a0c5d2e67f8f95bb2a0f6556aeb0f2cc24c7d885b346325e
 DIST j4-dmenu-desktop-2.18.tar.gz 34785 BLAKE2B 26d5861d6d7ddcd9653a464d1175d19532001705de193811087fd42fddbdead89b8d49bd14f8e323288d6a7ba37bd4e11f4c7c52dd9b0a454f95a83a14853bcb SHA512 f8b0c825d567d60da0fb418e6f0b24a6d9daa9fb142b194b0a8b249303f4e09b6694fce72bf031007ac67253e488fc7666d4ba7beb032bc74cc2a32aca0f6c96
diff --git a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17-r1.ebuild b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17-r1.ebuild
deleted file mode 100644
index 8a8d8c7525b9..000000000000
--- a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_PV="r${PV}"
-
-DESCRIPTION="A fast desktop replacement for i3-dmenu-desktop"
-HOMEPAGE="https://github.com/enkore/j4-dmenu-desktop"
-SRC_URI="https://github.com/enkore/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+dmenu test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-cpp/catch:1 )"
-RDEPEND="dmenu? ( x11-misc/dmenu )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Respect users CFLAGS
-	sed -i -e "s/-pedantic -O2//" CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_GIT_CATCH="no"
-		-DWITH_TESTS="$(usex test)"
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	doman j4-dmenu-desktop.1
-}
-
-pkg_postinst() {
-	if ! use dmenu; then
-		elog "As you have disabled the 'dmenu' use flag,"
-		elog "x11-misc/dmenu won't be installed by default."
-		elog ""
-		elog "Since x11-misc/j4-dmenu-desktop uses x11-misc/dmenu as default,"
-		elog "you must configure your own replacement with --dmenu=<command>,"
-		elog "as otherwise it won't work."
-	fi
-}
diff --git a/x11-misc/lineakd/lineakd-0.9.0-r2.ebuild b/x11-misc/lineakd/lineakd-0.9.0-r2.ebuild
index a87eac2fc117..b1d571e4369a 100644
--- a/x11-misc/lineakd/lineakd-0.9.0-r2.ebuild
+++ b/x11-misc/lineakd/lineakd-0.9.0-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils ltprune multilib
+inherit multilib
 
 MY_P=${P/.0/}
 
@@ -36,7 +36,10 @@ PATCHES=(
 )
 
 src_configure() {
-	econf $(use_enable debug) --with-x
+	econf \
+		$(use_enable debug) \
+		--with-x \
+		--disable-static
 }
 
 src_install() {
@@ -46,12 +49,12 @@ src_install() {
 
 	emake -j1 DESTDIR="${D}" install
 
-	prune_libtool_files
-
 	dodoc AUTHORS README TODO
 
 	keepdir /usr/$(get_libdir)/lineakd/plugins
 
 	insinto /etc/lineak
 	doins lineakd.conf.example lineakd.conf.kde.example
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild b/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild
index 4848da2c45c0..21a90c825f75 100644
--- a/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild
+++ b/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild
@@ -36,7 +36,10 @@ PATCHES=(
 )
 
 src_configure() {
-	econf $(use_enable debug) --with-x
+	econf \
+		$(use_enable debug) \
+		--with-x \
+		--disable-static
 }
 
 src_install() {
diff --git a/x11-misc/xdock/xdock-0.3.0.ebuild b/x11-misc/xdock/xdock-0.3.0.ebuild
index 63c9381744b7..379d89b1ad35 100644
--- a/x11-misc/xdock/xdock-0.3.0.ebuild
+++ b/x11-misc/xdock/xdock-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,3 +23,12 @@ src_prepare() {
 	sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.ac || die
 	eautoreconf
 }
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 6ec2b0b723ef..1e8f50180ada 100644
Binary files a/x11-plugins/Manifest.gz and b/x11-plugins/Manifest.gz differ
diff --git a/x11-plugins/pidgin-extprefs/pidgin-extprefs-0.7-r1.ebuild b/x11-plugins/pidgin-extprefs/pidgin-extprefs-0.7-r1.ebuild
index eaa00ed1dce3..bd365bd9122f 100644
--- a/x11-plugins/pidgin-extprefs/pidgin-extprefs-0.7-r1.ebuild
+++ b/x11-plugins/pidgin-extprefs/pidgin-extprefs-0.7-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Extra preferences that are desired but are not worthy for Pidgin"
 HOMEPAGE="http://gaim-extprefs.sourceforge.net"
@@ -10,9 +10,16 @@ SRC_URI="mirror://sourceforge/gaim-extprefs/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
 
 RDEPEND="net-im/pidgin[gtk]"
-DEPEND="
-	virtual/pkgconfig
-	${RDEPEND}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index f96eb2f949bc..2c3ce85d29c1 100644
Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ
diff --git a/x11-terms/alacritty/Manifest b/x11-terms/alacritty/Manifest
index 85bc9df119b8..94752c9fe862 100644
--- a/x11-terms/alacritty/Manifest
+++ b/x11-terms/alacritty/Manifest
@@ -1,11 +1,16 @@
+DIST ab_glyph_rasterizer-0.1.4.crate 6641 BLAKE2B fc70a45030d969f8af31d1bc3f83069acc014b33cde31817063ab1d40f8caebe12f3896b6a249620a8f2a2d0adc149fcc402f2af25b31ebe223ad0779028d843 SHA512 a942a3b0848386677ed5c651034b001c0e24c7bd101be6a25bfed815310f3a530c8cb9e67e96ea3c36f4d7f09731552f734d5e73f705e3e8f2bf40d5151a7a91
 DIST adler-0.2.2.crate 10934 BLAKE2B c4efb9db06151797bb1016571ec94e7038e6b0bed220d77049a9d42eddbd34d0cd0805b4a11411f5533c51a0ca7ae09405afe9d1bb07a167fcb0b38830329e67 SHA512 47be9b0c9115b0a3dbfcc09d04b430d7beb4396305a30b58b55d0cfb24205734f0b32c719cbee95b7c844046e83a8f2c53262d02e01d62a21453c6e45886c448
 DIST adler32-1.0.4.crate 5105 BLAKE2B 344a5258e77328a24a545e32f9bc653fa25b7ea43803ed7861db261bce227aa1599520a42acea3de1f2acebb8fa9fad251e2688413b752eafe2401ca1a2ee34a SHA512 5990e1e277a1c3aae5adef5e4601b807a756a40e88578bb91f1c70d70babfa97fb3f2c1b963482ec8e18c16d5e722bf90fb42f9646c8dd840373f28965a2d123
 DIST adler32-1.1.0.crate 5442 BLAKE2B 1a4d932402a584fa6edda414c0dedff4994afcee7bfc71f85f6e8b4568de835bb7a3eebad1b5ac0be7f59cdb0e5ce5dfa4444d2c59d5ecf819d2a6abbbd7ea37 SHA512 57e3b3812e2747470c63edf64e13827c96ef8dd2311833b7f616ec63cf57ce8967636ec4d57464b607f570df06f6f648214d12ddc567e761b2de2ab16c8a7271
+DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3
 DIST aho-corasick-0.7.10.crate 111039 BLAKE2B 69f984dbe528ece5ce4345bc0f39c122507a88e781d7c2d5c9175d1788aeef8d21e0487c7c449e28fbbdaae8203fe68627d23ac0a58d30dc70befd26ac9af32f SHA512 e8a1cb252015435009883662ca23408f1491d8f01461f3a81082feabeeff72ec61beb4f1f3271fc8a87f1379899ecfc38036ac208dca17889f70ddaca2406a9b
 DIST aho-corasick-0.7.13.crate 111381 BLAKE2B 08efdd762a12cbafabfb6c1c6f8b87465b337ea006d48e612c5275f796e4d62aa0a595bcda783f7a58b1e2655b9b35333033806215518f097b6671888d152e0f SHA512 9bd3c12559d6bdb1ce798a62c59a202771b48125afb6e1b5be76cad13d750d9bedd7acd77d69557e34a698b17ed7da6832a7813d48ee2627f4a2abd5e04263e6
+DIST aho-corasick-0.7.14.crate 113042 BLAKE2B 6ba517169dd0bfafe7dd7755e2f664d831a17c6a367f29cb54d22b8b61eb04c75b67dead9a7855bdeaa1afd8aa5049b7580617bebf0cdac61c0712eb3525db4e SHA512 0a11e7bd2d3b6868fb6f64b61f3feead4ea57ab3c5d75c6586b68765425219e631bf875e43f73e79888e71079b3d7e10af36af6f96b72515105df79f5922f296
 DIST alacritty-0.4.3.tar.gz 1488401 BLAKE2B 0c4b622ec2dfbd45d4e3e99f6c83b0c0cc798cdac1b72d828e14f06242cdc796c29d78317c11e41126cad0e81677e1be8c7ae0ef911cfd3afe99445b4a1c73ce SHA512 1c1a50098fe7c2dfa5fc75e5fd2632de0c60d8ceba5316de15910a9ece7d5385ead765075b87c5154171a908e5d7c78f519d3a2991eccb313aae766208007402
 DIST alacritty-0.5.0.tar.gz 1500418 BLAKE2B c6f727c1d13ab6e831b0b434ad821045c6045f791ff35cbdc93f629dae945adeaba58485d8dc4f6655a7bea6de3cd8b6ed6002827dfe6a8825bd5f255ddb21dc SHA512 53ecda7996473890eea90b01b3f71c32d07abc38072dbc40ef3ccbc500a747af866e5b5aeea0ae0b85dc17e0b3c16fc9c5e3bae1a0d0f9a88c5ac264f51af62e
+DIST alacritty-0.6.0_rc2.tar.gz 1404361 BLAKE2B 08371e93cbc28946a6b434e3bffab06f710bff31fda001244bc41ca47b7bcdec1205d574628f94ebb1f8329728a6e10f764e2b53be45c39ca21142d1b70e573e SHA512 9198e3f47eb879c646b2761a0c387efdf0f65e49590824472e820bd7fc66e99a024dbe426195d973cb956d742516bf29472a81003dfb523e6ca1d0d12cfeef90
 DIST andrew-0.2.1.crate 9595 BLAKE2B d2cf73285889aaf702fb994fd1d5a1011e0f78011a612937ad9f06f506ef75c86fb82ee1069a8f520b926325a4363d83863234e1fd2a2fcd08ead5ff66b638c5 SHA512 06ba5a756e0d84953dcb1cd1714d1639e67e836dcdd92f5f77c2b35a2afdf0b0babcdf598e2c5cf2dc8661c8326bc27b1ac3c9963a5fcbc2e0c753da6ac730ea
+DIST andrew-0.3.1.crate 14030 BLAKE2B 5224eb5a5ad5ba7dd07259a98b8dc04f92154dcc7b5a53c89b4f7fd3c1a12d834093350ce9f7cd69a935d70cff50c0fbc68305eea9f918b334ec1a6e9e979ae2 SHA512 c4fc8903d4c2542c91e7f099d5d9d2b9179ade3f4c3e83ccd8027b06cb582ef700777cf440a07c2478311c1b7c2f7ca64d53fb390f9f5753dcb32491003db8d3
 DIST android_glue-0.2.3.crate 1572 BLAKE2B 8404cc69af7d1c9e851e67a69b5b18195388b50924b6a8afc7203bc5101babe9ae007724e552a929947fa9c639eb8ae13cdae0aedbc2d54b0b8d48373f15b7a3 SHA512 16ff1f0e1f50cd120dfbe57d45ebac1725fa75447c964a5b05a1a0565b13b0bc3b6c153edb4a50083ef5d802a889c9f9007e2e21a58dc408f9fb12e9437bd01b
 DIST android_log-sys-0.1.2.crate 5806 BLAKE2B 354e1a8fd046a0a0931752876560bc7fa720524d20715f5ddb49b80589dc0cf6a23fb13a9cbfbb3a7a823de90f76f6bdc336304d028d8857da2a4348e8483cf7 SHA512 36bd43f2aa244ab085a8addc972753897c7dbc66a648981cd20301f3e67f097713f2397d3bb7011dfac1f60742804697ebab4070346351380fbd653b4b56cbce
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
@@ -17,6 +22,7 @@ DIST arrayvec-0.4.12.crate 26551 BLAKE2B 45514f09f0fd1fae7afb7dc812142ac8d88d1f4
 DIST arrayvec-0.5.1.crate 26816 BLAKE2B 172dab8f0129134dfc89c6032c5fc15e2f86a5cd1e5be18b87fe2108d18a1bdb0f597a6ed4cd214dc663fbfb27b05c66846fba4543b5e068b5c75d075bdc5bff SHA512 53db2fafea1f60ac1af9ecc0bc9b69010e9f8573048481d55969ecdc9f3d19832fe05824acf10a0186b0464f0fbfe898d73500fba39ed63650c64dac2c2e8043
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
+DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST base64-0.11.0.crate 48362 BLAKE2B 90d2a64496e20c4bcca6f21c2546474ec88283679ccae95303ea7521133414eba021810e64e5916e3980b6878f90281f09295ebadcc12324fc9a9060ac41a707 SHA512 31b5f56d4907a5e4ae40e92ef1629a446126525186f5236afc2475829bf2e5e067554db200a18f7b3ab741d0cc9c01e20612e77cc0cbc1bc2a4a8d11c0fdbf33
 DIST base64-0.12.3.crate 57545 BLAKE2B 5ff7e888f6b750ddfe302438d52766f5d6281b8c8ce73827a9ad1d64641704414649e6c1e02bce6abbb2858b9f859fce54a0e0e793549a474c4b49a724c8663f SHA512 ec6ad7cbd4980a12189690e9e24ec1db3c3def9e93672a415808904f68db2b5d8c5740e44207b2c629db5dd5d6ba6bd9dd342dd82367da6198e0313d86e54f02
 DIST bindgen-0.53.2.crate 191451 BLAKE2B 1852a0ef09f2f958be3ca4be297aee924841cf52cfd8fed6fd346f1ee018ec969eb3f64b51f36f4ac2c8457e99d0945cf68334467c15914b361319e371ebab62 SHA512 b4c4540dfcfd7be36a67ca58700fd44a0f3da42e289f1a84a43039b840e168321d08934c3188cf7d25be23df99c6df62941ff699d4e26456d4813715f6c88e36
@@ -25,40 +31,59 @@ DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022
 DIST blake2b_simd-0.5.10.crate 34093 BLAKE2B 6e725c9399714d1e199277e3f9882d636c1737af5b0b290f853573575005d053d2ab3a34843461747914a0c25d370f0d5a5cbb46765fe99308c1fd7666d471c7 SHA512 7471e0347267a4b88e9eea932b3001c420da0a472b2ea0f20dff974789955d6d95e19d51e3a8a312516c7fc4c83b6af17cc59ea2b8fcd4ef879ebac22534307a
 DIST block-0.1.6.crate 4077 BLAKE2B a2c11873b8cb1a1ea399ecc99ed45e5d0b9399bd88435cdea346910b8707b7da94eeef522dafa5cdb09929534472b2a096c03c373744a789962d4175fd1b110e SHA512 c278e3c0346cae423b533a8f5d6b822e788ec450c92ef0f5f559d5705764a0a11df49f0f66bb1c8af7e89bec8ec802934676b969e43f92255a38b210d0fbd710
 DIST bytemuck-1.2.0.crate 17957 BLAKE2B b033ed13bc59e13117b414f4b182105acbda408415ad99293308063704571a5fe1805245a1e7d021fcef81d8479bbc722adeb49d2584a7d76f78fa1297da292f SHA512 b20f061231518c9268c7f2cbc7614e4ff84f8af017dfec9297c61dea6f4d75b41b345129eb137fbc35cb0e9e92f35fdaf15eadb87c1b99027284d30ebe8c7800
+DIST bytemuck-1.4.1.crate 23450 BLAKE2B dfa2dd2cf2861069238076d7986f0395297989d6f7838b5c6e7c7190287a533b61aa6fefacb73fc821ed281738ada6045966f8bb99bf89e604247494f6bbd7e1 SHA512 234f524538afd0e28049d1559d0aafbc2803b9461c6b7f65525a3a8d9a9042886acfbcc037dcc4837cc9c42d9f2208eec61536ce559939064d5b0cab73d9e1b3
 DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
 DIST bzip2-0.3.3.crate 15346 BLAKE2B b3e5178400a2235f500c3f77ad538fa3c271e261cbb4a4128d89371fac0f117a12c6a84696cc8ae9462a9a1a8712ed5a2086c94af14ffc575e0ee1676fb2207a SHA512 f2a844655fbd9abc866e691b57ddad166f09a183b8bd33cc6ff5952fe7f11141b1843728c6ad23fdf88a181fd40a3599df3e716c5f004ef097af6b99162a55d2
 DIST bzip2-sys-0.1.8+1.0.8.crate 632179 BLAKE2B 08bb520d2dc35e64364b995ead41d94a8c3d19ff70b5abf5abb321fc833e802e2532724072e64b37ef5fa2008545ef6cbf87db8d35edd83c22e856c6ccbf578b SHA512 f12fab697a813907ff4ebe802f7699ce1e93c533e3795db4fbeaa4f4cc368b4b6a47cb31989de0000acc82d71e4d28ccbc365c08a60aad73bc3c9488a7d3b768
 DIST bzip2-sys-0.1.9+1.0.8.crate 632339 BLAKE2B 06d1379907c9e2993be7c4770d2b1907b79129e3c3623d38452ebcc552339e8ac0d1ef64c4204ec133a9784354f6b849520580ac99e2cc8ec232e86c507037f8 SHA512 069ff0c16f61f6c2b58fbbe11896130c666960926dc12a08e5db64073625b02f4e9628da52cc46fb2ef11ac8ac4268c735d6f37378e9eed1e2b258d5cd235145
 DIST calloop-0.4.4.crate 15784 BLAKE2B ada1b65bfc93fed2ecc584119c9a654a114727631cee9415fb80769e5225e8b77f5e616d51d6e6f20ae6de83c77cd789ab178eb701f4c45ec79899a0ca36ab08 SHA512 b08506d096fae0bd488b6e0f8ab177cf8b01ebf9b697722d9b7cb55f326d3c3791e03b895469c594775c84a7535c4bc4b3d4430903757b9fba2ade87e935f0e0
+DIST calloop-0.6.5.crate 25180 BLAKE2B 8a660962efdd929ec7b3a815a427f39e00a8c48c9bd34f4c0660bb7d2d08bed598a518926486454bd0304a433a1b513090f06a08bbe8a3e009d47aaf2162bef9 SHA512 e96cf64c54faea423a2b3428e4cb909c4b8791f2a92705518754f6c1c98b5e96a265b74b4fc51f8c282e4a5b506525940dcb0185dd0e32ccab226b436b590a2f
 DIST cc-1.0.53.crate 51740 BLAKE2B 04d9d6d7e5999c9463dd86eaed965ec728c285ea0e642a02383b45ea820bcbb37c91116646b0fa2636e7176030bcff29612a72482df8c7a02a7262a805791e55 SHA512 8c7224b21a36d46afcdb7b2475686edb2d31b784e95e792f81acd5d5840b0065ca8869ca1c8c5a70cfb3e31dbe5c006360b054c1f11a92f0e1937e4e6d335229
 DIST cc-1.0.58.crate 52896 BLAKE2B 118619bbe306aef5cb83350ea04a7660a4af2c365a5f0c30d045cdca73f7d68d6646889295590dff29cbf003b44f9b00d5eab22fcde8a57483aec615278dfbb8 SHA512 0a208c4dd7700ba92337ad0044c0ae1614b105d6e799fc660d07e7745c60d8e4c8d3688af7ced77734a2a695ac2e7c565c2f2b7a886d71714c2f7675ea2a22f7
+DIST cc-1.0.61.crate 53454 BLAKE2B 250a847faed1e7ae0a7d3d0f15511222a8cae499aed1e6736d65234d6915cd64abf0b01df5bcc38ff2800902854ed57b297fea2c63d41a480b02cb07863a7490 SHA512 c238590712c5359040ff9670fb60690d983b1a2aa53ab7031f552b4eb026c9e305f401ade77ee389eff90dbadfed6eb1978f67bfa143589a0e0ccf39edafb5d6
 DIST cexpr-0.4.0.crate 18023 BLAKE2B 4a55c6c80f09c1d4ee86706d8af1f52219ceee99f19ecd0618825ce5bb27535184b64c0a49a540756b0c5e9cce6e39aac271545c504fbfb37c44052d04856cb2 SHA512 31592e38d80414cd07b25f7460775eafce1f91570abc1b94af7452961604574d1ca2374c0177875569b644f615a2b6fede273f37a6ee137f9adc9c0315c59b37
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cgl-0.3.2.crate 7557 BLAKE2B 6c61b46f4157a3a400f75e81be8ec456759a0c3efaec2fd134a81d8070d47c478f7392a2e63e13b7b09fc0b620b27ec6831b9829927ae6685dcfcaedfc8bbb19 SHA512 230301b0f0ee7828bf0152b01ff97464609da32dc78edf2fc8518f2341cc48ef39bba946965e93069fa9e4fcda0d165195dbc6c1d594afcf1155707933b3dc73
 DIST clang-sys-0.29.3.crate 36660 BLAKE2B 51169ccae4f69b656e608bec3ff8f0ed323f3c569e7a27d097f83609efa6a772ba2c2a549d1b112577da0d74ce5e4a68c1d8095217bb0bdbca974b90dc7240ce SHA512 a34ae3e1963e64e3d5e28e2d665aca7caea1c0b604ffa184eaec8824d2fd8f8b4f48a6bf4721be8355411163a521e273218217deaac7adf1e4f8542244277bec
 DIST clap-2.33.1.crate 201567 BLAKE2B 7bb63b6a243eb33050e5354622fb544ba6db3b859005d857b198af4c3f34dbda22d605326e80a274a12f73fb2c13aea99ec6652584a02d0a3092841f4e119d91 SHA512 31209da6a0ac987f7e1b2504a2fb7738c3aba4ddee4cc2bc22cc37d4d2b0feeff41ece557d4960d51564fd31cb23e413bf180eb60102a872caf623bf55c6f089
+DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST clipboard-win-2.2.0.crate 11079 BLAKE2B 5713e17a93eac4a1d299d42a6abe5db1eadbc90bf5e7c99e84b6b5febfc817bbc1c478533af8cbec7a8e58ebbc1a8f3d83bf351d105b55017cebab8048009390 SHA512 f869775bb2e6d84096034c26c888c9f671272232af74c02bda2a6c8f0d600652af581c0e94d875d8746b986314f61168bf7539042a65cb2ccbbf858141fa42e0
+DIST clipboard-win-3.1.1.crate 11964 BLAKE2B 5e22d3a662285762128650e6b46249584683cff5e899e7ff90047fbd3d5b0ce077278f947fe12e1b04757328046ae59b6953a07e845451b1abb090dda42359e7 SHA512 5592f400830119e2512c5fb68f6ab190d8bcd16120c53d66f6f55bd0441f8dfc5c53663a3ebd5cc5e57e4d48ac55e2b2575b987ffc175664c85e2953037ad8f1
 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
+DIST cloudabi-0.1.0.crate 22687 BLAKE2B 62762386b89a02fb07873b7fc10cd78c4e652fa067a88c57bcd9425e9695ed195ca2a4ef58c6203e7d02e331b0562844da104e62a0a2488360ffdf39da12bcbf SHA512 5f7675bf273eacd59df3d91972ad19bc7e065ffc55183edcd15aaecd416e1f723466e9ba382520a5d3de60d2d421096a2dcb64b444a2ece028d6f75a9b1d8699
 DIST cmake-0.1.43.crate 16149 BLAKE2B e7fc26d0c6ddaa5e670c39244b405654ff8541443e60cd8412805eeb1ac5eefccfe0aede18764e29781ee15aa28d51cb4dcb973c3eca1707b5de4c021c8d6a9e SHA512 27deca4e0f959893114601fd550834dfca70cdb158faf07b72944d81b3f259a2ed2949115bb304a9b66c5fb68435025df044618aeb7a9a23b5113259c81185a9
 DIST cmake-0.1.44.crate 14377 BLAKE2B 5922b7dd8618e7982064fd754b1ee54941a4555961bbc832da6fb149afa1317951e4ab710f2a13856aee6af18bfd9612514dc56e795a013c8d4094c8be1fca11 SHA512 7adeb6289fb1072aa739b4f6bbe91f612fbab730c3ea67b6024a31ebfe3fadb2da798495ddabd5cbaaa1106bc4ae185b350f618eca3a72de4ea0a4d526664657
 DIST cocoa-0.19.1.crate 47947 BLAKE2B 45f17e847dfdd3e19f2894f9f0b645cd92bcce6fb0d759147ff07d2db9c506c19cb41384d2c2f91de4309ba677449e4f7b306d0af4eac926894e1cba90e05e2b SHA512 29c93bd4acc495f355eff488882e5ad42134e4e5abb66989732d5cef58a324448ec50bca452d17a251f7dfc0556628cfafce697ec043486ce6eb2bdcbed34c67
 DIST cocoa-0.20.0.crate 47904 BLAKE2B 17d59bdc8db0e48b2d10b573842d249d096a97cf4080ea1451204545b71f4af68a6dd3719893730d6f5359686eddebdb6aa6c1335c19381e85eeabadbceaf5fc SHA512 dc7daf539b5d10f6a656f95a0cf6cf7b16f66ea10ae3d760d9ecc4b0d0fc65134ac49cc3dc72e0b007eab04f7d1a78872e0785fd1f589bb3e2493d9c967d864a
 DIST cocoa-0.20.2.crate 47930 BLAKE2B 7cac51b0e7038f1b9d4c57d55c8a7b47d472fdd010b49a56271b2ed08ea22b868ce230cb9bd58749b1df2f0b71c67cbea61aab4788d15e40eb511c64f02cbaba SHA512 3b547980a47b6a982421152ce570786b784e68796b1588f976ec62fd2b84a1dcd87ab979b0a871c33882faaca3edda7ebada0aedc23f4e1a56d6505b57961b27
+DIST cocoa-0.23.0.crate 39052 BLAKE2B 91c2d572f41d767b77ebdad3521ec5af6927703bab36fb9b7b38846fa017210aeede3a3647915fe080092827b3a89b002119c32869f1da4a15653acb1986d1a1 SHA512 2c7a90a4d3bb1cf813e99cc51227d7e55f20cff4b67d4c67eed5193c1b4d726016cefc14f15da315ba669e521da71d702d7c7fdaf0d4f3db615291235e5b1ac4
+DIST cocoa-0.24.0.crate 39235 BLAKE2B 01078c3d96e88e0cac773f238d3d3144324594fd75cda87d18bc98d73f0a1acab4cd795471f4789d38b017e6cc90c0713bb33b0fdbdff36abcdc1cbae767da86 SHA512 accae0f676caa23c8d3fbc2e49365118a366c50a698ee9dce4ef194f1d391b3633cb789d65d5c2d1e43afdea5d7a82161f7e7042a9dab32747ecac29d1b1b20c
+DIST cocoa-foundation-0.1.0.crate 10645 BLAKE2B 8ea7db02939a5cf1785b2770743d609e28da415fdf49b881b620e0ae289976a5a737056976afa7e616fc49c15ce535304d70ce91e79bd61c39ed024078012e61 SHA512 cf0e8188bd4d0310716aad9f1e2cc77e4098e85306bd2098bdcfd9720782bc558f503033074e0f076748074a9067a4dfea263ee5356074207739d81c4a052ba6
 DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
 DIST copypasta-0.6.3.crate 15032 BLAKE2B 4a13e39c72ebc261005e2ca78c555cae161fcb399ede42fd393cf893bfb3600044061f0b9a8ed8c29cf0d4ce09a990dfccb3e9a36289aa06798a97f0966f1357 SHA512 b378e2947286a7c6f8c343fb358ada3d72081c0a98e7ef740f236f61299833a43e953ef8103371ed25f72cb4bde38020a18e38f9b37ae98a9ec2f92147aa037e
 DIST copypasta-0.7.0.crate 12677 BLAKE2B 23bea4a46d07178f253c72a86696417e5d53bf810302f2ce4d82b27c9c0f9f5f12b981a7c2e7996c65b016b2bae59432627dc98c3c4a7e594dac94aa2cb6058a SHA512 76210d4f1e6b2d8e7eeb698eda71501a0b0079df60f6261f8904f44feb3d6ecedf7ef0696feea7504e22448c54927d32b82d763a4e4670ea779d0661db318d03
+DIST copypasta-0.7.1.crate 12882 BLAKE2B 2deb0b5bd6401ef3a39dcfbc2760338019458b56a812447c2a0d12f62de0f69aae9d8e36d13d2c9d97e9663b091cdee53b1db50b1d00720960345bf082871f2c SHA512 e31b0b8b6ba0f5ab425aa0ec44db05b27b50a6eef7b8a2f05495441ec83f90859ec48c097a64b38e846dca6f56bcc8f2bc01f2cc299a80138e24e0c4c9e7c474
 DIST core-foundation-0.6.4.crate 25233 BLAKE2B 720cb670e0ce589fcb75e583c3f70b54669407481f61b67bb5df1a5056f07c88f568f2adeb65188004424b26b623ac42b03d830239571c15f241216e55fd8dfa SHA512 5dce50f15aa48f38e1bf287fdd3c5276d8e5f1d64bcf29da7d8a68008414f6ee560a940040361eb2f4e65657ca4329958dbec8105cc6d3606ecfe9e71ccb7632
 DIST core-foundation-0.7.0.crate 25384 BLAKE2B fde852b7673cc972da8d2f8663c2c8372fda36fd577d19c9536f9df929f649ccf94150e1e23a57013bee3cd8cbb6fb894c4fb3a5744171bc6be607cb27e2757e SHA512 919041f431e21783193c0661b82cbd15946a56e24e5100a6a9dc02476ddc714595fb0416ae182981ebf6a8b27181e3178135c27388b41ec848423d739a265da6
+DIST core-foundation-0.9.1.crate 25985 BLAKE2B 22e70b7b1cd1f39c4ac287f406dabc549e3ba750ecf17955f129ff83afe67bb4bdee7e7907287eac0c28597df971de27dae77619f44d0368864c08798def1ae2 SHA512 d6dae760082ef9dcfc37d18acfa9a6ad8ee491335d17ee17447c5bccad623564f1e8bdc54460fb260aebe9276ce5ea4d8a389a83b5c7d17193614906c3d2bea9
 DIST core-foundation-sys-0.6.2.crate 16204 BLAKE2B 32766d4b23a2b108777c57b2115cc718a0cdb42fcd2e3973a0adf944d326e0796a6953756c42140eb4e6e96a2609bfb41f84a54c59b4b840d7213f3c5dd4234e SHA512 bfbe4e77a5e2644952c66a2afd21058a07583d3a1776c34dbfc316d159289073d92b8672eaab2f39fa46c48cd7f22d88f0354f02b3208482d700473a807ebf07
 DIST core-foundation-sys-0.7.0.crate 17033 BLAKE2B 26d190931c7462ed8c13de82e86d4417e0d130f97295c8435ec666be08c7bdc37894ef25647043970fa40eae1c63503d2ad7660c2ac17ef35d7d35698652e18b SHA512 b77566aed2b572bdbce6f71ca9dcc942ef96b628a7ed9680c4d3e3ada4a9dce90c1b439a8c7c7f22d68e51becf1d22b3262e227cafdf8cfe5f42db0ffb9dadc7
+DIST core-foundation-sys-0.8.2.crate 17461 BLAKE2B bafa6f6af67f55b34c20e50093a5426bed35c159058a97c03d28c99b6f0075305596907291d26b170ee2ce1bf0c74bd51e2c54f11ef021399791129de6cabb57 SHA512 1c66f2012c11185603a0e4c09311d32bc4ffe639ef7626e49bb15006306fbed4c963f2c53d3b853a254b29cda73c393e0236436575d217992268463441ac7348
 DIST core-graphics-0.17.3.crate 26460 BLAKE2B 69936d832a92d8ab623ea584d0b594f438e218e78e33ac8aab8fc0b1df5eca5b801a628f17c5ab53f6aa845fec7775006037d4a902577249568961e58d536f62 SHA512 8794278f253aac719f5f7a36dbcadfd8f7ae5f16a940587e76c8c768ae96f78d4c419df7eaadf888047037e744e9bfae1e04953a02c347cfc3ec8296b7fbf68d
 DIST core-graphics-0.19.0.crate 27582 BLAKE2B 92a9bf883cfa3be48161359449dd86b309c6b566d9e44ee8351a569d1d6f640b14b97661c665eeb9e469e70d01cdfac8ec3ddb323125becd44523f09b0b02bf9 SHA512 b0db7b3683a490f627961a208bcdb47ff67b498085c8f4aabd3053e4ba7cb8b7f088344dfb9aad954011b1e6b32a14bd29dc4c9089a64ec4e27d5b24d1e55676
 DIST core-graphics-0.19.2.crate 28995 BLAKE2B 3efd61b69ff4a7dd6bfffe7836840d33f5101d169c20b2a73a529184a362c517032614956f37a4d170ff0073582996c5249eb8b24605d122ed5cc2e55acdfe9a SHA512 c9cace380466c26f2bb87aceaf9852ca0f29c4bdc0de11e132181939c5db0614b2cf7e882a2ef0603ead6145e05565f22d59cb7f69a501f350f6f9ce1aa9cf9b
+DIST core-graphics-0.22.1.crate 28227 BLAKE2B b7602fa2c107c585276df48a4ea7722fc48d146d6c943832ef614569e90f93fdfb590c76e8043501d6a968789d0c0db17fa36a0ee622cf0f41e3737dafcc4837 SHA512 b98da4712b38c8b3226679a9a54af0c00659338035261f9949c62192df5d9655ef0bb2bf512f09053b6dbe3283928980e0bfa8a48564ea4759ed541f5bfa4e14
+DIST core-graphics-types-0.1.1.crate 2530 BLAKE2B 2340e9e0147a904e5b439b3e9db53937347420d901f17677e952779680f5294955f4578273989237adbf374b13dc24d6f6efa293575ac1a449bae2bb6ce37a7d SHA512 bacfd01ad05b21851c0cf84cdf9516f63c542d51c2ee8fe2692c557a474ac0859c4ff6f0c35df68956c0389c5974ce09647a744632fcdb2faa13fc7d13cdb52a
 DIST core-text-15.0.0.crate 15538 BLAKE2B 3cd535a4fbd367ef9208877e640d00c445e0ef6ffc1b0b6fe028ee82e31f0011d970c6f933eb9b07ba81d0b607c0c4aaf2a03e9fc23dd6bd3576bf339f7fa95c SHA512 0ee16ae1dfadadbe211568c1a687d6b0e5e553008db22e1c40d99cad7ed457271e074ef568c935c4940b07d13a89c48ec3e71f11cae9593afa401fb87bfcc638
+DIST core-text-19.1.0.crate 17167 BLAKE2B 988ef2ce548a699b2d9194ff79577a2190fbebfb7b2c01be20e96a5d44f2e057326e7d8c0136c87dcbcd2d6203d180bb772f9bc1c8ca812ed09c95ef82e0f9de SHA512 41c45f46d4b2ec0ca1afb5bb6b8054a781ba99e64629d751a72c273e6923a9209df1e8b382d09fd1cebb9c12e10a68271ef9acfd08dd8c66fcfa5ad43c3532ed
 DIST core-video-sys-0.1.4.crate 10568 BLAKE2B aef062d1b1047d50d02e932413c7d24cf316d5b1d6947895ec2face253d26adc75811c4fb60535a35c2a0c87af6d3bb7b9e62dfe5421ee218356126a2a6c3bb7 SHA512 a6d3b0f78aebe7b64276f3accffb5d5b2ff23a19b9cb3dcf69a47b310098de8c85255c579cff8a7a711304c1f19b9fb1d8259c5eb511b617faac0da53e417bf2
 DIST crc32fast-1.2.0.crate 39161 BLAKE2B f71c85801f945602d53f93ce251c978c91f63fcd92fecba5083fff0f06738697e99d92c17a824605d5d56b3224db224ff32e4b147b6f6af47ae714dcd511e7cd SHA512 2ee73e0642f83e28034c1baca65156e65d751214e83f2a4ce94b6add5ba11f74ffc80832a3348ece1c099367be2b11e820dfb349fae89fbced1b68bd6b0466f0
 DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
 DIST crossfont-0.1.0.crate 26292 BLAKE2B f658437c4c3877ed5a51b67f5e1b7a2fd06b19d824137296d04785d3922af22395df90b33ed760b3e5f93f357d0ad296984c16d1ae15c7dab6dc9e5fdb33840a SHA512 1ebd82de281b704dc2d59452534eeb591894238883ec7e33c45191a463402314c6b16eb5d212117c17cbfdf64a65e49b7e7046cae59cc1eefccc6b1a94078aa3
+DIST crossfont-0.1.1.crate 30791 BLAKE2B 63193a7abdf5f4394e1778bc8db1d3e470c6c3155221c0630cd7ba272816710dedefb959ccbb9f1f88b7098a431cf18481448b3f73a99f94064d7dc939b90542 SHA512 2197e7dff9037af9d9f6aad82dad4ea2a941898c1547328a51bb2c4edf35f1aff844a3ecb8421bede1d4ef724ad5048d94c0970acfb356127cbfcced15e644de
+DIST darling-0.10.2.crate 17620 BLAKE2B 33d1fc3dc10fc971ea304efe5bf8084843241ca9c2a89e54e7c5227e53b1ad86749bd8693989ced6bf17805001909033aff92d600e7169a02dccf009fe60a88a SHA512 b312a74e577cb2f889315ae42513c7f26597faff306a40281189be2101339661772016a5e197466bd85ef94c275e811adee1b7c0772458126677d1998ed6fb15
+DIST darling_core-0.10.2.crate 44339 BLAKE2B 3ab3762840aa869baccf1030617a2a534c5d63019deb7ec5848cf4f80aa6304307ae32c4425264f1fda220a502110549812112d08f0f60261b30731ee47335af SHA512 a0af8e8ebb8584973c20eac01fe9ae828744b5e86cbe268262f8710a2e0ad568bbc6cd051d5225cc536a0a1fcb1886233063c8c18ea16b45c47207ce64af89d9
+DIST darling_macro-0.10.2.crate 1919 BLAKE2B 6f07815ff5b333b6c34df08f3aec2e5af5385e60a94bf9d169701be19935d2a9292ec7396905d2caadddba38d3f70bc5e5c3f1167690f045b778b8fc8cb00985 SHA512 43a0e9091fe12ec986e229a73bc41e23b1815fecfe62df8eed74d2ef33f5c329c444f1568d3c966554ff0bb29220146ba8f30d1c2d77ed7dea9adea10dacd152
 DIST deflate-0.8.4.crate 62021 BLAKE2B 2127108c8c4b0e15435e39965219d7615ecfb24623703ea53bde36e5a70b4678549d959fffe090083726e6e159534402b4a78ce08a054697969d8d361134321a SHA512 994bbf6720584b96987a32a0e391e4c0d173f19ed0e6d4a8011764729e85260926ff6c03b44fd7f058474360e744af635dd171a2270af3e18b28c4ec20d640c6
 DIST deflate-0.8.6.crate 62365 BLAKE2B 05b1f81e4c423f9fdd823bc33352d8421f2ca0c26d43cf0c5990db12f5e31c46ff7769f1baa3b971166b4146eb448ed0bd3ffe68f7c4aff5885b47826f77d847 SHA512 7e2e23205c56cc4c834ade2a6a22b056253c32e29346907558117714a18d8433882a712711413addb15da79f9f59e089a06dfd680b756ab2725b500a49dc16b2
 DIST derivative-2.1.1.crate 45571 BLAKE2B 7da3a10e734522cc5df0d40a5da54d5de3c799b28e016442ac88038a18a8b3c8dc30c33077510a4fc3155be9b114a9314e9e5fc2c2eb7c3b35e3380570c41de9 SHA512 a9d2edbba6cdca7980445d8b00180cdbb377830acbf3be371ee9ceb5d8f3a937a02f346dd2a3a49bcd3b65d89ec1c71f78f4d125afe020f82789cafe4120f5b0
@@ -78,8 +103,10 @@ DIST embed-resource-1.3.3.crate 10472 BLAKE2B fcb0e869b2e49a53644d4f2b6bf82be0b5
 DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
 DIST euclid-0.20.11.crate 73220 BLAKE2B f0ce8434252e384bab9befbb631014c642b4ea76e641aa71d8844311bd6d907af15caa0bc7a6f754129806695123fd2e6fcd1fc35d18ae5106718f812c66275d SHA512 48216f6d46c3008dc8601e70be8c0ac557b560eeec2f51e8f328fb82403582372c518eaed251fa2ae572a74b944473aff64688a7bb9899234cec2a0138a8dfb2
 DIST euclid-0.20.14.crate 74299 BLAKE2B 333c8def54f824dfed3eab5989ed6a3145db065b65b50580814672d850df863e5e75b1f07c2da17616c3bb5456de3d5b9f7d9d41118cc9f5a1250299ca680feb SHA512 ee6dea3a8bcf1f69212f528cf4196a038ae553c885710df49d6fed61bde946eac6bda880bef496ec3ec46ce1a1ca38e03849e4375965a99c6004f7c772f82262
+DIST euclid-0.22.1.crate 72623 BLAKE2B c836252bdb3efc2014c4918b7fbeb987cdff1bf1844b905f7a04be5f824f4842674489a24ca8a4eab52e227015e5db6496845f071518053089f9b61be0243172 SHA512 8392b023b3b97e89bc46d50eff0697794a905c8624184fc6240b721d223e7bc1dd6600156bf0733f7409a4da77f0c29973b11b9689e3663b28cd88954b39afe3
 DIST expat-sys-2.1.6.crate 518887 BLAKE2B 12e06f38859124c8da67aaf41477e0c94e9b2421a17c93666f019fd17de3579d52c66403ff95c6fdf27ec1e4db0652bc611e2b426705a177e615b5064d15adc1 SHA512 35d0c405a164e685972ea11df718e50a32a90b730332c3ccad74055544e750423ce2cd76edfd5de2810167cdc8ab6103db82bc4e2710a8e298ac0dd9e81648f8
 DIST filetime-0.2.10.crate 13880 BLAKE2B bc2289129c0d79f37b2589ee31f7bd9719c1aa97854c0c06f321a394202bb96e86b9ec8f8727735e4925e214e6c7f75d87578ab44530a123807b5b7eae7b1097 SHA512 45d1b6fd6017bd1a479a4e343b8651c8d426616cb68914c728456fae2a27bb1a45fafcafeb9a12c89c4eed835327e461bf92b80eed0f3a4e84b196b584b8698e
+DIST filetime-0.2.12.crate 14272 BLAKE2B 39969d952008f86c60b1e9e2e16d0221385b286eca8c093e225410dca615315d1d123008f6586c128d5660257791f6d4cbaf0956d858ac1313f0d89cbb025e22 SHA512 9806fc9f7e15ef35a0d36b1e099c5fd4edafb0f6592dba380211c4151b9fd83971cd554b9f42dc051916f48ac6e34ca1f8140e1361c656028be7fcabbea584ec
 DIST flate2-1.0.14.crate 74183 BLAKE2B d3ef991f13e063deec70e782c07d064b033c50bebe2d92fe648cc21ff45e1716e7c50eff84f3805d3b11d7ea3510cd97d96b75b531c8f03b56e06889867dae08 SHA512 d70ee34d21b345529149b95000692e2dc590e14924d862cefdf926e77bb6e2572a99d0cea76fc0661d1149730cb3914598c1f500bd09661338713894b9a19152
 DIST flate2-1.0.16.crate 73926 BLAKE2B 64eed66aa6bc81c8bad0f1cb3e0e33760654bcff20668a47a420d6aa755e6e5bfec47a104b96b20de1c3cfa583c661775d4b6e234fddd9a47e55501170bab895 SHA512 de28b0bd1caeadcca0bda0855cf7cfb54d9b0987a4cf16f577fe18f2164c66519e5482ed65207a8622d7a8be4a6f0796d47cf761f013afa0e3c933e6b579aa88
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
@@ -98,21 +125,30 @@ DIST fsevent-sys-2.0.1.crate 3984 BLAKE2B abcecda1e75e47b735f8cf638c958bcf0862d1
 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
 DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
+DIST getrandom-0.1.15.crate 24786 BLAKE2B 868817d62ee44fa5bbf54f9af0bd71a29503f92bc93e190a834f4ebdb8eb73dd29e175c661f9964298987949c0b82a53e99080cbe4090fc9c5453daea4b05595 SHA512 b26d9558554058f8a54b03f56f488db5ebad2d5cc84f737e489f8f532f8464ef9038d104173eb30acca61caa1f99e1ce267bc493c01ba1611b829e0a090cc87f
 DIST gl_generator-0.13.1.crate 22307 BLAKE2B 5283c8c4c982d7ca8bba7d156ce376b943d9ea84fca183f8b5bd1f9910c109de36568a77efe736572b8900b3316e0c9e1aa3c491e114b816cf8b5b14437202e8 SHA512 021b6fbde0e377898a7cb16bdc593b2796d004e809cd5b26efa0cf86225a2664a930879316ed2224856de3a27d120bb7b0a6bd3a004bbf92f0fbddedd348d723
 DIST gl_generator-0.14.0.crate 22330 BLAKE2B d2e84bf81e7c4e2869c3e23872bd86466ede80d6fdbdadaddafb1ae9ab45672613cfda319b15720c35fc26ab103ba106a997ea6f5d4654bc9db19fb86f20d765 SHA512 98779d525a042b47ac373340c6fd2e019a670a5bce643128ae2cde2021c0bc8b2253064819c2b0ff444e62bfb3679dc70f11f268c660050cc891063ed6b45fd0
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST glutin-0.24.0.crate 54674 BLAKE2B 1ed58b41bd92aeddf5447c85cb80dbb99b4248f757a4384f651d7bc765816be7e75763f3c411634d34be988d088ebc01c7a7a2e5719e52390352568cfecc21b5 SHA512 4c99b646c916ec3ae117baadff6a70a4e78816787892e50ab03a46f8aad194c13a514bf302dd7848758d6270d7b2d45113ed7b72c13f779a7a20d85520ad7605
 DIST glutin-0.24.1.crate 54655 BLAKE2B c3678ef30536649def1fe21e11e416602349721634f36f22ee292cf1fc1c78300952442273106db5e61079c7c0e5a7bbfeb39634ec9cd1c9358d4282a8f3bc2b SHA512 eeb933199e033bd7b847f20627633f939ca0f4eebe3c8eb53911a9f135fb907f16612d2f726292607d443e9cde0a07c765c3bdb940eca86a8eab8c6f923d7989
+DIST glutin-0.25.1.crate 59027 BLAKE2B 6ae0bc90a061085b015f36a051cb91a3a84b79b19f2cea4fc382ff0f8f7ecb9d9f30f78e829ad050ac5f2a404ce42efa49bd4887617a7e2cfd6ddb87170a57cc SHA512 66139943c249d8a7ee1183f0696b66f3948ea8c0ebc994db61ef53f02bef745e85441e05e826d39266f6019cc389263e88cf803158daadf50bcaaa7f5e6d196f
 DIST glutin_egl_sys-0.1.4.crate 1944 BLAKE2B 8f653a996cd6864e10e98b60cd238a59c55c9da8e7a1a0f056c6bd546f7863364eff95024a73e91de2846034bcaacf69aa2e66427bbe590e113c9e20073ceaf3 SHA512 eb6ac040a43758c1f35f5b7245064a2e32491b627b561e5a78bb2e6c4d004b9325a672ca0f62de71356c607a492355c04a088745c5971a6ba0cf03c171ce6e42
+DIST glutin_egl_sys-0.1.5.crate 5890 BLAKE2B 99c1a35fc3c6fcc6bd09351fbfd9242ac3e8eb3c652586a52b50e5635168dd96274216d9cfccaf77b06659264664f3d6d8e71012cb03ac2504673a5f9a848857 SHA512 ba8cd65013b4c15b27513a51c04723c4bcebe4668b0df62d364cbdba5c9705c54d5048dc86be3d03b03d00e9df1971985fd6242dadcdbe339c7bda14c72cc841
 DIST glutin_emscripten_sys-0.1.1.crate 1892 BLAKE2B 81662e2c87f28fe363d37ec716f8c535c9f872c92997cb0adbeabd63f12f8af14239de1be4ae12bad839dfe6b84835d21b7fb5c64471f051d6dc68da62ce68cb SHA512 faf80e96db3c7bea9c5c35cf136ab23c31e3c9eff55fb10fabd6474678d4e8bdc01deef54181826c90ffb97cbbab4145613b20cca6b9a87d28a1f99e100c4b7d
 DIST glutin_gles2_sys-0.1.4.crate 2102 BLAKE2B d5496783317b32c29e51f0d71b4e3daf5b05357fab2e3fa6274d88034b4be9af468db9d4e909a27818615c967266846b452d858d2244056d0014eea195240687 SHA512 fe945346f141b13280a17454073dc2442b5ccfb885887f4b388512b983e88350d302d3e622069c3ffadbbab7efae4bce919b2319e78394a4452a24f25403f4b8
+DIST glutin_gles2_sys-0.1.5.crate 6023 BLAKE2B 8e7d5059d9bc8c1224a41680b958696b05233c235214b0f04bdb5421348597ae048f06bd3d8b697ee21b9d04ea988ee042499e4e29c50a77f1027a9d0c5bd724 SHA512 a73dd93dcb57ca9a8174010643b3edc4f3e7cacca8f4710202bc930ad84270c5a2547a0e8da0701c7b3e4f306da7dc453ae570663265eb0bed04501fe5533c65
 DIST glutin_glx_sys-0.1.6.crate 1710 BLAKE2B fbf34ceb8cc8027c6de230d761a7eb1de9b83079d137a5de4092252b8ff066c43dd8b50081ea69cbdd1e79cecc55322a3d8bfaa88ce2dc2a7b159dd05f5b3aec SHA512 387774b25099ac9478329556ed39b745122b52b603a0955f3490dab21f30512e717ea09c19f862e50b2e18f677a7ed8965b4c0bfc1c7a39b1f66ec01409b7660
+DIST glutin_glx_sys-0.1.7.crate 5644 BLAKE2B 99d80523f882fdad3fb8d6429ee4ded4b43b66027ad37a286cc9d6d605a6315025e8f781addc6a842e5c0da7930e17d508982f11b5d0233b14ecbc66ea21d912 SHA512 4b9348e7a2bdf93b8abcd5ad6dc8d8edc061e0b959999ee38e7dbc0e0191d69b3e8f5d769078101171484097bbb8002fdf38bc3804564dfa86bf4a0385a30b1f
 DIST glutin_wgl_sys-0.1.4.crate 1556 BLAKE2B b3e7fe1d6d47ea8700b658a1aa7e3fa31e44168532fc4b0e887b763c2a5e8c04346c2614dda92bbc3bc70c5da65edb882425b0af1c80f0b46919585ac1748582 SHA512 38dcdd221d823458555711f3a652dcbbd8f86e3c5bec78e08771a96b1683651993ba2cf12427860d4030b0c70953c06110ce4bafb674d6543a4143028ea3e039
+DIST glutin_wgl_sys-0.1.5.crate 5487 BLAKE2B a457d1a413d0969d9ca23b17ec913c7de857c239c33b46ef9f1ec5f573997aa1c767179d83a8faa6e618ee8f0daa89c83f159466a6ef0dcbed82fc945599e38a SHA512 3bfc10817c0356a3ffe5edc92ffe26d1071d305cb38e2f209b3873ce7ec765b729313bfe4d43e8d5d8d27ae32290d145b57b2c24117c7aefacc455ecd52e9749
 DIST hermit-abi-0.1.13.crate 9230 BLAKE2B 9591171d6f303a4a462d23edc2f8d493bdc23b6c2da4b464444718bfc89078e5a627e1543b7ab5be9d4e05f16c3508e55642360bb8d2cbd5edc2ce39b28d022e SHA512 ac424683ee3cfff9c63c735ac91008df722a2709d12744f009466574098433677266799e8ca817d3d3cad8f10f3c02e8081c67ff479701eabdc4543c0a79bd25
 DIST hermit-abi-0.1.15.crate 9597 BLAKE2B 012fdcd6ed09e4bfc9256d524648b0e7f65e9bc8dc6351d04249c492a0b5e836c529791f79fd144b9f09ae55462c034b9a3fbcff5b2abb40a7c78f7f8d78f64a SHA512 f81f6a87e0a182b5e49a2edf60f47243b7cbb116df5aa6a3354f1e230d4030bb5697ad4eb9abb6203ff66c1cfac1fc35b7d7e76dedc276767124ea4f41f97535
+DIST hermit-abi-0.1.17.crate 10065 BLAKE2B 79aeac5f72873a29b53368fb01ed4288224692cc7c55221633775641ade40693bf3fb44db22cbe4422a74d1d6330450110f21b586426b6fb8ef93f116476c644 SHA512 1ed4688f2cc1f1d5ba2f7637e2a9dc230712ce8907e1fa3d95ae374cd4b67a325138a98f2a524cb03f99625775057aa0370f480a73ab20485f0456e2f108baf2
 DIST http_req-0.5.5.crate 71141 BLAKE2B 5957fbbc6b741df09c2cf1722b0b3a63c49af8c3d6d87514a2d4f594e31be1bd76916b8181e2a2fe0df32fcf224031fb9eacad38fb0f0d24e1a9fcda48b84e19 SHA512 0306deba1d7584a72b0715a4ca63a890d6fdfcad6c7360722d3638f14c82ba569a12c4b9c5b4a6d79abb110fc83d1f80e77336a020930c2353756363b1369b00
 DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
+DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9
 DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
+DIST image-0.23.10.crate 220464 BLAKE2B 3fde4f7d32a5c8379f6656efcd9d81195167b7c73e3f0da0d867db0959d13cdf1e5ab47c75fec08c2cdd33d107f56ee5a889be9c6e56a3055c2a2c3b8285908f SHA512 f7cd58c5827ed74fc0244c73421b19e9c63672f143a1ac21ea40b23b3525a55836ee1809258133c0d6a239369784782ee4b6fd1c692d9536c7bead91f467f9cc
 DIST image-0.23.4.crate 200946 BLAKE2B 4c86608654f5efdcb8377db29f42b23c86de6011a803c111280d1ff95a98203086d857bbad69cd01a819269542ecbfdaf2c41e3c507288aeb03e122a1e1bc9a5 SHA512 b4b8d4b91280268077f245f5ec19d78ccc88bc35aa3b1371d8eac7624e5a8a5a25112fab70629c3cc19729158b07c6fe579ecb65b642162d2b41925c25112210
 DIST image-0.23.6.crate 209589 BLAKE2B 37bea44338dbbaf7dd51d05d8e93a7638b6b43332b79e1d043bf6a384ad08b54930b7115eec018580a4c53b4083a42627d20ca855409d30821fb74fcbaafd8ff SHA512 af1e01ecddb75e6c29c65f7db619fc301fd2b0b0c9e7401931cbc2eabab319f0ce732b21b4ac2a9fcb276ce8c7f8f76fc68042b3986d95c773ab51d3bf41fbec
 DIST inflate-0.4.5.crate 17715 BLAKE2B c46dd3e4d064c135921670b940a3cd3ae152c5cadc67e00f6e4a350e7d22efc66807dc64b6e5943af30f1b985b2cea2dc42e7d923a05bcc268deec22a0a7de17 SHA512 1392402f72a8463dc5cdaf815d8933e8dfcc914fb3a91e69c38e54deb7d55b5211e157b640b7cfa999400fb4d2e233a4a1a678147594dfa0be300894126d17f2
@@ -121,6 +157,7 @@ DIST inotify-0.7.1.crate 24637 BLAKE2B 7089e15c76ab1585850cc17d1c7d5094f6c229d20
 DIST inotify-sys-0.1.3.crate 8327 BLAKE2B 964a7c49f16ac6b31bdb22085569e368063141962ef347c4924aba17ce4d4f99d79e7054f1530bee60bd0c99004816cd2ada19808e65b52ec367438d824e5050 SHA512 82ce82277ef2ef05888aae3a997461515d340c7286daefa4f54f7942fcdcbd1e29fbc60907ecdbcb00139db36462fb3c21ce64b9add2b785826adfaa54216a66
 DIST instant-0.1.3.crate 4554 BLAKE2B 49c069e9fe69379ec8108b1f8c80c55f53348d1e27a062cd9a9e29e9d0643a2cfaa19d780401e0885766b371838ac5c65144cc25da71ab4d83b5ba6346404aec SHA512 bc5cb472e3b33d6a8993c9f4c2cccd63c5b89aabd02be52d9a1065ee9bf6c4c754271acd3fd84d7c32cc87e96ba5d54f28ca0ce50668539b764156fb33068542
 DIST instant-0.1.6.crate 5109 BLAKE2B d5dcee737f36f1aa6e821e5b4971663ce44c1c0657723aa662a0eaa386495402cbc19aac37df2f9bb46bebab032508968827bfce586721e6e3472e98eedbbf66 SHA512 52a1b53dd6ab086679b5dc21902cb46fb91edcdf1a009ff13c43c89c0ba77e8b7f4c68e6c5939713d9f609d711881a502d121266fbfd99aa07e36807b3e5494a
+DIST instant-0.1.7.crate 5097 BLAKE2B 8677bc366db19d3d0851fe16622477d7e07f1b9f0ad747624f8ddd21137038486fc4d1bac4a05f46aefc38340fb6884470349df19d20d89e3d0fb2d175a84301 SHA512 647d073c2b3dc7d410ec02bd4e970dd6bc353a7252ce28ccadf3676c9cb6f654afe1e33a0942284fd870412a331eb9cae209a11e092873355f31b56f57f7b1a3
 DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
 DIST itoa-0.4.5.crate 11194 BLAKE2B d8f0e2aaf62152c187e0987ab4b0cf842ac13255262a9ccbf8484d730ea5397572791c023d2363d0562c18c8efd2418680583e99a1f5d14450b3f0184dce69ca SHA512 79ff8774524130a4729d5e708a4a4a837b3e5052384a12c22db4ae3e208dc4391ee185365f685137a8ba55ea7dc3499f8cddddb2fd98b84177ab292c264034d3
 DIST itoa-0.4.6.crate 12167 BLAKE2B a0ab539cfdaca0a61fc55afdb74ef3231d300452fabbc747cac16a51ec74b4ad5c877e2b2a35f3087693c7eb55b5c389b5bc037b960733ab2afa36ff781591c2 SHA512 9085ad30313a2904fc60a85afed99c7388a345ed50c988f4e7307b23b5f38b14bc9ff64edf02b85fda6c363e035ac314241d5dba4a6e2dcfef3d2648cadb9692
@@ -128,17 +165,23 @@ DIST jni-sys-0.3.0.crate 10232 BLAKE2B dd6334daa6db9fae6cf1b31b9c13f09f9dc3f6a0e
 DIST jobserver-0.1.21.crate 21228 BLAKE2B ab1a6496d609e19235f022e920495e708571116e90f8c036edb5f7ba270c2ac938f7571e89f3fb714043c87623d4cbf1d404067ccac6a8b41e4a6768039cf02b SHA512 944249819e1e3dd09495ead941330e9abe439647c1e66ab7e2140c0c9e100b63f4f792fe06aa3c86f509f057df297ee2d35df0ccdfd4bd6a115b6a44076237ad
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
 DIST khronos_api-3.1.0.crate 599718 BLAKE2B 945600455c85874c37c7c395162a3e56531b417a1e6ce414386ecf31f8951fb40049604c27d719014b5379028e5da25fb9977c7487433cebcee4ccc49e00c7d5 SHA512 f9ed9e1bac648a82bc608bc7df339d3ef1db868c8ce8bda9598926839b3de9e3c11c2b45886b9a7dfe5ad6900770fd59c690bfe9a87f7c5b479945ffb8dfd292
+DIST lazy-bytes-cast-5.0.1.crate 4354 BLAKE2B 38c5ee1edafe88f434e942d4024ffa0231c3876960ef0d4fdd57f3f56e9ce1f8a9178466286938e55cda4254849debef9926b8ee04707c9fa9f3955f604735c0 SHA512 d660f66f6ebf588a50121c425d8fdb9769bbf4df3a2e1e3253a2bbbaf6c73950505a60787951a1e5056a73f769894bd9a510c56ef4208dceb07882d6d5bd5c7a
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST lazycell-1.2.1.crate 11691 BLAKE2B 9b1d6e9ced918aa94dd5dddcd3ffba59116dae922d264180ac36c288d8a6dd9244324a7c3050c5991b216a241e482ee17b2e6d27527b88339b606586128df1f5 SHA512 de74ccd6a3c32c360a12a51ba1d51d6530130396b37d63350a960956ae0ba13e9ac31e2bb70b61ddf055fdfbe7e559b20a38415cac3906839684905a01256ff2
+DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
 DIST lexical-core-0.6.2.crate 459604 BLAKE2B 4a8020bdbf7f3f2eaab8e0e18ebb336f540f75a71b507320c0b4ffe5704db0aa7eafd872777de4a14e1cebec905c197a407858ed88a8725292baf8f8b8137a3d SHA512 a78876e157fbce23a0f536b14f79efa93730bf45d9a69833b336db80b2aca66b41b5c9625ddb0743ee0b503c6b78870f95cb909cf2ff1ba0233571aaaa18dbde
 DIST libc-0.2.70.crate 472909 BLAKE2B bbc4b3ec2ebad2bed2a164e407e344ee4a70a7d83a00b8501d82d70a03dd76a3af40b5a494676d203c37683d602437737c8fd1cf1e7f513bfe5db2820ff29b39 SHA512 a543b972e73d5bf142988464cd62f4402b782796074aabf4ec9396e341050d545b83212c7e4c62c224d5e06de4d794c67fea91b83d605626df115b30d8f326de
 DIST libc-0.2.72.crate 478292 BLAKE2B 23914e92f9ae57a023bbb9bd9cd823cf535ba14ce8d01f171d3223cd227bb9d3884f7596dc2f74c690f7de813da4783e277204dfa690fc1e4f26ee566f1fe32b SHA512 f59caec272f24b8cc29d421baa4ee4145afea8eb9e4a83d8c245602f6bd8de3c91c04008a9920f7f70c9967a3392cc44d8df141c83c6c18d1f14893b21ae4ea0
+DIST libc-0.2.79.crate 511752 BLAKE2B e5da81cbbf3bd400fc301096750cc94683f13000b3f20461d2bad942c3999122fb944655871039e3bc32b9dc5037de4e82800db16899dce4685d80a569e21512 SHA512 943e097b3a4fd33b547812dadad15da33c98b1d78fd86579f63a78030a5fadd431d5d1fc969e67e1bc301d33dc550c0398ccadae26aa990d05ee474a5f76c634
 DIST libloading-0.5.2.crate 16420 BLAKE2B 1b73f3294830cdd97b7ad42f0458bbdc95f641a182352095c26f835ba4fdc71cf9a0fa85244511b07bb79dd1c4e913625fc69b4b1e2ec28306dada1aaec2750f SHA512 d04cb1bb220c9364c02da4f360593907c875951fc0f6de5da1455bac4e96a470128409f77b21194fd6a87550f3ba00abe3b7a3426e7637acb62b80d61da46be4
 DIST libloading-0.6.2.crate 19275 BLAKE2B 6a98967c9c32eee18c04ffc219135cf2b85c146e0ef031f210ef1163930ebf2addf0703be0a2901f26bcf6c5a51eed2c61d455f8f78433cb6157d11065fc2e9d SHA512 02e65e3ade29dfee2e8db8f9f0a506ebc5bb792700cf5b1eff094c58f6aded748c51b675ebb5f7babbad2806923b478f340e879b4719995a112a7c25869cd3fa
+DIST libloading-0.6.4.crate 23964 BLAKE2B f1656585f72633941bac3b646a641aad60d75aea7ce20b2f55b651fe73d925b30092977f92a6553faaca186229479f1b16fc9fd6b193bcc87b1844821a8f19b5 SHA512 c8dc123244506104e87ebc75368f8936902d430b577d745272ca9cdf22de8c3f943292df82a00bc69b14fd7db2e1fd5d023051d81b739e4ae4280010ce505251
 DIST libz-sys-1.0.25.crate 650151 BLAKE2B dc11dc65c95f6c1f409ffbd0c9b12a809eaca5899da1073d8f302a752f9bb538b419cdf2f540b34b6f72c7ac36719e8fe21a1480533829cee305019304523520 SHA512 3c1d0754230c327876fadbaf3770f52282fedc6b373c92fba386a80261c577f6bea2983db7d3a40a231fbcfee40e560d8f738d25b634d270e2132b3162497547
 DIST line_drawing-0.7.0.crate 10452 BLAKE2B 512f8ca6526ff7e029bdad9fc956a8fd448c2eb8b2923ba65aad759cafb1a29749b3d051be47b53dc9c638aaa40ffd84d604771e4cc32b2db376b0b029ea478c SHA512 8bf1dfabff7cf592673096d43b754515e1def69c71dd959ac52887458ca3d98f94545f87f8fd813b8c04e6bf9d931449859c29c26815d61856b467e7c8070ad3
 DIST linked-hash-map-0.5.3.crate 16130 BLAKE2B 20ca73044271533d2da6bb6ca863a192b61231760fddb82ac373a34fe63d92efe5b841fa401b9aa509cc1e05b86cf672eae3f26ab5c07c7b0c25e764e128344e SHA512 90ec22fcd830ccfdefd1f7c480c5cebd5e95c822e0c28fff9ccf00bfbdda080c17a722697fdc991ee04a4a32e974309440a91284bc13c9ee70284e4e247d33b1
 DIST lock_api-0.3.4.crate 18750 BLAKE2B 1aa7cb716efa665df7b09ee8d95c9fe0ef7ec108d89348e413e78e3af4d6274a49530ac03d5438a503a7c6dcfe20973c1c040d79b6cf228c5a15696a1caa4a8c SHA512 1517ec7cb1f9012da78be866e026be40465cc9befbbfff4a5f644ec19653baab6b171323c3fb8ef218df4a7bc4b305e42a6b9d6849654d0542a1c2dc8fe11fd8
+DIST lock_api-0.4.1.crate 20339 BLAKE2B 254e3bfd1fc45d197fe64610f63eb039230c6f6f631577009c7056bc0c252c590963afb062fca48d48c4781859c43b299bb411440420966b723442a96b36c58e SHA512 10ea20ddd70fa8088ba62ef9f6a406cb15567913746d2567c31eefc07c048c5bac6123d6327498e05c34780cf4f29d5cef12a5a07135d64ce095893410f96635
+DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
 DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
 DIST malloc_buf-0.0.6.crate 1239 BLAKE2B baa59345fd372db162773adbb441caff1f6bad965c3681f244161deaee76282fa09b9af0d0642cd39ef35689f85f5bd7c2efb7ba8119a58e86c7cd12d81b2c6b SHA512 463b3d7666cdd7de618abf0cc4e488060c84d6d93c56d4e922169511a0b03de380ea988cd998f5a162b244088902198763351ac16dea3762f0fa0840fc29d6ed
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
@@ -158,11 +201,17 @@ DIST miow-0.3.3.crate 22850 BLAKE2B edfbbda60206d0e25eaa2d8972290feffe989bc2b6d9
 DIST miow-0.3.5.crate 23796 BLAKE2B ead9b1483f93617a623df2c0d6d9be60eecf76c74f357ddd7bf6e097f93344aa4bcfc3368739f72dadabc2d36f725ee75522ba5202a5a7443b925b51213a1699 SHA512 32343bb12b70323f8771816c6be2a42d9b3a92757f65b606ab2e98f762ff0bf85cc30c7ba8e39d5519a8a12aaf22061f52ba537c290169d38f11ee96b41e4b95
 DIST native-tls-0.2.4.crate 32170 BLAKE2B ff0e24edcf4b1014e95990dcff7a5f2139bd3623b6b9809cf8fb95fe11720b8fbd0e563bfdfead36935e4d162b7c0829f51934d8ec191ad34bfe1d2ad2ede4a5 SHA512 810cda42159f302d315f05dde222e3ee20cfa30958d48bc547837f7d6df87a1b51d1239de90cc2901f48581be978c11f8e758fd69213a8a8fa85c71266302632
 DIST ndk-0.1.0.crate 19313 BLAKE2B 914d703780cbfdaac01a87c1cf9fd5118c7ca1a9f8902f7fc029dfda03cfb0e0f670511bbd8342e8ba509b5010cf1886b64233cd79e3f3edb89e401f7ea8ee37 SHA512 40c5bd29549cbaf6bea188a30c2f3536e12e58cc26df56a11a5e5c5b2193d6dde59bf46752dd55acd585f35ec2b70691341f468481e5520249793f1fa19a2b95
+DIST ndk-0.2.1.crate 38584 BLAKE2B b110d4680c36160755097e2d9c5ee134c0c0735d386a64c6f6cdf2e5f7ea7a33123b19d52229adff7687e4f8c30df690d1330aa976e0da2d199833917471265a SHA512 36a287ae0e5eb4f616d4dbafa8002310f2c72edf8b1d340a583891239ffbfdebe0d9cd9abbe1a3636bed7682fa4dbfd2fc63445b73771cfe8bd863ac3c86664a
 DIST ndk-glue-0.1.0.crate 3285 BLAKE2B b806fa3717ba33c61d4ee9d2a4400cea2f834640bf3526f943a7b388fb15c5535e6303f61344e36c98044f02807c566f47eb43f02b6a57597bf299f8fb057795 SHA512 ae2bc116341130efd55cc1a1e74b51af9c67e2a5feb62a0ab3298b9cb50085dc096d0702a7ac0408b2a9e4f5bdbb3a9afa488ddaaea686c107f6aa2e3a84e2dd
+DIST ndk-glue-0.2.1.crate 3684 BLAKE2B 5fab22dfa0782c682e020bfa2a2c8fa48266d5366baa9f3c7ac3a033d6badc6826fd28bb5712abe2b472bca5a93660bcbe38dfe3e51d3f09eee618d656fcfec3 SHA512 25adebb161d33c2674c89c21c5f04f599aba79828503e50715cbc94459d4f8f31710a008dcaa3fdff11068858fe8546de302c16fefb8f2e892262030ff37e6d1
+DIST ndk-macro-0.2.0.crate 4949 BLAKE2B f7171f26ad4982e91f01dd00cfdfad4a8875d89d5d3d856eb4100a037e8cf393fd9df4bc4b7daac54aeeb288f53d83aa9a422fdc5ba37290319f765a9d352411 SHA512 44d0c9f0e4c4123d8c14b41983f0af6796c93700f128550f13a5dafa8491285c8bfbce6d2a5d7a8973409e122b77fcda11c46fb04fd7cd1ec6889ed415304374
 DIST ndk-sys-0.1.0.crate 167769 BLAKE2B 637ab31140c86af5a92cbd13d335a00833398d2770c869db1beefe18b6c829b1f60b4f4b59bf69ded0dc8d9a16a831db2532dca2c73b25d4f7c73e6b833b39a4 SHA512 c73652a5ddecd400e62b186fb44d058c4193eca3ba41f9356ac86965a2ec963f8d970de690c9b4b0c97278a78dbdfd175233bb980a89757afa72b507f0e35f16
+DIST ndk-sys-0.2.1.crate 273674 BLAKE2B 40a25da1f8179f6a680d5c85ab9a6b80308f75d025707d4df017b89b9047f471c1b3ebadeb2978bee86f0cebc03e0e16a158b6793a9fd3e2af3d283327d38afd SHA512 a059e5f77fbfc9b3b0747f9278ef50cbc575852d0d041553790da75900fbc1e80a540ad8647dd3c8a325c6f6ba53006a16cd063ff81a339d3732b8fc1c8b180c
 DIST net2-0.2.34.crate 20620 BLAKE2B aee9aac0deb14a13c5f90793f1e439c94362403cb329e24607c1970c117bc379049da1b173d1bf827f0e3db38740a2d2e696981daf88c1b2302d81564be5433a SHA512 136ba95ad540545165fc2e34fdb5aab7da8f6b20e7682302ad5796b86cbf3d80b5364679c82caa19151b277f9d18de053968fda779ffff8ac88024940772709b
+DIST net2-0.2.35.crate 20660 BLAKE2B 8bfbbad0c8ccd364f1be6fd67b3087a0dbd7a6301b8133bd28cacca3d32a5baa9dcbbc81cf957bf1591b20512f283e3fd441190e33c3ddc09dea3f9bd5dba251 SHA512 5a5b4ee65654fec31d820a71bc50a0d81555ab661e4d3c1dcafb048588218d6ba347f1ce5423b092f078f3bce55f7c74e33193d1924086bb1d43a5e6efc80540
 DIST nix-0.14.1.crate 185227 BLAKE2B ecd12ae7580879c960cd828a22109e5a7f209a24c4208bc04d4392f36726886b66b147dbd3a1f3705edd35e53187553c125dfd47589a326c032aab0a3d3c9ba2 SHA512 c6393f47cdff2134cd51ca3d6becf0309697a11ac9956e3979a2d6cd00a86545d1af4efd63f6d5e417a80b2d9b247a7416b7182156d9966e00c6da25a3bfdcb3
 DIST nix-0.17.0.crate 195654 BLAKE2B 6857f84b3deb5800fe3167efd226f042bbcbbc61a4153ce59f69fb544616842c3f6d4566444201c669c6235d1d7577302e5404399f4937f1c0bbbd17fd47ef71 SHA512 3f2bc4f0e9dcb9753535aec9d626ad8126f0a9ea18f73760ba72be0f35d82542c659b4c443783010de133a318f423a16f71cd1f1dd5b5a1f4f71ff7bda247b63
+DIST nix-0.18.0.crate 209962 BLAKE2B 3ff822e3d49a6c477d5da3702fc88bbe270202acb4f7c449a78969ada9b8fc8855a90ee194bd2943dd27c28286b88e1b22a6003e08260e19f7c8ed6036bc2891 SHA512 b86660bfa2533fdfb945a3ef840c692b5d96108e3e73b76d6489b65039cde87ae04935d2f10878cab1ea38f039083aebf4ec9b2bb6ba66ee204be700e3e96581
 DIST nodrop-0.1.14.crate 7667 BLAKE2B 83aa728540908d2d2d9f82c18282d9a9d74ea01b5b836d83cd3f03d225ddbef9fd3fd13460895d744158af74fccf13b7edcd5bb1bc127c696e613de673e25863 SHA512 f583ef6104aa087e13c66a183d451d4cf350560476ca959ce4e0e8308db26ac9f31166c25aca3d50ccd972266d7595d89767655504566a4131a54607e8ed9376
 DIST nom-5.1.1.crate 130862 BLAKE2B 4a56d6b469b32d0d8b2d8bb0426e29aab3e191f0aa9faa4bffad8aa8140e3a8d7419747821d98eb9767c7bf78174ae73a10d73d5b421bbae3a97f72d8aaf073a SHA512 947ee383f906336912daec1db1d2b3ac74364a650f733594df172136683fd238fb7eeb93f6cdd6da3bea3e05a6257f244e9ac58a7311c80a1eaaa3156b80b07f
 DIST nom-5.1.2.crate 136174 BLAKE2B 32387d6ded0fbcdee8a1a0d0a08cd36bf92c38906cd199b574b6b9b24f6c245f2287e04374f7d84e2867d2785aa16d8c01ae3bd3bc811829770232681e2d33a5 SHA512 53b8ddab62475588efae46c78b5fd086a14c0fa505c84e625fbedd6dc74d4ac047e9fbed7312b797f126e9ca1f056458d8ffe0ab13f0117de685ef8b43f86aca
@@ -181,6 +230,7 @@ DIST objc-0.2.7.crate 22036 BLAKE2B 14a41a5ed6beb100d68601af12914dfef67a9f580f80
 DIST objc-foundation-0.1.1.crate 9063 BLAKE2B 876dd217b612278a522f2d08434537d468f8b0fd1efb0e58d0b58216e20f7f9fc80a5ff034ea25d9216d4d53b2d65552684ae5d5212f18d758c7937c91742a84 SHA512 976dcab4e62ad1c387a81723d70b969fb7d332e1f7dbeb2ea9a26c62fa999d91ff6d8f737ac5725a7611334862df16fa8b15765c036d7acfc3e42a745d051f34
 DIST objc_id-0.1.1.crate 3258 BLAKE2B 9a74fc17235ffdd7987c2735a7a9d136376fd13355f0561b4ecf234784aed077d1ab5aa11c1a82fcee7d47d4d36e471ca4ba3e5bb725a2ed0049a5565967326f SHA512 ec36fae6f5cefda00f3e44618b3c9fe6ec8f528f70d1a95def6421704bfa128a6e5b4a32e9dd686bf6ff60c4f87fe8094aa5e1c8070bcde58b17fdc06f49f9f5
 DIST once_cell-1.4.0.crate 24625 BLAKE2B 6cfb6ffa2326fb53c4381d4b6a462928f96ad4133c653335c34265a1475c4f50067fcd2a6d9bb0660aab4406401edf02776ceff8d2b43c9d6b443998d2e3cdb7 SHA512 8debf21169653719820c4892ebceda67fedcc3c86e958aec42ade0d38247e12265a0152846f9284c37faa183e452ddf666b117e7ec5c066893cd33ec407dfaa6
+DIST once_cell-1.4.1.crate 24366 BLAKE2B ad569e1d79ec41800a62a84be50d1624efc19e2d08757964e84eaf8b1bc341988636723de8f0c87b37cf72dd4a4fed9a4623c6deb2577172c3d85fd6849685ea SHA512 7d075cb115e6146a9e08e27fe123865bb54fb73c1da6c84f3ac991ff9f6f83bbb55245a9741279a12b72f143e3ed4ada3da7b13764e7655dfe64b70c5d6c1958
 DIST openssl-0.10.29.crate 189956 BLAKE2B e229d813143abb14529f82d1ed7d55dfbcba7903fe8f0676b24b623183a11fafb57d3d1c8e16e055f3423da189b64550c0319201f87ec83edec6618bbe2f45f6 SHA512 dd6986abe65cdf2e9c3d4b54c1a8dbb279bb002119e8d9faa5cca3b9a6a7d8512a1c3b5f72803bd98d46c855da54dde63041119db1106ec62b9b67f1ade79c9d
 DIST openssl-0.10.30.crate 191808 BLAKE2B a6c76278f0d5fa3cb27eacab96d6430dcfb04deeb37cb8c6ecdc9b446f1bc8c44a69dcd83f50a8c50c56a49e8950303e807f05e90de3040a616f9c47a2f0caaa SHA512 058e9a483a9d0936e77626698bea5049608a9cc4e59a406b39c0b678f78c9207c5604286473dab334fe1d10d850fabcd786c6b54888a7affadb594f9459f5dc9
 DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
@@ -189,8 +239,11 @@ DIST openssl-sys-0.9.58.crate 47014 BLAKE2B a66f90a5cd9fc82ff22ad7481ca9e4a92c78
 DIST ordered-float-1.0.2.crate 9458 BLAKE2B 6a2611ecf0ed5c1a999b3b192edaba940caf8b07a432b4f3e27003d246f9b1eae346747da60019a9a60a92ccb867fd2451ad3f4e6acddb9c08ba817912806115 SHA512 aec5c5e00fc17e47687d69fdc6cc3d4cae337b2af6f28cc869ba5e98aa64c81493c8f822e6b68f6cc109b99a7b19363211b28cd3cd9263cd61f2ccad3d3f7399
 DIST ordered-float-1.1.0.crate 9864 BLAKE2B 61503b47d9d5cf7cfef0bd510cf182300c405cb545c402b648d3b058cceef33d0e6d313d44e90140b088f1d83bf68f521aaba67c0b8f2ea24fa3951a9677cdc0 SHA512 e8240cda13a18443e3fa1f8931c28f15c3a5344b470ad08d385bdeb460e31b3a519c80b63eec4dfdbad217f70e231a85bf16fa808b5af0814215759911059d77
 DIST osmesa-sys-0.1.2.crate 1322 BLAKE2B f0768f55e02534829d47cf91e839010a394d379ac0cdb06afb7e7b4993878026be62671f68e91d7d292919ccb336e59b7bd13790985cc1afce90957096bade11 SHA512 3ab87b968f685da1a3e79ac6a56eb167b8ff76f52cbbf57e19b765cc2ca16f5ba79d7264f0da36664d0ade9fc72c5d757e1e3e430fd41224f202399663fc98c0
+DIST owned_ttf_parser-0.6.0.crate 20574 BLAKE2B 6bfd6b3e0ded1b23a8d3037137e5408aae9454f853c1b871166cab16629c7d342b6ab8f9528a175e5102cce25587303570b76f8086804b98b2bf4cd739d95f78 SHA512 cf1540beda15ec1535b03edfcc661a11ffa471d741c2f754318b5a0e4808e335d88ab7d18c3b45bf93cec88cad8d2d8bfd7c5edda177b1a1b5dccb6a9b34ec66
 DIST parking_lot-0.10.2.crate 39536 BLAKE2B f5d78c5c7ddbb51e694b93b39a3d06b71de92d903d944e17205b853de4d1275622c76aec17cc362da8f3b601fb7df64636b1ee7c7dadff653fa187abfd3df76f SHA512 fcbc057e3c59a51d3b9eb2cc0d20a0beb36bf480e11954a701c4cce1a795ea7791fc17fbf992a259f855ccd1556704397c58060c93c27bf0828051aeebb35168
+DIST parking_lot-0.11.0.crate 39558 BLAKE2B 542a01f086b9626828879c916b642dc6b600f7ad882e59eaaf465de3f1917bc80cebfa7d3252fc3c64052e968fe62a6a703d0c8be7855135d92d829c741d7f70 SHA512 464aab46b53df68126c0b7ee635e48955e1a653ab2c89d3c2263b3674ddef253456675ca6c67fc30a3a6cafbffd269b10bcdbc7add505da8b32554753008a42f
 DIST parking_lot_core-0.7.2.crate 33875 BLAKE2B 5725d2c45be7bcc945a0e3765357d2c066684e4c8ba036e5d7da5ba0c15ccde4cd5fbbf02a9ae848aab365a8d71e8cdcf01942511e01b1e1302af7ac346fe2a3 SHA512 96c62ac274343f46f3e0481ba3265bb00a085a4a95c4fb642f923e42852050b04b5d3a4c547b0dc261b83fe91766856df897ea3104545b89962614f7c63dae2b
+DIST parking_lot_core-0.8.0.crate 33870 BLAKE2B 747adc7eb455690050e9c21e117dd85215d64cfefa1408e65956797b9374b02ff41e00400ffc4bfe8b8f22fa40915864a5df933364fe4e4e37f9b8860f60f71e SHA512 40ca590b3af8c8993cd0d78c11bdb92e64d58f720f18a2ad5ca7e1e099469f627361305d080700781c467ada73d14633e31246d2f0ad6256c57a55f33cbd41e3
 DIST peeking_take_while-0.1.2.crate 6697 BLAKE2B 31571604d00872900abcb677a483da93654de523bbdb0331c326dc9a3e531f246e571bebcb983e79dc46e33ed6dd32b978be509841ec0d9f1e7209c06289c22a SHA512 7bf8721987c3e2e1986683dd897746592a909382f02b840b777effec7d8b0a864c1a83b03c73d555e359f22c423168a54b75448a7e7b996b739527ce8c88b721
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
 DIST phf-0.8.0.crate 3902 BLAKE2B 3f1d4f9c23cfa2a3a0b7e4f809ff00783d71bb4839b27246d5244e5aee61a211498715ed576f00749e8132a6af1cdf50b2eb27d2f49896f006212981886a0e44 SHA512 a3013c4106ba72aa3cf22bd3f903eeacc24ac7cc47aad791bc5e9a63e1aff928a537399b6a86b0346c5eb37979ec01b404807e622e79a0a70a0e01e63c07a47f
@@ -198,16 +251,21 @@ DIST phf_codegen-0.8.0.crate 3192 BLAKE2B 65c733fb896fa034c97482d122a2ed4c39d763
 DIST phf_generator-0.8.0.crate 7604 BLAKE2B 936c9ad95d2d5b6b4bc97dac9bcf99813462950f6280d9cbb8c8ae9253d3197f25b8173c202cdd51c4a2d3f422ca1d6f5c9055e7a87e45b2dc5fbe5aa6aa45ce SHA512 de045f47567defd43fe32fc62191a9a892e5a478e1a84b853cff3005e94967ded68e5770eacb43f2e97e58b8f4283327a38a3bdbd55e1d5c708dab601ea66270
 DIST phf_shared-0.8.0.crate 2860 BLAKE2B db48d88ad6e7aa6bdb2f6750ab66063a55d005b4f5e92ededb59da1f1fa9b1296d30f87d32d036f08e3a74111ea4d8287e8eb6c86d0edd76b3ceb38f223696db SHA512 6ad7ac732b7cc42e7e179329fbfee7074d26652d73eb4f2b97224491d978ad9b14c66e5a539c96b84c70124ac44cfc009bf963a42c438d028bd9737b99f463f3
 DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc
+DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
 DIST png-0.16.3.crate 45421 BLAKE2B 03aed77ef5bd5ff1e60e92c1b8ab76c96c0ea918d0268f4b8fd5f7d882e3ebd3ce21808d71c664f57530cb778382375074933b6a44b95884b28b1205df972930 SHA512 989417d7fc10c2c3994109d28f0d4df06a08120fb0ec23b00d2ed0e2cc42cba74b604ab57c3185d10a146bdc2c6016f10fdaee8c6c9b1c33f9b706f11153e800
 DIST png-0.16.6.crate 53965 BLAKE2B ea8c74fe0621cedfbb258d01737447a87770fe51a96b51f5b89fa283aeab28fc58654313188fcd8bd4ad64de8960bb6254283a180a5b7384e747fa592ea48a07 SHA512 d5da72faf98bef425d30f5a9963c4a7b6677868f47ae011f44e4e35be8e2b6e663181645168c370b9946fdcfa75ee094d3c4473038e01d9012b7ecc71ead32d7
+DIST png-0.16.7.crate 54062 BLAKE2B 195b7049aa3b2574ce64bac34745c38aa97ec7996e1801d30b748a7126b62bbc5ad39a0f59b28077e1d4240f920438b8fbde59f4bf704f566be913599008a600 SHA512 3074568b2386b8db51668b313d67436d35bc39c60e64bd203d32dccdb5eaa4ea7a43b9830a0a6d012543b7b32422d514510bff32ce2d18310e03ad61f237fb27
 DIST podio-0.1.6.crate 10186 BLAKE2B 30f1ccfce0a1026ccbffbbbfae035fd3575b43c9226b6fb05c1dc7cceb31ec02de1dfed3cc497dd4fbcc611a767e3b5cfa3c751598663dd5c30ec457c6b5d946 SHA512 91901b941780db01f01848ed63fe44decf3543dd5163804fbd0118435ea60b43baba9d24bb1d182e929744a32ab4b2a0bb7fa9b6e9f3d32966bdd6b8ccc631f7
 DIST podio-0.1.7.crate 10294 BLAKE2B dd28ab835e8e63d7e975a00669ab5d40b4e1da47e65a9d1a7ccafbbbe7b84030ea20433a374cf3d944c923b7849af8bbcba94b09baabe42d05c1478536d0877d SHA512 e1e40efcbe6732d4f6f23f9f652c387de40f733699cfe1338a79e7fefabf3388428a5297557e274c057e197392c95494762eff3fe3025e77c4aabe624a2a5295
 DIST ppv-lite86-0.2.7.crate 20615 BLAKE2B 9096bf570d6289bd00d6a8864372693fe607319f581d7aeb8f8abc591436e96812e1998381a9a83a70f5f25ec72d383ed0e1b97d4cf1a7d49bd0ef2683eb3647 SHA512 48b182ebe035dfae220422be1e625f157f228fa4981a303ce2c82e24419ba3ec5e5f5cbb9d11bb685fa974c8c3dcef3fdbc44032535c404199332918de63fef8
 DIST ppv-lite86-0.2.8.crate 20848 BLAKE2B ca85104fc1d6b300aab69c7b9367ba04f77ccde38bb7aad80cf1f615490696b27d61dcf242574abebe54b288414fdec2b63c756e47f188386a0f5523482ad9f5 SHA512 224db067f771eb48e4b0ddc2b7a1baf7389a47675ba93da50e3e4d6c88cef09e0f4529f399350b1b3feac7a88469406aa9b967377177a8c89605c49e1179771b
+DIST ppv-lite86-0.2.9.crate 20933 BLAKE2B 493fb977d0db8eb4699893ed1d05758ee7cf1b5610b767a2ec352f3f430edf3d1a3bacefae554fb16eb2786fe4fb9b574c7b9961458a938da9a79b9084f062a8 SHA512 d9fe88a221733197b43db2a2a608dd2acdd9aa37129af07ad2405d66171b6f9f4c1a61530013c7f9ad69194a2e52e7480ba80c696e97cf2adaea7677052cb010
 DIST proc-macro-crate-0.1.4.crate 3783 BLAKE2B b18b6259140777447f40a22d9fcf7a1483634436e1c980383d0932d5850b9d1e2592265da17c36d73827f1a32bb104bac26081e456cfaf480842dff1bc29315e SHA512 85907785b3169afadad1aca6505e7303f81cdd3e38aace5967cbd42b44866d3477679d9397af3db0dc97b1c9ee5d68f3e4862e7dcb2e92070fb0960f2aeba883
+DIST proc-macro-crate-0.1.5.crate 8096 BLAKE2B 0a992f7aecf05335008731adc40e8ce6c4ef5e114228b51ea856112f850a24e995e4682c8d2ffbc703b9b5cfddad68342cc9d0f7d13b13a96961287bdc22c4a0 SHA512 b2922ea8beb762f42f7646398eff9d03a5fe3d942f1d0cce564eff8af41ed14f175986d07ac5bab75e7634f964b8ad24a6f05f597c90b83761bb4c1d2b2fed59
 DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
 DIST proc-macro2-1.0.13.crate 34303 BLAKE2B 090da288cbd3d21ef2faefee80fdb17a4184789f6ec47cbcfb6ee40eef25df8a64c22385ee1cb054d121db8919a337c82798452cc054aca19a415732350efac5 SHA512 bb8043709f54fc3f845c1c6ec937a393f3418165ad854fe9a15bc1cd40c8c1545fc127b0fdf337f49135e2e2b7f9b5203ebcad92d32987792eb22622a53af4c0
 DIST proc-macro2-1.0.18.crate 36252 BLAKE2B f55674ba8294f48d72a71dbf36a2e464898b96e53ff32d8dfb6f66271a3427e59e5f8e868309aa6c15e3b718983806b35f65599afa119ab76b658af863f90e63 SHA512 3e7cf577bc3548e03a2f1bee620e3ef484dcaa45fbaf7858a8ea04f79d82d636b527584765ef43c92624e1a1afac50e60ad3f9dd8efc34e8e6b84cda20c864ef
+DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
 DIST quote-0.6.13.crate 17475 BLAKE2B 985287f3e619c46b052e704c6da78565fe5d8e4f9a0d503aa0e8818f595fbef32a437d67228c35cd02d817ee3e19efc03e75239013a87a79553bb252f15c8ac5 SHA512 bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e
 DIST quote-1.0.5.crate 23920 BLAKE2B 797e9de5cb7294b5efd5963bf957e4f51716a368a7300b620e51bfc60e6b4d8cce56bc3ad3f382784cbf13f33cf7c5fa0fe93897c56f6af674f91729b4a37bc0 SHA512 2f1b2b4272d1caf280dbc82a68f5e25a63c4a33260bdc53925ad7dfcdbd905198fc7f9f3d326f89c5991ab1318bd8877d38cbc7b091db86f58a576c82f700b63
@@ -219,20 +277,26 @@ DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6
 DIST rand_pcg-0.2.1.crate 11291 BLAKE2B f8837f3f3dcd7ecfc90f88bb6464b9f79f7c1975ecc68289fd10a5c97323de9c1106de9847fc798f50d96044e46cca9d41f1635130be40bc789492bfaf999de9 SHA512 612c0d1cdc591f80733bf8097e251f02ef7a7e71cafb74e37b63ac68043558045c0c96196200ad07ce7aa9f2d373640c20e598ae5774935c8b52350ec20958ba
 DIST raw-window-handle-0.3.3.crate 5798 BLAKE2B d6fa979aa6eb23478abb3bc85f46633ef2807208c96de9fc327eeeb53e46944a8d2cb68dd25345f2a6f4b5c4274058a01e13d1eaef4be858dab11a8d3727c1fd SHA512 1939150cbf471a33654aeb953bf2dfe48e2fa7789d4a7a43fe449585737741cf03c4f13b2d3d3855f110f2cb8b91c15cca17e7f8ce1f6b63fc8d2e32ed3fefb4
 DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
+DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
 DIST redox_users-0.3.4.crate 12526 BLAKE2B cae43317cc63f129bec8d4da5959e5b00a17c4ecb35d5a18a410f12b70a9f72c235afcdbf9bf5de71a94cfe02f46d7e2d6988b536d02ff1b333c6025a5ab906d SHA512 7a42f4b6ced1b8ee53f2c35446154fea6646bd1634133738a281788e69121bfcbc02d4aeb88d25729382429945c0e89b6de4b6b63831e645c6197ff4ad022831
+DIST redox_users-0.3.5.crate 12644 BLAKE2B 093141c98164163dc66378f2ccb48a5f478c5b40b69ad4ecb89fe8967e4a309974088ea5f7a2b184b625fc03348f2e75b0809d3683696e9b74d5c4a5ac6a4e8d SHA512 d90f1816205a4f2eca59397f6866e5cd965af652940f56930f8bfbe2b50eda75cf78b09200bb69416a35cbeead3cbd4de354805568be2feef1ae4d691b9a6a3c
 DIST regex-1.3.7.crate 235600 BLAKE2B 15370ec0cc9f37c6a7092eaf78a731740aae3d79ec6d385244f4568395cac8947860828ff585aba9f35ccae684bb19e214120f39e7f4998350ff2890a43f2466 SHA512 59090515860c26551ce08e8b37cf1227712944844148b79dcc7348f430e5c3c70767c20807cb1affb242686e7e8f885224c4c9fb9ae890b57f766fec96e2aa69
 DIST regex-1.3.9.crate 236683 BLAKE2B 29bd39b138a8168015bb7a6b36bb5f7f9918b7c00bca28a720f3dffd5b805d3374a6648a04792585e85922e099faf547e5d02aeb23008b7802424351633ea23a SHA512 425713d3eeb4132d4056e6c1a08bc2fa5032b9971987c531b5707a9b5670ae15f037bd68921f1545580801957d1ea283eff87e533477364c7f76823800202f74
+DIST regex-1.4.1.crate 236871 BLAKE2B 1a232e6a83e02b4fd2189142eb2e20d3f06d8d484f9012661aea99c23bfc8d56a04b993cab6a3fe85d29aca38a1b3ad5a8ea6cd5bcf3439d5d173923af9d9d1f SHA512 eb8869031ac156f10e8d031c8f5e5fab66575663b7daf4a0e86523fb3dea43e11c7bffe802d5fb7896e017e61afa856783c0541a1d414d91f322b2fbfaf8e249
 DIST regex-automata-0.1.9.crate 114560 BLAKE2B 2bbaeaaa896479c817b7bac2f51108f8f74fda72178068c3b5e599b466899692fba8ff3ce8cd30f1f978a944a0df98f466f3d4bd340bf595d6f7048ba6f648a8 SHA512 53323733dc2f8c47ec33b5b3aefacac3a0042cff80c59c3a05ee02b581671dd9a6ebf6b0b5eeddf9cd249662731cabf5a684553daeff440bf8d1d4d296afbeb0
 DIST regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f
 DIST regex-syntax-0.6.18.crate 294440 BLAKE2B 355d6a2704e1267064719927269facce1f1c8897566d41e54741183969cde5e56c38d0c0b610b99dea3635de20fa00ebfb8748ceea331af6984198d927a93b73 SHA512 9cd999837890a87d0cc6bc351029a422bd52e5c621763e5c11ae9dcf1ba5edebabcd9e6d70db0b1656072a6109d439101412b3aab0d6ad357ae02ee7039a010e
+DIST regex-syntax-0.6.20.crate 293727 BLAKE2B ea19fdee49290481d20230e58da22d32e0cb715a93a67f98687b6fa8bfca5fea77d82399485a6be15b2a24d21fa4635c60cfe05b7132128e36a770fe86bf3c8f SHA512 65cfd5c493a066801a290d3663d5ceec738558ac7f3af9f3c3773065d9b6b02df006bedc556ee0dc377c032cf934426dea817d06f9639b837d7864f966ec94d8
 DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
 DIST rust-argon2-0.7.0.crate 27757 BLAKE2B ddeea9ffda1216294e0b8a3dced747fffbd8198fb3b5b74a347a8932a242db7c81554c08c3757574cfbcea5b13b253737df098355e65685d8ae7d95f55306290 SHA512 7310b7f993eb190c155b982bcc6e88e887ca4605dcdae521f0d744f48a5646694c4befa5518f9c94d303c8af1d9111e59c1c67512a9dac4e5f30b83cceed8ddc
+DIST rust-argon2-0.8.2.crate 28291 BLAKE2B 65b9727c348e1593bea85bdcd65b21ff0e667d87d1ff88692165d49948fb7b9294a4a4a20dbb824a68a2cdd59ce1c1483d6dfdc31d8f7800c7e34cae78297a0b SHA512 9ea8088ee1caba0cac453cc54f7e7327471282d0a8a65944b1c911f809bdeaad7e9379a399d215533e3c05538c9b5b7fe1f9845b01c580d76ada61ac8a24327b
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
 DIST rustc_tools_util-0.2.0.crate 2792 BLAKE2B 9cfa3b904c2e671f8dbb248d7a1cbcc2eeeb6a2d6c324aa34707fe675cedac809eee51594192b04a2a00b549b1e70c0fc6b61ddc6e1e3f26d4e51eb926a2a23d SHA512 ad4e972f31267ba1c913f24a1a4216f47332fe35fb2f114dcea595de678a688d9574d091bf7995b8ff2de871f3dd0131d099664b31639f65420c40405a89dcc0
 DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
 DIST rusttype-0.7.9.crate 42732 BLAKE2B 8eebf7691d754e000cbfe907f3be8aeb9ebdd63421a545bb4fcfa894426573c3f11be551a3a1e610a5f6fba4703459d9b68ad3fc551f06baf5d61aad510e97c0 SHA512 1a23f65e513536c2e08fb3342765293744aa696279ca96ea1ae304def876f60b4fcf9a34dc53c09e960f5928f1b0ec5f2f32eaecc95733c78c2905d087d4c826
 DIST rusttype-0.8.3.crate 37327 BLAKE2B c46d2a926f735c4ba3e3fde1f230238e167cc480787c03389ed851c2c6d837029d652471c6ccdf52b9bec9e57c4d703c72dda2f9b5686ed85377c983681fa18e SHA512 2dab21eea8fed6fe70c4f7d969639aa422e2800801c0282494d31ccfff451d13325236c2443cc65b18e013d15a28681909cd2ba34e32f75b3e21090f0b1f3554
+DIST rusttype-0.9.2.crate 31314 BLAKE2B 5c4910c91c584410bbdfc34f15c079feedd9c08fb96c41b4a0b6b93ceda385f2cb5a2079fae2f83faf33fd6476367fbd658df72943d8c1e1c05626e8f88743a0 SHA512 99fa1b6446c339f4c0c233622146bc18cf7e9f767db4bd1f1c40c334c7376e33b5fabfbfdfa7d47a4f88027323b0786bb6fe98bdd77ab6df3b898b78b11e7b2d
 DIST ryu-1.0.4.crate 42039 BLAKE2B a1cd38c85ff105a0aea5e0cf09aa2be15d07e5344fb4a52b00bcbee6c6f966276aed1163b480b2acf669276368f04217eb7c0a6c279140f34bb54b1802e1ca06 SHA512 a1b28c07b32374757019f93eae30f82ae00682d5e9838f50864dd4ca898b8220b9bdb0f5df55d23d6bfc7386a3ac93697a18c82215f2e946e06c079962123703
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
@@ -245,10 +309,13 @@ DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 DIST serde-1.0.110.crate 73947 BLAKE2B ceb9896bd205026825767951c6dd4c11aa5ce485ecded75eeae2f88627f4851c378c311d7ad8d06395f2ed976e342d31e11787ddf926dfeb0643ca0575b32ccf SHA512 508fc3195ba0deb75980a758a4392462068fdde9a87fe2f379ab9b28c573c5af45617b82e5fdd1e34cefa075888da7f533675b05d57757f0c0200b4fa5698863
 DIST serde-1.0.114.crate 74453 BLAKE2B d5cd4b23a0b6555f8efce963e833b0c293b53cf33a3846ddb189c8d8d8ef5f157c45e33833baa21683a336b60de4785509288c417243b43fc5395e5df6a4e7dc SHA512 9c8db28e52686bc0d428374f13e5a5f4ccb235ef17d8840aa676042321fc89adce4cef4dd00700bd25c2024f79a96d91eca8ec9122e899056116a890cb90300f
+DIST serde-1.0.117.crate 74505 BLAKE2B 59c5243dc10c00762659ef6352dbec857966540810117990f49eb1d19de435284151f8f0211000c264e7f7c6d3d4ada45c695384d397b31daae32d95efa13048 SHA512 77001954c9f1f7eb11c7a6293454dc0c581e536f4a07368dfcf62b744f42b620a6de8c67ca89138291b964d17f198274e2372fb72a9905dbbafe56276c5a9d5b
 DIST serde_derive-1.0.110.crate 49751 BLAKE2B 14f3ffe6d6ce5aed13a800c2802459bca54546d3a77dd05c4c095f10ffabec8e66195cd69994b46162a96bd95fc5fb0d78a08864b7709a8f6c32643183cb90be SHA512 b02a831fced998388a39ad5e8ec12de5c7d09e18b69f15b112870d1e5976f74e0cfcd28a68dbcaef87c4be30001bd2cae076de234a59e8f39ea0be3014a395a5
 DIST serde_derive-1.0.114.crate 50733 BLAKE2B f66ccfcbd8ccbdea4e3acc7fcb33fb1da516cf41e75c2993c2de79cd139fdf1b7c0ff6a95790df623eaf8b30fce4dec80f2a9c5332a8047dd0812fa65170737c SHA512 b3bea48a9ddd9c442a4ae6d0b76a116450e648976c02f07c2acf48459b15aef9c69d4843c2f04f387015c7f3ff5c3a1f4e5d1dc1e3a3ec3a114f6a651874aeb2
+DIST serde_derive-1.0.117.crate 50712 BLAKE2B 59bf7592d80ab2085899e256e325e0e43c69ba2134ff423e0612f31cdc1629e9d519be538538546f21067ccc460d07619a3fb2312bb31263a63ec4f624fad788 SHA512 072c761421d10c1b25d545991c0ba9ef6dfaa1a6fa8797abd4a2a194b121588d25942ce662df9b4c5de2fea229d6c06c7963224ed80e3fa11fac07f6dee3f72d
 DIST serde_json-1.0.53.crate 73130 BLAKE2B 28f118648c77c8ada5a434416ec6b28615d8a9b677da7f34c8ba1104730087ac6d93e010a767199a98208ebe5dbde1203a47f28a2394a3ecb75b3d115a3b27b4 SHA512 8932a9f9f783b7124c7a41c9c3c0c1934c0e5b8b628fc9bab5ae0f78370231649f17de8015f9d6facf4ccd0305c68d8c648799e239bf32558c6be9bbe3819e22
 DIST serde_json-1.0.56.crate 114541 BLAKE2B 1e393b296983b55d6f516f87ac0b3222956e3ecd7e088955f430c0957642ba59f6d7e927bd924b30f8ca989a04f611078b5c05690d8b1195a0e8b0d11f1b6412 SHA512 ee937a1449701235984a71c9e92035251019d922eccf29e1dc95cdfa008e9bae614650949d8536a5a42ae7b8decfb419b75ec5285b1f85618750efbad24cb11f
+DIST serde_json-1.0.59.crate 114956 BLAKE2B 27552d21b80d88cc3c643b25e5f0105c0d79a7c74c5bc3c2cdcc68050103ad73b75f7ee9d1d5afb60adbae33c351091b180cb1f8aa17c80f06cce4fb4c57f2d8 SHA512 2f9bf96fa770f9be9c43fc889e1671e9bb883f49a820aa69a1709d9f679f21f01cef2b771eea4d1fe7994cf850af44577710521fffdc4cc46d0dc6f913842075
 DIST serde_yaml-0.8.12.crate 35916 BLAKE2B 6a2cee8a83219dd804d1b8bdeeb8c7b14b6989a849c6707a56fd14c65099a4f67b0a9c0e5f85a6cc97d90abada3d736a18a022a8522aab6c7e6987f5accb43ec SHA512 53cc9327e2baed3583497922dd20870c570de2be20074a537d703d17d7038e2826bf4b5ebf6daa8f451204d07453dff05e931a66670b19910b2d04385229fb1f
 DIST serde_yaml-0.8.13.crate 37683 BLAKE2B a6739f29e638fa77516ae106314a332a6cc86022db4a029eb7615e5deca712b67669330f02ba0d04cc53b9e3f661a5e970f7ebe723be18cd44c309218123a74a SHA512 12621a641ccc68f90a962e9a6d84ab922d9b30e58be88c26e8fa0cf921981f573bb929113108cfd08f47988902997d4b685db2cd361cbf83119612e95ff6e686
 DIST servo-fontconfig-0.4.0.crate 9303 BLAKE2B 8ce98c5cbf197041fbcdaa1764e49a48a96f4ea572d82e7969a639644cb5ac23896d1f2c6b34a30ace93eed68c7f30fa9e15f7474c46a9a9e682bd91c5f27aa6 SHA512 22491b9a3d4791c2a0ef26647ee2d4fd97344e3f4b2085f910428ed06c68bb4b0eb419a98bfd789a2db0fd4141038c38d32bb1d2a2eb681b25844f7b991e1cbd
@@ -261,29 +328,41 @@ DIST shlex-0.1.1.crate 5687 BLAKE2B 8e2942051c783369a8161b667f8f5b73b2081f766db2
 DIST signal-hook-0.1.15.crate 27040 BLAKE2B c0c5c43564d75694592285d9be314822c90e51dd204a4025f0e498998ec49280ec56d0e20aa4d1ae86dac9c2ef878f6bcb08ff96dc6a22ba9e5725556c39e0ea SHA512 44542789682d8906524a5990b2e6f04c028e524f278a61b5d5328f7bfebc19ae5c98c7fa7aaa7181d62950272ee2a00020c325714da615852b6f619597d4d738
 DIST signal-hook-0.1.16.crate 27183 BLAKE2B e275b3516c8e4dfb5f61f8d85c255237e152347135170d9ced8b9d47988df2f98e4d430c3ff4a6f9cc856943c0f662238145a0eb09c7e0b62ba3f91ed53e8237 SHA512 74e77b4d8d3c69b75b8e2517dffde35f98b6eada8853bb349a2acb5517980559a7f30c0866f06751f981958c05928f0acf9a2282d1afe43059e5424f6fb78597
 DIST signal-hook-registry-1.2.0.crate 14490 BLAKE2B 52c56376f5572787d78d4691201d51d219c623d2eedf912625128d6da8fb01f6930dbecbc5e5c021de098fb0a194fd6b35a9452f92a484095e9606ce96fac135 SHA512 f4552fbeb50f66a2ee1d9826fd74a8ecb3e6d242913c20ca7099d165afb55ecd359a44427b8c3eb73bfc4e3c887d972853b49a842472389454988060dd4aaa07
+DIST signal-hook-registry-1.2.1.crate 14735 BLAKE2B f49dc2ab4801ad1794bcb538eb2eab7c8698be7e004ac9b01987a870ad5f0e0696d9f1f2e5ec5f6153953121d6f2a1140a2ddda3d35ab67f31b4a3e0733701aa SHA512 91a5a22bd89f8c04cdb78809d6610ca39e1111a356e797206c42f7305d57f43a8f1e6d5ac60ca9e5f86299372e86ff692baeabc6d9913c56ee92d260ee1ae477
 DIST siphasher-0.3.3.crate 9458 BLAKE2B 02f61c68b432909711c8f8d3c9cdb641528274b9cc991cfd23c10660d4ce4fbe49dfe9c2226404ad72cca498f14813eb531ab2149229071782a9e267504aa95a SHA512 53bec96ee1edcd658886ac650a1528ce5186a203a412d4dce5a95ede4b50ab5ef9406af5150fafff220484ef96ab5a883dc9ba4b0927d6bc42321a4b0cbf454e
 DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661
 DIST smallvec-1.4.0.crate 24645 BLAKE2B ff5102e2b3a03bf5a8e3e2325f93ffc96dccaf2a4c9ca50ccbe7837215eb356e21d2aa5c02e5130a657c166913e8c42cf9dfe50352b6301231b4bcd37225b6fb SHA512 32a56d7055655ee7d4a6556afd63db7200c269a109ec3bee29fefce8bc75363762c3cf625aa3edd3b06a93046b8c64fea2036403b63ac0e764e08af78c936a63
 DIST smallvec-1.4.1.crate 25818 BLAKE2B 44165d8a6e9522542c9d76be3aa7f515a662eb385a1c381f64f008e78461943676cc47ab7e1477c80319d7bd36284f5530aad65ea1e59642003ded4ca7149775 SHA512 9fd60cfc29f413b44a5f215d3dc78b90b25a5f300e70d5f655571fbffc14bd701383485fb67ed3f4a73b9cfb46c6584bcf81be67e99d5e6a69dec5681ed6c4e4
+DIST smallvec-1.4.2.crate 26109 BLAKE2B 7227afe12e1430510bed73e4a97c512d3c7062bc9cdc05024ef5ab4fd1bd66ae0ca74549f8e5f509e9382c33dec2094e3529dc71d8c3ee3fc5102d00a5667c59 SHA512 5fa8ca2bd49dcf23c5f2c241b69811ff92bcca30b9687c3796cd4d4676450640cf5ab15745fd0df07993db42d12e2d4022fc395c55e5464b12ad6a1b3f7f75d5
 DIST smithay-client-toolkit-0.10.0.crate 127492 BLAKE2B acb869bcd84f9271fcbcac823ed4bc76e27207e1de061deb8e20b78f6654b419e49c95fc8af054d9eb12349f40767534aa3988e732924b4b9f9ece2f8f6c6397 SHA512 f55b8b13580c8a52761c1c157cccb7e57e6feee83c0dbeaa1b32d4acf0ddaef490fad1365b9a8087f6cf7e11912bf5b05afd7535f640955de367a2ac59bd7788
+DIST smithay-client-toolkit-0.12.0.crate 130640 BLAKE2B 805490d9b9ae6a29828326b5e06f84fc3519c3314a9b4f851137c7b0150bff97b5243b2d65aeea8555c6108a6052d47c47b02a6f8708ad3d0c86318e096083b5 SHA512 acbb2dd6419fd98374af9a240d7637e74f7e3b3c7c1906f1c93bd8f0efb6102383489acd837475d3a4c2989282f8730d7c03a010fb6552e07420e85568afba1f
 DIST smithay-client-toolkit-0.6.6.crate 102563 BLAKE2B 3db1e91ddca74341d062a9394e66b357eef435a35c2001197c91e9e54bcfc47ac6fa893c8970a421a66aab50dd7ad92e4536da690796e839c081b73db30f80ac SHA512 587dce66eeb391abc8124035809579e4430bcc504058bcf98aa11a38d1cba50550f6ddae2f325239834a2a7fcb44f962e901bc10cccba9f72a71c3a5b0a054fe
 DIST smithay-clipboard-0.4.0.crate 14608 BLAKE2B 0da514b052c1debb2b661991f1f71607d286ecabee4782ed0714cade2951affa14ac6a6ff0726ac404b9c7893c7e167d4b5652175986b06134a4664943737f43 SHA512 0ec70127f53c8d90b0cabc8946330fb9b709c61fdc5ec559c67c178ece51f0cbae9c4ad749c46aa7d0f9e1b61938f65810e3a030eb948576008312e294162709
 DIST smithay-clipboard-0.5.1.crate 16476 BLAKE2B a07e99ed302a76ad2ded88bd6865e5adccb188e3bbf44e43ba4d17b8bb3b3e71b390bf275f31d43069a04741b2bd6a37de7f1f836a818a3a8b43dc1231ec0f53 SHA512 c687c434bbcc30300065fe15c3a31fb6d7a793b84c0948bec6dbd668ec3dc6954b315330384ebbd5200826abfccad86a361bcbbf9b27aa7458a5300b4d8ada84
+DIST smithay-clipboard-0.6.1.crate 16590 BLAKE2B 51579c7800bdd626afaee8cd96c0d64ea16b775d645b76ccd20e805ff18dd032c128008262f814f6cd24af268ebafc562cda635d9068a42bc56dcbe93bfd62ea SHA512 ec6b158c9d807653b33245caa3cad0bd286db1cd7ff67f995bbbaa85b31b6176ef4810411d54925386f643533bb97e567336a5fc849852c99a110e0c5c994c55
 DIST socket2-0.3.12.crate 29253 BLAKE2B 0b5c48c90b45ddc6e98e2a9437f239e681acd1431684ad47a9386d437d3aa2fccbb7190ed601a6f3dae65715f1056a211004a071b0f6e71be8761165e18e2660 SHA512 b39014c4c48d0aead812d9310651f459654314163e9f7d059801ee6e56ee116eacb912738b1dd58b5b979997c7334811161257e9b7a024299a2422808445d6ad
+DIST socket2-0.3.15.crate 29282 BLAKE2B 9ebbdd90073120d0457469907b02ac15cdc1805114fee8475b7be23478ed0215dbbae4506219d95b073f56f668e5b6b808f262da5c9ebae1ddce496166104fdd SHA512 dcd2ba06911d56ceb6859cd4053d8d9d32d485c71af86978dab0d4fd53c96e486c8729f93842711e8e9f2b0f8f4604c904c5ef2426c96660dbc05b3bed237d64
 DIST spsc-buffer-0.1.1.crate 3176 BLAKE2B d0f3aa4876df5baa1097dcc17f2d717ba57778f44c085bb29afe59d3c23ea6b7c965ca2dedfba1e8e123e36af379e282edfa783c1ffa16f7f792e3e60d0742a5 SHA512 c77619a2dac332f5ec359c559c408e25836b4130f6d078488ffa48cf2ea173acf74ec6bf3488d17e3e51ef756b33c3c27050587aef2e1b0525c2900906cc15b4
 DIST static_assertions-0.3.4.crate 15034 BLAKE2B 75a363dd72a291f2c137105787f3cd409bdc8fafd3498ad75b04ce8dbc7e2676cd0a1d988f1cbefcffa0e48467438f8c2a5f79ebb6fb142cf5c942e07b04cbbb SHA512 53fee00bbda34d5413461c4a2a2e627d0a0b06f7d2d3417f0e1d609430f7e83b235a98d02d97633b79ec64c23c3d4045cd9e69b9075b2ba4945faa0c490da566
 DIST stb_truetype-0.3.1.crate 22111 BLAKE2B cfe6594277d5445332cf05f9c8184a901e62d39bc3502f49d43097a3cfa0fae8d47cc608a579f4a0ab1022aaad9e04cec0da3251cb889bcd73e67b362ad6465e SHA512 08934a6c265aa6de106ef56c937c133b85f74a325f86908c07a73e074b14cb9bda1cb4609dad47541e2ff67a59412181498fca49c8c82be5169487dd0366d4f7
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
+DIST strsim-0.9.3.crate 10266 BLAKE2B d850a2d5199cdc2deae94c02a1934933e22b943750871c624256f3722e78878cf15750abdef6cb27a5acbbe95ed0acfc33f960305d08f942f2a4b066e93e2684 SHA512 8d7468be0f19819a454720d2fc9a139cb9afde9984f73d334b9b77085b58008d6d8ed0786f88ef91b4967c503fa1fac0ddf2fdba01391629f7bcf1ef2fe36b51
 DIST syn-1.0.22.crate 200450 BLAKE2B 325403804ad8723d2e63132dd9aab16fdfe305d9bac0b2fbfd1597f562e259290ff34946a0aad9b6dc36524632f0ba3a8b2261147cee2d9eedceed8d21a60ee7 SHA512 4d3beb6d448d24bb7413b6f9fcc5887fafdbdb9392c196bc7c1c0ee6dcf41fee2eb9166d8e69279437d266772a2581733868e763c19db32334f01c8c92fa11e3
 DIST syn-1.0.33.crate 204845 BLAKE2B acde40a1eb59a78ef17afd46fbc5dd3710db4a1fab1d2ca6159bfb1ab3e3ee4182818284ed6a78f6babb539312dfd46eb43dc62842063db953cedc65cd307ba6 SHA512 82408aea39c376825b977d54ea339661cf54664358637e5caaf8efaa7d08e03385b160b3317060c27662a621ab5752bd761cbc416165d1c2cccf28985d73db51
+DIST syn-1.0.46.crate 225691 BLAKE2B b42bbf924279167fc03c98732d6f570c95224ba69c2ab7243dd10c80badcb527e7a9e1af1b99db1e6c788128d8be530c5a31d1263b7fdb95503c52dfda820f5d SHA512 9a299269e290d0885ad3493584fe5f48c1750ee0f1e9efbea58d0fb4c27065f04ff1617d7f8d0630effeafd9daa849786ec40cef6d1bfb1dd169da589f911deb
 DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
 DIST termcolor-1.1.0.crate 17193 BLAKE2B c3a1a80269195f6bc92d141fce0885413c031980a4ad2f0f6e5a9051acfac10bad8a484362bfcaf3a60851a97d930e9602df4c00aec39431ea5a8a20d40a55c2 SHA512 41b05b047cbfdd5e3990eb36f635dc8ccf26a42bd5403d6d14a9f3c341e92b61c3b8d4d5f4fcd29071a97b3d96280ed59b4557b63a769390e2729fc82ab39702
 DIST terminfo-0.7.2.crate 49379 BLAKE2B 83bdbaa4626b3d1fc643b35b410ebb476642fe1bf34fc96b6012cecd61cfd91cc1d568e53ce2fb4096f633c0508aa75bb746add40ad8f4c8f9887b13b714eafc SHA512 9b40ce748af06a348a0e8103878e434c73ea7f0aaf93a2baa233c5f9563a3bbec93a95d2e5b03f9e62760685a00193117da351db4be4e6dca2f41db6a9bc2490
 DIST terminfo-0.7.3.crate 48821 BLAKE2B 73c01dc5104a1df1a48ae7c407da7a5600598b86a9df82beb7da3d484c97d8bda3d18789dac558d64f27cb30de4a8d381f6632a09d4982731830b1d16aabb4ee SHA512 9382e8846401b9717dd6fd8ea223ce46a3534466a21ded2325b2d7525a685e6bb588e1110ca421b63982e1881ee3be94b89e594b56e24977e1a185fc361ac735
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
+DIST thiserror-1.0.21.crate 16187 BLAKE2B 9599c8410f9a8c837d5e3a7eb1656e29dcb6c0b6edf4a09312caa01bf11613cc23d9c2aded04e3233c5abac97e7e6e4e46fa2f6311b93edd332a1dd5036b7760 SHA512 440c4e7486bbe813b8840a215859da9e1c8f95383fb894e5ad445c86d40005c62738aca14ba761636c17c5db206b71bc40a915035b2dd9023f8b5eff5e970e99
+DIST thiserror-impl-1.0.21.crate 13199 BLAKE2B 6f694e1282bfe3c5aba54b523afa25feee2a356d61d5031de046822fc9df1ae3942126ca7841f7ba8ddad0949e069a2e8be888099bde95576e2d01616b69bccc SHA512 70322106df1df17affca80481672210261a6344c484f4338f7470226914721e8a2157ea875744d4652b0ea1575dd4992a6d366a2da0524b2c84ce321a3badf45
 DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
 DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
+DIST time-0.1.44.crate 28885 BLAKE2B 5e2ca11af9da0847239a086330d0cd00fcb5b63862f9dfec46f72a065bb35ec2236a21ee1c56bf65e3117105e7815cafe67e3725b8575373e875dfcea401d967 SHA512 736a38637be0193a06fa35d42b4873b04a0a35d84cd2af85b7f653a1b67b95078577134bb187b777730e73cce67f437b45ff5c72b8e3f1f8e2ed3420ea0324cf
 DIST toml-0.5.6.crate 54341 BLAKE2B a367d22daf6169dbdc9cd58c97f824ab76567679e1032af7a0f924ca53720d2f0989c14545d1f5d82e7f46293e3d27849459157d0cd77dc78e9d76dd6d200648 SHA512 718f5d3fde823ae5d7fbea31e3cd0eaa66f6a2bcd854093d0179dfc4328930a984deff466bcabf3c81caa323aa743c609136b8d036b80087b88e888ba7577f54
+DIST toml-0.5.7.crate 54372 BLAKE2B 8147ee2e9412cb79f00585cc54b06943ab3fe3e852b4b033fb06ef13122b07216c0b2f7c84aa548f9b0cb11c2190da3c69ed8b91eacfbe1519a5d94398b358b9 SHA512 5537a103d2329feb55a470f39962d6484da515c2727d379be108a778c8fcc551065942133ad9f943f0fe96847a9d0dcbce009cd0ce1ef3df355e34fb1439dc77
+DIST ttf-parser-0.6.2.crate 106052 BLAKE2B 8065c460b59de5d792048642c538bf7475691b0c83cbd236c20236083d5ee7109f1caf056a3e56eeac2faf722fca4f1fcfb6ea8eec4d93c389baf856ad3e3af7 SHA512 93bdb9b43761a62d43ade6d74596927b0718732d7c0b3d3660544ff4a9a76579852b94db3d26639df6f8044ef81a3bf52253f4a9f30d7299959fbfa984129df9
 DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4f4f758bb8f5f073bd1af61943ee0de34cc27769525b19da8c24f8dea4941d0f5454594ab0cc8b78071ff053 SHA512 7e76a5f344e32c56cf87223585d87a56c79627b52bba0b29eb6de82de874b2964accededa8e9b5741f57944b6750fba5c61e679a50d4fd5a5646f431e2f4f188
 DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
 DIST unicode-normalization-0.1.12.crate 91057 BLAKE2B d5b8354990e1911e093d63d9b3b3adeacb38142ac68637fbfe59c0822f34c743e348cae9f535421c12cc6a56db2112dd5ec75f96c173b1f34a68db66c8ad8dd7 SHA512 0e095a59ff965499a5d2c79bfd4826b793103bebb4d2666c09e675110a50f79d985eb29565e4c40bd8fddc30237f874324d8a24786ead697ee0698ef8f79a1b6
@@ -305,20 +384,29 @@ DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968d
 DIST vswhom-0.1.0.crate 9420 BLAKE2B ad748822fa9650d011c5f240f5e52ae1e27380fc1b22db2ceaaece4fbc814ac2f2792cf6772079199202efe88fb968618a13d91609e5245639f25b32640fad44 SHA512 0ac192e6a1d296904246d89a08021b55384b48959f26f1f0dca893f8fa1e71a012a0d731d1e48e41ca8e4427da84e50fa43ced621e435b010cbcda4f19c45a58
 DIST vswhom-sys-0.1.0.crate 15589 BLAKE2B ee13d0c15323c32d1fba2a952860042f4500c5809a62d27b33d4cfdd7be8099cd04041267bbb61c61bb84fea0892dd6e81b5ee7ec69b19334f31048d8b8c4989 SHA512 f4c4c080c25638c7ea5e96ac42d71bd92752e1fed92234f194d6b597b0f451dc19c44ae28f436aa93e5cff94bf2102e49dbec600d64d3c00c9bf03f98d3ad30e
 DIST vte-0.8.0.crate 23854 BLAKE2B 27fdd36358b5d10f2b30e2dd8d0f0f3201263ca86bb5e734966cc67099a125df91512c39ed8dc06206dd3db90f02cabf7ba85c6471c402999c7529c2d607031b SHA512 c4545c8e12bdb78674434eb8414dac9d2885c2547f302d19533eeb77dc2dc8d97f077ace4905f8f105269e68b808bd01a1a825ddb86fe5947c8a4acf18ea4ee7
+DIST vte-0.9.0.crate 24930 BLAKE2B 91b3c85493037d35563337e43ab64e14503e997b029bd2cc68e56a4e95cd25f1e65b9bbd24cde567e170f5744d55fa965f1b7abba407486cb44f84a21d0bedbf SHA512 ac7c947a01ec404132133740efbaba0bb7fe441fb97373c144dfe4f19a6e5d300657768c2a93fbc7be78247efffcf90257ac2373d5f1a283abd98a968f88b5c7
 DIST vte_generate_state_changes-0.1.1.crate 2422 BLAKE2B 6e8fb4ce0ca0fd6b9a4dcccdfb02445babbc13d47de5fae9bbb81e8c67ada8a40e8dc5e57c120c36876293b111ccc71e1069ea3fdabade6f9ba5ea2d44ff4632 SHA512 ba09352e037cbd279cbf5641c9783a24f76e54f1f09e13f0ab1ca99c9646c1e3c958e8e302d7cc88431073bad2e2d5619410f2f93f96f1db25f0f0ded0236f7e
 DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
+DIST wasi-0.10.0+wasi-snapshot-preview1.crate 26964 BLAKE2B 525db01649a5981ee82ad80a1a4bab9baffd235262452675619f36a1b454017a74593c53c129f8c30b865994bbe30ef19cebaad9d245ccf54b9b07ef70d5d8ec SHA512 88e2da617f50d9ebfb1e0c5857321fb86b5ee88ae8a8d199d3cc092e0f39688a2cb68503f7c6bb09dd6bc50a9a03597a1eb2e032150fbd0d0b8afa02ad771c88
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
 DIST wayland-client-0.23.6.crate 69713 BLAKE2B 2323b14d37be28f5db621c0d5b15527e79a53f0af41cb8277d5788acf882b27bd376dc79065f18758f9093f833390edff527c3ab2fc58554fc8b1098a0678060 SHA512 e0ccc10f99d5cc05310b231e455dc007a73d63aaa11847fd9110122c1f44f76ccac60dcaff2914e464287b1d3d130d6593b3ebbd544c9e32228e1f36cf1b7536
 DIST wayland-client-0.27.0.crate 67401 BLAKE2B 31c6a19192aa43bad3d894635a76c98f47870533c806f2d8c0178220b278d8cd0575b1bac81b2fde09d60dd1a99c6c3eb6e1bfddcd6fbd8d1415a7373968e9c2 SHA512 e4d8ad88b2ac12490417b76f5c31b0171abfa90a11e08dbd0fa75860dfb80071afdd7598312083529a7ae5652f4960230d6196fe95007a19881db5dc81810908
+DIST wayland-client-0.28.2.crate 68722 BLAKE2B 7f3e13559d8e6cc6bab38183b1d3e90d095295a756b204d805f5405492c99c8e9d5f56eb5409de5df940f3c9b6bcb550a0de8b0d663a7be6246327a3287b0a8d SHA512 1eb6c8ae1e8e964a4cdb124bf42c49617cedb7b3870bb7adf314648bc93da170cf435eb06ceb08394f952a20236658858aa5ff67ae6ede99eeedd53f7f1e5fbb
 DIST wayland-commons-0.23.6.crate 16999 BLAKE2B f2cb1eca6a26bdb7923d7ee6181c6f219770f57ababc70698639423beaccb2a16374cdf7b5a05a0058b38da847e362bd4fd0c98b7988f4bb910e416eadd43950 SHA512 3f7f7a4f23003b26a8aa631f02b2be21abef8281cddda8fc116aa512c19e75168e83d0cc9621384a2b514b42e1abec053b032244ed7851797dc839ec3155e29a
 DIST wayland-commons-0.27.0.crate 20386 BLAKE2B 426453ad3318adfd2934379e52f23b35d13bc9d9b0436cdd358d6c8cf5350037686ac711ee98ecbe88cee3e6029b8dc49f7e37802faed9eeafeb54093ce4c23c SHA512 ce807a47d5cd719c789a747b5bd55a4d90530e6d02aa30b8efebfc9204c0870efeaf698d98cdea0b42c396190b77a5254c307bb3c43a25555143a87b05cb1414
+DIST wayland-commons-0.28.2.crate 20334 BLAKE2B 98049ab9e55434f37fa6465403bc1aa08a562854efef0d519f015c99a0608291559312a2ef01ffe1cfd62b4a570f8e9b9e4e44b7a9e61d84f1c6717d2ceb9cb0 SHA512 b99a17c8f78ad45db78a4dcc215f6e7677408ca90c2c3bdfa7b77491b334b3d83e13b9a1239ff18b6924c2f42a8554570320780d98393b1ab4a030f8f3fb5d42
 DIST wayland-cursor-0.27.0.crate 6176 BLAKE2B c6311e8aa0b93921fa1e4fd8749ea3da6b0bf4f31998998ff8e0e6dde4f38c76d9e34d584f1f4e14a371bc94087dbc644461bcb7d950b61e8e7b318f560f0fdb SHA512 2911b32fac0c8751ed241cc352ae05a1ce19fde31a701a9a7ad5eb52eb2ae9210c4b191bb8057e0c109fb8f82d82831b16b9739afb0e53e76124bca1358ba1e0
+DIST wayland-cursor-0.28.2.crate 6284 BLAKE2B 497510d76d64a6e54076d002cd9e23e51e47cbea4ab99dcc8a805174293477d1dbb9b2b7cfe3e1b57165b012b80aa0b0f545a97e061afc88aaed26b096dbb8b7 SHA512 a9e574a626b1e4218a79a4ddc20c49ee7e387b45266b633e676a9e54fd584e9a753626d60c74d2783a788f9aba13443de962c2d4a4463ded65308791a533028a
+DIST wayland-egl-0.28.2.crate 3113 BLAKE2B 913a98a960ed3df5c2792c1d5f0234d8516c23e8ab871c26c949479aea33a0884f665f8751dd48e36251f2d4c7b88a4cd3d9793d82013e919c59850a54db0755 SHA512 44cb7c9a14b198636aaf0a755daabb53b10469ab2f6f073775d65651372e87bacd21dc752f1a329cc4993c7afe4fd21cfa96d66b37389e7476f222c5493eb102
 DIST wayland-protocols-0.23.6.crate 112147 BLAKE2B 2a43374c6b91801bc8c93f07c6b22edb725a3699d95b6aa6cb37235d4b09729c5c2767f6b25441a6e9030855921d3649e2b802a617b80bd1811357d60c3d525f SHA512 34a3341d0713022ed102fad4515679c356c643ca482960a14f7b783cc847a1aca306902ff4168f49327c2c45f9d2abb4bbba1f2bfc9e548d1c03c36bdbb1168e
 DIST wayland-protocols-0.27.0.crate 124654 BLAKE2B c5c3329f7489659e4f132008bae00b28d4463138c04fd591c3ab45dfd1b0fc4f28d15e1c70ac00e68dc982f6857dc06d32138526a98cd799de01a08dfc6bed5b SHA512 705c33e412df1c214a3b7d9991e059f597bd3697064be5703487c33cca80dc5bae8d3302ec9e5af2b11d63b57a7b66036b5e111418738aab3c8d5075d246ac45
+DIST wayland-protocols-0.28.2.crate 125585 BLAKE2B ef030b2440952e1a019a51a9b2d3fab35b2b51771266dd96b02e4b79b47f92ef7d58e5c44421951a3d8ed17199603673b6d111bc41459b56c90176d091c38cc8 SHA512 8b4490ca3e27bb11af738209dcf1def28f2d73982f4ea48ad19d30905ca1009cd5a0fb33e8d89efc404c27021cbf3695f0ab194650d67656188ee799297a0d3b
 DIST wayland-scanner-0.23.6.crate 16370 BLAKE2B 955814612330557a41c6984a9c43f390fb9c9071c8ddd2146e1edb2913df1c0cebd55a25dece1fdbd47692befe302f2b02d308945f48054ba1d61e720542fdd6 SHA512 113d8a0cafd2d99225312ba32f9aac1e2a7610e618928e6dce9091ddf46a32f09e8d1254047167e648d219394974d9c2cd223ea3ccec998a2889db1dacd532c7
 DIST wayland-scanner-0.27.0.crate 17263 BLAKE2B 57e741a5f0ce5fb92f5701a59d8993b8b606f5ccc649b74e2da0a0ccda1050dcca31b94a5f5bc27435b48ef94f477504c6371ab10d430f2bd76380294b660957 SHA512 b64674472c513983f47d5db73126bdee2188c844296276ca5d3bd422188c7e1859b922ec6a1242470edefb3f404d9d6730f3a449361e5b63077753264e06f45b
+DIST wayland-scanner-0.28.2.crate 17329 BLAKE2B 7ce5a94a20c44efed4ea24c2d9112d1f3e2aed2fc7a823fdae3654d5832f2ba65e4365f04a8e5e4801e56438a3d0de4975f4621c11c2fd21680e5afd25f51331 SHA512 ee8577a9ce9edd2f224c1daaf2036f0cf0a731d21b49cd28b39c4b31f3bb777aa5505eb82eae2cb794529580fff5bf409af1a59cf789fff7239e03b11eb82276
 DIST wayland-sys-0.23.6.crate 6764 BLAKE2B 96929bdbf381ffa8a16191966ac71204b424d4ba2c317e54a1f1b3490fd04f0f4a0f865e534967abcb17e8dfe098e678880b879aff2ee73aae3c2d4f23217586 SHA512 3d7b171b8df10381ac133f2a68f436560f13e6f18951bda9c71a1aaf09316642d3da51e34e6f226972b267d46032b37cb5abe816d80a0f7e222b33e3a5c136e3
 DIST wayland-sys-0.27.0.crate 8016 BLAKE2B a59096780e41c478943ca2b120c5aeebc13718aa5b9e1d881380a08f60a7b7f11da905fccbe06c77d746aead5c9d5559266d8d34f39612f0923fe518e605ec57 SHA512 f168da1ccb36d43d1185d3198cfae5d936fc6b6635c60eec6a15edc768fd16c1393d6d42a3fe2c0b8028a48b7fc91faf91652bb4d3eb7c5239728ef4bd410047
+DIST wayland-sys-0.28.2.crate 8021 BLAKE2B fdd80e494d4c5f8dd6f3e657888c99275d5bafd31e9476976857e1476726d367b77ded3cdbb7d3a389b2e83dd1f549984a6efa75bf322b2367b88cbe48f7dd1c SHA512 95a452c4050165dfc3b9fc59be0322aa55c4ed92d8b98cd37ac985e0a82557398be02262941c0a97005917fb844b478d685e58ef52871b19f6a1c38c8d9bdf95
 DIST which-3.1.1.crate 8071 BLAKE2B b53adc5136f26fc1be6ae18987d0129527cfd6eb2fb1f0876600ff55ac2f935f608337ff89478f3aed2e8c97a08c474109382a56eabe67dc788b744d90c73ad9 SHA512 3677d709eced54a332e68d9c9385708205838301a576da0c4d88049403a81676c3939a97cd1bec4ab261c7e8fb6211956b47afe5d1fee84d9c4ecf4eb30184f5
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
@@ -328,6 +416,7 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST winit-0.22.2.crate 304495 BLAKE2B d1e69b0db42a17cb8e7ca89004683e353a052e94c6ea540a8cce2261e1c5f7aeb7ee1c556a9835a64a6781ea2e18391de2f0a6ab5f05256f497fd763ac6eee24 SHA512 4e2a99e0b0cb9f98951353d64d2d054401dba6caf5cd9243e7eb0672854223203f890f3a18379db620c1949449d117e05eb5755105b5c3257a917c4605e80a70
+DIST winit-0.23.0.crate 327955 BLAKE2B 4a90d77f7c1e1c9ee5eea8fed4d14c50a5d1e82b16fa5c0f7ea5bb4d719fc1ce4260093227af1dfdb3aa0b2a7ea3fd5c0e56de7714691bd0380a77f30b4d720e SHA512 53f4d468bc382bffb53d9075163908af32203400cd0eb94d99c8d85dd7d9c82817e7f20da5f3a0ecb3fbf218af0ec488e33cd717aca650f594055667d583a650
 DIST winpty-0.2.0.crate 6217 BLAKE2B cec8f71e00c0f074dd4d352e4d4ec68d72b36063ade92aa04daaa6df810cd6b8ff91c733bf3e3d3c85bbd35ea8186691e492b3c05a51b6a233082f233fb3dbf7 SHA512 8b8c6cbe3771ae277a7ba0cc91c32f7e4250b07f8439b1e32afe12cabdf211d8b93d91e303c0aad603e09847ee335bcefd8890c22712ebbec55f524f02fa1949
 DIST winpty-sys-0.5.0.crate 123300 BLAKE2B 0394a99317a23f32ec43941ff7816b69d2a6dd19df4adaccf4661af3d8571a22c0a26a03925142ff732a67dd1409d50c67e366623a09ea6a9bfa9d2de7efba17 SHA512 eda7a9d99c6d84c744994cfecccadda6b266b019b5cb64827834a976683340b29013da9eb986ee296738919fe150ca824471da7a68f0416cf1a526ce5a1b689e
 DIST winreg-0.6.2.crate 19338 BLAKE2B d866995d54b69077efc1bb900235a4c00d9e69779cb365ad2fc97686a6c13de6a91d6204856ea35a18b86a7f32e8d4ac1ea2d2c096d7dd3e42f78400752cd3e2 SHA512 a2b6a7a0fcdb1f81dab62e1626089b6fd753a2233f9496505420ccb7997765c34293ce07b724b8179646345e0f6819eca88a6c167a03d8439a386fe53e184102
@@ -344,3 +433,4 @@ DIST yaml-rust-0.4.3.crate 45768 BLAKE2B 6af7374439000dc5e8795b26fccb1bc69104084
 DIST yaml-rust-0.4.4.crate 48359 BLAKE2B 3c504a593663eff6ccdc96b949f2bf5ff9e9030b2cb08dd4bdb6ab2d0409513d4454ae99af4afe69a1dea1d7560454f2eed434cc6ded2c0cbaf9bedea2f3be85 SHA512 63cb5518101a8c841700efa556a14199d136ab390da3b79c9d11a54789e497d0ca0f420bfa31fa75257864beac619d1b28182714c99a8c92f44e333b299d1d6a
 DIST zip-0.5.5.crate 33064 BLAKE2B b10857e79c0548ce0aec9d1d7689e4b9c9d78756c7eaa97462dd201e05877f60fd1bb6f88e9a219bf96063f0716d2246629dac15f802305ea9188d02e61634e5 SHA512 d7f32cba1de57b62546316f3ce81f24dcdf47287555294ca61470d14b61c11f1347c22f2d51df55d351e910720c0b12d1196164964232c9c5fb349ab2630a6ff
 DIST zip-0.5.6.crate 33064 BLAKE2B a14d64b109ddeba3a86b254c6c0ff4b50908d96cfa7b0bc826f292bb7c5e5b58d86c523c1ea630fa93eb9a804e83ba11048ce1cd90c0c0d1d014645d4b47e728 SHA512 e78ccef45715e49228443324057e94046ebd4e0b992f4d91eb680263a7d71aed931d19dd45bf0b18f8a9507a4716cb2f3c7a3888fed0b9a6fba3e65e74125e90
+DIST zip-0.5.8.crate 41175 BLAKE2B b961a7d7d05540b459e80b6ceb37cdbad974d4221c0e911c145c6ea4c2159ad86e33ee41060a915ff3d20d2847d7c1f3dfe05913d18940b351f8fb89670b349f SHA512 758d6c51f44fb0151176c0ec24d493c2f159a00c6f44d118568b1096676eb115ae4874556b7031a5f8ba0b17f3b48b6e355c340e7ea38b196d3df077cfdef344
diff --git a/x11-terms/alacritty/alacritty-0.6.0_rc2.ebuild b/x11-terms/alacritty/alacritty-0.6.0_rc2.ebuild
new file mode 100644
index 000000000000..dfced84f7325
--- /dev/null
+++ b/x11-terms/alacritty/alacritty-0.6.0_rc2.ebuild
@@ -0,0 +1,370 @@
+# Copyright 2017-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+ab_glyph_rasterizer-0.1.4
+adler32-1.2.0
+aho-corasick-0.7.14
+andrew-0.3.1
+android_glue-0.2.3
+ansi_term-0.11.0
+arc-swap-0.4.7
+arrayref-0.3.6
+arrayvec-0.5.1
+atty-0.2.14
+autocfg-1.0.1
+base64-0.12.3
+bindgen-0.53.3
+bitflags-1.2.1
+blake2b_simd-0.5.10
+block-0.1.6
+bytemuck-1.4.1
+byteorder-1.3.4
+bzip2-0.3.3
+bzip2-sys-0.1.9+1.0.8
+calloop-0.6.5
+cc-1.0.61
+cexpr-0.4.0
+cfg-if-0.1.10
+cgl-0.3.2
+clang-sys-0.29.3
+clap-2.33.3
+clipboard-win-3.1.1
+cloudabi-0.1.0
+cmake-0.1.44
+cocoa-0.23.0
+cocoa-0.24.0
+cocoa-foundation-0.1.0
+constant_time_eq-0.1.5
+copypasta-0.7.1
+core-foundation-0.7.0
+core-foundation-0.9.1
+core-foundation-sys-0.7.0
+core-foundation-sys-0.8.2
+core-graphics-0.19.2
+core-graphics-0.22.1
+core-graphics-types-0.1.1
+core-text-19.1.0
+core-video-sys-0.1.4
+crc32fast-1.2.0
+crossbeam-utils-0.7.2
+crossfont-0.1.1
+darling-0.10.2
+darling_core-0.10.2
+darling_macro-0.10.2
+deflate-0.8.6
+derivative-2.1.1
+dirs-2.0.2
+dirs-sys-0.3.5
+dispatch-0.2.0
+dlib-0.4.2
+downcast-rs-1.2.0
+dtoa-0.4.6
+dwrote-0.11.0
+embed-resource-1.3.3
+env_logger-0.7.1
+euclid-0.22.1
+expat-sys-2.1.6
+filetime-0.2.12
+flate2-1.0.14
+fnv-1.0.7
+foreign-types-0.3.2
+foreign-types-0.5.0
+foreign-types-macros-0.2.1
+foreign-types-shared-0.1.1
+foreign-types-shared-0.3.0
+freetype-rs-0.26.0
+freetype-sys-0.13.1
+fsevent-0.4.0
+fsevent-sys-2.0.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+getrandom-0.1.15
+gl_generator-0.14.0
+glob-0.3.0
+glutin-0.25.1
+glutin_egl_sys-0.1.5
+glutin_emscripten_sys-0.1.1
+glutin_gles2_sys-0.1.5
+glutin_glx_sys-0.1.7
+glutin_wgl_sys-0.1.5
+hermit-abi-0.1.17
+http_req-0.5.5
+humantime-1.3.0
+ident_case-1.0.1
+image-0.23.10
+inotify-0.7.1
+inotify-sys-0.1.3
+instant-0.1.7
+iovec-0.1.4
+itoa-0.4.6
+jni-sys-0.3.0
+jobserver-0.1.21
+kernel32-sys-0.2.2
+khronos_api-3.1.0
+lazy-bytes-cast-5.0.1
+lazycell-1.3.0
+lazy_static-1.4.0
+libc-0.2.79
+libloading-0.5.2
+libloading-0.6.4
+linked-hash-map-0.5.3
+lock_api-0.4.1
+log-0.4.11
+malloc_buf-0.0.6
+maybe-uninit-2.0.0
+memchr-2.3.3
+memmap-0.7.0
+miniz_oxide-0.3.7
+mio-0.6.22
+mio-anonymous-pipes-0.1.0
+mio-extras-2.0.6
+mio-named-pipes-0.1.7
+miow-0.2.1
+miow-0.3.5
+native-tls-0.2.4
+ndk-0.2.1
+ndk-glue-0.2.1
+ndk-macro-0.2.0
+ndk-sys-0.2.1
+net2-0.2.35
+nix-0.18.0
+nom-5.1.2
+notify-4.0.15
+num_enum-0.4.3
+num_enum_derive-0.4.3
+num-integer-0.1.43
+num-iter-0.1.41
+num-rational-0.3.0
+num-traits-0.2.12
+objc-0.2.7
+objc-foundation-0.1.1
+objc_id-0.1.1
+once_cell-1.4.1
+openssl-0.10.30
+openssl-probe-0.1.2
+openssl-sys-0.9.58
+osmesa-sys-0.1.2
+owned_ttf_parser-0.6.0
+parking_lot-0.11.0
+parking_lot_core-0.8.0
+peeking_take_while-0.1.2
+percent-encoding-2.1.0
+phf-0.8.0
+phf_codegen-0.8.0
+phf_generator-0.8.0
+phf_shared-0.8.0
+pkg-config-0.3.19
+png-0.16.7
+ppv-lite86-0.2.9
+proc-macro2-1.0.24
+proc-macro-crate-0.1.5
+quick-error-1.2.3
+quote-1.0.7
+rand-0.7.3
+rand_chacha-0.2.2
+rand_core-0.5.1
+rand_hc-0.2.0
+rand_pcg-0.2.1
+raw-window-handle-0.3.3
+redox_syscall-0.1.57
+redox_users-0.3.5
+regex-1.4.1
+regex-automata-0.1.9
+regex-syntax-0.6.20
+remove_dir_all-0.5.3
+rust-argon2-0.8.2
+rustc-hash-1.1.0
+rusttype-0.9.2
+ryu-1.0.5
+same-file-1.0.6
+schannel-0.1.19
+scoped-tls-1.0.0
+scopeguard-1.1.0
+security-framework-0.4.4
+security-framework-sys-0.4.3
+serde-1.0.117
+serde_derive-1.0.117
+serde_json-1.0.59
+serde_yaml-0.8.13
+servo-fontconfig-0.5.1
+servo-fontconfig-sys-5.1.0
+shared_library-0.1.9
+shlex-0.1.1
+signal-hook-0.1.16
+signal-hook-registry-1.2.1
+siphasher-0.3.3
+slab-0.4.2
+smallvec-1.4.2
+smithay-client-toolkit-0.12.0
+smithay-clipboard-0.6.1
+socket2-0.3.15
+spsc-buffer-0.1.1
+strsim-0.8.0
+strsim-0.9.3
+syn-1.0.46
+tempfile-3.1.0
+termcolor-1.1.0
+terminfo-0.7.3
+textwrap-0.11.0
+thiserror-1.0.21
+thiserror-impl-1.0.21
+thread_local-1.0.1
+time-0.1.44
+toml-0.5.7
+ttf-parser-0.6.2
+unicase-2.6.0
+unicode-width-0.1.8
+unicode-xid-0.2.1
+urlocator-0.1.4
+utf8parse-0.2.0
+vcpkg-0.2.10
+vec_map-0.8.2
+version_check-0.9.2
+vswhom-0.1.0
+vswhom-sys-0.1.0
+vte-0.9.0
+vte_generate_state_changes-0.1.1
+walkdir-2.3.1
+wasi-0.10.0+wasi-snapshot-preview1
+wasi-0.9.0+wasi-snapshot-preview1
+wayland-client-0.28.2
+wayland-commons-0.28.2
+wayland-cursor-0.28.2
+wayland-egl-0.28.2
+wayland-protocols-0.28.2
+wayland-scanner-0.28.2
+wayland-sys-0.28.2
+which-3.1.1
+winapi-0.2.8
+winapi-0.3.9
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+winit-0.23.0
+winpty-0.2.0
+winpty-sys-0.5.0
+winreg-0.6.2
+wio-0.2.2
+ws2_32-sys-0.2.1
+x11-clipboard-0.5.1
+x11-dl-2.18.5
+xcb-0.9.0
+xcursor-0.3.2
+xdg-2.2.0
+xml-rs-0.8.3
+yaml-rust-0.4.4
+zip-0.5.8
+"
+
+MY_PV="${PV//_rc/-rc}"
+# https://bugs.gentoo.org/725962
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit bash-completion-r1 cargo desktop python-any-r1
+
+DESCRIPTION="GPU-accelerated terminal emulator"
+HOMEPAGE="https://github.com/alacritty/alacritty"
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/alacritty/alacritty"
+else
+	SRC_URI="https://github.com/alacritty/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
+fi
+
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 BSD BSD-2 CC0-1.0 FTL ISC MIT MPL-2.0 Unlicense WTFPL-2 ZLIB"
+SLOT="0"
+IUSE="wayland +X"
+
+REQUIRED_USE="|| ( wayland X )"
+
+DEPEND="${PYTHON_DEPS}"
+
+COMMON_DEPEND="
+	media-libs/fontconfig:=
+	media-libs/freetype:2
+	X? ( x11-libs/libxcb:=[xkb] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	media-libs/mesa[X?,wayland?]
+	sys-libs/zlib
+	sys-libs/ncurses:0
+	wayland? ( dev-libs/wayland )
+	X? (
+		x11-libs/libXcursor
+		x11-libs/libXi
+		x11-libs/libXrandr
+	)
+"
+
+BDEPEND="dev-util/cmake"
+
+QA_FLAGS_IGNORED="usr/bin/alacritty"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_configure() {
+	local myfeatures=(
+		$(usex X x11 '')
+		$(usev wayland)
+	)
+	cargo_src_configure --no-default-features
+}
+
+src_compile() {
+	cd alacritty || die
+	cargo_src_compile
+}
+
+src_install() {
+	cargo_src_install --path alacritty
+
+	newman extra/alacritty.man alacritty.1
+
+	newbashcomp extra/completions/alacritty.bash alacritty
+
+	insinto /usr/share/fish/vendor_completions.d/
+	doins extra/completions/alacritty.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins extra/completions/_alacritty
+
+	domenu extra/linux/Alacritty.desktop
+	newicon extra/logo/compat/alacritty-term.svg Alacritty.svg
+
+	newman extra/alacritty.man alacritty.1
+
+	insinto /usr/share/metainfo
+	doins extra/linux/io.alacritty.Alacritty.appdata.xml
+
+	insinto /usr/share/alacritty/scripts
+	doins -r scripts/*
+
+	local DOCS=(
+		alacritty.yml
+		CHANGELOG.md INSTALL.md README.md
+		docs/{ansicode.txt,escape_support.md,features.md}
+	)
+	einstalldocs
+}
+
+src_test() {
+	cd alacritty || die
+	cargo_src_test
+}
diff --git a/x11-terms/alacritty/alacritty-9999.ebuild b/x11-terms/alacritty/alacritty-9999.ebuild
index 01963348e68d..7b2029ef5c69 100644
--- a/x11-terms/alacritty/alacritty-9999.ebuild
+++ b/x11-terms/alacritty/alacritty-9999.ebuild
@@ -8,7 +8,7 @@ CRATES="
 
 MY_PV="${PV//_rc/-rc}"
 # https://bugs.gentoo.org/725962
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit bash-completion-r1 cargo desktop python-any-r1
 
@@ -112,5 +112,5 @@ src_install() {
 
 src_test() {
 	cd alacritty || die
-	cargo_src_test ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+	cargo_src_test
 }
diff --git a/x11-terms/mlterm/mlterm-3.9.0.ebuild b/x11-terms/mlterm/mlterm-3.9.0.ebuild
index fc4bc951a7aa..81617541d78a 100644
--- a/x11-terms/mlterm/mlterm-3.9.0.ebuild
+++ b/x11-terms/mlterm/mlterm-3.9.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="bidi brltty cairo canna debug fbcon fcitx freewnn gtk gtk2 harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter wayland xft"
 REQUIRED_USE="gtk2? ( gtk )"
 
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index f87c2d03982d..9395d089f993 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.36.1.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.36.1.ebuild
index accaa2122300..f75c14047992 100644
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.36.1.ebuild
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.36.1.ebuild
@@ -17,7 +17,7 @@ LICENSE="
 "
 SLOT="0"
 IUSE="branding"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 # gtk+:3 is needed for build for the gtk-encode-symbolic-svg utility
 # librsvg is needed for gtk-encode-symbolic-svg to be able to read the source SVG via its pixbuf loader and at runtime for rendering scalable icons shipped by the theme
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index fc0bf93409a7..b03f2057a052 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/i3-gaps/i3-gaps-4.18.2.ebuild b/x11-wm/i3-gaps/i3-gaps-4.18.2.ebuild
index a65d2f2db049..61451b2c94d4 100644
--- a/x11-wm/i3-gaps/i3-gaps-4.18.2.ebuild
+++ b/x11-wm/i3-gaps/i3-gaps-4.18.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-wm/icewm/icewm-1.7.0.ebuild b/x11-wm/icewm/icewm-1.7.0.ebuild
index beecb5b1f558..a9502b12ad78 100644
--- a/x11-wm/icewm/icewm-1.7.0.ebuild
+++ b/x11-wm/icewm/icewm-1.7.0.ebuild
@@ -51,7 +51,13 @@ RDEPEND="
 	)
 	bidi? ( dev-libs/fribidi )
 	gdk-pixbuf? (
-		x11-libs/gdk-pixbuf:2[X]
+		|| (
+			(
+				x11-libs/gdk-pixbuf-xlib
+				>=x11-libs/gdk-pixbuf-2.42.0:2
+			)
+			<x11-libs/gdk-pixbuf-2.42.0:2[X]
+		)
 	)
 	!gdk-pixbuf? (
 		media-libs/libpng:0=
diff --git a/x11-wm/icewm/icewm-1.8.3.ebuild b/x11-wm/icewm/icewm-1.8.3.ebuild
index b45cf38e905b..310d2f45e737 100644
--- a/x11-wm/icewm/icewm-1.8.3.ebuild
+++ b/x11-wm/icewm/icewm-1.8.3.ebuild
@@ -51,7 +51,13 @@ RDEPEND="
 	)
 	bidi? ( dev-libs/fribidi )
 	gdk-pixbuf? (
-		x11-libs/gdk-pixbuf:2[X]
+		|| (
+			(
+				x11-libs/gdk-pixbuf-xlib
+				>=x11-libs/gdk-pixbuf-2.42.0:2
+			)
+			<x11-libs/gdk-pixbuf-2.42.0:2[X]
+		)
 	)
 	!gdk-pixbuf? (
 		media-libs/libpng:0=
diff --git a/x11-wm/icewm/icewm-1.9.1.ebuild b/x11-wm/icewm/icewm-1.9.1.ebuild
index fd1315decb53..cd8d3315fba2 100644
--- a/x11-wm/icewm/icewm-1.9.1.ebuild
+++ b/x11-wm/icewm/icewm-1.9.1.ebuild
@@ -51,7 +51,13 @@ RDEPEND="
 	)
 	bidi? ( dev-libs/fribidi )
 	gdk-pixbuf? (
-		x11-libs/gdk-pixbuf:2[X]
+		|| (
+			(
+				x11-libs/gdk-pixbuf-xlib
+				>=x11-libs/gdk-pixbuf-2.42.0:2
+			)
+			<x11-libs/gdk-pixbuf-2.42.0:2[X]
+		)
 	)
 	!gdk-pixbuf? (
 		media-libs/libpng:0=
diff --git a/x11-wm/icewm/icewm-1.9.2.ebuild b/x11-wm/icewm/icewm-1.9.2.ebuild
index fd1315decb53..cd8d3315fba2 100644
--- a/x11-wm/icewm/icewm-1.9.2.ebuild
+++ b/x11-wm/icewm/icewm-1.9.2.ebuild
@@ -51,7 +51,13 @@ RDEPEND="
 	)
 	bidi? ( dev-libs/fribidi )
 	gdk-pixbuf? (
-		x11-libs/gdk-pixbuf:2[X]
+		|| (
+			(
+				x11-libs/gdk-pixbuf-xlib
+				>=x11-libs/gdk-pixbuf-2.42.0:2
+			)
+			<x11-libs/gdk-pixbuf-2.42.0:2[X]
+		)
 	)
 	!gdk-pixbuf? (
 		media-libs/libpng:0=
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 3cdaedae08a4..5fd550b5e6b3 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,2 +1,4 @@
 DIST mutter-3.36.5.tar.xz 2687916 BLAKE2B 15eedc6b1a7c5fdb3a355b8aa4b5586491d0fc50ef293b200b747e9d2a8540df9dcb5d492edb30d1a51b779bf4faceba9448535475c65864d08219eb94e71599 SHA512 cf02003578ebe4d025006b7dc8c277e5a2240373d41fd21e9e7a0ea3d7f323454925a09a5f77117e63a95d4f7663fc4ad7b6e21b042044a8a1a5238713f8d5ec
+DIST mutter-3.36.7-patchset.tar.xz 14232 BLAKE2B 90a289f7012e28607d487fd635b73683e657bfd8792dbf662f8822ac7f096d21add6fcd3b7092e4e82f2130226f5b1ff9afd1e026fec8333680c9b4e4712dea2 SHA512 74e3951358a02c552a45b590360b9a038283e983ff78daf433fea1589ca3e7824f21af3b786a06ba84fb400581dfc4f97f29d259afdaca2ae3e1456a49a96243
+DIST mutter-3.36.7.tar.xz 2689176 BLAKE2B a3849b254dbe2029736ef760fe4225e63bf1d87bf2856a87682574904bd047822916485a3e00d2760118132466414b68764731ea4af9add5d734fd7ce3eac730 SHA512 6061cc8a3bdefe57049f9da757b9a33321b28ff7bc9543bc1db3abd75c7261bf233180fb1e8a2f76145dd67ebda91c48981f6e844a866ef6cbb66203af4b7ef7
 DIST mutter-3.38.1.tar.xz 2618944 BLAKE2B 2b7d0baea765a2680e8610553fcf5944af275d4533af61d719ca922c21a400ce771bf7a23093e8fa224453c1fddea6f718b1cfaaac6f079c993cdca5f721bf2d SHA512 55a65d80c886b90da110de69fca8f2c92912b36d6244bd6fcb1e09507469b5d860fa888614a33170b2799574f521ee117fb289a768fa2af5059fe0da51835d31
diff --git a/x11-wm/mutter/mutter-3.36.7.ebuild b/x11-wm/mutter/mutter-3.36.7.ebuild
new file mode 100644
index 000000000000..660d4be56966
--- /dev/null
+++ b/x11-wm/mutter/mutter-3.36.7.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/6" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
+
+IUSE="elogind input_devices_wacom +introspection screencast +sysprof systemd test udev wayland"
+# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
+REQUIRED_USE="
+	wayland? ( ^^ ( elogind systemd ) udev )
+	test? ( wayland )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
+# xorg-server is needed at build and runtime with USE=wayland for Xwayland
+# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
+DEPEND="
+	x11-libs/libX11
+	>=media-libs/graphene-1.9.3[introspection?]
+	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/pango-1.30[introspection?]
+	>=dev-libs/fribidi-1.0.0
+	>=x11-libs/cairo-1.14[X]
+	>=gnome-base/gsettings-desktop-schemas-3.33.0[introspection?]
+	>=dev-libs/glib-2.61.1:2
+	gnome-base/gnome-settings-daemon
+	>=dev-libs/json-glib-0.12.0[introspection?]
+	gnome-base/gnome-desktop:3=
+	>=x11-libs/libXcomposite-0.4
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	>=x11-libs/libXfixes-3
+	>=x11-libs/libXi-1.7.4
+	x11-libs/libXtst
+	x11-libs/libxkbfile
+	x11-misc/xkeyboard-config
+	>=x11-libs/libxkbcommon-0.4.3[X]
+	x11-libs/libXrender
+	>=x11-libs/libXrandr-1.5.0
+	x11-libs/libxcb
+	x11-libs/libXinerama
+	x11-libs/libXau
+	x11-libs/libICE
+	>=dev-libs/atk-2.5.3[introspection?]
+	>=media-libs/libcanberra-0.26
+	sys-apps/dbus
+	media-libs/mesa[X(+),egl]
+	wayland? (
+		>=dev-libs/wayland-protocols-1.19
+		>=dev-libs/wayland-1.13.0
+		x11-libs/libdrm:=
+		>=media-libs/mesa-10.3[egl,gbm,wayland,gles2]
+		>=dev-libs/libinput-1.7
+		systemd? ( sys-apps/systemd )
+		elogind? ( sys-auth/elogind )
+		x11-base/xorg-server[wayland]
+	)
+	udev? ( >=dev-libs/libgudev-232:=
+		>=virtual/libudev-232-r1:= )
+	x11-libs/libSM
+	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
+	>=x11-libs/startup-notification-0.7
+	screencast? ( >=media-video/pipewire-0.3.0:0/0.3 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	gnome-extra/zenity
+"
+DEPEND="${DEPEND}
+	x11-base/xorg-proto
+	sysprof? ( >=dev-util/sysprof-capture-3.35.2:3 )
+"
+# wayland bdepend for wayland-scanner, xorg-server for cvt utility
+BDEPEND="
+	dev-libs/wayland
+	>=dev-util/meson-0.50.0
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	wayland? ( >=sys-kernel/linux-headers-4.4
+		x11-base/xorg-server )
+"
+
+PATCHES=(
+	"${FILESDIR}"/3.34.6-tests-dontreq-gdkwayland.patch
+)
+
+src_configure() {
+	# TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain
+	local emesonargs=(
+		-Dopengl=true
+		#opengl_libname
+		#gles2_libname
+		$(meson_use wayland gles2)
+		-Degl=true
+		-Dglx=true
+		$(meson_use wayland)
+		$(meson_use wayland native_backend)
+		$(meson_use screencast remote_desktop)
+		-Degl_device=false # This should be dependent on wayland,video_drivers_nvidia, once eglstream support is there
+		-Dwayland_eglstream=false # requires packages egl-wayland for wayland-eglstream-protocols.pc
+		$(meson_use udev)
+		$(meson_use input_devices_wacom libwacom)
+		-Dpango_ft2=true
+		-Dstartup_notification=true
+		-Dsm=true
+		$(meson_use introspection)
+		$(meson_use test cogl_tests)
+		$(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
+		$(meson_use test clutter_tests)
+		$(meson_use test tests)
+		$(meson_use sysprof profiler)
+		-Dinstalled_tests=false
+		#verbose # Let upstream choose default for verbose mode
+		#xwayland_path
+		# TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
+		#xwayland_grab_default_access_rules
+	)
+	meson_src_configure
+}
+
+src_test() {
+	glib-compile-schemas "${BUILD_DIR}"/data
+	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 134cce8d70ed..36343808bc63 100644
Binary files a/xfce-base/Manifest.gz and b/xfce-base/Manifest.gz differ
diff --git a/xfce-base/thunar/thunar-1.8.16.ebuild b/xfce-base/thunar/thunar-1.8.16.ebuild
index 80545f3c2e18..ec8b34b0a7a5 100644
--- a/xfce-base/thunar/thunar-1.8.16.ebuild
+++ b/xfce-base/thunar/thunar-1.8.16.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="exif introspection libnotify pcre +trash-panel-plugin udisks"
 
 GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index 669d3d5e635d..a4213e7e02e3 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,2 +1,3 @@
 DIST xfce4-settings-4.14.3.tar.bz2 1201308 BLAKE2B daf20e5adda24f3c1ecc88506c1a1cd03b33b379bafc236ed3b99404b816803288041de7d507072a311c3966bb0e040986e358ea94d01636c56ea31c1b843c8d SHA512 fcc5bfa98d8903dc3ac51ec909e542485a44f6c11ddca815508c2ed913410a0becd54b2db6761ee48f5a20d6ca08377eeefbb54bd0cb7cde0a0c0d4b65802ab5
 DIST xfce4-settings-4.15.2.tar.bz2 1415214 BLAKE2B 508a2eaa8c73ab643ed42a768af3f2c5c97ac367a5dd5919f401424e21de6f9bea8a747d9920c396a313f3734ea1bd60d562a35bdd275b32314cc9658a2a4bda SHA512 f286be970d2351d1b47d7ff1ddf862093e8b88cd2d29aa088f81d48c30f120e03c0712526c562fb6fb3cc33939a7098c5d4de8938c1f825b87560544bad7606c
+DIST xfce4-settings-4.15.3.tar.bz2 1487754 BLAKE2B 272c76096f1f0690bead5472e949057959fc7c90558be7c96454f121a9c427494490b4aaf64c6490fe9df0a1de131e630b2cc0ae1310f8dfb7057d573a55f39f SHA512 a2c841e971a0a67bb81697c7e31568026d90b185a7acc93bd39b22f3f4b3670b15f6b798b6658dee4b9bb44df1a5a2b4985e743cc36dc11dbb047baa816f1941
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.15.3.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.15.3.ebuild
new file mode 100644
index 000000000000..dc27875a4f06
--- /dev/null
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.15.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit python-single-r1 xdg-utils
+
+DESCRIPTION="Configuration system for the Xfce desktop environment"
+HOMEPAGE="https://www.xfce.org/projects/"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="colord input_devices_libinput libcanberra libnotify upower +xklavier"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.45.8
+	media-libs/fontconfig
+	>=x11-libs/gtk+-3.20:3
+	x11-libs/libX11
+	>=x11-libs/libXcursor-1.1
+	>=x11-libs/libXi-1.3
+	>=x11-libs/libXrandr-1.2
+	>=xfce-base/garcon-0.2:=
+	>=xfce-base/exo-4.15.1:=
+	>=xfce-base/libxfce4ui-4.15.1:=
+	>=xfce-base/libxfce4util-4.15.2:=
+	>=xfce-base/xfconf-4.13:=
+	colord? ( x11-misc/colord:= )
+	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
+	input_devices_libinput? ( x11-drivers/xf86-input-libinput )
+	libnotify? ( >=x11-libs/libnotify-0.7 )
+	upower? ( >=sys-power/upower-0.9.23 )
+	xklavier? ( >=x11-libs/libxklavier-5 )
+	!<xfce-base/exo-4.15.1"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+	x11-base/xorg-proto"
+
+src_configure() {
+	local myconf=(
+		$(use_enable upower upower-glib)
+		$(use_enable input_devices_libinput xorg-libinput)
+		$(use_enable libnotify)
+		$(use_enable colord)
+		$(use_enable xklavier libxklavier)
+		$(use_enable libcanberra sound-settings)
+	)
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-base/xfdesktop/xfdesktop-4.14.3.ebuild b/xfce-base/xfdesktop/xfdesktop-4.14.3.ebuild
index c0250e01fe7a..e4496d4bd965 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.14.3.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.14.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug libnotify +thunar"
 
 RDEPEND=">=x11-libs/cairo-1.12
diff --git a/xfce-base/xfwm4/xfwm4-4.14.6.ebuild b/xfce-base/xfwm4/xfwm4-4.14.6.ebuild
index 77ed670eb91b..9556d697e996 100644
--- a/xfce-base/xfwm4/xfwm4-4.14.6.ebuild
+++ b/xfce-base/xfwm4/xfwm4-4.14.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="opengl startup-notification +xcomposite +xpresent"
 
 RDEPEND=">=dev-libs/glib-2.20
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index b68d9d3a20a0..3278c3f6c309 100644
Binary files a/xfce-extra/Manifest.gz and b/xfce-extra/Manifest.gz differ
diff --git a/xfce-extra/tumbler/Manifest b/xfce-extra/tumbler/Manifest
index c381e436690f..83521cb10dff 100644
--- a/xfce-extra/tumbler/Manifest
+++ b/xfce-extra/tumbler/Manifest
@@ -1,2 +1,3 @@
 DIST tumbler-0.2.9.tar.bz2 557794 BLAKE2B 564b0d91489ee617799749db13085301f8b7195736ee01cd44d1e4bee7130a34235deaaac973f9be902b63eab46c69a5a277872204f53067d15645556f00dd42 SHA512 df9cf9b2ba77e220f11c5ca3ec4601c973802b802e989dcd24d1b2c7c13e97c185071488c866f3ed5ed1cc6defde1a4879b5fc2c48bfc015456508e526d6bf0f
 DIST tumbler-0.3.0.tar.bz2 559424 BLAKE2B e9f9674a5fb3d9acba6435e9a5d1eada27269c24c395211a71dc3c3d751aa20f82ee154b5ebb36c2aecf34710e975b9167277e25cf8b210e8d4014e429a0d944 SHA512 e216a9c8c659457c6e6dbb40d95cd9a34d64d204fea9523d0a66f1c331108f6e01fb83d668b99eed73ed26579ae3a717cd3215ddceaebfff888d942ecb18469b
+DIST tumbler-0.3.1.tar.bz2 559835 BLAKE2B 69f0c1d904b908fcef5ef42388600b8371b37e885ca38bdcdacbc5fefabec2fd49a8aba737832621f8942e788f5c52eb5da0acdd66cbe18f452b706df0d9fd9f SHA512 42bfe9b10411f07e8c9aca40ba8d1829f677fdb65d1b2612a7345f7f467d5a02761fa758359ac3c2eb1e1622bb9f659787cdd21dc2b711424ff64025f08ea375
diff --git a/xfce-extra/tumbler/metadata.xml b/xfce-extra/tumbler/metadata.xml
index b06afeaae912..6f7a36157e9d 100644
--- a/xfce-extra/tumbler/metadata.xml
+++ b/xfce-extra/tumbler/metadata.xml
@@ -6,6 +6,7 @@
     <name>XFCE Team</name>
   </maintainer>
   <use>
+    <flag name="epub">Enable support for .epub thumbnailer using <pkg>app-text/libgepub</pkg></flag>
     <flag name="odf">Enable support for .odf thumbnailers by using <pkg>gnome-extra/libgsf</pkg></flag>
   </use>
 </pkgmetadata>
diff --git a/xfce-extra/tumbler/tumbler-0.3.1.ebuild b/xfce-extra/tumbler/tumbler-0.3.1.ebuild
new file mode 100644
index 000000000000..9600c486a5f2
--- /dev/null
+++ b/xfce-extra/tumbler/tumbler-0.3.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="A thumbnail service for Thunar"
+HOMEPAGE="https://docs.xfce.org/xfce/thunar/start"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl epub ffmpeg gstreamer jpeg odf pdf raw"
+
+DEPEND=">=dev-libs/glib-2.42:2
+	media-libs/freetype:2=
+	media-libs/libpng:0=
+	>=sys-apps/dbus-1.6
+	>=x11-libs/gdk-pixbuf-2.14:2
+	curl? ( >=net-misc/curl-7.25:= )
+	epub? ( app-text/libgepub )
+	ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		)
+	jpeg? ( virtual/jpeg:0= )
+	odf? ( >=gnome-extra/libgsf-1.14.20:= )
+	pdf? ( >=app-text/poppler-0.12.4[cairo] )
+	raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] )"
+RDEPEND="${DEPEND}
+	gstreamer? ( media-plugins/gst-plugins-meta:1.0 )"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		$(use_enable curl cover-thumbnailer)
+		$(use_enable epub gepub-thumbnailer)
+		$(use_enable jpeg jpeg-thumbnailer)
+		$(use_enable ffmpeg ffmpeg-thumbnailer)
+		$(use_enable gstreamer gstreamer-thumbnailer)
+		$(use_enable odf odf-thumbnailer)
+		$(use_enable pdf poppler-thumbnailer)
+		$(use_enable raw raw-thumbnailer)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-dict/xfce4-dict-0.8.4.ebuild b/xfce-extra/xfce4-dict/xfce4-dict-0.8.4.ebuild
index 28ad3e4c2e49..a7e4bbf473fd 100644
--- a/xfce-extra/xfce4-dict/xfce4-dict-0.8.4.ebuild
+++ b/xfce-extra/xfce4-dict/xfce4-dict-0.8.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.24
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.92-r1.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.92-r1.ebuild
index f62c925542bd..d740fbfc2c1d 100644
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.92-r1.ebuild
+++ b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.92-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit gnome2-utils
 
@@ -29,8 +29,9 @@ RDEPEND=">=x11-libs/gtk+-3.20:3=
 	libnotify? ( >=x11-libs/libnotify-0.7:= )
 	lm-sensors? ( >=sys-apps/lm-sensors-3.1.0:= )
 	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )"
+DEPEND=${RDEPEND}
 
-DEPEND="${RDEPEND}
+BDEPEND="
 	dev-util/intltool
 	virtual/pkgconfig"
 
@@ -59,9 +60,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }