diff --git a/Manifest.files.gz b/Manifest.files.gz
index 3c3316417769..4dfb120208c6 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index cda600ba2c1e..edee343bc4c8 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/conky/conky-1.10.8-r9.ebuild b/app-admin/conky/conky-1.10.8-r9.ebuild
new file mode 100644
index 000000000000..f4e4ff4ac759
--- /dev/null
+++ b/app-admin/conky/conky-1.10.8-r9.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils linux-info readme.gentoo-r1
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="https://github.com/brndnmtthws/conky"
+SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apcupsd cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
+	lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
+	nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
+	weather-metar webserver wifi X xmms2"
+
+COMMON_DEPEND="
+	X? (
+		imlib? ( media-libs/imlib2[X] )
+		lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] )
+		lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] )
+		lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg )
+		nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+		truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+		x11-libs/libX11
+		x11-libs/libXdamage
+		x11-libs/libXinerama
+		x11-libs/libXfixes
+		x11-libs/libXext
+		xmms2? ( media-sound/xmms2 )
+	)
+	cmus? ( media-sound/cmus )
+	curl? ( net-misc/curl )
+	eve? ( net-misc/curl dev-libs/libxml2 )
+	ical? ( dev-libs/libical:= )
+	iconv? ( virtual/libiconv )
+	irc? ( net-libs/libircclient )
+	mysql? ( dev-db/mysql-connector-c )
+	ncurses? ( sys-libs/ncurses:= )
+	pulseaudio? ( media-sound/pulseaudio )
+	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
+	systemd? ( sys-apps/systemd )
+	wifi? ( net-wireless/wireless-tools )
+	weather-metar? ( net-misc/curl )
+	webserver? ( net-libs/libmicrohttpd )
+	|| ( dev-lang/lua:0 dev-lang/lua:5.1 )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	apcupsd? ( sys-power/apcupsd )
+	hddtemp? ( app-admin/hddtemp )
+	moc? ( media-sound/moc )
+	nano-syntax? ( app-editors/nano )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	app-text/docbook2X
+"
+
+CONFIG_CHECK=~IPV6
+
+DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-use-pkgconfig.patch
+	"${FILESDIR}"/${P}-libical-3.patch
+	"${FILESDIR}"/${P}-portmon.patch
+	"${FILESDIR}"/${P}-clang.patch
+)
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}.
+To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf
+and edit it to your liking.
+
+There are pretty html docs available at the conky homepage
+or in ${ROOT}/usr/share/doc/${PF}/html.
+
+Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
+
+pkg_setup() {
+	use ipv6 && linux-info_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \
+		cmake/ConkyPlatformChecks.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs
+
+	if use X; then
+		mycmakeargs=(
+			-DBUILD_X11=ON
+			-DOWN_WINDOW=ON
+			-DBUILD_XDAMAGE=ON
+			-DBUILD_XINERAMA=ON
+			-DBUILD_XDBE=ON
+			-DBUILD_XFT=$(usex truetype)
+			-DBUILD_IMLIB2=$(usex imlib)
+			-DBUILD_XSHAPE=ON
+			-DBUILD_ARGB=ON
+			-DBUILD_LUA_CAIRO=$(usex lua-cairo)
+			-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
+			-DBUILD_LUA_RSVG=$(usex lua-rsvg)
+			-DBUILD_NVIDIA=$(usex nvidia)
+			-DBUILD_XMMS2=$(usex xmms2)
+		)
+	else
+		mycmakeargs=(
+			-DBUILD_X11=OFF
+			-DBUILD_NVIDIA=OFF
+			-DBUILD_LUA_CAIRO=OFF
+			-DBUILD_LUA_IMLIB2=OFF
+			-DBUILD_LUA_RSVG=OFF
+			-DBUILD_XMMS2=OFF
+		)
+	fi
+
+	mycmakeargs+=(
+		-DBUILD_APCUPSD=$(usex apcupsd)
+		-DBUILD_CMUS=$(usex cmus)
+		-DBUILD_CURL=$(usex curl)
+		-DBUILD_EVE=$(usex eve)
+		-DBUILD_HDDTEMP=$(usex hddtemp)
+		-DBUILD_IOSTATS=$(usex iostats)
+		-DBUILD_ICAL=$(usex ical)
+		-DBUILD_ICONV=$(usex iconv)
+		-DBUILD_IPV6=$(usex ipv6)
+		-DBUILD_IRC=$(usex irc)
+		-DBUILD_MATH=$(usex math)
+		-DBUILD_MOC=$(usex moc)
+		-DBUILD_MPD=$(usex mpd)
+		-DBUILD_MYSQL=$(usex mysql)
+		-DBUILD_NCURSES=$(usex ncurses)
+		-DBUILD_PORT_MONITORS=$(usex portmon)
+		-DBUILD_PULSEAUDIO=$(usex pulseaudio)
+		-DBUILD_RSS=$(usex rss)
+		-DBUILD_JOURNAL=$(usex systemd)
+		-DBUILD_IBM=$(usex thinkpad)
+		-DBUILD_HTTP=$(usex webserver)
+		-DBUILD_WEATHER_METAR=$(usex weather-metar)
+		-DBUILD_WLAN=$(usex wifi)
+		-DBUILD_BUILTIN_CONFIG=ON
+		-DBUILD_OLD_CONFIG=ON
+		-DBUILD_I18N=ON
+		-DMAINTAINER_MODE=ON
+		-DRELEASE=ON
+		-DBUILD_AUDACIOUS=OFF
+		-DBUILD_BMPX=OFF
+		-DDOC_PATH=/usr/share/doc/${PF}
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${S}"/extras/vim/ftdetect/conkyrc.vim
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}"/extras/vim/syntax/conkyrc.vim
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano/
+		doins "${S}"/extras/nano/conky.nanorc
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-admin/conky/files/conky-1.10.8-clang.patch b/app-admin/conky/files/conky-1.10.8-clang.patch
new file mode 100644
index 000000000000..2fc49fa9cf25
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.8-clang.patch
@@ -0,0 +1,30 @@
+--- conky-1.10.8/src/linux.cc	2018-02-07 17:16:39.000000000 +0300
++++ conky-1.10.8.new/src/linux.cc	2020-02-22 00:43:52.336620654 +0300
+@@ -37,6 +37,7 @@
+ #include <ctype.h>
+ #include <errno.h>
+ #include <limits.h>
++#include <clocale>
+ #include <sys/types.h>
+ #include <sys/sysinfo.h>
+ #include <sys/stat.h>
+--- conky-1.10.8/src/luamm.cc	2020-02-22 00:57:25.847867585 +0300
++++ conky-1.10.8.new/src/luamm.cc	2020-02-22 00:59:29.820510124 +0300
+@@ -23,6 +23,8 @@
+ 
+ #include "luamm.hh"
+ 
++#include <cxxabi.h>
++
+ namespace lua {
+ 	namespace {
+ 
+@@ -57,7 +59,7 @@
+ 				lua_pushstring(l, e.what());
+ 			}
+ 			catch(...) {
+-				lua_pushstring(l, ptr->__cxa_exception_type()->name());
++				lua_pushstring(l, abi::__cxa_current_exception_type()->name());
+ 			}
+ 			return 1;
+ 		}
diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest
index 415ffb59073e..bd8e019558ac 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -1092,6 +1092,7 @@ DIST helm-3.0.1.tar.gz 498975 BLAKE2B 802b49ecc8888ef988571c9469be2dc039bb583733
 DIST helm-3.0.2.tar.gz 499904 BLAKE2B 0a3fb3912a1cca4c2539922ad5759196de5d4d7e61acb9370017a5053a519ebfd2eaa7bfa3514a05c28e40ba2d0d8bf55b7651fffdc2f32e69d0e0db50bfdb17 SHA512 c45ca39603e14c75812c695ffd1d67b070144c5311de369a53fbe10d2935ae616d5fd8e79fb81bbc8485061f649b63446b4f081152c3de0a3a0b4bafac7104a3
 DIST helm-3.0.3.tar.gz 499874 BLAKE2B eda691d2b02fb5aaee7e09dd846c19650c3fc0e5d46e703a768b3db5a9966c8bb5548beb1699c5c8771e8e39f8fe35558e601a961d900cd6ebd2e813dec1e6b7 SHA512 9dc776f0638350ba09f7a1af383160a56b0badd3c353f57173ea2540625eb36afe2c0cc1a203b6bcef738d32e4d914028a9b0495d2b652a8cbee4317bca47f0b
 DIST helm-3.1.1.tar.gz 530397 BLAKE2B 02e92379a9d2010e2126e9b24b48282ff607c4850328d7988e7110c33c509b606d4f48b4cc6413ef4fbc3613536dca6f8ca118921da8b53fe976ecc82bf6b41a SHA512 c48a6cded6c65b44f75d45136a2b9f661a4c2b3ced3ab479558f2cf4d7eb0921b10852ebf998582f607975b4e5b5258dce0e2166f55facbfcffb023cf486b276
+DIST helm-3.1.2.tar.gz 532703 BLAKE2B c3b1ca53d2cb6847342c67514094487e960bcdec0b2a3aafc21d493702a8d48e49a32afb7178f1336e840cdc908e88fffd81c48306771cedb7f0c51f64e606e7 SHA512 5d2392fa1c738f3be0cab1542df850748d237d2cfa978bdab96267e74401f2956ad372e178ff9716ba7ba5cb8f7bce7e3a31448830666b570767a533d559db33
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
diff --git a/app-admin/helm/helm-3.1.2.ebuild b/app-admin/helm/helm-3.1.2.ebuild
new file mode 100644
index 000000000000..e8f8fe91a467
--- /dev/null
+++ b/app-admin/helm/helm-3.1.2.ebuild
@@ -0,0 +1,737 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module bash-completion-r1
+GIT_COMMIT=d878d4d45863e42fd5cff6743294a11d28a9abce
+MY_PV=${PV/_rc/-rc.}
+
+DESCRIPTION="Kubernetes Package Manager"
+HOMEPAGE="https://github.com/helm/helm https://helm.sh"
+
+EGO_SUM=(
+	"bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod"
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.38.0"
+	"cloud.google.com/go v0.38.0/go.mod"
+	"github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/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 v13.3.2+incompatible"
+	"github.com/Azure/go-autorest v13.3.2+incompatible/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.0"
+	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.5.0"
+	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.1.0"
+	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.2.0"
+	"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/logger v0.1.0"
+	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/tracing v0.5.0"
+	"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
+	"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/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd"
+	"github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod"
+	"github.com/Masterminds/goutils v1.1.0"
+	"github.com/Masterminds/goutils v1.1.0/go.mod"
+	"github.com/Masterminds/semver/v3 v3.0.3"
+	"github.com/Masterminds/semver/v3 v3.0.3/go.mod"
+	"github.com/Masterminds/sprig/v3 v3.0.2"
+	"github.com/Masterminds/sprig/v3 v3.0.2/go.mod"
+	"github.com/Masterminds/vcs v1.13.1"
+	"github.com/Masterminds/vcs v1.13.1/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/PuerkitoBio/purell v1.0.0/go.mod"
+	"github.com/PuerkitoBio/purell v1.1.0/go.mod"
+	"github.com/PuerkitoBio/purell v1.1.1"
+	"github.com/PuerkitoBio/purell v1.1.1/go.mod"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod"
+	"github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d"
+	"github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod"
+	"github.com/agnivade/levenshtein v1.0.1/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod"
+	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496"
+	"github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod"
+	"github.com/aws/aws-sdk-go v1.15.11/go.mod"
+	"github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/bitly/go-simplejson v0.5.0"
+	"github.com/bitly/go-simplejson v0.5.0/go.mod"
+	"github.com/blang/semver v3.1.0+incompatible/go.mod"
+	"github.com/blang/semver v3.5.0+incompatible/go.mod"
+	"github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869"
+	"github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod"
+	"github.com/bshuster-repo/logrus-logstash-hook v0.4.1"
+	"github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod"
+	"github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd"
+	"github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod"
+	"github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b"
+	"github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod"
+	"github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0"
+	"github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
+	"github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f"
+	"github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod"
+	"github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod"
+	"github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod"
+	"github.com/containerd/containerd v1.3.2"
+	"github.com/containerd/containerd v1.3.2/go.mod"
+	"github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod"
+	"github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41"
+	"github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41/go.mod"
+	"github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod"
+	"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/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+	"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-semver v0.3.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+	"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod"
+	"github.com/cpuguy83/go-md2man v1.0.10"
+	"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+	"github.com/creack/pty v1.1.7/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 v0.0.0-20151105211317-5215b55f46b2/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/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod"
+	"github.com/deislabs/oras v0.8.1"
+	"github.com/deislabs/oras v0.8.1/go.mod"
+	"github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod"
+	"github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dnaeon/go-vcr v1.0.1/go.mod"
+	"github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492"
+	"github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492/go.mod"
+	"github.com/docker/distribution v0.0.0-20191216044856-a8371794149d"
+	"github.com/docker/distribution v0.0.0-20191216044856-a8371794149d/go.mod"
+	"github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod"
+	"github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce"
+	"github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce/go.mod"
+	"github.com/docker/docker-credential-helpers v0.6.3"
+	"github.com/docker/docker-credential-helpers v0.6.3/go.mod"
+	"github.com/docker/go-connections v0.4.0"
+	"github.com/docker/go-connections v0.4.0/go.mod"
+	"github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916"
+	"github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod"
+	"github.com/docker/go-units v0.3.3/go.mod"
+	"github.com/docker/go-units v0.4.0"
+	"github.com/docker/go-units v0.4.0/go.mod"
+	"github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1"
+	"github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+	"github.com/dustin/go-humanize v1.0.0/go.mod"
+	"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e"
+	"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
+	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+	"github.com/emicklei/go-restful v2.9.5+incompatible"
+	"github.com/emicklei/go-restful v2.9.5+incompatible/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/evanphx/json-patch v4.2.0+incompatible/go.mod"
+	"github.com/evanphx/json-patch v4.5.0+incompatible"
+	"github.com/evanphx/json-patch v4.5.0+incompatible/go.mod"
+	"github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d"
+	"github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod"
+	"github.com/fatih/camelcase v1.0.0/go.mod"
+	"github.com/fatih/color v1.7.0"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7"
+	"github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod"
+	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+	"github.com/ghodss/yaml v1.0.0"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod"
+	"github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod"
+	"github.com/go-ini/ini v1.25.4/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logr/logr v0.1.0/go.mod"
+	"github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod"
+	"github.com/go-openapi/analysis v0.17.0/go.mod"
+	"github.com/go-openapi/analysis v0.18.0/go.mod"
+	"github.com/go-openapi/analysis v0.19.2/go.mod"
+	"github.com/go-openapi/analysis v0.19.5/go.mod"
+	"github.com/go-openapi/errors v0.17.0/go.mod"
+	"github.com/go-openapi/errors v0.18.0/go.mod"
+	"github.com/go-openapi/errors v0.19.2/go.mod"
+	"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+	"github.com/go-openapi/jsonpointer v0.17.0/go.mod"
+	"github.com/go-openapi/jsonpointer v0.18.0/go.mod"
+	"github.com/go-openapi/jsonpointer v0.19.2/go.mod"
+	"github.com/go-openapi/jsonpointer v0.19.3"
+	"github.com/go-openapi/jsonpointer v0.19.3/go.mod"
+	"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+	"github.com/go-openapi/jsonreference v0.17.0/go.mod"
+	"github.com/go-openapi/jsonreference v0.18.0/go.mod"
+	"github.com/go-openapi/jsonreference v0.19.2/go.mod"
+	"github.com/go-openapi/jsonreference v0.19.3"
+	"github.com/go-openapi/jsonreference v0.19.3/go.mod"
+	"github.com/go-openapi/loads v0.17.0/go.mod"
+	"github.com/go-openapi/loads v0.18.0/go.mod"
+	"github.com/go-openapi/loads v0.19.0/go.mod"
+	"github.com/go-openapi/loads v0.19.2/go.mod"
+	"github.com/go-openapi/loads v0.19.4/go.mod"
+	"github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod"
+	"github.com/go-openapi/runtime v0.19.0/go.mod"
+	"github.com/go-openapi/runtime v0.19.4/go.mod"
+	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+	"github.com/go-openapi/spec v0.17.0/go.mod"
+	"github.com/go-openapi/spec v0.18.0/go.mod"
+	"github.com/go-openapi/spec v0.19.2/go.mod"
+	"github.com/go-openapi/spec v0.19.3"
+	"github.com/go-openapi/spec v0.19.3/go.mod"
+	"github.com/go-openapi/strfmt v0.17.0/go.mod"
+	"github.com/go-openapi/strfmt v0.18.0/go.mod"
+	"github.com/go-openapi/strfmt v0.19.0/go.mod"
+	"github.com/go-openapi/strfmt v0.19.3/go.mod"
+	"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+	"github.com/go-openapi/swag v0.17.0/go.mod"
+	"github.com/go-openapi/swag v0.18.0/go.mod"
+	"github.com/go-openapi/swag v0.19.2/go.mod"
+	"github.com/go-openapi/swag v0.19.5"
+	"github.com/go-openapi/swag v0.19.5/go.mod"
+	"github.com/go-openapi/validate v0.18.0/go.mod"
+	"github.com/go-openapi/validate v0.19.2/go.mod"
+	"github.com/go-openapi/validate v0.19.5/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/gobwas/glob v0.2.3"
+	"github.com/gobwas/glob v0.2.3/go.mod"
+	"github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod"
+	"github.com/gofrs/flock v0.7.1"
+	"github.com/gofrs/flock v0.7.1/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.2.2-0.20190723190241-65acae22fc9d/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/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/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"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/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod"
+	"github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod"
+	"github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0"
+	"github.com/google/btree v1.0.0/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.4.0"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
+	"github.com/google/gofuzz v1.0.0"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/uuid v1.0.0/go.mod"
+	"github.com/google/uuid v1.1.1"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d"
+	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
+	"github.com/gophercloud/gophercloud v0.1.0"
+	"github.com/gophercloud/gophercloud v0.1.0/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33"
+	"github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod"
+	"github.com/gorilla/mux v1.7.2"
+	"github.com/gorilla/mux v1.7.2/go.mod"
+	"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
+	"github.com/gorilla/websocket v1.4.0/go.mod"
+	"github.com/gosuri/uitable v0.0.4"
+	"github.com/gosuri/uitable v0.0.4/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
+	"github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod"
+	"github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hpcloud/tail v1.0.0"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/huandu/xstrings v1.2.0"
+	"github.com/huandu/xstrings v1.2.0/go.mod"
+	"github.com/imdario/mergo v0.3.5/go.mod"
+	"github.com/imdario/mergo v0.3.7"
+	"github.com/imdario/mergo v0.3.7/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.7/go.mod"
+	"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/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/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/konsorten/go-windows-terminal-sequences v1.0.1"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"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/pty v1.1.1/go.mod"
+	"github.com/kr/pty v1.1.5/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de"
+	"github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod"
+	"github.com/lithammer/dedent v1.1.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.0.0-20180823135443-60711f1a8329/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod"
+	"github.com/mailru/easyjson v0.7.0"
+	"github.com/mailru/easyjson v0.7.0/go.mod"
+	"github.com/marstr/guid v1.1.0/go.mod"
+	"github.com/mattn/go-colorable v0.0.9"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-isatty v0.0.4"
+	"github.com/mattn/go-isatty v0.0.4/go.mod"
+	"github.com/mattn/go-runewidth v0.0.2"
+	"github.com/mattn/go-runewidth v0.0.2/go.mod"
+	"github.com/mattn/go-shellwords v1.0.9"
+	"github.com/mattn/go-shellwords v1.0.9/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/mitchellh/copystructure v1.0.0"
+	"github.com/mitchellh/copystructure v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-wordwrap v1.0.0"
+	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f"
+	"github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.0"
+	"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+	"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"
+	"github.com/morikuni/aec v1.0.0"
+	"github.com/morikuni/aec v1.0.0/go.mod"
+	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+	"github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/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/ncw/swift v1.0.47/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
+	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.10.1"
+	"github.com/onsi/ginkgo v1.10.1/go.mod"
+	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/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-20170106003457-a6d0ee40d420/go.mod"
+	"github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod"
+	"github.com/opencontainers/go-digest v1.0.0-rc1"
+	"github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
+	"github.com/opencontainers/image-spec v1.0.0/go.mod"
+	"github.com/opencontainers/image-spec v1.0.1"
+	"github.com/opencontainers/image-spec v1.0.1/go.mod"
+	"github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod"
+	"github.com/opencontainers/runc v0.1.1"
+	"github.com/opencontainers/runc v0.1.1/go.mod"
+	"github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod"
+	"github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod"
+	"github.com/pborman/uuid v1.2.0/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+	"github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2"
+	"github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/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 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/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod"
+	"github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v1.0.0"
+	"github.com/prometheus/client_golang v1.0.0/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod"
+	"github.com/prometheus/common v0.4.1"
+	"github.com/prometheus/common v0.4.1/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.2/go.mod"
+	"github.com/prometheus/procfs v0.0.5"
+	"github.com/prometheus/procfs v0.0.5/go.mod"
+	"github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/russross/blackfriday v1.5.2"
+	"github.com/russross/blackfriday v1.5.2/go.mod"
+	"github.com/satori/go.uuid v1.2.0/go.mod"
+	"github.com/sergi/go-diff v1.0.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"
+	"github.com/sirupsen/logrus v1.4.2"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
+	"github.com/soheilhy/cmux v0.1.4/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"
+	"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/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/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.2.0/go.mod"
+	"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/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/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod"
+	"github.com/tidwall/pretty v1.0.0/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
+	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+	"github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod"
+	"github.com/urfave/cli v1.20.0/go.mod"
+	"github.com/vektah/gqlparser v1.1.2/go.mod"
+	"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f"
+	"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod"
+	"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415"
+	"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod"
+	"github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod"
+	"github.com/xeipuuv/gojsonschema v1.1.0"
+	"github.com/xeipuuv/gojsonschema v1.1.0/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+	"github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43"
+	"github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod"
+	"github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50"
+	"github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod"
+	"github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f"
+	"github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod"
+	"go.etcd.io/bbolt v1.3.3/go.mod"
+	"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod"
+	"go.mongodb.org/mongo-driver v1.0.3/go.mod"
+	"go.mongodb.org/mongo-driver v1.1.1/go.mod"
+	"go.mongodb.org/mongo-driver v1.1.2/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.uber.org/atomic v1.3.2/go.mod"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/zap v1.10.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-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-20190320223903-b7391e95e576/go.mod"
+	"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
+	"golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod"
+	"golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod"
+	"golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod"
+	"golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d"
+	"golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod"
+	"golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod"
+	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/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-20190301231843-5614ed5bae6f/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/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"
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/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-20190320064053-1272bf9dcd53/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+	"golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
+	"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
+	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9"
+	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/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/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-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/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-20181107165924-66b7b1311ac8/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-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-20190321052220-f7bb7a8bee54/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-20190514135907-3a4b5fb9f71f/go.mod"
+	"golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod"
+	"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod"
+	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
+	"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3"
+	"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/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.2"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/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-20190125232054-d66bd3c5d5a6/go.mod"
+	"golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/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-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod"
+	"golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod"
+	"golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod"
+	"gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod"
+	"gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod"
+	"google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.5.0"
+	"google.golang.org/appengine v1.5.0/go.mod"
+	"google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.23.1/go.mod"
+	"google.golang.org/grpc v1.27.0"
+	"google.golang.org/grpc v1.27.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-20141024133853-64131543e789/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.25/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.1"
+	"gopkg.in/inf.v0 v0.9.1/go.mod"
+	"gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/square/go-jose.v2 v2.2.2/go.mod"
+	"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.0.0-20170812160011-eb3733d160e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4"
+	"gopkg.in/yaml.v2 v2.2.4/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"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"k8s.io/api v0.17.2"
+	"k8s.io/api v0.17.2/go.mod"
+	"k8s.io/apiextensions-apiserver v0.17.2"
+	"k8s.io/apiextensions-apiserver v0.17.2/go.mod"
+	"k8s.io/apimachinery v0.17.2"
+	"k8s.io/apimachinery v0.17.2/go.mod"
+	"k8s.io/apiserver v0.17.2/go.mod"
+	"k8s.io/cli-runtime v0.17.2"
+	"k8s.io/cli-runtime v0.17.2/go.mod"
+	"k8s.io/client-go v0.17.2"
+	"k8s.io/client-go v0.17.2/go.mod"
+	"k8s.io/code-generator v0.17.2/go.mod"
+	"k8s.io/component-base v0.17.2"
+	"k8s.io/component-base v0.17.2/go.mod"
+	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
+	"k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod"
+	"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
+	"k8s.io/klog v0.3.0/go.mod"
+	"k8s.io/klog v1.0.0"
+	"k8s.io/klog v1.0.0/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a"
+	"k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod"
+	"k8s.io/kubectl v0.17.2"
+	"k8s.io/kubectl v0.17.2/go.mod"
+	"k8s.io/kubernetes v1.13.0/go.mod"
+	"k8s.io/metrics v0.17.2/go.mod"
+	"k8s.io/utils v0.0.0-20191114184206-e782cd3c129f"
+	"k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod"
+	"modernc.org/cc v1.0.0/go.mod"
+	"modernc.org/golex v1.0.0/go.mod"
+	"modernc.org/mathutil v1.0.0/go.mod"
+	"modernc.org/strutil v1.0.0/go.mod"
+	"modernc.org/xc v1.0.0/go.mod"
+	"sigs.k8s.io/kustomize v2.0.3+incompatible"
+	"sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod"
+	"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
+	"sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06/go.mod"
+	"sigs.k8s.io/yaml v1.1.0"
+	"sigs.k8s.io/yaml v1.1.0/go.mod"
+	"vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod"
+	)
+go-module_set_globals
+SRC_URI="https://github.com/helm/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	# Makefile:
+	# - change GIT & LDFLAGS variable assignments from immediate ":=" to
+	#   deferred "=", to allow better overrides.
+	# - Remove GOFLAGS entirely
+	# - Remove -w & -s from LDFLAGS
+	# - Git spec will be passed later
+	sed -r -i \
+		-e '/^GIT_(COMMIT|SHA|TAG|DIRTY)/s,:?=.*,=,g' \
+		-e "/^GOFLAGS[[:space:]]+:?=/d" \
+		-e '/^LDFLAGS[[:space:]]+:?=/{s,-[ws],,g;s,:=,=,g}' \
+		Makefile || die
+}
+
+src_compile() {
+	# Do not pass LDFLAGS directly here, as the upstream Makefile adds some
+	# data to it via +=
+	emake \
+		GOFLAGS="${GOFLAGS}" \
+		GIT_SHA=${GIT_COMMIT} \
+		GIT_COMMIT=${GIT_COMMIT:0:7} \
+		GIT_TAG=v${PV} \
+		GIT_DIRTY=clean \
+		build
+	bin/${PN} completion bash > ${PN}.bash || die
+	bin/${PN} completion zsh > ${PN}.zsh || die
+}
+
+src_install() {
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	dobin bin/${PN}
+	dodoc README.md
+}
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 50310074dbda..0c061efd5175 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 0df4f6873900..3993ad108d0d 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1 +1 @@
-DIST stress-ng-0.10.18.tar.xz 417592 BLAKE2B 806a6b1bdd49e5f0ab7f91f0b381b74c47df43e896ee2bbb1f7b8e78a9604443615fd13f331806e6fbaf360f9088a3e8c80d51deadd0dd56ffe92f821b8a3bb5 SHA512 ee2980c28479e50fed90a697e4cbd60732934b0488bb18733d7df8e3e04c32d5f0c5458d536f836a1f8160a60b9d2aa0d99bd2d2de03e1cc94d2c60a250c2daa
+DIST stress-ng-0.11.02.tar.xz 421596 BLAKE2B 3f6eb0d6a17cdbedf66c3efdbaec73760e6f6dfedb8fb1c59f759c31dd5d471c0687e0fe7d1f578c630b0a38499c3e7bf37799571dfdab3c6d47965dc39967d6 SHA512 115812728bc26af6ce32e78fa8008fe5fb8a08d8fbb5d82ac96b49572e4c451c0f4affdbad86ce15b5f77106d0e50bdd209eeae4c84fe0e0547161f2f3064140
diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.10.13-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.11.02-makefile.patch
similarity index 93%
rename from app-benchmarks/stress-ng/files/stress-ng-0.10.13-makefile.patch
rename to app-benchmarks/stress-ng/files/stress-ng-0.11.02-makefile.patch
index f49988768d5f..bce1907d139d 100644
--- a/app-benchmarks/stress-ng/files/stress-ng-0.10.13-makefile.patch
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.11.02-makefile.patch
@@ -4,7 +4,7 @@ and don't install compressed man pages.
 --- a/Makefile
 +++ b/Makefile
 @@ -21,7 +21,7 @@
- # Codename "systematic system smasher"
+ # Codename "synthetic system strainer"
  #
  
 -CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu99
@@ -12,7 +12,7 @@ and don't install compressed man pages.
  
  #
  # Pedantic flags
-@@ -359,12 +359,10 @@
+@@ -357,12 +357,10 @@
  .o: stress-ng.h Makefile
  
  .c.o: stress-ng.h Makefile $(SRC)
@@ -27,7 +27,7 @@ and don't install compressed man pages.
  	@sync
  
  makeconfig:
-@@ -385,7 +383,7 @@
+@@ -383,7 +381,7 @@
  		sed '$$ s/.$$//' >> apparmor-data.c
  	@echo "};" >> apparmor-data.c
  	@echo "const size_t g_apparmor_data_len = sizeof(g_apparmor_data);" >> apparmor-data.c
@@ -36,7 +36,7 @@ and don't install compressed man pages.
  	@$(CC) -c apparmor-data.c -o apparmor-data.o
  	@rm -rf apparmor-data.c apparmor-data.bin
  
-@@ -401,12 +399,12 @@
+@@ -399,12 +397,12 @@
  core-perf.o: core-perf.c core-perf-event.c
  	@$(CC) $(CFLAGS) -E core-perf-event.c | grep "PERF_COUNT" | sed 's/,/ /' | \
  	awk {'print "#define _SNG_" $$1 " (1)"'} > core-perf-event.h
@@ -53,7 +53,7 @@ and don't install compressed man pages.
  	@touch stress-ng.c
  
  $(OBJS): stress-ng.h Makefile
-@@ -455,7 +453,7 @@
+@@ -453,7 +451,7 @@
  	mkdir -p ${DESTDIR}${BINDIR}
  	cp stress-ng ${DESTDIR}${BINDIR}
  	mkdir -p ${DESTDIR}${MANDIR}
diff --git a/app-benchmarks/stress-ng/stress-ng-0.10.18.ebuild b/app-benchmarks/stress-ng/stress-ng-0.11.02.ebuild
similarity index 92%
rename from app-benchmarks/stress-ng/stress-ng-0.10.18.ebuild
rename to app-benchmarks/stress-ng/stress-ng-0.11.02.ebuild
index c73232604872..d50be0f6a38a 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.10.18.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.11.02.ebuild
@@ -29,7 +29,7 @@ RDEPEND="${DEPEND}"
 
 DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
 
-PATCHES=( "${FILESDIR}/${PN}-0.10.13-makefile.patch" )
+PATCHES=( "${FILESDIR}/${PN}-0.11.02-makefile.patch" )
 
 src_compile() {
 	tc-export CC
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 9aff82393480..d653dbadabbd 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index cf8fd919a806..1ffffaf9d5ee 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,6 +1,2 @@
 DIST libvirt-5.10.0.tar.xz 8732120 BLAKE2B 9b191a624cca2c84d157482c48cd4eec0456382aa861958880bbbdc25785625386f63320a0626e52683776cca25c4af80ee65d19349ed0b2862e76a074e4e419 SHA512 bb518a6aa6731a7de4b24fc7b8ffdcd2cdd84dfe49047374e0f02265c274eb06dbe1732c9cc4954412853d36d9dd5c1124fb8a5e37f4c01654d85013773ffa23
-DIST libvirt-5.2.0.tar.xz 14992888 BLAKE2B d68aedb634a70063a116e112689f252d3fc2fe5369a4cdde8cacd392e806203bf277406bb10c751bae27f34f27a38355fde84573b6221fc4843393f9ae60ae5c SHA512 378dc1552263cce746117487abc0a1f3411e5be149331717158ba23825734ceae7ca474290264d71de798fdd089ad9672026bcb242fa5b3aef87294284d06f04
-DIST libvirt-5.5.0.tar.xz 12930224 BLAKE2B 4add0b727e4754bd1b2b4e9020942b17872533737e496ddf7976bf86a0fd3bcfbebd83387a8f3bab8dcc9afb05755b245e55682ed17d6094085d3dc96d94eefe SHA512 47923aaca605fb43a53238ac535abc1f88f73435336b8f3e88cb01df277ed205d99c586991e523aa32b50c832a0a7c949ab5f84dc78eb8d18a4951cfc791448d
-DIST libvirt-5.6.0.tar.xz 13147976 BLAKE2B dbfc997123f43fcf9d635b59fffa00d96826e673c4037105151bde2c4a0fb3015a0e458e8e67969b5513a4ddbf41d062feb91e6a86054ddcc1d661f0554fd1f7 SHA512 95fe931394fb31288faf73349bb298f08f63cf062f851b9935303145f8166f69128be9360757f0e1845256c14f4d7672843dba0dc6c086b1c3c8bfc035cc8986
-DIST libvirt-5.8.0.tar.xz 13129328 BLAKE2B ff49b0b6dca86f35c68edfb880677c88e0aed8021ed01ebd145922821914edd70c355ca777fe470e2b0e4baf36f2813c1100be9377344f81c9df374068307da1 SHA512 73d18fdf307b8029921a9f1a0c84ca31c50c662a3c0339e3850d6d2f31574168807a6f34943b286ed86a44031decbbc1339f27366da7269e29d38c7094503113
 DIST libvirt-6.0.0.tar.xz 8686092 BLAKE2B 669054aa3bb3e4f2cf0be2e9ea796b820786661f65495597322e178d7c7e42355b0e3752c8a847cb2fc4405928a30a00544829647aa84cc2e71bc0cb8ce9af5f SHA512 64259c0cffa9fc01192c5474f69d88a61ed0bae0a100379fed6112723a37eff1865ccfc85a19d6b8cd39ed504f04998bb3f6390aaafff797bb41ef65b6ec413c
diff --git a/app-emulation/libvirt/libvirt-5.10.0.ebuild b/app-emulation/libvirt/libvirt-5.10.0.ebuild
index 6caad4d83cdc..6e3d68eee334 100644
--- a/app-emulation/libvirt/libvirt-5.10.0.ebuild
+++ b/app-emulation/libvirt/libvirt-5.10.0.ebuild
@@ -71,7 +71,7 @@ RDEPEND="
 	dbus? ( sys-apps/dbus )
 	dtrace? ( dev-util/systemtap )
 	firewalld? ( >=net-firewall/firewalld-0.6.3 )
-	fuse? ( >=sys-fs/fuse-2.8.6:= )
+	fuse? ( sys-fs/fuse:0= )
 	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
 	iscsi? ( sys-block/open-iscsi )
 	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
diff --git a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
deleted file mode 100644
index 73ffa5123b71..000000000000
--- a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
+++ /dev/null
@@ -1,384 +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 autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt.git"
-	SRC_URI=""
-	KEYWORDS="amd64 x86"
-	SLOT="0"
-else
-	SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 x86"
-	SLOT="0/${PV}"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-LICENSE="LGPL-2.1"
-IUSE="
-	apparmor audit +caps +dbus firewalld fuse glusterfs iscsi iscsi-direct
-	+libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp
-	policykit +qemu rbd sasl selinux +udev +vepa virtualbox virt-network
-	wireshark-plugins xen zeroconf zfs
-"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	policykit? ( dbus )
-	qemu? ( libvirtd )
-	vepa? ( macvtap )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="
-	acct-user/qemu
-	policykit? ( acct-group/libvirt )
-	app-misc/scrub
-	dev-libs/libgcrypt:0
-	dev-libs/libnl:3
-	>=dev-libs/libxml2-2.7.6
-	>=net-analyzer/openbsd-netcat-1.105-r1
-	>=net-libs/gnutls-1.0.25:0=
-	net-libs/libssh2
-	net-libs/libtirpc
-	net-libs/rpcsvc-proto
-	>=net-misc/curl-7.18.0
-	sys-apps/dmidecode
-	!sys-apps/systemd[-cgroup-hybrid(+)]
-	>=sys-apps/util-linux-2.17
-	sys-devel/gettext
-	sys-libs/ncurses:0=
-	sys-libs/readline:=
-	apparmor? ( sys-libs/libapparmor )
-	audit? ( sys-process/audit )
-	caps? ( sys-libs/libcap-ng )
-	dbus? ( sys-apps/dbus )
-	firewalld? ( >=net-firewall/firewalld-0.6.3 )
-	fuse? ( >=sys-fs/fuse-2.8.6:= )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-	iscsi? ( sys-block/open-iscsi )
-	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-	libssh? ( net-libs/libssh )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-	nfs? ( net-fs/nfs-utils )
-	numa? (
-		>sys-process/numactl-2.0.2
-		sys-process/numad
-	)
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2[-device-mapper-only(-)]
-	)
-	pcap? ( >=net-libs/libpcap-1.0.0 )
-	policykit? ( >=sys-auth/polkit-0.9 )
-	qemu? (
-		>=app-emulation/qemu-1.5.0
-		dev-libs/yajl
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virt-network? (
-		net-dns/dnsmasq[script]
-		net-firewall/ebtables
-		>=net-firewall/iptables-1.4.10[ipv6]
-		net-misc/radvd
-		sys-apps/iproute2[-minimal]
-	)
-	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
-	wireshark-plugins? ( net-analyzer/wireshark:= )
-	xen? (
-		>=app-emulation/xen-4.6.0
-		app-emulation/xen-tools:=
-	)
-	udev? (
-		virtual/udev
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
-	zfs? ( sys-fs/zfs )"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.2.0-do-not-use-sysconf.patch
-	"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-5.2.0-fix-paths-for-apparmor.patch
-	"${FILESDIR}"/${PN}-5.2.0-md-clear.patch
-)
-
-pkg_setup() {
-	# Check kernel configuration:
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+="
-		~FUSE_FS"
-
-	use lvm && CONFIG_CHECK+="
-		~BLK_DEV_DM
-		~DM_MULTIPATH
-		~DM_SNAPSHOT"
-
-	use lxc && CONFIG_CHECK+="
-		~BLK_CGROUP
-		~CGROUP_CPUACCT
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~CGROUP_NET_PRIO
-		~CGROUP_PERF
-		~CGROUPS
-		~CGROUP_SCHED
-		~CPUSETS
-		~IPC_NS
-		~MACVLAN
-		~NAMESPACES
-		~NET_CLS_CGROUP
-		~NET_NS
-		~PID_NS
-		~POSIX_MQUEUE
-		~SECURITYFS
-		~USER_NS
-		~UTS_NS
-		~VETH
-		~!GRKERNSEC_CHROOT_MOUNT
-		~!GRKERNSEC_CHROOT_DOUBLE
-		~!GRKERNSEC_CHROOT_PIVOT
-		~!GRKERNSEC_CHROOT_CHMOD
-		~!GRKERNSEC_CHROOT_CAPS"
-
-	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-		~DEVPTS_MULTIPLE_INSTANCES"
-
-	use macvtap && CONFIG_CHECK+="
-		~MACVTAP"
-
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_MARK_T
-		~BRIDGE_NF_EBTABLES
-		~NETFILTER_ADVANCED
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MARK
-		~NETFILTER_XT_TARGET_CHECKSUM
-		~IP_NF_FILTER
-		~IP_NF_MANGLE
-		~IP_NF_NAT
-		~IP_NF_TARGET_MASQUERADE
-		~IP6_NF_FILTER
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT"
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~IP_NF_TARGET_REJECT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	# Handle specific kernel versions for different features
-	kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
-	if kernel_is ge 3 6; then
-		CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
-		kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
-	fi
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	touch "${S}/.mailmap"
-
-	default
-
-	if [[ ${PV} = *9999* ]]; then
-		# Reinitialize submodules as this is required for gnulib's bootstrap
-		git submodule init
-		# git checkouts require bootstrapping to create the configure script.
-		# Additionally the submodules must be cloned to the right locations
-		# bug #377279
-		./bootstrap || die "bootstrap failed"
-		(
-		    git submodule status .gnulib | awk '{ print $1 }'
-		    git hash-object bootstrap.conf
-		    git ls-tree -d HEAD gnulib/local | awk '{ print $3 }'
-		) >.git-module-status
-	fi
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r17" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-e "s/USE_FLAG_AVAHI/$(usex zeroconf 'use avahi-daemon' '')/" \
-		-e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \
-		-e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with apparmor)
-		$(use_with apparmor apparmor-profiles)
-		$(use_with audit)
-		$(use_with caps capng)
-		$(use_with dbus)
-		$(use_with firewalld)
-		$(use_with fuse)
-		$(use_with glusterfs)
-		$(use_with glusterfs storage-gluster)
-		$(use_with iscsi storage-iscsi)
-		$(use_with iscsi-direct storage-iscsi-direct)
-		$(use_with libvirtd)
-		$(use_with libssh)
-		$(use_with lvm storage-lvm)
-		$(use_with lvm storage-mpath)
-		$(use_with lxc)
-		$(use_with macvtap)
-		$(use_enable nls)
-		$(use_with numa numactl)
-		$(use_with numa numad)
-		$(use_with openvz)
-		$(use_with parted storage-disk)
-		$(use_with pcap libpcap)
-		$(use_with phyp)
-		$(use_with policykit polkit)
-		$(use_with qemu)
-		$(use_with qemu yajl)
-		$(use_with rbd storage-rbd)
-		$(use_with sasl)
-		$(use_with selinux)
-		$(use_with udev)
-		$(use_with vepa virtualport)
-		$(use_with virt-network network)
-		$(use_with wireshark-plugins wireshark-dissector)
-		$(use_with xen libxl)
-		$(use_with zeroconf avahi)
-		$(use_with zfs storage-zfs)
-
-		--without-hal
-		--without-netcf
-		--without-sanlock
-
-		--with-esx
-		--with-init-script=systemd
-		--with-qemu-group=$(usex caps qemu root)
-		--with-qemu-user=$(usex caps qemu root)
-		--with-remote
-		--with-storage-fs
-		--with-vmware
-
-		--disable-static
-		--disable-werror
-
-		--with-html-subdir=${PF}/html
-		--localstatedir=/var
-	)
-
-	if use virtualbox && has_version app-emulation/virtualbox-ose; then
-		myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
-	else
-		myeconfargs+=( $(use_with virtualbox vbox) )
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	if [[ ${PV} = *9999* ]]; then
-		# Restore gnulib's config.sub and config.guess
-		# bug #377279
-		(cd .gnulib && git reset --hard > /dev/null)
-	fi
-}
-
-src_test() {
-	cd "${BUILD_DIR}"
-
-	# remove problematic tests, bug #591416, bug #591418
-	sed -i -e 's#commandtest$(EXEEXT) # #' \
-		-e 's#virfirewalltest$(EXEEXT) # #' \
-		-e 's#nwfilterebiptablestest$(EXEEXT) # #' \
-		-e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
-		tests/Makefile
-
-	export VIR_TEST_DEBUG=1
-	HOME="${T}" emake check
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
-
-	find "${D}" -name '*.la' -delete || die
-
-	# Remove bogus, empty directories. They are either not used, or
-	# libvirtd is able to create them on demand
-	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var
-
-	newbashcomp "${S}/tools/bash-completion/vsh" virsh
-	bashcomp_alias virsh virt-admin
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	systemd_install_serviced \
-		"${FILESDIR}"/libvirtd.service.conf libvirtd.service
-
-	systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-	newinitd "${S}/libvirtd.init" libvirtd
-	newinitd "${FILESDIR}/libvirt-guests.init-r3" libvirt-guests
-	newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd
-	newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd
-
-	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# we only ever want to generate this once
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
-	fi
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild b/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
deleted file mode 100644
index c444b69c7db4..000000000000
--- a/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
+++ /dev/null
@@ -1,379 +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 autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt.git"
-	SRC_URI=""
-	KEYWORDS="amd64 x86"
-	SLOT="0"
-else
-	SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 x86"
-	SLOT="0/${PV}"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-LICENSE="LGPL-2.1"
-IUSE="
-	apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi
-	iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz
-	parted pcap phyp policykit +qemu rbd sasl selinux +udev +vepa
-	virtualbox virt-network wireshark-plugins xen zfs
-"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	policykit? ( dbus )
-	qemu? ( libvirtd )
-	vepa? ( macvtap )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="
-	acct-user/qemu
-	policykit? ( acct-group/libvirt )
-	app-misc/scrub
-	dev-libs/libgcrypt:0
-	dev-libs/libnl:3
-	>=dev-libs/libxml2-2.7.6
-	>=net-analyzer/openbsd-netcat-1.105-r1
-	>=net-libs/gnutls-1.0.25:0=
-	net-libs/libssh2
-	net-libs/libtirpc
-	net-libs/rpcsvc-proto
-	>=net-misc/curl-7.18.0
-	sys-apps/dmidecode
-	!sys-apps/systemd[-cgroup-hybrid(+)]
-	>=sys-apps/util-linux-2.17
-	sys-devel/gettext
-	sys-libs/ncurses:0=
-	sys-libs/readline:=
-	apparmor? ( sys-libs/libapparmor )
-	audit? ( sys-process/audit )
-	caps? ( sys-libs/libcap-ng )
-	dbus? ( sys-apps/dbus )
-	dtrace? ( dev-util/systemtap )
-	firewalld? ( >=net-firewall/firewalld-0.6.3 )
-	fuse? ( >=sys-fs/fuse-2.8.6:= )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-	iscsi? ( sys-block/open-iscsi )
-	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-	libssh? ( net-libs/libssh )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-	nfs? ( net-fs/nfs-utils )
-	numa? (
-		>sys-process/numactl-2.0.2
-		sys-process/numad
-	)
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2[-device-mapper-only(-)]
-	)
-	pcap? ( >=net-libs/libpcap-1.0.0 )
-	policykit? ( >=sys-auth/polkit-0.9 )
-	qemu? (
-		>=app-emulation/qemu-1.5.0
-		dev-libs/yajl
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virt-network? (
-		net-dns/dnsmasq[script]
-		net-firewall/ebtables
-		>=net-firewall/iptables-1.4.10[ipv6]
-		net-misc/radvd
-		sys-apps/iproute2[-minimal]
-	)
-	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
-	wireshark-plugins? ( net-analyzer/wireshark:= )
-	xen? (
-		>=app-emulation/xen-4.6.0
-		app-emulation/xen-tools:=
-	)
-	udev? (
-		virtual/udev
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	zfs? ( sys-fs/zfs )"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.2.0-do-not-use-sysconf.patch
-	"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-5.2.0-fix-paths-for-apparmor.patch
-)
-
-pkg_setup() {
-	# Check kernel configuration:
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+="
-		~FUSE_FS"
-
-	use lvm && CONFIG_CHECK+="
-		~BLK_DEV_DM
-		~DM_MULTIPATH
-		~DM_SNAPSHOT"
-
-	use lxc && CONFIG_CHECK+="
-		~BLK_CGROUP
-		~CGROUP_CPUACCT
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~CGROUP_NET_PRIO
-		~CGROUP_PERF
-		~CGROUPS
-		~CGROUP_SCHED
-		~CPUSETS
-		~IPC_NS
-		~MACVLAN
-		~NAMESPACES
-		~NET_CLS_CGROUP
-		~NET_NS
-		~PID_NS
-		~POSIX_MQUEUE
-		~SECURITYFS
-		~USER_NS
-		~UTS_NS
-		~VETH
-		~!GRKERNSEC_CHROOT_MOUNT
-		~!GRKERNSEC_CHROOT_DOUBLE
-		~!GRKERNSEC_CHROOT_PIVOT
-		~!GRKERNSEC_CHROOT_CHMOD
-		~!GRKERNSEC_CHROOT_CAPS"
-
-	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-		~DEVPTS_MULTIPLE_INSTANCES"
-
-	use macvtap && CONFIG_CHECK+="
-		~MACVTAP"
-
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_MARK_T
-		~BRIDGE_NF_EBTABLES
-		~NETFILTER_ADVANCED
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MARK
-		~NETFILTER_XT_TARGET_CHECKSUM
-		~IP_NF_FILTER
-		~IP_NF_MANGLE
-		~IP_NF_NAT
-		~IP_NF_TARGET_MASQUERADE
-		~IP6_NF_FILTER
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT"
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~IP_NF_TARGET_REJECT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	# Handle specific kernel versions for different features
-	kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
-	if kernel_is ge 3 6; then
-		CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
-		kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
-	fi
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	touch "${S}/.mailmap"
-
-	default
-
-	if [[ ${PV} = *9999* ]]; then
-		# Reinitialize submodules as this is required for gnulib's bootstrap
-		git submodule init
-		# git checkouts require bootstrapping to create the configure script.
-		# Additionally the submodules must be cloned to the right locations
-		# bug #377279
-		./bootstrap || die "bootstrap failed"
-		(
-		    git submodule status .gnulib | awk '{ print $1 }'
-		    git hash-object bootstrap.conf
-		    git ls-tree -d HEAD gnulib/local | awk '{ print $3 }'
-		) >.git-module-status
-	fi
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r18" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with apparmor)
-		$(use_with apparmor apparmor-profiles)
-		$(use_with audit)
-		$(use_with caps capng)
-		$(use_with dbus)
-		$(use_with dtrace)
-		$(use_with firewalld)
-		$(use_with fuse)
-		$(use_with glusterfs)
-		$(use_with glusterfs storage-gluster)
-		$(use_with iscsi storage-iscsi)
-		$(use_with iscsi-direct storage-iscsi-direct)
-		$(use_with libvirtd)
-		$(use_with libssh)
-		$(use_with lvm storage-lvm)
-		$(use_with lvm storage-mpath)
-		$(use_with lxc)
-		$(use_with macvtap)
-		$(use_enable nls)
-		$(use_with numa numactl)
-		$(use_with numa numad)
-		$(use_with openvz)
-		$(use_with parted storage-disk)
-		$(use_with pcap libpcap)
-		$(use_with phyp)
-		$(use_with policykit polkit)
-		$(use_with qemu)
-		$(use_with qemu yajl)
-		$(use_with rbd storage-rbd)
-		$(use_with sasl)
-		$(use_with selinux)
-		$(use_with udev)
-		$(use_with vepa virtualport)
-		$(use_with virt-network network)
-		$(use_with wireshark-plugins wireshark-dissector)
-		$(use_with xen libxl)
-		$(use_with zfs storage-zfs)
-
-		--without-hal
-		--without-netcf
-		--without-sanlock
-
-		--with-esx
-		--with-init-script=systemd
-		--with-qemu-group=$(usex caps qemu root)
-		--with-qemu-user=$(usex caps qemu root)
-		--with-remote
-		--with-storage-fs
-		--with-vmware
-
-		--disable-static
-		--disable-werror
-
-		--localstatedir=/var
-	)
-
-	if use virtualbox && has_version app-emulation/virtualbox-ose; then
-		myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
-	else
-		myeconfargs+=( $(use_with virtualbox vbox) )
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	if [[ ${PV} = *9999* ]]; then
-		# Restore gnulib's config.sub and config.guess
-		# bug #377279
-		(cd .gnulib && git reset --hard > /dev/null)
-	fi
-}
-
-src_test() {
-	cd "${BUILD_DIR}"
-
-	# remove problematic tests, bug #591416, bug #591418
-	sed -i -e 's#commandtest$(EXEEXT) # #' \
-		-e 's#virfirewalltest$(EXEEXT) # #' \
-		-e 's#nwfilterebiptablestest$(EXEEXT) # #' \
-		-e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
-		tests/Makefile
-
-	export VIR_TEST_DEBUG=1
-	HOME="${T}" emake check
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
-
-	find "${D}" -name '*.la' -delete || die
-
-	# Remove bogus, empty directories. They are either not used, or
-	# libvirtd is able to create them on demand
-	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var
-
-	newbashcomp "${S}/tools/bash-completion/vsh" virsh
-	bashcomp_alias virsh virt-admin
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	systemd_install_serviced \
-		"${FILESDIR}"/libvirtd.service.conf libvirtd.service
-
-	systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-	newinitd "${S}/libvirtd.init" libvirtd
-	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-	newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd
-	newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd
-
-	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# we only ever want to generate this once
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
-	fi
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/libvirt/libvirt-5.6.0.ebuild b/app-emulation/libvirt/libvirt-5.6.0.ebuild
deleted file mode 100644
index 7c37c5926e7b..000000000000
--- a/app-emulation/libvirt/libvirt-5.6.0.ebuild
+++ /dev/null
@@ -1,379 +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 autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt.git"
-	SRC_URI=""
-	KEYWORDS=""
-	SLOT="0"
-else
-	SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	SLOT="0/${PV}"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-LICENSE="LGPL-2.1"
-IUSE="
-	apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi
-	iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz
-	parted pcap phyp policykit +qemu rbd sasl selinux +udev +vepa
-	virtualbox virt-network wireshark-plugins xen zfs
-"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	policykit? ( dbus )
-	qemu? ( libvirtd )
-	vepa? ( macvtap )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="
-	acct-user/qemu
-	policykit? ( acct-group/libvirt )
-	app-misc/scrub
-	dev-libs/libgcrypt:0
-	dev-libs/libnl:3
-	>=dev-libs/libxml2-2.7.6
-	>=net-analyzer/openbsd-netcat-1.105-r1
-	>=net-libs/gnutls-1.0.25:0=
-	net-libs/libssh2
-	net-libs/libtirpc
-	net-libs/rpcsvc-proto
-	>=net-misc/curl-7.18.0
-	sys-apps/dmidecode
-	!sys-apps/systemd[-cgroup-hybrid(+)]
-	>=sys-apps/util-linux-2.17
-	sys-devel/gettext
-	sys-libs/ncurses:0=
-	sys-libs/readline:=
-	apparmor? ( sys-libs/libapparmor )
-	audit? ( sys-process/audit )
-	caps? ( sys-libs/libcap-ng )
-	dbus? ( sys-apps/dbus )
-	dtrace? ( dev-util/systemtap )
-	firewalld? ( >=net-firewall/firewalld-0.6.3 )
-	fuse? ( >=sys-fs/fuse-2.8.6:= )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-	iscsi? ( sys-block/open-iscsi )
-	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-	libssh? ( net-libs/libssh )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-	nfs? ( net-fs/nfs-utils )
-	numa? (
-		>sys-process/numactl-2.0.2
-		sys-process/numad
-	)
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2[-device-mapper-only(-)]
-	)
-	pcap? ( >=net-libs/libpcap-1.0.0 )
-	policykit? ( >=sys-auth/polkit-0.9 )
-	qemu? (
-		>=app-emulation/qemu-1.5.0
-		dev-libs/yajl
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virt-network? (
-		net-dns/dnsmasq[script]
-		net-firewall/ebtables
-		>=net-firewall/iptables-1.4.10[ipv6]
-		net-misc/radvd
-		sys-apps/iproute2[-minimal]
-	)
-	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
-	wireshark-plugins? ( net-analyzer/wireshark:= )
-	xen? (
-		>=app-emulation/xen-4.6.0
-		app-emulation/xen-tools:=
-	)
-	udev? (
-		virtual/udev
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	zfs? ( sys-fs/zfs )"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.6.0-do-not-use-sysconf.patch
-	"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-5.2.0-fix-paths-for-apparmor.patch
-)
-
-pkg_setup() {
-	# Check kernel configuration:
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+="
-		~FUSE_FS"
-
-	use lvm && CONFIG_CHECK+="
-		~BLK_DEV_DM
-		~DM_MULTIPATH
-		~DM_SNAPSHOT"
-
-	use lxc && CONFIG_CHECK+="
-		~BLK_CGROUP
-		~CGROUP_CPUACCT
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~CGROUP_NET_PRIO
-		~CGROUP_PERF
-		~CGROUPS
-		~CGROUP_SCHED
-		~CPUSETS
-		~IPC_NS
-		~MACVLAN
-		~NAMESPACES
-		~NET_CLS_CGROUP
-		~NET_NS
-		~PID_NS
-		~POSIX_MQUEUE
-		~SECURITYFS
-		~USER_NS
-		~UTS_NS
-		~VETH
-		~!GRKERNSEC_CHROOT_MOUNT
-		~!GRKERNSEC_CHROOT_DOUBLE
-		~!GRKERNSEC_CHROOT_PIVOT
-		~!GRKERNSEC_CHROOT_CHMOD
-		~!GRKERNSEC_CHROOT_CAPS"
-
-	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-		~DEVPTS_MULTIPLE_INSTANCES"
-
-	use macvtap && CONFIG_CHECK+="
-		~MACVTAP"
-
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_MARK_T
-		~BRIDGE_NF_EBTABLES
-		~NETFILTER_ADVANCED
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MARK
-		~NETFILTER_XT_TARGET_CHECKSUM
-		~IP_NF_FILTER
-		~IP_NF_MANGLE
-		~IP_NF_NAT
-		~IP_NF_TARGET_MASQUERADE
-		~IP6_NF_FILTER
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT"
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~IP_NF_TARGET_REJECT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	# Handle specific kernel versions for different features
-	kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
-	if kernel_is ge 3 6; then
-		CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
-		kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
-	fi
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	touch "${S}/.mailmap"
-
-	default
-
-	if [[ ${PV} = *9999* ]]; then
-		# Reinitialize submodules as this is required for gnulib's bootstrap
-		git submodule init
-		# git checkouts require bootstrapping to create the configure script.
-		# Additionally the submodules must be cloned to the right locations
-		# bug #377279
-		./bootstrap || die "bootstrap failed"
-		(
-		    git submodule status .gnulib | awk '{ print $1 }'
-		    git hash-object bootstrap.conf
-		    git ls-tree -d HEAD gnulib/local | awk '{ print $3 }'
-		) >.git-module-status
-	fi
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r18" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with apparmor)
-		$(use_with apparmor apparmor-profiles)
-		$(use_with audit)
-		$(use_with caps capng)
-		$(use_with dbus)
-		$(use_with dtrace)
-		$(use_with firewalld)
-		$(use_with fuse)
-		$(use_with glusterfs)
-		$(use_with glusterfs storage-gluster)
-		$(use_with iscsi storage-iscsi)
-		$(use_with iscsi-direct storage-iscsi-direct)
-		$(use_with libvirtd)
-		$(use_with libssh)
-		$(use_with lvm storage-lvm)
-		$(use_with lvm storage-mpath)
-		$(use_with lxc)
-		$(use_with macvtap)
-		$(use_enable nls)
-		$(use_with numa numactl)
-		$(use_with numa numad)
-		$(use_with openvz)
-		$(use_with parted storage-disk)
-		$(use_with pcap libpcap)
-		$(use_with phyp)
-		$(use_with policykit polkit)
-		$(use_with qemu)
-		$(use_with qemu yajl)
-		$(use_with rbd storage-rbd)
-		$(use_with sasl)
-		$(use_with selinux)
-		$(use_with udev)
-		$(use_with vepa virtualport)
-		$(use_with virt-network network)
-		$(use_with wireshark-plugins wireshark-dissector)
-		$(use_with xen libxl)
-		$(use_with zfs storage-zfs)
-
-		--without-hal
-		--without-netcf
-		--without-sanlock
-
-		--with-esx
-		--with-init-script=systemd
-		--with-qemu-group=$(usex caps qemu root)
-		--with-qemu-user=$(usex caps qemu root)
-		--with-remote
-		--with-storage-fs
-		--with-vmware
-
-		--disable-static
-		--disable-werror
-
-		--localstatedir=/var
-	)
-
-	if use virtualbox && has_version app-emulation/virtualbox-ose; then
-		myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
-	else
-		myeconfargs+=( $(use_with virtualbox vbox) )
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	if [[ ${PV} = *9999* ]]; then
-		# Restore gnulib's config.sub and config.guess
-		# bug #377279
-		(cd .gnulib && git reset --hard > /dev/null)
-	fi
-}
-
-src_test() {
-	cd "${BUILD_DIR}"
-
-	# remove problematic tests, bug #591416, bug #591418
-	sed -i -e 's#commandtest$(EXEEXT) # #' \
-		-e 's#virfirewalltest$(EXEEXT) # #' \
-		-e 's#nwfilterebiptablestest$(EXEEXT) # #' \
-		-e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
-		tests/Makefile
-
-	export VIR_TEST_DEBUG=1
-	HOME="${T}" emake check
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
-
-	find "${D}" -name '*.la' -delete || die
-
-	# Remove bogus, empty directories. They are either not used, or
-	# libvirtd is able to create them on demand
-	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var
-
-	newbashcomp "${S}/tools/bash-completion/vsh" virsh
-	bashcomp_alias virsh virt-admin
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	systemd_install_serviced \
-		"${FILESDIR}"/libvirtd.service.conf libvirtd.service
-
-	systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-	newinitd "${S}/libvirtd.init" libvirtd
-	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-	newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd
-	newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd
-
-	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# we only ever want to generate this once
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
-	fi
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/libvirt/libvirt-5.8.0.ebuild b/app-emulation/libvirt/libvirt-5.8.0.ebuild
deleted file mode 100644
index 796534d0663c..000000000000
--- a/app-emulation/libvirt/libvirt-5.8.0.ebuild
+++ /dev/null
@@ -1,383 +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 autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt.git"
-	SRC_URI=""
-	KEYWORDS="amd64 x86"
-	SLOT="0"
-else
-	SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-	SLOT="0/${PV}"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-LICENSE="LGPL-2.1"
-IUSE="
-	apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi
-	iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz
-	parted pcap phyp pm-utils policykit +qemu rbd sasl selinux +udev +vepa
-	virtualbox virt-network wireshark-plugins xen zfs
-"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	policykit? ( dbus )
-	qemu? ( libvirtd )
-	vepa? ( macvtap )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="
-	acct-user/qemu
-	policykit? ( acct-group/libvirt )
-	app-misc/scrub
-	dev-libs/libgcrypt:0
-	dev-libs/libnl:3
-	>=dev-libs/libxml2-2.7.6
-	>=net-analyzer/openbsd-netcat-1.105-r1
-	>=net-libs/gnutls-1.0.25:0=
-	net-libs/libssh2
-	net-libs/libtirpc
-	net-libs/rpcsvc-proto
-	>=net-misc/curl-7.18.0
-	sys-apps/dmidecode
-	>=sys-apps/util-linux-2.17
-	sys-devel/gettext
-	sys-libs/ncurses:0=
-	sys-libs/readline:=
-	apparmor? ( sys-libs/libapparmor )
-	audit? ( sys-process/audit )
-	caps? ( sys-libs/libcap-ng )
-	dbus? ( sys-apps/dbus )
-	dtrace? ( dev-util/systemtap )
-	firewalld? ( >=net-firewall/firewalld-0.6.3 )
-	fuse? ( >=sys-fs/fuse-2.8.6:= )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-	iscsi? ( sys-block/open-iscsi )
-	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-	libssh? ( net-libs/libssh )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-	lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] )
-	nfs? ( net-fs/nfs-utils )
-	numa? (
-		>sys-process/numactl-2.0.2
-		sys-process/numad
-	)
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2[-device-mapper-only(-)]
-	)
-	pcap? ( >=net-libs/libpcap-1.0.0 )
-	pm-utils? ( sys-power/pm-utils )
-	policykit? ( >=sys-auth/polkit-0.9 )
-	qemu? (
-		>=app-emulation/qemu-1.5.0
-		dev-libs/yajl
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virt-network? (
-		net-dns/dnsmasq[script]
-		net-firewall/ebtables
-		>=net-firewall/iptables-1.4.10[ipv6]
-		net-misc/radvd
-		sys-apps/iproute2[-minimal]
-	)
-	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
-	wireshark-plugins? ( net-analyzer/wireshark:= )
-	xen? (
-		>=app-emulation/xen-4.6.0
-		app-emulation/xen-tools:=
-	)
-	udev? (
-		virtual/udev
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	zfs? ( sys-fs/zfs )"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.7.0-do-not-use-sysconf.patch
-	"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-5.2.0-fix-paths-for-apparmor.patch
-)
-
-pkg_setup() {
-	# Check kernel configuration:
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+="
-		~FUSE_FS"
-
-	use lvm && CONFIG_CHECK+="
-		~BLK_DEV_DM
-		~DM_MULTIPATH
-		~DM_SNAPSHOT"
-
-	use lxc && CONFIG_CHECK+="
-		~BLK_CGROUP
-		~CGROUP_CPUACCT
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~CGROUP_NET_PRIO
-		~CGROUP_PERF
-		~CGROUPS
-		~CGROUP_SCHED
-		~CPUSETS
-		~IPC_NS
-		~MACVLAN
-		~NAMESPACES
-		~NET_CLS_CGROUP
-		~NET_NS
-		~PID_NS
-		~POSIX_MQUEUE
-		~SECURITYFS
-		~USER_NS
-		~UTS_NS
-		~VETH
-		~!GRKERNSEC_CHROOT_MOUNT
-		~!GRKERNSEC_CHROOT_DOUBLE
-		~!GRKERNSEC_CHROOT_PIVOT
-		~!GRKERNSEC_CHROOT_CHMOD
-		~!GRKERNSEC_CHROOT_CAPS"
-
-	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-		~DEVPTS_MULTIPLE_INSTANCES"
-
-	use macvtap && CONFIG_CHECK+="
-		~MACVTAP"
-
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_MARK_T
-		~BRIDGE_NF_EBTABLES
-		~NETFILTER_ADVANCED
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MARK
-		~NETFILTER_XT_TARGET_CHECKSUM
-		~IP_NF_FILTER
-		~IP_NF_MANGLE
-		~IP_NF_NAT
-		~IP_NF_TARGET_MASQUERADE
-		~IP6_NF_FILTER
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT"
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~IP_NF_TARGET_REJECT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	# Handle specific kernel versions for different features
-	kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
-	if kernel_is ge 3 6; then
-		CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
-		kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
-	fi
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	touch "${S}/.mailmap"
-
-	default
-
-	if [[ ${PV} = *9999* ]]; then
-		# Reinitialize submodules as this is required for gnulib's bootstrap
-		git submodule init
-		# git checkouts require bootstrapping to create the configure script.
-		# Additionally the submodules must be cloned to the right locations
-		# bug #377279
-		./bootstrap || die "bootstrap failed"
-		(
-		    git submodule status .gnulib | awk '{ print $1 }'
-		    git hash-object bootstrap.conf
-		    git ls-tree -d HEAD gnulib/local | awk '{ print $3 }'
-		) >.git-module-status
-	fi
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r18" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with apparmor)
-		$(use_with apparmor apparmor-profiles)
-		$(use_with audit)
-		$(use_with caps capng)
-		$(use_with dbus)
-		$(use_with dtrace)
-		$(use_with firewalld)
-		$(use_with fuse)
-		$(use_with glusterfs)
-		$(use_with glusterfs storage-gluster)
-		$(use_with iscsi storage-iscsi)
-		$(use_with iscsi-direct storage-iscsi-direct)
-		$(use_with libvirtd)
-		$(use_with libssh)
-		$(use_with lvm storage-lvm)
-		$(use_with lvm storage-mpath)
-		$(use_with lxc)
-		$(use_with macvtap)
-		$(use_enable nls)
-		$(use_with numa numactl)
-		$(use_with numa numad)
-		$(use_with openvz)
-		$(use_with parted storage-disk)
-		$(use_with pcap libpcap)
-		$(use_with phyp)
-		$(use_with pm-utils )
-		$(use_with policykit polkit)
-		$(use_with qemu)
-		$(use_with qemu yajl)
-		$(use_with rbd storage-rbd)
-		$(use_with sasl)
-		$(use_with selinux)
-		$(use_with udev)
-		$(use_with vepa virtualport)
-		$(use_with virt-network network)
-		$(use_with wireshark-plugins wireshark-dissector)
-		$(use_with xen libxl)
-		$(use_with zfs storage-zfs)
-
-		--without-hal
-		--without-netcf
-		--without-sanlock
-
-		--with-esx
-		--with-init-script=systemd
-		--with-qemu-group=$(usex caps qemu root)
-		--with-qemu-user=$(usex caps qemu root)
-		--with-remote
-		--with-storage-fs
-		--with-vmware
-
-		--disable-static
-		--disable-werror
-
-		--localstatedir="$EPREFIX/var"
-		--with-runstatedir="$EPREFIX/run"
-	)
-
-	if use virtualbox && has_version app-emulation/virtualbox-ose; then
-		myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
-	else
-		myeconfargs+=( $(use_with virtualbox vbox) )
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	if [[ ${PV} = *9999* ]]; then
-		# Restore gnulib's config.sub and config.guess
-		# bug #377279
-		(cd .gnulib && git reset --hard > /dev/null)
-	fi
-}
-
-src_test() {
-	cd "${BUILD_DIR}"
-
-	# remove problematic tests, bug #591416, bug #591418
-	sed -i -e 's#commandtest$(EXEEXT) # #' \
-		-e 's#virfirewalltest$(EXEEXT) # #' \
-		-e 's#nwfilterebiptablestest$(EXEEXT) # #' \
-		-e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
-		tests/Makefile
-
-	export VIR_TEST_DEBUG=1
-	HOME="${T}" emake check
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
-
-	find "${D}" -name '*.la' -delete || die
-
-	# Remove bogus, empty directories. They are either not used, or
-	# libvirtd is able to create them on demand
-	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var
-	rm -rf "${D}"/run
-
-	newbashcomp "${S}/tools/bash-completion/vsh" virsh
-	bashcomp_alias virsh virt-admin
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	systemd_install_serviced \
-		"${FILESDIR}"/libvirtd.service.conf libvirtd.service
-
-	systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-	newinitd "${S}/libvirtd.init" libvirtd
-	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-	newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd
-	newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd
-
-	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# we only ever want to generate this once
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
-	fi
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/libvirt/libvirt-6.0.0-r1.ebuild b/app-emulation/libvirt/libvirt-6.0.0-r1.ebuild
index 477f8f977c06..bad85683c7f4 100644
--- a/app-emulation/libvirt/libvirt-6.0.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-6.0.0-r1.ebuild
@@ -71,7 +71,7 @@ RDEPEND="
 	dbus? ( sys-apps/dbus )
 	dtrace? ( dev-util/systemtap )
 	firewalld? ( >=net-firewall/firewalld-0.6.3 )
-	fuse? ( >=sys-fs/fuse-2.8.6:= )
+	fuse? ( sys-fs/fuse:0= )
 	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
 	iscsi? ( sys-block/open-iscsi )
 	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
diff --git a/app-emulation/libvirt/metadata.xml b/app-emulation/libvirt/metadata.xml
index 16c0b4752e5c..920d0228defa 100644
--- a/app-emulation/libvirt/metadata.xml
+++ b/app-emulation/libvirt/metadata.xml
@@ -71,9 +71,6 @@
 	<flag name="pcap">
 		Support auto learning IP addreses for routing
 	</flag>
-	<flag name="pm-utils">
-		Add runtime support for <pkg>sys-power/pm-utils</pkg>
-	</flag>
 	<flag name="macvtap">
 		Support for MAC-based TAP (macvlan/macvtap). For networking instead
 		of the normal TUN/TAP.
diff --git a/app-emulation/vagrant/vagrant-2.2.7.ebuild b/app-emulation/vagrant/vagrant-2.2.7-r1.ebuild
similarity index 94%
rename from app-emulation/vagrant/vagrant-2.2.7.ebuild
rename to app-emulation/vagrant/vagrant-2.2.7-r1.ebuild
index d81979d0d04a..19daab60aa2d 100644
--- a/app-emulation/vagrant/vagrant-2.2.7.ebuild
+++ b/app-emulation/vagrant/vagrant-2.2.7-r1.ebuild
@@ -59,7 +59,6 @@ all_ruby_prepare() {
 
 	# loosen dependencies
 	sed -e '/hashicorp-checkpoint\|i18n\|listen\|net-ssh\|net-scp\|rake\|childprocess/s/~>/>=/' \
-		-e '/ruby_dep/s/<=/>=/' \
 		-i ${PN}.gemspec || die
 
 	# remove windows-specific gems
@@ -70,6 +69,10 @@ all_ruby_prepare() {
 	sed -e '/rb-kqueue/d' \
 		-i ${PN}.gemspec || die
 
+	# remove ruby_dep, it's unused and only listed to loosen ruby implementation deps
+	sed -e '/ruby_dep/d' \
+		-i ${PN}.gemspec || die
+
 	sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" || die
 }
 
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index c707fd8fe941..909f0c5ed45e 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -3,8 +3,6 @@ DIST lwip-1.3.0.tar.gz 398933 BLAKE2B 3567a593eec3d247213daaaab57d9456c9cae50329
 DIST newlib-1.16.0.tar.gz 12024353 BLAKE2B 26d3308148fb99baf8ad02eee4cc699cfac690100ea63aaa4be03b86d12dade238478342514bd083cbc3d27964ac42eb8dae3873fdac5ff2c593fc4fb39b2309 SHA512 40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3
 DIST pciutils-2.2.9.tar.bz2 212265 BLAKE2B 014b664e90c64e7255c9e21fc25a2cc60d57f47ce282fc0331a0481a460b237783bd3774dd0689e1596d4a0be0d2889faad904da01a6f02147464bce1d1b1bc0 SHA512 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5
 DIST polarssl-1.1.4-gpl.tgz 611340 BLAKE2B 613da06dda9e4b86db5a4d616a0a0afee98c907c3c6b352eed3d9e500fc5739e62eb4f6fc32ff02579c6a6de9bd49fcd2c8bd8b2d158a5050cbaa82118d61ef0 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad
-DIST xen-4.11.3-upstream-patches-0.tar.xz 3692 BLAKE2B f1fb200020b6e8767cb4b900e3468edbebbd61c8147a13d2102e425f8c5f0016b95a1f51fb26bd3560c97b73bbd2935d117ce08f92744fd02a97658cd0168ff8 SHA512 ebb64219b62e418276056eae6c47561366c0a22afaa8750a56a252e84b84c4644189a22788cf176d7d2ca5ceb84d307afa884f373f54db693f0182d951353ab2
-DIST xen-4.11.3.tar.gz 25180826 BLAKE2B 56041bcef9adec754ee21032cf849745c6011224463f73b763ea186b37460f8456cb1f10614cb51ee4d2d77f03cba311f025e8999687888d15ac59cc122cd172 SHA512 2204e490e9fc357a05983a9bf4e7345e1d364fe00400ce473988dcb9ca7d4e2b921fe10f095cbbc64248130a92d22c6f0d154dcae250a57a7f915df32e3dc436
 DIST xen-4.12.2.tar.gz 26985135 BLAKE2B 530821011a6dd0ac0a99fb135ff5311eb8e975c3791818093b5e250eed7854d153de6d4340197f9b949c0ad2c3d7b2b7180deb42bc71748ff70ff6fad195269d SHA512 7d9e7921271830c9eadf1bb8eca1aec20d343ad7475b0dc3165ef6d681759e7cb70739f8d9f85622a23aef960988820e822267fb198b12ee3dd657ad6164069f
 DIST xen-4.13.0.tar.gz 39005191 BLAKE2B cd85bfe549e20447afb8ec6b2ab33ea1893f45392c08737730d7898706748ebb96b2e842b2ff3e4af8c5d8a705e6d25a2bfb8acf0d7cc771805d0cc97757a949 SHA512 5b2ded9a2fe3f7ddf40eed1fa9858baead06233a01eb6099cc45b3c78b6c3823acfe7b731910733e87125dfa49d08c53f74c215fb1b320a92b44b87a0a105225
 DIST zlib-1.2.3.tar.gz 496597 BLAKE2B 603020b70cd52b83e48bde420b86e2acfd29d69bf7476eecbeeb07d1b8bcab703d2cbd3eab77772990bddb8c268f13594592ce985798d49e2d6ba25104d49f22 SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.11.3.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.11.3.ebuild
deleted file mode 100644
index 8e9696b63248..000000000000
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.11.3.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='xml,threads'
-
-inherit flag-o-matic multilib python-single-r1 toolchain-funcs
-
-XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
-LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
-GRUB_URL=mirror://gnu-alpha/grub
-
-UPSTREAM_VER=0
-[[ -n ${UPSTREAM_VER} ]] && \
-	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-
-SRC_URI="
-		https://downloads.xenproject.org/release/xen/${PV}/xen-${PV}.tar.gz
-		$GRUB_URL/grub-0.97.tar.gz
-		$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
-		$LIBPCI_URL/pciutils-2.2.9.tar.bz2
-		$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
-		$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
-		$XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz
-		${UPSTREAM_PATCHSET_URI}"
-
-S="${WORKDIR}/xen-${PV}"
-
-DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
-HOMEPAGE="https://www.xenproject.org"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="custom-cflags"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="sys-devel/gettext
-	sys-devel/bin86
-	sys-apps/texinfo
-	x11-libs/pixman"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-emulation/xen-tools-${PV}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-retar-externals() {
-	# Purely to unclutter src_prepare
-	local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
-
-	# eapply can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
-	sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
-		-i "${WORKDIR}"/zlib-1.2.3/configure || die
-	sed -e 's:^AR=ar rc:AR=ar:' \
-		-e s':$(AR) $@:$(AR) rc $@:' \
-		-i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in} || die
-	einfo "zlib Makefile edited"
-
-	cd "${WORKDIR}" || die
-	tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz || die
-	tar czp grub-0.97 -f grub-0.97.tar.gz || die
-	tar czp lwip -f lwip-1.3.0.tar.gz || die
-	tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz || die
-	tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz || die
-	mv $set "${S}"/stubdom/ || die
-	einfo "tarballs moved to source"
-}
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		einfo "Try to apply Xen Upstream patch set"
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			eapply "${WORKDIR}"/patches-upstream
-	fi
-
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-		# try and remove all the default custom-cflags
-		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-			-i {} \;
-	fi
-
-	# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
-	cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
-
-	# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
-	eapply "${FILESDIR}"/${PN/-pvgrub/}-4.10-externals.patch
-
-	# fix jobserver in Makefile
-	eapply "${FILESDIR}"/${PN}-4.8-jserver.patch
-
-	#Substitute for internal downloading. pciutils copied only due to the only .bz2
-	cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
-	retar-externals || die "re-tar procedure failed"
-
-	default
-}
-
-src_configure() {
-	local myconf="--prefix=${PREFIX}/usr \
-		--libdir=${PREFIX}/usr/$(get_libdir) \
-		--libexecdir=${PREFIX}/usr/libexec \
-		--disable-werror \
-		--disable-xen"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	use custom-cflags || unset CFLAGS
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/libs
-
-	if use x86; then
-		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
-		XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
-	elif use amd64; then
-		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
-		XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
-		if has_multilib_profile; then
-			multilib_toolchain_setup x86
-			emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
-			XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
-		fi
-	fi
-}
-
-src_install() {
-	if use x86; then
-		emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
-	fi
-	if use amd64; then
-		emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
-		if has_multilib_profile; then
-			emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
-		fi
-	fi
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "https://wiki.xen.org/wiki/Main_Page"
-}
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 4036c50a647f..33a75f083dba 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -6,12 +6,8 @@ DIST ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz 3810726 BLAKE2B b9
 DIST ipxe-git-d2063b7693e0e35db97b2264aa987eb6341ae779.tar.gz 3792227 BLAKE2B 720ac29ab3187d7abaec33823dda967caab7eea9631123a7619d2f83d3ad6c7bb47db01665a4c54548fe367866606936d36690a06ecf42323b9bd0ef00e41569 SHA512 2b4ae8e65cd678dbb376f24001294eb54aead8d66456e06fc270dec178d90b282c1eb19731234d8b458054e49c5b8b8c4a89345c63ed0a4dafaf205e642b00b7
 DIST seabios-1.12.0.tar.gz 613542 BLAKE2B f145c2db716996bfa9e5c014086ccfaa8ae96ebc158f34303b122b7bf209408c567665d8691364df8d8e886f63e0e72a3f3cd319dfa86ef581023201b5d94e53 SHA512 e52c5363e5bb37b5286e55545aa06bd126218f9d0e3a06ac2e189de68fe3de3256c11ca1bb13357a9c384d7e3af6284083ff3aa587688b5de04ef11b97bdfa27
 DIST seabios-1.12.1.tar.gz 613450 BLAKE2B cb926b650c41a9962db407945cb5b6558079b061bd61f32ea56aedf0d37a00d10ad4434acbe717ffbc0dd1d1c0767304af8e640a53b0fc3784969dfa1590f681 SHA512 58755ce842adcb99c0f2f3ebbf9ec6d4a5072753966ab46805a96db1570847b109a90e6e03d61f9088ef877ca8ba96a8006777dc38ec434fce6b487f6c1f91d0
-DIST seabios-rel-1.11.1.tar.gz 604125 BLAKE2B df2b7322f5169fb74e7f5dd3f680e7d8ad3e6f93e8b1376d15bbda8865458648a0d6086011a8a6549e7ad1794844878736441e70067580c0eb416e20ee038d95 SHA512 69622460475b54ba77a10509dae0ef46d9c733c6c8527ab56a4f2298534dcf1f7722eb501df873ab612222e5867e334c2831cc4c95dd23771aee10740acf0273
-DIST xen-4.11.3-upstream-patches-0.tar.xz 3692 BLAKE2B f1fb200020b6e8767cb4b900e3468edbebbd61c8147a13d2102e425f8c5f0016b95a1f51fb26bd3560c97b73bbd2935d117ce08f92744fd02a97658cd0168ff8 SHA512 ebb64219b62e418276056eae6c47561366c0a22afaa8750a56a252e84b84c4644189a22788cf176d7d2ca5ceb84d307afa884f373f54db693f0182d951353ab2
-DIST xen-4.11.3.tar.gz 25180826 BLAKE2B 56041bcef9adec754ee21032cf849745c6011224463f73b763ea186b37460f8456cb1f10614cb51ee4d2d77f03cba311f025e8999687888d15ac59cc122cd172 SHA512 2204e490e9fc357a05983a9bf4e7345e1d364fe00400ce473988dcb9ca7d4e2b921fe10f095cbbc64248130a92d22c6f0d154dcae250a57a7f915df32e3dc436
 DIST xen-4.12.2-upstream-patches-0.tar.xz 3976 BLAKE2B 4527b5699b13e1b5bed9b82b67c7a3ddfbe39dc69f63b3bb1fda81cb315c6d78a34441219b8d4ae3d95ae2bc52ef0779410b65813212fa07867061fcb2b599ac SHA512 462de147b0474ca8e051219b41b088f25eb4be3962cde399403be5fbcfd4747054f84bf8c732ba8d86c1ba1980c518b67cd8e4f342e4120dd8bf6594d185a92e
 DIST xen-4.12.2.tar.gz 26985135 BLAKE2B 530821011a6dd0ac0a99fb135ff5311eb8e975c3791818093b5e250eed7854d153de6d4340197f9b949c0ad2c3d7b2b7180deb42bc71748ff70ff6fad195269d SHA512 7d9e7921271830c9eadf1bb8eca1aec20d343ad7475b0dc3165ef6d681759e7cb70739f8d9f85622a23aef960988820e822267fb198b12ee3dd657ad6164069f
 DIST xen-4.13.0-upstream-patches-0.tar.xz 11156 BLAKE2B e704a3fc1a9213a79208cf60b9972f5480214c0f050fce15245e225b67a34f90ca46e77a74c286d7aef90718295ec6968c2671b72f1994a4372bc191681d38f8 SHA512 594194021d0786016e8e214d477892c1ea721e1964729a15ab6928c3cb14b986cbc628d1522ccbf9d53fe568f680acb056d2ff2a37e64261d183589accea4983
 DIST xen-4.13.0.tar.gz 39005191 BLAKE2B cd85bfe549e20447afb8ec6b2ab33ea1893f45392c08737730d7898706748ebb96b2e842b2ff3e4af8c5d8a705e6d25a2bfb8acf0d7cc771805d0cc97757a949 SHA512 5b2ded9a2fe3f7ddf40eed1fa9858baead06233a01eb6099cc45b3c78b6c3823acfe7b731910733e87125dfa49d08c53f74c215fb1b320a92b44b87a0a105225
-DIST xen-gentoo-patches-19.tar.xz 17460 BLAKE2B 6f25c4c9bb438ba0ceded75d04ba6c05ca74e6319d14cf744ea23ecbed2e8283c3c00275a4609b583402d352216520a10197fd4ab9e056eac1c841b0f79bc6b8 SHA512 586e88eea0f2dcc5bae0eb4691cc1d722a8b1a7ca849fd8992d72c0990b2832b3e78738c936e8e46bc9623aa1c8e8afa341a22608479629ea012474d5ff6b69a
 DIST xen-gentoo-patches-20.tar.xz 17376 BLAKE2B 909795f611a089ab1eee86db5f034cec963c831873b3088f0682cdb7ec5284e75a4d49a5a1c93ee7a7e7ba3a899648b38928a1c7b726e019c2a90b66e31fee4a SHA512 d06b846ccb8c488f7155437cdf220533fc2d23ad13b0a2bd4d69d68938c4858fdb961c9e59f57c5228368b4e60dbbdf81ec15b77ecb0639bbf475333f8bf4b97
diff --git a/app-emulation/xen-tools/xen-tools-4.11.3-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.11.3-r1.ebuild
deleted file mode 100644
index 72913356f070..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.11.3-r1.ebuild
+++ /dev/null
@@ -1,464 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='ncurses,xml,threads'
-
-inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-
-if [[ $PV == *9999 ]]; then
-	inherit git-r3
-	REPO="xen.git"
-	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
-	S="${WORKDIR}/${REPO}"
-else
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-	UPSTREAM_VER=0
-	SECURITY_VER=
-	# xen-tools's gentoo patches tarball
-	GENTOO_VER=19
-	# xen-tools's gentoo patches version which apply to this specific ebuild
-	GENTOO_GPV=0
-	# xen-tools ovmf's patches
-	OVMF_VER=
-
-	SEABIOS_VER=1.11.1
-	EDK2_COMMIT=ef529e6ab7c31290a33045bb1f1837447cc0eb56
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	[[ -n ${OVMF_VER} ]] && \
-		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
-
-	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
-	https://git.seabios.org/cgit/seabios.git/snapshot/seabios-rel-${SEABIOS_VER}.tar.gz
-	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
-		${OVMF_PATCHSET_URI} )
-	${UPSTREAM_PATCHSET_URI}
-	${SECURITY_PATCHSET_URI}
-	${GENTOO_PATCHSET_URI}"
-
-	S="${WORKDIR}/xen-${MY_PV}"
-fi
-
-DESCRIPTION="Xen tools including QEMU and xl"
-HOMEPAGE="https://www.xenproject.org"
-DOCS=( README docs/README.xen-bugtool )
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api debug doc flask +hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	ovmf? ( hvm )
-	pygrub? ( python )
-	?? ( qemu system-qemu )"
-
-COMMON_DEPEND="
-	sys-apps/pciutils
-	dev-libs/lzo:2
-	dev-libs/glib:2
-	dev-libs/yajl
-	dev-libs/libaio
-	dev-libs/libgcrypt:0
-	sys-libs/zlib
-	${PYTHON_DEPS}
-"
-
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-4.11
-	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-		pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] )
-	')
-	x86? ( sys-devel/dev86
-		sys-firmware/ipxe[qemu]
-		sys-power/iasl )
-	api? ( dev-libs/libxml2
-		net-misc/curl )
-	ovmf? (
-		!arm? ( !arm64? ( dev-lang/nasm ) )
-		$(python_gen_impl_dep sqlite)
-		)
-	!amd64? ( >=sys-apps/dtc-1.4.0 )
-	amd64? ( sys-devel/bin86
-		sys-devel/dev86
-		sys-firmware/ipxe[qemu]
-		sys-power/iasl
-		system-seabios? ( sys-firmware/seabios ) )
-	dev-lang/perl
-	app-misc/pax-utils
-	doc? (
-		app-text/ghostscript-gpl
-		app-text/pandoc
-		$(python_gen_cond_dep '
-			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
-		')
-		dev-texlive/texlive-latexextra
-		media-gfx/transfig
-	)
-	hvm? ( x11-base/xorg-proto )
-	qemu? (
-		app-arch/snappy:=
-		x11-libs/pixman
-		sdl? ( media-libs/libsdl[X] )
-	)
-	system-qemu? ( app-emulation/qemu[xen] )
-	ocaml? ( dev-ml/findlib
-		>=dev-lang/ocaml-4 )"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2[-minimal]
-	net-misc/bridge-utils
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="
-	usr/libexec/xen/boot/hvmloader
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-QA_PREBUILT="
-	usr/libexec/xen/bin/ivshmem-client
-	usr/libexec/xen/bin/ivshmem-server
-	usr/libexec/xen/bin/qemu-img
-	usr/libexec/xen/bin/qemu-io
-	usr/libexec/xen/bin/qemu-keymap
-	usr/libexec/xen/bin/qemu-nbd
-	usr/libexec/xen/bin/qemu-pr-helper
-	usr/libexec/xen/bin/qemu-system-i386
-	usr/libexec/xen/bin/virtfs-proxy-helper
-	usr/libexec/xen/libexec/xen-bridge-helper
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/s390-netboot.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-RESTRICT="test"
-
-pkg_setup() {
-	python_setup
-	export "CONFIG_LOMOUNT=y"
-
-	#bug 522642, disable compile tools/tests
-	export "CONFIG_TESTS=n"
-
-	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64 ; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-src_prepare() {
-	local i
-
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		einfo "Try to apply Xen Upstream patch set"
-		eapply "${WORKDIR}"/patches-upstream
-	fi
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-	einfo "Try to apply Xen Security patch set"
-		# apply main xen patches
-		# Two parallel systems, both work side by side
-		# Over time they may concdense into one. This will suffice for now
-		EPATCH_SUFFIX="patch"
-		EPATCH_FORCE="yes"
-
-		source "${WORKDIR}"/patches-security/${PV}.conf || die
-
-		for i in ${XEN_SECURITY_MAIN}; do
-			eapply "${WORKDIR}"/patches-security/xen/$i
-		done
-
-		# apply qemu-xen/upstream patches
-		pushd "${S}"/tools/qemu-xen/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUU}; do
-			eapply "${WORKDIR}"/patches-security/qemuu/$i
-		done
-		popd > /dev/null
-
-		# apply qemu-traditional patches
-		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUT}; do
-			eapply "${WORKDIR}"/patches-security/qemut/$i
-		done
-		popd > /dev/null
-	fi
-
-	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
-	mv ../seabios-rel-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
-	pushd tools/firmware/ > /dev/null
-	ln -s seabios-dir-remote seabios-dir || die
-	popd > /dev/null
-
-	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
-		einfo "Try to apply Gentoo specific patch set"
-		source "${FILESDIR}"/gentoo-patches.conf || die
-		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
-		for i in ${!_gpv}; do
-			eapply "${WORKDIR}"/patches-gentoo/$i
-		done
-	fi
-
-	# Ovmf's patchset
-	if use ovmf; then
-		if [[ -n ${OVMF_VER} ]];then
-			einfo "Try to apply Ovmf patch set"
-			pushd "${WORKDIR}"/edk2-*/ > /dev/null
-			eapply "${WORKDIR}"/patches-ovmf
-			popd > /dev/null
-		fi
-		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
-		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
-	fi
-
-	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
-	# Fix texi2html build error with new texi2html, qemu.doc.html
-	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
-
-	use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
-	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
-		-i tools/firmware/Makefile || die
-
-	# Drop .config, fixes to gcc-4.6
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	# drop flags
-	unset CFLAGS
-	unset LDFLAGS
-	unset ASFLAGS
-	unset CPPFLAGS
-
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-	fi
-
-	if ! use python; then
-		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-	fi
-
-	if ! use hvm; then
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	# Bug 351648
-	elif ! use x86 && ! has x86 $(get_all_abis); then
-		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
-		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
-		export CPATH="${WORKDIR}"/extra-headers
-	fi
-
-	if use qemu; then
-		if use sdl; then
-			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
-				tools/Makefile || die
-		else
-			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
-				tools/qemu-xen-traditional/xen-setup || die
-			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
-				tools/Makefile || die
-		fi
-	else
-		# Don't bother with qemu, only needed for fully virtualised guests
-		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
-	fi
-
-	# Reset bash completion dir; Bug 472438
-	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
-		-i Config.mk || die
-	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
-
-	# xencommons, Bug #492332, sed lighter weight than patching
-	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-		-i tools/hotplug/Linux/init.d/xencommons.in || die
-
-	# fix bashishm
-	sed -e '/Usage/s/\$//g' \
-		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
-
-	# respect multilib, usr/lib/libcacard.so.0.0.0
-	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-		-i tools/qemu-xen/configure || die
-
-	#bug 518136, don't build 32bit exactuable for nomultilib profile
-	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
-		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
-	fi
-
-	# uncomment lines in xl.conf
-	sed -e 's:^#autoballoon=:autoballoon=:' \
-		-e 's:^#lockfile=:lockfile=:' \
-		-e 's:^#vif.default.script=:vif.default.script=:' \
-		-i tools/examples/xl.conf  || die
-
-	# disable capstone (Bug #673474)
-	sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
-		-i tools/Makefile || die
-
-	# disable glusterfs
-	sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
-		-i tools/Makefile || die
-
-	default
-}
-
-src_configure() {
-	local myconf="--prefix=${PREFIX}/usr \
-		--libdir=${PREFIX}/usr/$(get_libdir) \
-		--libexecdir=${PREFIX}/usr/libexec \
-		--localstatedir=${EPREFIX}/var \
-		--disable-werror \
-		--disable-xen \
-		--enable-tools \
-		--enable-docs \
-		$(use_enable api xenapi) \
-		$(use_enable pam) \
-		$(use_enable ocaml ocamltools) \
-		$(use_enable ovmf) \
-		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
-		"
-
-	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
-	use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
-	use amd64 && myconf+=" $(use_enable qemu-traditional)"
-	tc-ld-disable-gold # Bug 669570
-	econf ${myconf}
-}
-
-src_compile() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
-
-	if use doc; then
-		emake -C docs build
-	else
-		emake -C docs man-pages
-	fi
-}
-
-src_install() {
-	# Override auto-detection in the build system, bug #382573
-	export INITD_DIR=/tmp/init.d
-	export CONFIG_LEAF_DIR=../tmp/default
-
-	# Let the build system compile installed Python modules.
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
-
-	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-		XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-	# Created at runtime
-	rm -rv "${ED}/var/run" || die
-
-	# Fix the remaining Python shebangs.
-	python_fix_shebang "${D}"
-
-	# Remove RedHat-specific stuff
-	rm -rf "${D}/tmp" || die
-
-	if use doc; then
-		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-		dodoc -r docs/{pdf,txt}
-	else
-		emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
-	fi
-	dodoc ${DOCS[@]}
-
-	newconfd "${FILESDIR}"/xendomains.confd xendomains
-	newconfd "${FILESDIR}"/xenstored.confd xenstored
-	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
-	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-	newinitd "${FILESDIR}"/xencommons.initd xencommons
-	newconfd "${FILESDIR}"/xencommons.confd xencommons
-	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
-		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-		keepdir /var/log/xen-consoles
-	fi
-
-	# For -static-libs wrt Bug 384355
-	if ! use static-libs; then
-		rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
-	fi
-
-	# for xendomains
-	keepdir /etc/xen/auto
-
-	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
-	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-
-	keepdir /var/lib/xen/dump
-	keepdir /var/lib/xen/xenpaging
-	keepdir /var/lib/xenstored
-	keepdir /var/log/xen
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "https://wiki.xen.org/wiki/Main_Page"
-	elog ""
-	elog "Recommended to utilise the xencommons script to config system at boot"
-	elog "Add by use of rc-update on completion of the install"
-
-	if ! use hvm; then
-		echo
-		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
-		elog "support enable the hvm use flag."
-		elog "An x86 or amd64 system is required to build HVM support."
-	fi
-
-	if use qemu; then
-		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
-		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
-		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
-		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
-	fi
-}
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 7fdea212714f..14e471c8015c 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,5 +1,3 @@
-DIST xen-4.11.3-upstream-patches-1.tar.xz 30200 BLAKE2B c63fd2d15efda1ae9aab534c13cd1826a87a5fbd2757f3d82461b1ef2dada0ee23dbb814328e3f8695e0819094d80584fc388536c927c386f02201d4d26a8287 SHA512 e48c60f724fa0f2d5e2bbea3d71590d7c3be2973c35c4b73ff0737f03207dcbfd7f9e43b43783bb739f7059778862693a50354178ae2fd53b04e5d39429e59cf
-DIST xen-4.11.3.tar.gz 25180826 BLAKE2B 56041bcef9adec754ee21032cf849745c6011224463f73b763ea186b37460f8456cb1f10614cb51ee4d2d77f03cba311f025e8999687888d15ac59cc122cd172 SHA512 2204e490e9fc357a05983a9bf4e7345e1d364fe00400ce473988dcb9ca7d4e2b921fe10f095cbbc64248130a92d22c6f0d154dcae250a57a7f915df32e3dc436
 DIST xen-4.12.2-upstream-patches-1.tar.xz 17016 BLAKE2B 5bd27f6187c13b1c4792aa81c0ca8cde0d687566e0fde322e7cb249e1c8665fca0def5a137493a04598b617c46f052cf69701257ea1b97823fd1534d94cabd8f SHA512 dab5e7a3ac1a82faff3069f07945dc0b9651f90e8e87b3c342bb98a06ac244d212dc0baf8c7f1997f285b06baca9dc57d4823bfb220ca34274bd3d6d31421b02
 DIST xen-4.12.2.tar.gz 26985135 BLAKE2B 530821011a6dd0ac0a99fb135ff5311eb8e975c3791818093b5e250eed7854d153de6d4340197f9b949c0ad2c3d7b2b7180deb42bc71748ff70ff6fad195269d SHA512 7d9e7921271830c9eadf1bb8eca1aec20d343ad7475b0dc3165ef6d681759e7cb70739f8d9f85622a23aef960988820e822267fb198b12ee3dd657ad6164069f
 DIST xen-4.13.0-upstream-patches-1.tar.xz 26000 BLAKE2B 0ab884f4b64f318c256d1959fde34da85e85a1d6974f00001125e29838f3f7d9b06ff767dff437635648eed1449976ff88250cbe141e9175d4430135e8923667 SHA512 f37514bf7ad92f8d8be798129c446fe9ec0d409e904f6b4971f07dd8b899dd20f40424a72106d7c50da83fed1f7097c575fbdeee06e18f9f4255bf6b2a71f08a
diff --git a/app-emulation/xen/xen-4.11.3-r1.ebuild b/app-emulation/xen/xen-4.11.3-r1.ebuild
deleted file mode 100644
index e5c3b8002e9d..000000000000
--- a/app-emulation/xen/xen-4.11.3-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-if [[ $PV == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
-	SRC_URI=""
-else
-	KEYWORDS="amd64 ~arm -x86"
-	UPSTREAM_VER=1
-	SECURITY_VER=
-	GENTOO_VER=
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
-		${UPSTREAM_PATCHSET_URI}
-		${SECURITY_PATCHSET_URI}
-		${GENTOO_PATCHSET_URI}"
-fi
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="https://www.xenproject.org"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug efi flask"
-
-DEPEND="${PYTHON_DEPS}
-	efi? ( >=sys-devel/binutils-2.22[multitarget] )
-	!efi? ( >=sys-devel/binutils-2.22 )"
-RDEPEND=""
-PDEPEND="~app-emulation/xen-tools-${PV}"
-
-# no tests are available for the hypervisor
-# prevent the silliness of /usr/lib/debug/usr/lib/debug files
-# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
-RESTRICT="test splitdebug strip"
-
-# Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${PV}"
-
-REQUIRED_USE="arm? ( debug )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	if [[ -z ${XEN_TARGET_ARCH} ]]; then
-		if use amd64; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-
-	if use flask ; then
-		export "XSM_ENABLE=y"
-		export "FLASK_ENABLE=y"
-	fi
-}
-
-src_prepare() {
-	# Upstream's patchset
-	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-	einfo "Try to apply Xen Security patch set"
-		# apply main xen patches
-		# Two parallel systems, both work side by side
-		# Over time they may concdense into one. This will suffice for now
-		source "${WORKDIR}"/patches-security/${PV}.conf
-
-		local i
-		for i in ${XEN_SECURITY_MAIN}; do
-			eapply "${WORKDIR}"/patches-security/xen/$i
-		done
-	fi
-
-	# Gentoo's patchset
-	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
-
-	eapply "${FILESDIR}"/${PN}-4.11-efi.patch
-
-	# Drop .config
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	if use efi; then
-		export EFI_VENDOR="gentoo"
-		export EFI_MOUNTPOINT="boot"
-	fi
-
-	default
-}
-
-src_configure() {
-	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
-
-	use debug && myopt="${myopt} debug=y"
-
-	# remove flags
-	unset CFLAGS
-	unset LDFLAGS
-	unset ASFLAGS
-
-	tc-ld-disable-gold # Bug 700374
-}
-
-src_compile() {
-	# Send raw LDFLAGS so that --as-needed works
-	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
-}
-
-src_install() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	# The 'make install' doesn't 'mkdir -p' the subdirs
-	if use efi; then
-		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
-	fi
-
-	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
-
-	# make install likes to throw in some extra EFI bits if it built
-	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide:"
-	elog " https://wiki.gentoo.org/wiki/Xen"
-
-	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
-
-	elog "You can optionally block the installation of /boot/xen-syms by an entry"
-	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
-	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
-}
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 12ece14ba466..1ebfe15c442b 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/calcurse/calcurse-4.4.0.ebuild b/app-office/calcurse/calcurse-4.4.0-r1.ebuild
similarity index 60%
rename from app-office/calcurse/calcurse-4.4.0.ebuild
rename to app-office/calcurse/calcurse-4.4.0-r1.ebuild
index 4448627c9e42..bb42a1c1c864 100644
--- a/app-office/calcurse/calcurse-4.4.0.ebuild
+++ b/app-office/calcurse/calcurse-4.4.0-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+PYTHON_COMPAT=( python3_{6..8} )
 
-inherit autotools eutils multilib-minimal
+inherit autotools python-single-r1
 
 DESCRIPTION="a text-based calendar and scheduling application"
 HOMEPAGE="https://calcurse.org/"
@@ -12,9 +13,11 @@ SRC_URI="https://calcurse.org/files/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
-	dev-python/httplib2
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-python/httplib2[${PYTHON_MULTI_USEDEP}]')
 	sys-libs/ncurses:0="
 
 DEPEND="
@@ -27,19 +30,17 @@ PATCHES=(
 # Most tests fail.
 RESTRICT="test"
 
+pkg_setup() {
+	:
+}
+
 src_prepare() {
 	default
 	eautoreconf
 }
 
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf
-}
-
 src_compile() {
-	multilib-minimal_src_compile
-}
-
-src_install() {
-	multilib-minimal_src_install
+	default
+	python_setup
+	python_fix_shebang contrib/caldav/calcurse-caldav
 }
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index ebdf1f378f92..ad523d600c02 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index 85682a50421f..1a609e8e618f 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,2 +1,3 @@
 DIST gentoolkit-0.4.6.tar.gz 3205641 BLAKE2B 7da91a313c8a9263eb7b4abd6207ece9dd602a5069a87f1e78ada13fc9f396e1f2afddaf0637c473445034cf57b5ca7631e209361a88fa3892d302b20f4cc986 SHA512 3aa3c9af7e994313400607943b9090fd813227ddd6d550b50fbcf7eeb4053da8bcdb41c9ef2579d957d2f279fdcc4e2f2ceca1091c5fd457df4204dd11792d6e
 DIST gentoolkit-0.4.7.tar.gz 3205669 BLAKE2B e5f64b85546bc10ad16e7fa42d288965539177375e8796b40df699859efa13fb98bb86aec58e60363c955b2d5e4b2e6379a7597252ee4fdbeec49559de67b328 SHA512 0fab600b4323d23e12009eeb4ade595950880a88b05bcfbfeada1a9b9af615b96d31c568285629bf6e5de7b45ed857bdf98b6261dc54974fbaf70c924e093c76
+DIST gentoolkit-0.4.8.tar.gz 3206070 BLAKE2B 7f689ae85136827b8af50401165ccd44bc824e12bec43dad786c7221ec78ee3c1f14d538d197e277a2fedc23f570440f4ec7c0cc707a146814315ff6de48c115 SHA512 689b4229c5d2b6f4440b7d3d57e4b9be5265eead53737890c17dbd0510df287f5c19f86b924735d4ad146d1a500c59a15869b718cbf805b894b0bf115b69f838
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild
new file mode 100644
index 000000000000..e4162f133220
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_REQ_USE="xml(+),threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of administration scripts for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
+SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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"
+
+DEPEND="
+	sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	sys-apps/gawk
+	sys-apps/gentoo-functions"
+
+python_prepare_all() {
+	python_setup
+	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-0.4.0"; then
+		SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1
+	fi
+}
+
+pkg_postinst() {
+	# Create cache directory for revdep-rebuild
+	mkdir -p -m 0755 "${EROOT}"/var/cache
+	mkdir -p -m 0700 "${EROOT}"/var/cache/revdep-rebuild
+
+	if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then
+		elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
+		elog "part of the gentoolkit package."
+		elog "The gentoolkit-dev package is now deprecated in favor of a single"
+		elog "gentoolkit package.   The remaining tools from gentoolkit-dev"
+		elog "are now obsolete/unused with the git based tree."
+	fi
+
+	# Only show the elog information on a new install
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "For further information on gentoolkit, please read the gentoolkit"
+		elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
+		elog
+		elog "Another alternative to equery is app-portage/portage-utils"
+		elog
+		elog "Additional tools that may be of interest:"
+		elog
+		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/prefix-toolkit/prefix-toolkit-4.ebuild b/app-portage/prefix-toolkit/prefix-toolkit-4.ebuild
deleted file mode 100644
index cfe11c4c353a..000000000000
--- a/app-portage/prefix-toolkit/prefix-toolkit-4.ebuild
+++ /dev/null
@@ -1,650 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Utilities for users of Gentoo Prefix"
-HOMEPAGE="https://prefix.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-3"
-SLOT="0"
-
-[[ ${PV} == 9999 ]] ||
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-DEPEND="
-	!app-portage/prefix-chain-setup
-	!sys-apps/prefix-chain-utils
-"
-BDEPEND="${DEPEND}
-	>sys-apps/portage-2.3.62
-"
-# In prefix-stack, these dependencies actually are the @system set,
-# as we rely on the base prefix anyway for package management,
-# which should have a proper @system set.
-# See als: pkg_preinst
-RDEPEND="${DEPEND}
-	prefix-stack? (
-		>=sys-apps/baselayout-prefix-2.6
-		sys-apps/gentoo-functions
-		app-portage/elt-patches
-		sys-devel/gnuconfig
-		sys-devel/gcc-config
-	)
-"
-
-S="${WORKDIR}"
-
-my_unpack() {
-	local infile=$1
-	local outfile=${2:-${infile}}
-	ebegin "extracting ${outfile}"
-	sed -ne "/^: ${infile} /,/EOIN/{/EOIN/d;p}" "${EBUILD}" \
-		> "${outfile}" || die "Failed to unpack ${outfile}"
-	eend $?
-}
-
-src_unpack() {
-	if use prefix-stack ; then
-		my_unpack prefix-stack.bash_login
-		my_unpack prefix-stack.bashrc
-		my_unpack prefix-stack.envd.99stack
-		my_unpack prefix-stack-ccwrap
-		local editor pager
-		for editor in "${EDITOR}" {"${EPREFIX}","${BROOT}"}/bin/nano
-		do
-			[[ -x ${editor} ]] || continue
-		done
-		for pager in "${PAGER}" {"${EPREFIX}","${BROOT}"}/usr/bin/less
-		do
-			[[ -x ${pager} ]] || continue
-		done
-		printf '%s\n' "EDITOR=\"${editor}\"" "PAGER=\"${pager}\"" > 000fallback
-	else
-		my_unpack prefix-stack-setup
-	fi
-	my_unpack startprefix
-}
-
-my_prefixify() {
-	local ebash eenv
-	if use prefix-stack ; then
-		ebash="${BROOT}/bin/bash"
-		eenv="${BROOT}/usr/bin/env"
-	else
-		ebash="${EPREFIX}/bin/bash"
-		eenv="${EPREFIX}/usr/bin/env"
-	fi
-
-	# the @=@ prevents repoman from believing we set readonly vars
-	sed -e "s,@GENTOO_PORTAGE_BPREFIX@,${BROOT},g" \
-		-e "s,@GENTOO_PORTAGE_EPREFIX@,${EPREFIX},g" \
-		-e "s,@GENTOO_PORTAGE_CHOST@,${CHOST},g" \
-		-e "s,@GENTOO_PORTAGE_EBASH@,${ebash},g" \
-		-e "s,@GENTOO_PORTAGE_EENV@,${eenv},g" \
-		-e "s,@=@,=,g" \
-		-i "$@" || die
-}
-
-src_configure() {
-	# do not eprefixify during unpack, to allow userpatches to apply
-	my_prefixify *
-}
-
-src_install-prefix-stack-ccwrap() {
-	# install toolchain wrapper.
-	local wrapperdir=/usr/${CHOST}/gcc-bin/${CHOST}-${PN}/${PV}
-	local wrappercfg=${CHOST}-${P}
-
-	exeinto $wrapperdir
-	doexe prefix-stack-ccwrap
-
-	local cc
-	for cc in \
-		gcc \
-		g++ \
-		cpp \
-		c++ \
-		windres \
-	; do
-		dosym prefix-stack-ccwrap $wrapperdir/${CHOST}-${cc}
-		dosym ${CHOST}-${cc} $wrapperdir/${cc}
-	done
-
-	# LDPATH is required to keep gcc-config happy :(
-	cat > ./${wrappercfg} <<-EOF
-		GCC_PATH="${EPREFIX}$wrapperdir"
-		LDPATH="${EPREFIX}$wrapperdir"
-		EOF
-
-	insinto /etc/env.d/gcc
-	doins ./${wrappercfg}
-}
-
-src_install() {
-	if use prefix-stack; then
-		src_install-prefix-stack-ccwrap
-		insinto /etc
-		doins prefix-stack.bash_login
-		insinto /etc/bash
-		newins prefix-stack.bashrc bashrc
-		newenvd prefix-stack.envd.99stack 99stack
-		doenvd 000fallback
-	else
-		dobin prefix-stack-setup
-	fi
-	exeinto /
-	doexe startprefix
-}
-
-pkg_preinst() {
-	use prefix-stack || return 0
-	ebegin "Purging @system package set for prefix stack"
-	# In prefix stack we empty out the @system set defined via make.profile,
-	# as we may be using some normal profile, but that @system set applies
-	# to the base prefix only.
-	# Instead, we only put ourselve into the @system set, and have additional
-	# @system packages in our RDEPEND.
-	my_lsprofile() {
-		(
-			cd -P "${1:-.}" || exit 1
-			[[ -r ./parent ]] &&
-				for p in $(<parent)
-				do
-					my_lsprofile "${p}" || exit 1
-				done
-			pwd -P
-		)
-	}
-	local systemset="/etc/portage/profile/packages"
-	dodir "${systemset%/*}"
-	[[ -s ${EROOT}${systemset} ]] &&
-		grep -v "# maintained by ${PN}" \
-			"${EROOT}${systemset}" \
-			> "${ED}${systemset}"
-	local p
-	for p in $(my_lsprofile "${EPREFIX}"/etc/portage/make.profile)
-	do
-		[[ -s ${p}/${systemset##*/} ]] || continue
-		awk '/^[ \t]*[^-#]/{print "-" $1 " # maintained by '"${PN}-${PVR}"'"}' \
-			< "${p}"/packages || die
-	done | sort -u >> "${ED}${systemset}"
-	[[ ${PIPESTATUS[@]} == "0 0" ]] || die "failed to collect for ${systemset}"
-	echo "*${CATEGORY}/${PN} # maintained by ${PN}-${PVR}" >> "${ED}${systemset}" || die
-	eend $?
-}
-
-return 0
-
-: startprefix <<'EOIN'
-#!@GENTOO_PORTAGE_EBASH@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> -- 2007-03-10
-# Enters the prefix environment by starting a login shell from the
-# prefix.  The SHELL environment variable is elevated in order to make
-# applications that start login shells to work, such as `screen`.
-
-# if you come from a substantially polluted environment (another
-# Prefix), a cleanup as follows resolves most oddities I've ever seen:
-# env -i HOME=$HOME TERM=$TERM USER=$USER $SHELL -l
-# hence this script starts the Prefix shell like this
-
-if [[ ${SHELL#@GENTOO_PORTAGE_EPREFIX@} != ${SHELL} ]]
-then
-	echo "You appear to be in prefix already (SHELL=${SHELL})" > /dev/stderr
-	exit -1
-elif [[ ${SHELL#@GENTOO_PORTAGE_BPREFIX@} != ${SHELL} ]] &&
-	 [[ ${EPREFIX-unset} == '@GENTOO_PORTAGE_EPREFIX@' ]]
-then
-	echo "You appear to be in stacked prefix already (EPREFIX=${EPREFIX})" > /dev/stderr
-	exit -1
-fi
-
-# What is our prefix?
-EPREFIX@=@'@GENTOO_PORTAGE_EPREFIX@'
-BPREFIX@=@'@GENTOO_PORTAGE_BPREFIX@'
-
-# not all systems have the same location for shells, however what it
-# boils down to, is that we need to know what the shell is, and then we
-# can find it in the bin dir of our prefix
-for SHELL in \
-	"${EPREFIX}/bin/${SHELL##*/}" \
-	"${BPREFIX}/bin/${SHELL##*/}" \
-	${SHELL##*/}
-do
-	[[ ${SHELL} == */* && -x ${SHELL} ]] && break
-done
-
-# check if the shell exists
-if [[ ${SHELL} != */* ]]
-then
-	echo "Failed to find the Prefix shell, this is probably" > /dev/stderr
-	echo "because you didn't emerge the shell ${SHELL}" > /dev/stderr
-	exit 1
-fi
-
-# set the prefix shell in the environment
-export SHELL
-
-# give a small notice
-echo "Entering Gentoo Prefix ${EPREFIX}"
-# start the login shell, clean the entire environment but what's needed
-RETAIN="HOME=$HOME TERM=$TERM USER=$USER SHELL=$SHELL"
-# PROFILEREAD is necessary on SUSE not to wipe the env on shell start
-[[ -n ${PROFILEREAD} ]] && RETAIN+=" PROFILEREAD=$PROFILEREAD"
-# ssh-agent is handy to keep, of if set, inherit it
-[[ -n ${SSH_AUTH_SOCK} ]] && RETAIN+=" SSH_AUTH_SOCK=$SSH_AUTH_SOCK"
-# if we're on some X terminal, makes sense to inherit that too
-[[ -n ${DISPLAY} ]] && RETAIN+=" DISPLAY=$DISPLAY"
-# do it!
-if [[ ${SHELL#${EPREFIX}} != ${SHELL} ]] ; then
-	'@GENTOO_PORTAGE_EENV@' -i $RETAIN $SHELL -l
-elif [[ ' bash ' == *" ${SHELL##*/} "* ]] ; then
-	# shell coming from different prefix would load it's own
-	# etc/profile upon -l, so we have to override
-	'@GENTOO_PORTAGE_EENV@' -i ${RETAIN} "${SHELL}" --rcfile "${EPREFIX}"/etc/prefix-stack.bash_login -i
-else
-	echo "Only bash is supported with stacked Prefix (you have ${SHELL##*/}), sorry!" > /dev/stderr
-	exit 1
-fi
-# and leave a message when we exit... the shell might return non-zero
-# without having real problems, so don't send alarming messages about
-# that
-echo "Leaving Gentoo Prefix with exit status $?"
-EOIN
-
-: prefix-stack.bashrc <<'EOIN'
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-#
-# In stacked Prefix there is no bash installed, yet
-# etc/bash/bashrc from base Prefix still is useful.
-#
-
-if [[ $- != *i* ]] ; then
-	# Shell is non-interactive, bashrc does not apply
-	return
-fi
-
-if [[ -r @GENTOO_PORTAGE_BPREFIX@/etc/bash/bashrc ]] ; then
-	source '@GENTOO_PORTAGE_BPREFIX@/etc/bash/bashrc'
-	# only if base Prefix does have an etc/bash/bashrc, we also
-	# run bashrc snippets provided by packages in stacked Prefix
-	for sh in '@GENTOO_PORTAGE_EPREFIX@'/etc/bash/bashrc.d/* ; do
-		[[ -r ${sh} ]] && source "${sh}"
-	done
-	unset sh
-else
-	# etc/profile does expect etc/bash/bashrc to set PS1
-	PS1='\u@\h \w \$ '
-fi
-EOIN
-
-: prefix-stack.bash_login <<'EOIN'
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-#
-# In stacked Prefix there is no bash installed, so there is
-# no bash able to load this Prefix' profile as login shell.
-# Instead, you can specify this one as bash rcfile to mimic
-# a bash login shell using this stacked Prefix profile.
-#
-
-if [[ -s '@GENTOO_PORTAGE_EPREFIX@/etc/profile' ]] ; then
-	. '@GENTOO_PORTAGE_EPREFIX@/etc/profile'
-fi
-if [[ -s ~/.bash_profile ]] ; then
-	. ~/.bash_profile
-elif [[ -s ~/.bash_login ]] ; then
-	. ~/.bash_login
-elif [[ -s ~/.profile ]] ; then
-	. ~/.profile
-fi
-EOIN
-
-: prefix-stack.envd.99stack <<'EOIN'
-PKG_CONFIG_PATH@=@"@GENTOO_PORTAGE_EPREFIX@/usr/lib/pkgconfig:@GENTOO_PORTAGE_EPREFIX@/usr/share/pkgconfig"
-PORTAGE_CONFIGROOT@=@"@GENTOO_PORTAGE_EPREFIX@"
-EPREFIX@=@"@GENTOO_PORTAGE_EPREFIX@"
-EOIN
-
-: prefix-stack-setup <<'EOIN'
-#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-PARENT_EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
-PARENT_CHOST="@GENTOO_PORTAGE_CHOST@"
-CHILD_EPREFIX=
-CHILD_PROFILE=
-CHILD_CHOST=
-
-#
-# get ourselfs the functions.sh script for ebegin/eend/etc.
-#
-for f in \
-	/lib/gentoo/functions.sh \
-	/etc/init.d/functions.sh \
-	/sbin/functions.sh \
-; do
-	if [[ -r ${PARENT_EPREFIX}${f} ]] ; then
-		. "${PARENT_EPREFIX}${f}"
-		f=found
-		break
-	fi
-done
-
-if [[ ${f} != found ]] ; then
-	echo "Cannot find Gentoo functions, aborting." >&2
-	exit 1
-fi
-
-for arg in "$@"; do
-	case "${arg}" in
-	--eprefix=*) CHILD_EPREFIX="${arg#--eprefix=}" ;;
-	--profile=*) CHILD_PROFILE="${arg#--profile=}" ;;
-	--chost=*)   CHILD_CHOST="${arg#--chost=}" ;;
-
-	--help)
-		einfo "$0 usage:"
-		einfo "  --eprefix=[PATH]       Path to new EPREFIX to create stacked to the prefix"
-		einfo "                         where this script is installed (${PARENT_EPREFIX})"
-		einfo "  --profile=[PATH]       The absolute path to the profile to use. This path"
-		einfo "                         must point to a directory within ${PARENT_EPREFIX}"
-		einfo "  --chost=[CHOST]        The CHOST to use for the new EPREFIX, required if"
-		einfo "                         the profile does not set CHOST, or to override."
-		exit 0
-		;;
-	esac
-done
-
-#
-# sanity check of given values
-#
-
-test -n "${CHILD_EPREFIX}" || { eerror "no eprefix argument given"; exit 1; }
-test -d "${CHILD_EPREFIX}" && { eerror "${CHILD_EPREFIX} already exists"; exit 1; }
-test -n "${CHILD_PROFILE}" || { eerror "no profile argument given"; exit 1; }
-test -d "${CHILD_PROFILE}" || { eerror "${CHILD_PROFILE} does not exist"; exit 1; }
-
-if [[ -z ${CHILD_CHOST} ]]
-then
-	my_lsprofile() {
-		(
-			cd -P "${1:-.}" || exit 1
-			[[ -r ./parent ]] &&
-				for p in $(<parent)
-				do
-					my_lsprofile "${p}" || exit 1
-				done
-			pwd -P
-		)
-	}
-
-	for profile in $(my_lsprofile "${CHILD_PROFILE}") missing
-	do
-		if [[ ${profile} == missing ]]
-		then
-		  eerror "profile does not set CHOST, need --chost argument"
-		  exit 1
-		fi
-		[[ -s "${profile}/make.defaults" ]] || continue
-		grep -q '^[ 	]*CHOST@=@' "${profile}/make.defaults" && break
-	done
-fi
-
-einfo "creating stacked prefix ${CHILD_EPREFIX}"
-
-#
-# functions needed below.
-#
-eend_exit() {
-	eend $1
-	[[ $1 != 0 ]] && exit 1
-}
-
-#
-# create the directories required to bootstrap the least.
-#
-ebegin "creating directory structure"
-(
-	set -e
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.mask
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.force
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage/env
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage/package.env
-	ln -s "${PARENT_EPREFIX}"/etc/portage/repos.conf "${CHILD_EPREFIX}"/etc/portage/repos.conf
-)
-eend_exit $?
-
-#
-# create a make.conf and set PORTDIR and PORTAGE_TMPDIR
-#
-ebegin "creating make.conf"
-(
-	set -e
-	echo "#"
-	echo "# The following values where taken from the parent prefix's"
-	echo "# environment. Feel free to adopt them as you like."
-	echo "#"
-	echo "CFLAGS=\"$(portageq envvar CFLAGS)\""
-	echo "CXXFLAGS=\"$(portageq envvar CXXFLAGS)\""
-	echo "MAKEOPTS=\"$(portageq envvar MAKEOPTS)\""
-	niceness=$(portageq envvar PORTAGE_NICENESS || true)
-	[[ -n ${niceness} ]] &&
-		echo "PORTAGE_NICENESS=\"${niceness}\""
-	echo
-	echo "# Mirrors from parent prefix."
-	echo "GENTOO_MIRRORS=\"$(portageq envvar GENTOO_MIRRORS || true)\""
-	echo
-	echo "# Below comes the prefix-stack setup. Only change things"
-	echo "# if you know exactly what you are doing!"
-	echo "EPREFIX=\"${CHILD_EPREFIX}\""
-	echo "PORTAGE_OVERRIDE_EPREFIX=\"${PARENT_EPREFIX}\""
-	echo "BROOT=\"${PARENT_EPREFIX}\""
-	# Since EAPI 7 there is BDEPEND, which is DEPEND in EAPI up to 6.
-	# We do not want to pull DEPEND from EAPI <= 6, but RDEPEND only.
-	echo "EMERGE_DEFAULT_OPTS=\"--root-deps=rdeps\""
-	if [[ -n ${CHILD_CHOST} ]] ; then
-		echo "CHOST=\"${CHILD_CHOST}\""
-	fi
-) > "${CHILD_EPREFIX}"/etc/portage/make.conf
-eend_exit $?
-
-ebegin "creating use.mask/prefix-stack"
-printf -- '-%s\n' prefix{,-guest,-stack} > "${CHILD_EPREFIX}"/etc/portage/profile/use.mask/prefix-stack
-eend_exit $?
-
-ebegin "creating use.force/prefix-stack"
-printf -- '%s\n' prefix{,-guest,-stack} > "${CHILD_EPREFIX}"/etc/portage/profile/use.force/prefix-stack
-eend_exit $?
-
-ebegin "creating env/host-cc.conf"
-cat > "${CHILD_EPREFIX}"/etc/portage/env/host-cc.conf <<-EOM
-	CC=${PARENT_CHOST}-gcc
-	CXX=${PARENT_CHOST}-g++
-	EOM
-eend_exit $?
-
-ebegin "creating package.env/prefix-stack"
-cat > "${CHILD_EPREFIX}"/etc/portage/package.env/prefix-stack <<-'EOM'
-	# merge with the parent's chost. this forces the use of the parent
-	# compiler, which generally would be illegal - this is an exception.
-	# This is required for example on winnt, because the wrapper has to
-	# be able to use/resolve symlinks, etc. native winnt binaries miss
-	# that ability, but cygwin binaries don't.
-	sys-devel/gcc-config host-cc.conf
-	sys-apps/gentoo-functions host-cc.conf
-	EOM
-eend_exit $?
-
-#
-# create the make.profile symlinks.
-#
-ebegin "creating make.profile"
-(
-	ln -s "${CHILD_PROFILE}" "${CHILD_EPREFIX}/etc/portage/make.profile"
-)
-eend_exit $?
-
-#
-# adjust permissions of generated files.
-#
-ebegin "adjusting permissions"
-(
-	set -e
-	chmod 644 "${CHILD_EPREFIX}"/etc/portage/make.conf
-	chmod 644 "${CHILD_EPREFIX}"/etc/portage/env/host-cc.conf
-	chmod 644 "${CHILD_EPREFIX}"/etc/portage/package.env/prefix-stack
-)
-eend_exit $?
-
-#
-# now merge some basics.
-#
-ebegin "installing required basic packages"
-(
-	set -e
-	export PORTAGE_CONFIGROOT@=@"${CHILD_EPREFIX}"
-	export EPREFIX@=@"${CHILD_EPREFIX}"
-	export PORTAGE_OVERRIDE_EPREFIX@=@"${PARENT_EPREFIX}"
-
-	# let baselayout create the directories
-	USE@=@"${USE} build" \
-	emerge --verbose --nodeps --oneshot \
-		'>=baselayout-prefix-2.6'
-
-	# In prefix-stack, app-portage/prefix-toolkit does
-	# install/update an etc/portage/profile/packages file,
-	# removing all @system packages from current make.profile,
-	# and adding itself to @system set instead.
-	emerge --verbose --nodeps --oneshot \
-		app-portage/prefix-toolkit
-
-	# In prefix-stack, prefix-toolkit does have an RDEPEND on them,
-	# to hold them in the @system set.
-	emerge --verbose --nodeps --oneshot \
-		sys-apps/gentoo-functions \
-		app-portage/elt-patches \
-		sys-devel/gnuconfig \
-		sys-devel/gcc-config
-
-	# select the stack wrapper profile from gcc-config
-	env -i PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" \
-		"$(type -P bash)" "${CHILD_EPREFIX}"/usr/bin/gcc-config 1
-)
-eend_exit $?
-
-#
-# wow, all ok :)
-#
-ewarn
-ewarn "all done. don't forget to tune ${CHILD_EPREFIX}/etc/portage/make.conf."
-ewarn "to enter the new prefix, run \"${CHILD_EPREFIX}/startprefix\"."
-ewarn
-EOIN
-
-: prefix-stack-ccwrap <<'EOIN'
-#!@GENTOO_PORTAGE_BPREFIX@/bin/bash
-
-if [ -r /cygdrive/. ]; then
-	winpath2unix() { cygpath -u "$1"; }
-	unixpath2win() { cygpath -w "$1"; }
-fi
-
-myself=${0##*/} # basename $0
-link_dirs=()
-opts=()
-chost="@GENTOO_PORTAGE_CHOST@"
-prefix="@GENTOO_PORTAGE_EPREFIX@"
-absprefix=${prefix}
-if [[ ${chost} == *"-winnt"* ]]; then
-	# we may get called from windows binary, like pkgdata in dev-libs/icu
-	# in this case, PATH elements get the "/dev/fs/C/WINDOWS/SUA" prefix
-	absprefix=$(winpath2unix "$(unixpath2win "${absprefix}")")
-fi
-[[ ${myself} == *windres* ]] && mode=compile || mode=link
-orig_args=("$@")
-
-for opt in "$@"
-do
-	case "$opt" in
-	-L)
-		link_dirs=("${link_dirs[@]}" "-L$1")
-		shift
-		;;
-	-L*)
-		link_dirs=("${link_dirs[@]}" "${opt}")
-		;;
-	*)
-		case "${opt}" in
-		-v)
-			# -v done right: only use mode version if -v is the _only_
-			# argument on the command line.
-			[[ ${#orig_args[@]} -gt 1 ]] || mode=version
-			;;
-		--version)	mode=version ;;
-		-c|-E|-S)	mode=compile ;;
-		-print-search-dirs) mode=dirs ;;
-		esac
-		opts=("${opts[@]}" "${opt}")
-		;;
-	esac
-done
-
-# remove any path to current prefix, need base prefix only
-new_path=
-save_ifs=$IFS
-IFS=':'
-for p in $PATH
-do
-	IFS=$save_ifs
-	[[ ${p#${absprefix}} != "${p}" ]] && continue
-	if [[ -z "${new_path}" ]]; then
-		new_path="${p}"
-	else
-		new_path="${new_path}:${p}"
-	fi
-done
-IFS=$save_ifs
-
-PATH=${new_path}
-
-pfx_comp=("-I${prefix}/include" "-I${prefix}/usr/include")
-pfx_link=("-L${prefix}/usr/lib" "-L${prefix}/lib")
-# binutils-config's ldwrapper understands '-R' for aix and hpux too.
-pfx_link_r=("-Wl,-R,${prefix}/lib" "-Wl,-R,${prefix}/usr/lib")
-case "${chost}" in
-*-winnt*)
-	# parity (winnt) understands -rpath only ...
-	pfx_link_r=("-Wl,-rpath,${prefix}/lib" "-Wl,-rpath,${prefix}/usr/lib")
-	;;
-*-linux*)
-	# With gcc, -isystem would avoid warning messages in installed headers,
-	# but that breaks with AIX host headers.
-	pfx_comp=("-isystem" "${prefix}/include" "-isystem" "${prefix}/usr/include")
-	;;
-esac
-
-# ensure we run the right chost program in base prefix
-[[ ${myself} == *-*-*-* ]] || myself=${chost}-${myself#${chost}-}
-
-case "$mode" in
-link)    exec "${myself}" "${link_dirs[@]}" "${pfx_link[@]}" "${opts[@]}" "${pfx_comp[@]}" "${pfx_link_r[@]}" ;;
-compile) exec "${myself}" "${link_dirs[@]}" "${opts[@]}" "${pfx_comp[@]}" ;;
-version) exec "${myself}" "${orig_args[@]}" ;;
-dirs)
-	"${myself}" "${orig_args[@]}" | while read line; do
-		if [[ "${line}" == "libraries: ="* ]]; then
-			echo "libraries: =${prefix}/usr/lib:${prefix}/lib:${line#"libraries: ="}"
-		else
-			echo "${line}"
-		fi
-	done
-	;;
-*)			echo "cannot infer ${myself}'s mode from comamnd line arguments"; exit 1 ;;
-esac
-EOIN
diff --git a/app-portage/prefix-toolkit/prefix-toolkit-5.ebuild b/app-portage/prefix-toolkit/prefix-toolkit-5.ebuild
deleted file mode 100644
index 61ea23e6a37a..000000000000
--- a/app-portage/prefix-toolkit/prefix-toolkit-5.ebuild
+++ /dev/null
@@ -1,665 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Utilities for users of Gentoo Prefix"
-HOMEPAGE="https://prefix.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-3"
-SLOT="0"
-
-[[ ${PV} == 9999 ]] ||
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-DEPEND="
-	!app-portage/prefix-chain-setup
-	!sys-apps/prefix-chain-utils
-"
-BDEPEND="${DEPEND}
-	>sys-apps/portage-2.3.62
-"
-# In prefix-stack, these dependencies actually are the @system set,
-# as we rely on the base prefix anyway for package management,
-# which should have a proper @system set.
-# See als: pkg_preinst
-RDEPEND="${DEPEND}
-	prefix-stack? (
-		>=sys-apps/baselayout-prefix-2.6
-		sys-apps/gentoo-functions
-		app-portage/elt-patches
-		sys-devel/gnuconfig
-		sys-devel/gcc-config
-	)
-"
-
-S="${WORKDIR}"
-
-my_unpack() {
-	local infile=$1
-	local outfile=${2:-${infile}}
-	ebegin "extracting ${outfile}"
-	sed -ne "/^: ${infile} /,/EOIN/{/EOIN/d;p}" "${EBUILD}" \
-		> "${outfile}" || die "Failed to unpack ${outfile}"
-	eend $?
-}
-
-src_unpack() {
-	if use prefix-stack ; then
-		my_unpack prefix-stack.bash_login
-		my_unpack prefix-stack.bashrc
-		my_unpack prefix-stack.envd.99stack
-		my_unpack prefix-stack-ccwrap
-		local editor pager
-		for editor in "${EDITOR}" {"${EPREFIX}","${BROOT}"}/bin/nano
-		do
-			[[ -x ${editor} ]] || continue
-		done
-		for pager in "${PAGER}" {"${EPREFIX}","${BROOT}"}/usr/bin/less
-		do
-			[[ -x ${pager} ]] || continue
-		done
-		printf '%s\n' "EDITOR=\"${editor}\"" "PAGER=\"${pager}\"" > 000fallback
-	else
-		my_unpack prefix-stack-setup
-	fi
-	my_unpack startprefix
-}
-
-my_prefixify() {
-	local ebash eenv
-	if use prefix-stack ; then
-		ebash="${BROOT}/bin/bash"
-		eenv="${BROOT}/usr/bin/env"
-	else
-		ebash="${EPREFIX}/bin/bash"
-		eenv="${EPREFIX}/usr/bin/env"
-	fi
-
-	# the @=@ prevents repoman from believing we set readonly vars
-	sed -e "s,@GENTOO_PORTAGE_BPREFIX@,${BROOT},g" \
-		-e "s,@GENTOO_PORTAGE_EPREFIX@,${EPREFIX},g" \
-		-e "s,@GENTOO_PORTAGE_CHOST@,${CHOST},g" \
-		-e "s,@GENTOO_PORTAGE_EBASH@,${ebash},g" \
-		-e "s,@GENTOO_PORTAGE_EENV@,${eenv},g" \
-		-e "s,@=@,=,g" \
-		-i "$@" || die
-}
-
-src_configure() {
-	# do not eprefixify during unpack, to allow userpatches to apply
-	my_prefixify *
-}
-
-src_install-prefix-stack-ccwrap() {
-	# install toolchain wrapper.
-	local wrapperdir=/usr/${CHOST}/gcc-bin/${CHOST}-${PN}/${PV}
-	local wrappercfg=${CHOST}-${P}
-
-	exeinto $wrapperdir
-	doexe prefix-stack-ccwrap
-
-	local cc
-	for cc in \
-		gcc \
-		g++ \
-		cpp \
-		c++ \
-		windres \
-	; do
-		dosym prefix-stack-ccwrap $wrapperdir/${CHOST}-${cc}
-		dosym ${CHOST}-${cc} $wrapperdir/${cc}
-	done
-
-	# LDPATH is required to keep gcc-config happy :(
-	cat > ./${wrappercfg} <<-EOF
-		GCC_PATH="${EPREFIX}$wrapperdir"
-		LDPATH="${EPREFIX}$wrapperdir"
-		EOF
-
-	insinto /etc/env.d/gcc
-	doins ./${wrappercfg}
-}
-
-src_install() {
-	if use prefix-stack; then
-		src_install-prefix-stack-ccwrap
-		insinto /etc
-		doins prefix-stack.bash_login
-		insinto /etc/bash
-		newins prefix-stack.bashrc bashrc
-		newenvd prefix-stack.envd.99stack 99stack
-		doenvd 000fallback
-	else
-		dobin prefix-stack-setup
-	fi
-	exeinto /
-	doexe startprefix
-}
-
-pkg_preinst() {
-	use prefix-stack || return 0
-	ebegin "Purging @system package set for prefix stack"
-	# In prefix stack we empty out the @system set defined via make.profile,
-	# as we may be using some normal profile, but that @system set applies
-	# to the base prefix only.
-	# Instead, we only put ourselve into the @system set, and have additional
-	# @system packages in our RDEPEND.
-	my_lsprofile() {
-		(
-			cd -P "${1:-.}" || exit 1
-			[[ -r ./parent ]] &&
-				for p in $(<parent)
-				do
-					my_lsprofile "${p}" || exit 1
-				done
-			pwd -P
-		)
-	}
-	local systemset="/etc/portage/profile/packages"
-	dodir "${systemset%/*}"
-	[[ -s ${EROOT}${systemset} ]] &&
-		grep -v "# maintained by ${PN}" \
-			"${EROOT}${systemset}" \
-			> "${ED}${systemset}"
-	local p
-	for p in $(my_lsprofile "${EPREFIX}"/etc/portage/make.profile)
-	do
-		[[ -s ${p}/${systemset##*/} ]] || continue
-		awk '/^[ \t]*[^-#]/{print "-" $1 " # maintained by '"${PN}-${PVR}"'"}' \
-			< "${p}"/packages || die
-	done | sort -u >> "${ED}${systemset}"
-	[[ ${PIPESTATUS[@]} == "0 0" ]] || die "failed to collect for ${systemset}"
-	echo "*${CATEGORY}/${PN} # maintained by ${PN}-${PVR}" >> "${ED}${systemset}" || die
-	eend $?
-}
-
-return 0
-
-: startprefix <<'EOIN'
-#!@GENTOO_PORTAGE_EBASH@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> -- 2007-03-10
-# Enters the prefix environment by starting a login shell from the
-# prefix.  The SHELL environment variable is elevated in order to make
-# applications that start login shells to work, such as `screen`.
-
-# if you come from a substantially polluted environment (another
-# Prefix), a cleanup as follows resolves most oddities I've ever seen:
-# env -i HOME=$HOME TERM=$TERM USER=$USER $SHELL -l
-# hence this script starts the Prefix shell like this
-
-if [[ ${SHELL#@GENTOO_PORTAGE_EPREFIX@} != ${SHELL} ]]
-then
-	echo "You appear to be in prefix already (SHELL=${SHELL})" > /dev/stderr
-	exit -1
-elif [[ ${SHELL#@GENTOO_PORTAGE_BPREFIX@} != ${SHELL} ]] &&
-	 [[ ${EPREFIX-unset} == '@GENTOO_PORTAGE_EPREFIX@' ]]
-then
-	echo "You appear to be in stacked prefix already (EPREFIX=${EPREFIX})" > /dev/stderr
-	exit -1
-fi
-
-# What is our prefix?
-EPREFIX@=@'@GENTOO_PORTAGE_EPREFIX@'
-BPREFIX@=@'@GENTOO_PORTAGE_BPREFIX@'
-
-# not all systems have the same location for shells, however what it
-# boils down to, is that we need to know what the shell is, and then we
-# can find it in the bin dir of our prefix
-for SHELL in \
-	"${EPREFIX}/bin/${SHELL##*/}" \
-	"${BPREFIX}/bin/${SHELL##*/}" \
-	${SHELL##*/}
-do
-	[[ ${SHELL} == */* && -x ${SHELL} ]] && break
-done
-
-# check if the shell exists
-if [[ ${SHELL} != */* ]]
-then
-	echo "Failed to find the Prefix shell, this is probably" > /dev/stderr
-	echo "because you didn't emerge the shell ${SHELL}" > /dev/stderr
-	exit 1
-fi
-
-# set the prefix shell in the environment
-export SHELL
-
-# give a small notice
-echo "Entering Gentoo Prefix ${EPREFIX}"
-# start the login shell, clean the entire environment but what's needed
-RETAIN="HOME=$HOME TERM=$TERM USER=$USER SHELL=$SHELL"
-# PROFILEREAD is necessary on SUSE not to wipe the env on shell start
-[[ -n ${PROFILEREAD} ]] && RETAIN+=" PROFILEREAD=$PROFILEREAD"
-# ssh-agent is handy to keep, of if set, inherit it
-[[ -n ${SSH_AUTH_SOCK} ]] && RETAIN+=" SSH_AUTH_SOCK=$SSH_AUTH_SOCK"
-# if we're on some X terminal, makes sense to inherit that too
-[[ -n ${DISPLAY} ]] && RETAIN+=" DISPLAY=$DISPLAY"
-if [[ -d /proc/registry ]]; then # we're on Cygwin
-	# crucial to Windows but cannot be restored, see
-	# https://cygwin.com/ml/cygwin/2019-08/msg00072.html
-	[[ -n ${SYSTEMDRIVE} ]] && RETAIN+=" SYSTEMDRIVE=$SYSTEMDRIVE"
-	# COMSPEC is to native Windows what SHELL is to *nix
-	[[ -n ${COMSPEC} ]] && RETAIN+=" COMSPEC=$COMSPEC"
-	# some Windows programs (e.g. devenv.exe) need TMP or TEMP
-	[[ -n ${TEMP} ]] && RETAIN+=" TEMP=$TEMP"
-fi
-# do it!
-if [[ ${SHELL#${EPREFIX}} != ${SHELL} ]] ; then
-	'@GENTOO_PORTAGE_EENV@' -i $RETAIN $SHELL -l
-elif [[ ' bash ' == *" ${SHELL##*/} "* ]] ; then
-	# shell coming from different prefix would load it's own
-	# etc/profile upon -l, so we have to override
-	'@GENTOO_PORTAGE_EENV@' -i ${RETAIN} "${SHELL}" --rcfile "${EPREFIX}"/etc/prefix-stack.bash_login -i
-else
-	echo "Only bash is supported with stacked Prefix (you have ${SHELL##*/}), sorry!" > /dev/stderr
-	exit 1
-fi
-# and leave a message when we exit... the shell might return non-zero
-# without having real problems, so don't send alarming messages about
-# that
-echo "Leaving Gentoo Prefix with exit status $?"
-EOIN
-
-: prefix-stack.bashrc <<'EOIN'
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-#
-# In stacked Prefix there is no bash installed, yet
-# etc/bash/bashrc from base Prefix still is useful.
-#
-
-if [[ $- != *i* ]] ; then
-	# Shell is non-interactive, bashrc does not apply
-	return
-fi
-
-if [[ -r @GENTOO_PORTAGE_BPREFIX@/etc/bash/bashrc ]] ; then
-	source '@GENTOO_PORTAGE_BPREFIX@/etc/bash/bashrc'
-	# only if base Prefix does have an etc/bash/bashrc, we also
-	# run bashrc snippets provided by packages in stacked Prefix
-	for sh in '@GENTOO_PORTAGE_EPREFIX@'/etc/bash/bashrc.d/* ; do
-		[[ -r ${sh} ]] && source "${sh}"
-	done
-	unset sh
-else
-	# etc/profile does expect etc/bash/bashrc to set PS1
-	PS1='\u@\h \w \$ '
-fi
-EOIN
-
-: prefix-stack.bash_login <<'EOIN'
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-#
-# In stacked Prefix there is no bash installed, so there is
-# no bash able to load this Prefix' profile as login shell.
-# Instead, you can specify this one as bash rcfile to mimic
-# a bash login shell using this stacked Prefix profile.
-#
-
-if [[ -s '@GENTOO_PORTAGE_EPREFIX@/etc/profile' ]] ; then
-	. '@GENTOO_PORTAGE_EPREFIX@/etc/profile'
-fi
-if [[ -s ~/.bash_profile ]] ; then
-	. ~/.bash_profile
-elif [[ -s ~/.bash_login ]] ; then
-	. ~/.bash_login
-elif [[ -s ~/.profile ]] ; then
-	. ~/.profile
-fi
-EOIN
-
-: prefix-stack.envd.99stack <<'EOIN'
-PKG_CONFIG_PATH@=@"@GENTOO_PORTAGE_EPREFIX@/usr/lib/pkgconfig:@GENTOO_PORTAGE_EPREFIX@/usr/share/pkgconfig"
-PORTAGE_CONFIGROOT@=@"@GENTOO_PORTAGE_EPREFIX@"
-EPREFIX@=@"@GENTOO_PORTAGE_EPREFIX@"
-EOIN
-
-: prefix-stack-setup <<'EOIN'
-#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-PARENT_EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
-PARENT_CHOST="@GENTOO_PORTAGE_CHOST@"
-CHILD_EPREFIX=
-CHILD_PROFILE=
-CHILD_CHOST=
-
-#
-# get ourselfs the functions.sh script for ebegin/eend/etc.
-#
-for f in \
-	/lib/gentoo/functions.sh \
-	/etc/init.d/functions.sh \
-	/sbin/functions.sh \
-; do
-	if [[ -r ${PARENT_EPREFIX}${f} ]] ; then
-		. "${PARENT_EPREFIX}${f}"
-		f=found
-		break
-	fi
-done
-
-if [[ ${f} != found ]] ; then
-	echo "Cannot find Gentoo functions, aborting." >&2
-	exit 1
-fi
-
-for arg in "$@"; do
-	case "${arg}" in
-	--eprefix=*) CHILD_EPREFIX="${arg#--eprefix=}" ;;
-	--profile=*) CHILD_PROFILE="${arg#--profile=}" ;;
-	--chost=*)   CHILD_CHOST="${arg#--chost=}" ;;
-
-	--help)
-		einfo "$0 usage:"
-		einfo "  --eprefix=[PATH]       Path to new EPREFIX to create stacked to the prefix"
-		einfo "                         where this script is installed (${PARENT_EPREFIX})"
-		einfo "  --profile=[PATH]       The absolute path to the profile to use. This path"
-		einfo "                         must point to a directory within ${PARENT_EPREFIX}"
-		einfo "  --chost=[CHOST]        The CHOST to use for the new EPREFIX, required if"
-		einfo "                         the profile does not set CHOST, or to override."
-		exit 0
-		;;
-	esac
-done
-
-#
-# sanity check of given values
-#
-
-test -n "${CHILD_EPREFIX}" || { eerror "no eprefix argument given"; exit 1; }
-test -d "${CHILD_EPREFIX}" && { eerror "${CHILD_EPREFIX} already exists"; exit 1; }
-test -n "${CHILD_PROFILE}" || { eerror "no profile argument given"; exit 1; }
-test -d "${CHILD_PROFILE}" || { eerror "${CHILD_PROFILE} does not exist"; exit 1; }
-
-if [[ -z ${CHILD_CHOST} ]]
-then
-	my_lsprofile() {
-		(
-			cd -P "${1:-.}" || exit 1
-			[[ -r ./parent ]] &&
-				for p in $(<parent)
-				do
-					my_lsprofile "${p}" || exit 1
-				done
-			pwd -P
-		)
-	}
-
-	for profile in $(my_lsprofile "${CHILD_PROFILE}") missing
-	do
-		if [[ ${profile} == missing ]]
-		then
-		  eerror "profile does not set CHOST, need --chost argument"
-		  exit 1
-		fi
-		[[ -s "${profile}/make.defaults" ]] || continue
-		grep -q '^[ 	]*CHOST@=@' "${profile}/make.defaults" && break
-	done
-fi
-
-einfo "creating stacked prefix ${CHILD_EPREFIX}"
-
-#
-# functions needed below.
-#
-eend_exit() {
-	eend $1
-	[[ $1 != 0 ]] && exit 1
-}
-
-#
-# create the directories required to bootstrap the least.
-#
-ebegin "creating directory structure"
-(
-	set -e
-	mkdir -p "${CHILD_EPREFIX}"/var/tmp/portage
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.mask
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.force
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage/env
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage/package.env
-	ln -s "${PARENT_EPREFIX}"/etc/portage/repos.conf "${CHILD_EPREFIX}"/etc/portage/repos.conf
-)
-eend_exit $?
-
-#
-# create a make.conf and set PORTDIR and PORTAGE_TMPDIR
-#
-ebegin "creating make.conf"
-(
-	set -e
-	echo "#"
-	echo "# These are sane default compiler flags, feel free to adopt them as you like."
-	echo "# Extending the flags is done to respect flags probably set by some profile."
-	echo "#"
-	echo "CFLAGS=\"\${CFLAGS} -O2 -pipe\""
-	echo "CXXFLAGS=\"${CXXFLAGS} -O2 -pipe\""
-	echo "MAKEOPTS=\"$(portageq envvar MAKEOPTS)\""
-	niceness=$(portageq envvar PORTAGE_NICENESS || true)
-	[[ -n ${niceness} ]] &&
-		echo "PORTAGE_NICENESS=\"${niceness}\""
-	echo
-	echo "# Mirrors from parent prefix."
-	echo "GENTOO_MIRRORS=\"$(portageq envvar GENTOO_MIRRORS || true)\""
-	echo
-	echo "# Below comes the prefix-stack setup. Only change things"
-	echo "# if you know exactly what you are doing!"
-	echo "EPREFIX=\"${CHILD_EPREFIX}\""
-	echo "PORTAGE_OVERRIDE_EPREFIX=\"${PARENT_EPREFIX}\""
-	echo "BROOT=\"${PARENT_EPREFIX}\""
-	echo "PORTAGE_TMPDIR=\"\${EPREFIX}/var/tmp\""
-	# Since EAPI 7 there is BDEPEND, which is DEPEND in EAPI up to 6.
-	# We do not want to pull DEPEND from EAPI <= 6, but RDEPEND only.
-	echo "EMERGE_DEFAULT_OPTS=\"--root-deps=rdeps\""
-	if [[ -n ${CHILD_CHOST} ]] ; then
-		echo "CHOST=\"${CHILD_CHOST}\""
-	fi
-) > "${CHILD_EPREFIX}"/etc/portage/make.conf
-eend_exit $?
-
-ebegin "creating use.mask/prefix-stack"
-printf -- '-%s\n' prefix{,-guest,-stack} > "${CHILD_EPREFIX}"/etc/portage/profile/use.mask/prefix-stack
-eend_exit $?
-
-ebegin "creating use.force/prefix-stack"
-printf -- '%s\n' prefix{,-guest,-stack} > "${CHILD_EPREFIX}"/etc/portage/profile/use.force/prefix-stack
-eend_exit $?
-
-ebegin "creating env/host-cc.conf"
-cat > "${CHILD_EPREFIX}"/etc/portage/env/host-cc.conf <<-EOM
-	CC=${PARENT_CHOST}-gcc
-	CXX=${PARENT_CHOST}-g++
-	# Inherited compiler flags from parent prefix,
-	# as the child prefix may have a different compiler.
-	CFLAGS="$(portageq envvar CFLAGS)"
-	CXXFLAGS="$(portageq envvar CXXFLAGS)"
-	EOM
-eend_exit $?
-
-ebegin "creating package.env/prefix-stack"
-cat > "${CHILD_EPREFIX}"/etc/portage/package.env/prefix-stack <<-'EOM'
-	# merge with the parent's chost. this forces the use of the parent
-	# compiler, which generally would be illegal - this is an exception.
-	# This is required for example on winnt, because the wrapper has to
-	# be able to use/resolve symlinks, etc. native winnt binaries miss
-	# that ability, but cygwin binaries don't.
-	sys-devel/gcc-config host-cc.conf
-	sys-apps/gentoo-functions host-cc.conf
-	EOM
-eend_exit $?
-
-#
-# create the make.profile symlinks.
-#
-ebegin "creating make.profile"
-(
-	ln -s "${CHILD_PROFILE}" "${CHILD_EPREFIX}/etc/portage/make.profile"
-)
-eend_exit $?
-
-#
-# adjust permissions of generated files.
-#
-ebegin "adjusting permissions"
-(
-	set -e
-	chmod 644 "${CHILD_EPREFIX}"/etc/portage/make.conf
-	chmod 644 "${CHILD_EPREFIX}"/etc/portage/env/host-cc.conf
-	chmod 644 "${CHILD_EPREFIX}"/etc/portage/package.env/prefix-stack
-)
-eend_exit $?
-
-#
-# now merge some basics.
-#
-ebegin "installing required basic packages"
-(
-	set -e
-	export PORTAGE_CONFIGROOT@=@"${CHILD_EPREFIX}"
-	export EPREFIX@=@"${CHILD_EPREFIX}"
-	export PORTAGE_OVERRIDE_EPREFIX@=@"${PARENT_EPREFIX}"
-
-	# let baselayout create the directories
-	USE@=@"${USE} build" \
-	emerge --verbose --nodeps --oneshot \
-		'>=baselayout-prefix-2.6'
-
-	# In prefix-stack, app-portage/prefix-toolkit does
-	# install/update an etc/portage/profile/packages file,
-	# removing all @system packages from current make.profile,
-	# and adding itself to @system set instead.
-	emerge --verbose --nodeps --oneshot \
-		app-portage/prefix-toolkit
-
-	# In prefix-stack, prefix-toolkit does have an RDEPEND on them,
-	# to hold them in the @system set.
-	emerge --verbose --nodeps --oneshot \
-		sys-apps/gentoo-functions \
-		app-portage/elt-patches \
-		sys-devel/gnuconfig \
-		sys-devel/gcc-config
-
-	# select the stack wrapper profile from gcc-config
-	env -i PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" \
-		"$(type -P bash)" "${CHILD_EPREFIX}"/usr/bin/gcc-config 1
-)
-eend_exit $?
-
-#
-# wow, all ok :)
-#
-ewarn
-ewarn "all done. don't forget to tune ${CHILD_EPREFIX}/etc/portage/make.conf."
-ewarn "to enter the new prefix, run \"${CHILD_EPREFIX}/startprefix\"."
-ewarn
-EOIN
-
-: prefix-stack-ccwrap <<'EOIN'
-#!@GENTOO_PORTAGE_BPREFIX@/bin/bash
-
-if [ -r /cygdrive/. ]; then
-	winpath2unix() { cygpath -u "$1"; }
-	unixpath2win() { cygpath -w "$1"; }
-fi
-
-myself=${0##*/} # basename $0
-link_dirs=()
-opts=()
-chost="@GENTOO_PORTAGE_CHOST@"
-prefix="@GENTOO_PORTAGE_EPREFIX@"
-absprefix=${prefix}
-if [[ ${chost} == *"-winnt"* ]]; then
-	# we may get called from windows binary, like pkgdata in dev-libs/icu
-	# in this case, PATH elements get the "/dev/fs/C/WINDOWS/SUA" prefix
-	absprefix=$(winpath2unix "$(unixpath2win "${absprefix}")")
-fi
-[[ ${myself} == *windres* ]] && mode=compile || mode=link
-orig_args=("$@")
-
-for opt in "$@"
-do
-	case "$opt" in
-	-L)
-		link_dirs=("${link_dirs[@]}" "-L$1")
-		shift
-		;;
-	-L*)
-		link_dirs=("${link_dirs[@]}" "${opt}")
-		;;
-	*)
-		case "${opt}" in
-		-v)
-			# -v done right: only use mode version if -v is the _only_
-			# argument on the command line.
-			[[ ${#orig_args[@]} -gt 1 ]] || mode=version
-			;;
-		--version)	mode=version ;;
-		-c|-E|-S)	mode=compile ;;
-		-print-search-dirs) mode=dirs ;;
-		esac
-		opts=("${opts[@]}" "${opt}")
-		;;
-	esac
-done
-
-# remove any path to current prefix, need base prefix only
-new_path=
-save_ifs=$IFS
-IFS=':'
-for p in $PATH
-do
-	IFS=$save_ifs
-	[[ ${p#${absprefix}} != "${p}" ]] && continue
-	if [[ -z "${new_path}" ]]; then
-		new_path="${p}"
-	else
-		new_path="${new_path}:${p}"
-	fi
-done
-IFS=$save_ifs
-
-PATH=${new_path}
-
-pfx_comp=("-I${prefix}/include" "-I${prefix}/usr/include")
-pfx_link=("-L${prefix}/usr/lib" "-L${prefix}/lib")
-# binutils-config's ldwrapper understands '-R' for aix and hpux too.
-pfx_link_r=("-Wl,-R,${prefix}/lib" "-Wl,-R,${prefix}/usr/lib")
-case "${chost}" in
-*-winnt*)
-	# parity (winnt) understands -rpath only ...
-	pfx_link_r=("-Wl,-rpath,${prefix}/lib" "-Wl,-rpath,${prefix}/usr/lib")
-	;;
-*-linux*)
-	# With gcc, -isystem would avoid warning messages in installed headers,
-	# but that breaks with AIX host headers.
-	pfx_comp=("-isystem" "${prefix}/include" "-isystem" "${prefix}/usr/include")
-	;;
-esac
-
-# ensure we run the right chost program in base prefix
-[[ ${myself} == *-*-*-* ]] || myself=${chost}-${myself#${chost}-}
-
-case "$mode" in
-link)    exec "${myself}" "${link_dirs[@]}" "${pfx_link[@]}" "${opts[@]}" "${pfx_comp[@]}" "${pfx_link_r[@]}" ;;
-compile) exec "${myself}" "${link_dirs[@]}" "${opts[@]}" "${pfx_comp[@]}" ;;
-version) exec "${myself}" "${orig_args[@]}" ;;
-dirs)
-	"${myself}" "${orig_args[@]}" | while read line; do
-		if [[ "${line}" == "libraries: ="* ]]; then
-			echo "libraries: =${prefix}/usr/lib:${prefix}/lib:${line#"libraries: ="}"
-		else
-			echo "${line}"
-		fi
-	done
-	;;
-*)			echo "cannot infer ${myself}'s mode from comamnd line arguments"; exit 1 ;;
-esac
-EOIN
diff --git a/app-portage/prefix-toolkit/prefix-toolkit-6.ebuild b/app-portage/prefix-toolkit/prefix-toolkit-6.ebuild
deleted file mode 100644
index a052312b8df4..000000000000
--- a/app-portage/prefix-toolkit/prefix-toolkit-6.ebuild
+++ /dev/null
@@ -1,685 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Utilities for users of Gentoo Prefix"
-HOMEPAGE="https://prefix.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-3"
-SLOT="0"
-
-[[ ${PV} == 9999 ]] ||
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-DEPEND="
-	!app-portage/prefix-chain-setup
-	!sys-apps/prefix-chain-utils
-"
-BDEPEND="${DEPEND}
-	>sys-apps/portage-2.3.62
-"
-# In prefix-stack, these dependencies actually are the @system set,
-# as we rely on the base prefix anyway for package management,
-# which should have a proper @system set.
-# See als: pkg_preinst
-RDEPEND="${DEPEND}
-	prefix-stack? (
-		>=sys-apps/baselayout-prefix-2.6
-		sys-apps/gentoo-functions
-		app-portage/elt-patches
-		sys-devel/gnuconfig
-		sys-devel/gcc-config
-		elibc_Winnt? (
-			dev-libs/pthreads4w
-		)
-	)
-"
-
-S="${WORKDIR}"
-
-my_unpack() {
-	local infile=$1
-	local outfile=${2:-${infile}}
-	ebegin "extracting ${outfile}"
-	sed -ne "/^: ${infile} /,/EOIN/{/EOIN/d;p}" "${EBUILD}" \
-		> "${outfile}" || die "Failed to unpack ${outfile}"
-	eend $?
-}
-
-src_unpack() {
-	if use prefix-stack ; then
-		my_unpack prefix-stack.bash_login
-		my_unpack prefix-stack.bashrc
-		my_unpack prefix-stack.envd.99stack
-		my_unpack prefix-stack-ccwrap
-		local editor pager
-		for editor in "${EDITOR}" {"${EPREFIX}","${BROOT}"}/bin/nano
-		do
-			[[ -x ${editor} ]] || continue
-		done
-		for pager in "${PAGER}" {"${EPREFIX}","${BROOT}"}/usr/bin/less
-		do
-			[[ -x ${pager} ]] || continue
-		done
-		printf '%s\n' "EDITOR=\"${editor}\"" "PAGER=\"${pager}\"" > 000fallback
-	else
-		my_unpack prefix-stack-setup
-	fi
-	my_unpack startprefix
-}
-
-my_prefixify() {
-	local ebash eenv
-	if use prefix-stack ; then
-		ebash="${BROOT}/bin/bash"
-		eenv="${BROOT}/usr/bin/env"
-	else
-		ebash="${EPREFIX}/bin/bash"
-		eenv="${EPREFIX}/usr/bin/env"
-	fi
-
-	# the @=@ prevents repoman from believing we set readonly vars
-	sed -e "s,@GENTOO_PORTAGE_BPREFIX@,${BROOT},g" \
-		-e "s,@GENTOO_PORTAGE_EPREFIX@,${EPREFIX},g" \
-		-e "s,@GENTOO_PORTAGE_CHOST@,${CHOST},g" \
-		-e "s,@GENTOO_PORTAGE_EBASH@,${ebash},g" \
-		-e "s,@GENTOO_PORTAGE_EENV@,${eenv},g" \
-		-e "s,@=@,=,g" \
-		-i "$@" || die
-}
-
-src_configure() {
-	# do not eprefixify during unpack, to allow userpatches to apply
-	my_prefixify *
-}
-
-src_install-prefix-stack-ccwrap() {
-	# install toolchain wrapper.
-	local wrapperdir=/usr/${CHOST}/gcc-bin/${CHOST}-${PN}/${PV}
-	local wrappercfg=${CHOST}-${P}
-
-	exeinto $wrapperdir
-	doexe prefix-stack-ccwrap
-
-	local cc
-	for cc in \
-		gcc \
-		g++ \
-		cpp \
-		c++ \
-		windres \
-	; do
-		dosym prefix-stack-ccwrap $wrapperdir/${CHOST}-${cc}
-		dosym ${CHOST}-${cc} $wrapperdir/${cc}
-	done
-
-	# LDPATH is required to keep gcc-config happy :(
-	cat > ./${wrappercfg} <<-EOF
-		GCC_PATH="${EPREFIX}$wrapperdir"
-		LDPATH="${EPREFIX}$wrapperdir"
-		EOF
-
-	insinto /etc/env.d/gcc
-	doins ./${wrappercfg}
-}
-
-src_install() {
-	if use prefix-stack; then
-		src_install-prefix-stack-ccwrap
-		insinto /etc
-		doins prefix-stack.bash_login
-		insinto /etc/bash
-		newins prefix-stack.bashrc bashrc
-		newenvd prefix-stack.envd.99stack 99stack
-		doenvd 000fallback
-	else
-		dobin prefix-stack-setup
-	fi
-	exeinto /
-	doexe startprefix
-}
-
-pkg_preinst() {
-	use prefix-stack || return 0
-	ebegin "Purging @system package set for prefix stack"
-	# In prefix stack we empty out the @system set defined via make.profile,
-	# as we may be using some normal profile, but that @system set applies
-	# to the base prefix only.
-	# Instead, we only put ourselve into the @system set, and have additional
-	# @system packages in our RDEPEND.
-	my_lsprofile() {
-		(
-			cd -P "${1:-.}" || exit 1
-			[[ -r ./parent ]] &&
-				for p in $(<parent)
-				do
-					my_lsprofile "${p}" || exit 1
-				done
-			pwd -P
-		)
-	}
-	local systemset="/etc/portage/profile/packages"
-	dodir "${systemset%/*}"
-	[[ -s ${EROOT}${systemset} ]] &&
-		grep -v "# maintained by ${PN}" \
-			"${EROOT}${systemset}" \
-			> "${ED}${systemset}"
-	local p
-	for p in $(my_lsprofile "${EPREFIX}"/etc/portage/make.profile)
-	do
-		[[ -s ${p}/${systemset##*/} ]] || continue
-		awk '/^[ \t]*[^-#]/{print "-" $1 " # maintained by '"${PN}-${PVR}"'"}' \
-			< "${p}"/packages || die
-	done | sort -u >> "${ED}${systemset}"
-	[[ ${PIPESTATUS[@]} == "0 0" ]] || die "failed to collect for ${systemset}"
-	echo "*${CATEGORY}/${PN} # maintained by ${PN}-${PVR}" >> "${ED}${systemset}" || die
-	eend $?
-}
-
-return 0
-
-: startprefix <<'EOIN'
-#!@GENTOO_PORTAGE_EBASH@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> -- 2007-03-10
-# Enters the prefix environment by starting a login shell from the
-# prefix.  The SHELL environment variable is elevated in order to make
-# applications that start login shells to work, such as `screen`.
-
-# if you come from a substantially polluted environment (another
-# Prefix), a cleanup as follows resolves most oddities I've ever seen:
-# env -i HOME=$HOME TERM=$TERM USER=$USER $SHELL -l
-# hence this script starts the Prefix shell like this
-
-if [[ ${SHELL#@GENTOO_PORTAGE_EPREFIX@} != ${SHELL} ]]
-then
-	echo "You appear to be in prefix already (SHELL=${SHELL})" > /dev/stderr
-	exit -1
-elif [[ ${SHELL#@GENTOO_PORTAGE_BPREFIX@} != ${SHELL} ]] &&
-	 [[ ${EPREFIX-unset} == '@GENTOO_PORTAGE_EPREFIX@' ]]
-then
-	echo "You appear to be in stacked prefix already (EPREFIX=${EPREFIX})" > /dev/stderr
-	exit -1
-fi
-
-# What is our prefix?
-EPREFIX@=@'@GENTOO_PORTAGE_EPREFIX@'
-BPREFIX@=@'@GENTOO_PORTAGE_BPREFIX@'
-
-# not all systems have the same location for shells, however what it
-# boils down to, is that we need to know what the shell is, and then we
-# can find it in the bin dir of our prefix
-for SHELL in \
-	"${EPREFIX}/bin/${SHELL##*/}" \
-	"${BPREFIX}/bin/${SHELL##*/}" \
-	${SHELL##*/}
-do
-	[[ ${SHELL} == */* && -x ${SHELL} ]] && break
-done
-
-# check if the shell exists
-if [[ ${SHELL} != */* ]]
-then
-	echo "Failed to find the Prefix shell, this is probably" > /dev/stderr
-	echo "because you didn't emerge the shell ${SHELL}" > /dev/stderr
-	exit 1
-fi
-
-# set the prefix shell in the environment
-export SHELL
-
-# give a small notice
-echo "Entering Gentoo Prefix ${EPREFIX}"
-# start the login shell, clean the entire environment but what's needed
-RETAIN="HOME=$HOME TERM=$TERM USER=$USER SHELL=$SHELL"
-# PROFILEREAD is necessary on SUSE not to wipe the env on shell start
-[[ -n ${PROFILEREAD} ]] && RETAIN+=" PROFILEREAD=$PROFILEREAD"
-# ssh-agent is handy to keep, of if set, inherit it
-[[ -n ${SSH_AUTH_SOCK} ]] && RETAIN+=" SSH_AUTH_SOCK=$SSH_AUTH_SOCK"
-# if we're on some X terminal, makes sense to inherit that too
-[[ -n ${DISPLAY} ]] && RETAIN+=" DISPLAY=$DISPLAY"
-if [[ -d /proc/registry ]]; then # we're on Cygwin
-	# crucial to Windows but cannot be restored, see
-	# https://cygwin.com/ml/cygwin/2019-08/msg00072.html
-	[[ -n ${SYSTEMDRIVE} ]] && RETAIN+=" SYSTEMDRIVE=$SYSTEMDRIVE"
-	# COMSPEC is to native Windows what SHELL is to *nix
-	[[ -n ${COMSPEC} ]] && RETAIN+=" COMSPEC=$COMSPEC"
-	# some Windows programs (e.g. devenv.exe) need TMP or TEMP
-	[[ -n ${TEMP} ]] && RETAIN+=" TEMP=$TEMP"
-fi
-# do it!
-if [[ ${SHELL#${EPREFIX}} != ${SHELL} ]] ; then
-	'@GENTOO_PORTAGE_EENV@' -i $RETAIN $SHELL -l
-elif [[ ' bash ' == *" ${SHELL##*/} "* ]] ; then
-	# shell coming from different prefix would load it's own
-	# etc/profile upon -l, so we have to override
-	'@GENTOO_PORTAGE_EENV@' -i ${RETAIN} "${SHELL}" --rcfile "${EPREFIX}"/etc/prefix-stack.bash_login -i
-else
-	echo "Only bash is supported with stacked Prefix (you have ${SHELL##*/}), sorry!" > /dev/stderr
-	exit 1
-fi
-# and leave a message when we exit... the shell might return non-zero
-# without having real problems, so don't send alarming messages about
-# that
-echo "Leaving Gentoo Prefix with exit status $?"
-EOIN
-
-: prefix-stack.bashrc <<'EOIN'
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-#
-# In stacked Prefix there is no bash installed, yet
-# etc/bash/bashrc from base Prefix still is useful.
-#
-
-if [[ $- != *i* ]] ; then
-	# Shell is non-interactive, bashrc does not apply
-	return
-fi
-
-if [[ -r @GENTOO_PORTAGE_BPREFIX@/etc/bash/bashrc ]] ; then
-	source '@GENTOO_PORTAGE_BPREFIX@/etc/bash/bashrc'
-	# only if base Prefix does have an etc/bash/bashrc, we also
-	# run bashrc snippets provided by packages in stacked Prefix
-	for sh in '@GENTOO_PORTAGE_EPREFIX@'/etc/bash/bashrc.d/* ; do
-		[[ -r ${sh} ]] && source "${sh}"
-	done
-	unset sh
-else
-	# etc/profile does expect etc/bash/bashrc to set PS1
-	PS1='\u@\h \w \$ '
-fi
-EOIN
-
-: prefix-stack.bash_login <<'EOIN'
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-#
-# In stacked Prefix there is no bash installed, so there is
-# no bash able to load this Prefix' profile as login shell.
-# Instead, you can specify this one as bash rcfile to mimic
-# a bash login shell using this stacked Prefix profile.
-#
-
-if [[ -s '@GENTOO_PORTAGE_EPREFIX@/etc/profile' ]] ; then
-	. '@GENTOO_PORTAGE_EPREFIX@/etc/profile'
-fi
-if [[ -s ~/.bash_profile ]] ; then
-	. ~/.bash_profile
-elif [[ -s ~/.bash_login ]] ; then
-	. ~/.bash_login
-elif [[ -s ~/.profile ]] ; then
-	. ~/.profile
-fi
-EOIN
-
-: prefix-stack.envd.99stack <<'EOIN'
-PKG_CONFIG_PATH@=@"@GENTOO_PORTAGE_EPREFIX@/usr/lib/pkgconfig:@GENTOO_PORTAGE_EPREFIX@/usr/share/pkgconfig"
-PORTAGE_CONFIGROOT@=@"@GENTOO_PORTAGE_EPREFIX@"
-EPREFIX@=@"@GENTOO_PORTAGE_EPREFIX@"
-EOIN
-
-: prefix-stack-setup <<'EOIN'
-#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-PARENT_EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
-PARENT_CHOST="@GENTOO_PORTAGE_CHOST@"
-CHILD_EPREFIX=
-CHILD_PROFILE=
-CHILD_CHOST=
-
-#
-# get ourselfs the functions.sh script for ebegin/eend/etc.
-#
-for f in \
-	/lib/gentoo/functions.sh \
-	/etc/init.d/functions.sh \
-	/sbin/functions.sh \
-; do
-	if [[ -r ${PARENT_EPREFIX}${f} ]] ; then
-		. "${PARENT_EPREFIX}${f}"
-		f=found
-		break
-	fi
-done
-
-if [[ ${f} != found ]] ; then
-	echo "Cannot find Gentoo functions, aborting." >&2
-	exit 1
-fi
-
-for arg in "$@"; do
-	case "${arg}" in
-	--eprefix=*) CHILD_EPREFIX="${arg#--eprefix=}" ;;
-	--profile=*) CHILD_PROFILE="${arg#--profile=}" ;;
-	--chost=*)   CHILD_CHOST="${arg#--chost=}" ;;
-
-	--help)
-		einfo "$0 usage:"
-		einfo "  --eprefix=[PATH]       Path to new EPREFIX to create stacked to the prefix"
-		einfo "                         where this script is installed (${PARENT_EPREFIX})"
-		einfo "  --profile=[PATH]       The absolute path to the profile to use. This path"
-		einfo "                         must point to a directory within ${PARENT_EPREFIX}"
-		einfo "  --chost=[CHOST]        The CHOST to use for the new EPREFIX, required if"
-		einfo "                         the profile does not set CHOST, or to override."
-		exit 0
-		;;
-	esac
-done
-
-#
-# sanity check of given values
-#
-
-test -n "${CHILD_EPREFIX}" || { eerror "no eprefix argument given"; exit 1; }
-test -d "${CHILD_EPREFIX}" && { eerror "${CHILD_EPREFIX} already exists"; exit 1; }
-test -n "${CHILD_PROFILE}" || { eerror "no profile argument given"; exit 1; }
-test -d "${CHILD_PROFILE}" || { eerror "${CHILD_PROFILE} does not exist"; exit 1; }
-
-if [[ -z ${CHILD_CHOST} ]]
-then
-	my_lsprofile() {
-		(
-			cd -P "${1:-.}" || exit 1
-			[[ -r ./parent ]] &&
-				for p in $(<parent)
-				do
-					my_lsprofile "${p}" || exit 1
-				done
-			pwd -P
-		)
-	}
-
-	for profile in $(my_lsprofile "${CHILD_PROFILE}") missing
-	do
-		if [[ ${profile} == missing ]]
-		then
-		  eerror "profile does not set CHOST, need --chost argument"
-		  exit 1
-		fi
-		[[ -s "${profile}/make.defaults" ]] || continue
-		grep -q '^[ 	]*CHOST@=@' "${profile}/make.defaults" && break
-	done
-fi
-
-einfo "creating stacked prefix ${CHILD_EPREFIX}"
-
-#
-# functions needed below.
-#
-eend_exit() {
-	eend $1
-	[[ $1 != 0 ]] && exit 1
-}
-
-#
-# create the directories required to bootstrap the least.
-#
-ebegin "creating directory structure"
-(
-	set -e
-	mkdir -p "${CHILD_EPREFIX}"/var/tmp/portage
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.mask
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.force
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage/env
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage/package.env
-	ln -s "${PARENT_EPREFIX}"/etc/portage/repos.conf "${CHILD_EPREFIX}"/etc/portage/repos.conf
-)
-eend_exit $?
-
-#
-# create a make.conf and set PORTDIR and PORTAGE_TMPDIR
-#
-ebegin "creating make.conf"
-(
-	set -e
-	echo "#"
-	echo "# These are sane default compiler flags, feel free to adopt them as you like."
-	echo "# Extending the flags is done to respect flags probably set by some profile."
-	echo "#"
-	echo "CFLAGS=\"\${CFLAGS} -O2 -pipe\""
-	echo "CXXFLAGS=\"${CXXFLAGS} -O2 -pipe\""
-	echo "MAKEOPTS=\"$(portageq envvar MAKEOPTS)\""
-	niceness=$(portageq envvar PORTAGE_NICENESS || true)
-	[[ -n ${niceness} ]] &&
-		echo "PORTAGE_NICENESS=\"${niceness}\""
-	echo
-	echo "# Mirrors from parent prefix."
-	echo "GENTOO_MIRRORS=\"$(portageq envvar GENTOO_MIRRORS || true)\""
-	echo
-	echo "# Below comes the prefix-stack setup. Only change things"
-	echo "# if you know exactly what you are doing!"
-	echo "EPREFIX=\"${CHILD_EPREFIX}\""
-	echo "PORTAGE_OVERRIDE_EPREFIX=\"${PARENT_EPREFIX}\""
-	echo "BROOT=\"${PARENT_EPREFIX}\""
-	echo "PORTAGE_TMPDIR=\"\${EPREFIX}/var/tmp\""
-	# Since EAPI 7 there is BDEPEND, which is DEPEND in EAPI up to 6.
-	# We do not want to pull DEPEND from EAPI <= 6, but RDEPEND only.
-	echo "EMERGE_DEFAULT_OPTS=\"--root-deps=rdeps\""
-	if [[ -n ${CHILD_CHOST} ]] ; then
-		echo "CHOST=\"${CHILD_CHOST}\""
-	fi
-) > "${CHILD_EPREFIX}"/etc/portage/make.conf
-eend_exit $?
-
-ebegin "creating use.mask/prefix-stack"
-printf -- '-%s\n' prefix{,-guest,-stack} > "${CHILD_EPREFIX}"/etc/portage/profile/use.mask/prefix-stack
-eend_exit $?
-
-ebegin "creating use.force/prefix-stack"
-printf -- '%s\n' prefix{,-guest,-stack} > "${CHILD_EPREFIX}"/etc/portage/profile/use.force/prefix-stack
-eend_exit $?
-
-ebegin "creating env/host-cc.conf"
-cat > "${CHILD_EPREFIX}"/etc/portage/env/host-cc.conf <<-EOM
-	CC=${PARENT_CHOST}-gcc
-	CXX=${PARENT_CHOST}-g++
-	# Inherited compiler flags from parent prefix,
-	# as the child prefix may have a different compiler.
-	CFLAGS="$(portageq envvar CFLAGS)"
-	CXXFLAGS="$(portageq envvar CXXFLAGS)"
-	EOM
-eend_exit $?
-
-ebegin "creating package.env/prefix-stack"
-cat > "${CHILD_EPREFIX}"/etc/portage/package.env/prefix-stack <<-'EOM'
-	# merge with the parent's chost. this forces the use of the parent
-	# compiler, which generally would be illegal - this is an exception.
-	# This is required for example on winnt, because the wrapper has to
-	# be able to use/resolve symlinks, etc. native winnt binaries miss
-	# that ability, but cygwin binaries don't.
-	sys-devel/gcc-config host-cc.conf
-	sys-apps/gentoo-functions host-cc.conf
-	EOM
-eend_exit $?
-
-#
-# create the make.profile symlinks.
-#
-ebegin "creating make.profile"
-(
-	ln -s "${CHILD_PROFILE}" "${CHILD_EPREFIX}/etc/portage/make.profile"
-)
-eend_exit $?
-
-#
-# adjust permissions of generated files.
-#
-ebegin "adjusting permissions"
-(
-	set -e
-	chmod 644 "${CHILD_EPREFIX}"/etc/portage/make.conf
-	chmod 644 "${CHILD_EPREFIX}"/etc/portage/env/host-cc.conf
-	chmod 644 "${CHILD_EPREFIX}"/etc/portage/package.env/prefix-stack
-)
-eend_exit $?
-
-#
-# now merge some basics.
-#
-ebegin "installing required basic packages"
-(
-	set -e
-	export PORTAGE_CONFIGROOT@=@"${CHILD_EPREFIX}"
-	export EPREFIX@=@"${CHILD_EPREFIX}"
-	export PORTAGE_OVERRIDE_EPREFIX@=@"${PARENT_EPREFIX}"
-
-	# let baselayout create the directories
-	USE@=@"${USE} build" \
-	emerge --verbose --nodeps --oneshot \
-		'>=baselayout-prefix-2.6'
-
-	# In prefix-stack, app-portage/prefix-toolkit does
-	# install/update an etc/portage/profile/packages file,
-	# removing all @system packages from current make.profile,
-	# and adding itself to @system set instead.
-	emerge --verbose --nodeps --oneshot \
-		app-portage/prefix-toolkit
-
-	# In prefix-stack, prefix-toolkit does have an RDEPEND on them,
-	# to hold them in the @system set.
-	emerge --verbose --nodeps --oneshot \
-		sys-apps/gentoo-functions \
-		app-portage/elt-patches \
-		sys-devel/gnuconfig \
-		sys-devel/gcc-config
-
-	# get eventual dependencies, add to world
-	emerge --verbose --update --deep \
-		app-portage/prefix-toolkit
-
-	# select the stack wrapper profile from gcc-config
-	env -i PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" \
-		"$(type -P bash)" "${CHILD_EPREFIX}"/usr/bin/gcc-config 1
-)
-eend_exit $?
-
-#
-# wow, all ok :)
-#
-ewarn
-ewarn "all done. don't forget to tune ${CHILD_EPREFIX}/etc/portage/make.conf."
-ewarn "to enter the new prefix, run \"${CHILD_EPREFIX}/startprefix\"."
-ewarn
-EOIN
-
-: prefix-stack-ccwrap <<'EOIN'
-#!@GENTOO_PORTAGE_BPREFIX@/bin/bash
-
-if [ -r /cygdrive/. ]; then
-	winpath2unix() { cygpath -u "$1"; }
-	unixpath2win() { cygpath -w "$1"; }
-fi
-
-myself=${0##*/} # basename $0
-link_dirs=()
-linkopts=()
-opts=()
-chost="@GENTOO_PORTAGE_CHOST@"
-prefix="@GENTOO_PORTAGE_EPREFIX@"
-absprefix=${prefix}
-if [[ ${chost} == *"-winnt"* ]]; then
-	# we may get called from windows binary, like pkgdata in dev-libs/icu
-	# in this case, PATH elements get the "/dev/fs/C/WINDOWS/SUA" prefix
-	absprefix=$(winpath2unix "$(unixpath2win "${absprefix}")")
-fi
-[[ ${myself} == *windres* ]] && mode=compile || mode=link
-orig_args=("$@")
-
-for opt in "$@"
-do
-	if [[ ${chost} == *"-winnt"* ]]; then
-		# We depend on dev-libs/pthreads4w, no?
-		case ${opt} in
-		-pthread | -lpthread)
-			case " ${linkopts[*]} " in
-			*" -lpthread "*) ;;
-			*) linkopts=( "${linkopts[@]}" "-lpthread" ) ;;
-			esac
-			continue
-			;;
-		esac
-	fi
-	case "$opt" in
-	-L)
-		link_dirs=("${link_dirs[@]}" "-L$1")
-		shift
-		;;
-	-L*)
-		link_dirs=("${link_dirs[@]}" "${opt}")
-		;;
-	*)
-		case "${opt}" in
-		-v)
-			# -v done right: only use mode version if -v is the _only_
-			# argument on the command line.
-			[[ ${#orig_args[@]} -gt 1 ]] || mode=version
-			;;
-		--version)	mode=version ;;
-		-c|-E|-S)	mode=compile ;;
-		-print-search-dirs) mode=dirs ;;
-		esac
-		opts=("${opts[@]}" "${opt}")
-		;;
-	esac
-done
-
-# remove any path to current prefix, need base prefix only
-new_path=
-save_ifs=$IFS
-IFS=':'
-for p in $PATH
-do
-	IFS=$save_ifs
-	[[ ${p#${absprefix}} != "${p}" ]] && continue
-	if [[ -z "${new_path}" ]]; then
-		new_path="${p}"
-	else
-		new_path="${new_path}:${p}"
-	fi
-done
-IFS=$save_ifs
-
-PATH=${new_path}
-
-pfx_comp=("-I${prefix}/include" "-I${prefix}/usr/include")
-pfx_link=("-L${prefix}/usr/lib" "-L${prefix}/lib")
-# binutils-config's ldwrapper understands '-R' for aix and hpux too.
-pfx_link_r=("-Wl,-R,${prefix}/lib" "-Wl,-R,${prefix}/usr/lib")
-case "${chost}" in
-*-winnt*)
-	# parity (winnt) understands -rpath only ...
-	pfx_link_r=("-Wl,-rpath,${prefix}/lib" "-Wl,-rpath,${prefix}/usr/lib")
-	;;
-*-linux*)
-	# With gcc, -isystem would avoid warning messages in installed headers,
-	# but that breaks with AIX host headers.
-	pfx_comp=("-isystem" "${prefix}/include" "-isystem" "${prefix}/usr/include")
-	;;
-esac
-
-# ensure we run the right chost program in base prefix
-[[ ${myself} == *-*-*-* ]] || myself=${chost}-${myself#${chost}-}
-
-case "$mode" in
-link)    exec "${myself}" "${link_dirs[@]}" "${pfx_link[@]}" "${opts[@]}" "${pfx_comp[@]}" "${pfx_link_r[@]}" "${linkopts[@]}" ;;
-compile) exec "${myself}" "${link_dirs[@]}" "${opts[@]}" "${pfx_comp[@]}" ;;
-version) exec "${myself}" "${orig_args[@]}" ;;
-dirs)
-	"${myself}" "${orig_args[@]}" | while read line; do
-		if [[ "${line}" == "libraries: ="* ]]; then
-			echo "libraries: =${prefix}/usr/lib:${prefix}/lib:${line#"libraries: ="}"
-		else
-			echo "${line}"
-		fi
-	done
-	;;
-*)			echo "cannot infer ${myself}'s mode from comamnd line arguments"; exit 1 ;;
-esac
-EOIN
diff --git a/app-portage/prefix-toolkit/prefix-toolkit-7.ebuild b/app-portage/prefix-toolkit/prefix-toolkit-9.ebuild
similarity index 97%
rename from app-portage/prefix-toolkit/prefix-toolkit-7.ebuild
rename to app-portage/prefix-toolkit/prefix-toolkit-9.ebuild
index f401ec709a4e..05ebbcc42e84 100644
--- a/app-portage/prefix-toolkit/prefix-toolkit-7.ebuild
+++ b/app-portage/prefix-toolkit/prefix-toolkit-9.ebuild
@@ -23,17 +23,21 @@ BDEPEND="${DEPEND}
 # In prefix-stack, these dependencies actually are the @system set,
 # as we rely on the base prefix anyway for package management,
 # which should have a proper @system set.
+# Strictly speaking, only baselayout and gcc-config are necessary
+# (and pthreads4w for Winnt), but it is easier for now to install
+# elt-patches, gentoo-functions and gnuconfig as well, instead of
+# fixing all uses that expect them in EPREFIX rather than BROOT.
 # See als: pkg_preinst
 RDEPEND="${DEPEND}
 	prefix-stack? (
 		>=sys-apps/baselayout-prefix-2.6
-		sys-apps/gentoo-functions
-		app-portage/elt-patches
-		sys-devel/gnuconfig
 		sys-devel/gcc-config
 		elibc_Winnt? (
 			dev-libs/pthreads4w
 		)
+		app-portage/elt-patches
+		sys-apps/gentoo-functions
+		sys-devel/gnuconfig
 	)
 "
 
@@ -67,7 +71,10 @@ src_unpack() {
 	else
 		my_unpack prefix-stack-setup
 	fi
-	my_unpack startprefix
+	if use prefix; then
+		# does not make sense on vanilla Gentoo
+		my_unpack startprefix
+	fi
 }
 
 my_prefixify() {
@@ -134,11 +141,14 @@ src_install() {
 		newins prefix-stack.bashrc bashrc
 		newenvd prefix-stack.envd.99stack 99stack
 		doenvd 000fallback
+		keepdir /usr/share/aclocal
 	else
 		dobin prefix-stack-setup
 	fi
-	exeinto /
-	doexe startprefix
+	if use prefix; then
+		exeinto /
+		doexe startprefix
+	fi
 }
 
 pkg_preinst() {
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index f9c9f04896d2..7891fb06e799 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/aspell/aspell-0.60.8.ebuild b/app-text/aspell/aspell-0.60.8.ebuild
index 116604300287..574877c3e70c 100644
--- a/app-text/aspell/aspell-0.60.8.ebuild
+++ b/app-text/aspell/aspell-0.60.8.ebuild
@@ -17,7 +17,7 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls unicode"
 
 PDEPEND="app-dicts/aspell-en"
diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index 919bebaa34bf..243c36c83962 100644
Binary files a/dev-go/Manifest.gz and b/dev-go/Manifest.gz differ
diff --git a/dev-go/golint/Manifest b/dev-go/golint/Manifest
index 8e31f5f6a7dd..258526aeee1f 100644
--- a/dev-go/golint/Manifest
+++ b/dev-go/golint/Manifest
@@ -1,3 +1,16 @@
 DIST github.com-golang-tools-a911d9008d1f732040244007778232b02ebb2b84.tar.gz 2298164 BLAKE2B 1c47d5f354174578ee376cc0907235b70df8a81b403da26083dd4138e8bbd1064bb62a5481a5079c43af31e71f76d77eb2be23b85571dbe3a2f48ffd7ed161cf SHA512 acce459c8fa32ca7e48163f92fb6e343b0ea8ec6994b98eb7f7326cf09bf194191c00a01c9eb5d055210cc144d5b986a9e554102a31eca4bba9cbedc500ccdf1
+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-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod 159 BLAKE2B 7124b4e21f0b1ff142fe4cd5c57a22de7bc5b1c578e16e8661085d475d67573279c1ce3165e05a28c77a41eac43fe29b1d98854abdcc7b0b66167f82db652dd8 SHA512 5e225da646ef87b8bf435b745313187cecd1bd3e88660f8a90cd2a6fdcadbe8fc51f53edae4b3aa2357ad273a8e58034920bb61a1cd5898b95d3fe39f30ec648
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+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-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.zip 2931354 BLAKE2B eaa01c066a3be354b161262a5e83f67b8edafec70735dff4727dfdfa59fc867b73f7246758b219c23055e05303d4ae663d656d12dd32ea5cbe368610ae33df41 SHA512 2201bbed9215537b9eacb06b9ae232511626138e508a5739c405ba8e5d498237a45919a55bb2b2a476a2fdf69bdad6144ec7673610423c0bf76099f7ea75eb4c
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golint-0_pre20180702.tar.gz 31957 BLAKE2B fb3129918bf352ab75f617d933902055877473ca9269b0e5bf91a727e88b579b7b6ced6255d845364405a749ef0aae1f8f67bab0cf97916b39fd7e8f4be54f74 SHA512 bbf550927f547950e0a8270eaf4981cf51b799998e2154058aad3345579ea3a70581cdc13cc36345ca82cf3513a88092f0f5d453895768d05b25a4c47f030fb0
 DIST golint-0_pre20191125.tar.gz 31595 BLAKE2B ca35aea7e2977c31e2be964e6322a4c5eda200876ef634ade8654e0e9f4a32545bd4890160ae7ffad68295f08d6ccbfaeaccd8ebd7f45e837419724c78ec5261 SHA512 4689a1d3e12a917339eb43de5a125c6eebfdb225b6ec815891a07d7feca5f57c7c874b415a902b32056d8caea551680b8eb7102064a990deb913450a39dfd7cb
+DIST golint-0_pre20200301.tar.gz 31870 BLAKE2B 54fd5d0c8c490c95f397ce7889a696726a57e83b350e2133724d80d8500a7d3b2427e3fa24bc28d82c8b4ca32fb9c4e45ec8021fe6f499e320c8194bb113f229 SHA512 d62a20f02006d6e69391f5758ed1f3fe2c81a44e782d6a5530c6feacd9b1547168ae9401f84c92ff4adfcbda32d97049cd7afe47b00ee91ec50bc850c8ca9462
diff --git a/dev-go/golint/golint-0_pre20200301.ebuild b/dev-go/golint/golint-0_pre20200301.ebuild
new file mode 100644
index 000000000000..667f9da059da
--- /dev/null
+++ b/dev-go/golint/golint-0_pre20200301.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+EGIT_COMMIT=738671d3881b9731cc63024d5d88cf28db875626
+
+DESCRIPTION="a linter for Go"
+HOMEPAGE="https://github.com/golang/lint"
+
+EGO_SUM=(
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7"
+	"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+	)
+go-module_set_globals
+SRC_URI="https://github.com/golang/lint/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S=${WORKDIR}/lint-${EGIT_COMMIT}
+
+DOCS=(
+	CONTRIBUTING.md
+	README.md
+	misc
+)
+
+src_compile() {
+	env GOBIN="${S}/bin" go install ./... ||
+		die "compile failed"
+}
+
+src_install() {
+	dobin bin/*
+	einstalldocs
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 78466d886896..a472244d37aa 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/mmix/files/mmix-20160804-gcc-10.patch b/dev-lang/mmix/files/mmix-20160804-gcc-10.patch
new file mode 100644
index 000000000000..076d22952a51
--- /dev/null
+++ b/dev-lang/mmix/files/mmix-20160804-gcc-10.patch
@@ -0,0 +1,24 @@
+gcc-10 defaults to -fno-common. Causes linker errors for
+duplicate 'buffer' definition.
+--- a/mmix-config.w
++++ b/mmix-config.w
+@@ -357,7 +357,7 @@ print error messages.
+ 
+ @<Global variables@>=
+ FILE *config_file; /* input comes from here */
+-char buffer[BUF_SIZE]; /* input lines go here */
++static char buffer[BUF_SIZE]; /* input lines go here */
+ char token[BUF_SIZE]; /* and tokens are copied to here */
+ char *buf_pointer=buffer; /* this is our current position */
+ bool token_prescanned; /* does |token| contain the next token already? */
+--- a/mmmix.w
++++ b/mmmix.w
+@@ -115,7 +115,7 @@ and \Hex{fedcba9876543210} into location \Hex{0123456789b0}.
+ octa cur_loc;
+ octa cur_dat;
+ bool new_chunk;
+-char buffer[BUF_SIZE];
++static char buffer[BUF_SIZE];
+ FILE *prog_file;
+ 
+ @ @<Input a rudimentary hexadecimal file@>=
diff --git a/dev-lang/mmix/mmix-20160804-r1.ebuild b/dev-lang/mmix/mmix-20160804-r1.ebuild
index 65491269b4a1..15e84fef8c3a 100644
--- a/dev-lang/mmix/mmix-20160804-r1.ebuild
+++ b/dev-lang/mmix/mmix-20160804-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=7
@@ -24,6 +24,7 @@ S="${WORKDIR}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-20110420-makefile.patch
 	"${FILESDIR}"/${PN}-20131017-format-security.patch
+	"${FILESDIR}"/${PN}-20160804-gcc-10.patch
 )
 
 src_compile() {
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index 357a8e613e19..28903a0187ed 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -54,20 +54,6 @@ DIST rust-1.40.0-powerpc64le-unknown-linux-gnu.tar.xz 87972788 BLAKE2B ad1e460db
 DIST rust-1.40.0-s390x-unknown-linux-gnu.tar.xz 95398844 BLAKE2B e897ac3e1f46a63c7ad14e0e5229b7028ac325256e084439bcad0ced631eb26d50ca72710c46e59accb0e3d0574d08a9c15455be59a8d78173387d35ddd3bed7 SHA512 e71d3a1d85975653b6d972a4854c9e53be7f2d093a601145261c97f7917f869399fbc6322a04f63b782a5a28b91c3be40041a8c77367d19dec8d0e857cbbef14
 DIST rust-1.40.0-x86_64-unknown-linux-gnu.tar.xz 110186516 BLAKE2B ad89d8cecbd565b23c98ec095bad218de971cb4bb89924bbcb012df6c9ecf0db2b50d624abdf6b050fe1f5067aea9311dc01852950a5ca5e993e99f913fc5dbc SHA512 11a2ad1d8b9e91cbe9ee6a1954d46ac75eeaa83f0c2425a8ad70d191727b02e86ead33d6464222effca6f5134c31a165801a854aa57bdb5f12944d605de3c1d1
 DIST rust-1.40.0-x86_64-unknown-linux-musl.tar.xz 96869284 BLAKE2B 61cdf2eab51455e377e079e7013959ee51358c9846f8442f81a3240062af573f452a0f5f007e63cbbcdd0db98ac22ab0d4f3006f6ef30327b609d303410cba8c SHA512 3e6d7cf7b24c09d13266e06f20ab317c5ffb68de3242719c71e95c3d778269c4076e06badfb488e8fc223b822246ebbeb888d4168ddf6e2401793e23e77810bb
-DIST rust-1.41.0-aarch64-unknown-linux-gnu.tar.xz 96574096 BLAKE2B 1cd5e5c2cc9a53344e46f2bc88894346669f7395959e5beea921be1765d0c71fe2bd8f6cbf31bca91fef391e2e35dd8d477432d0a9e4c23b147ab9982b74870e SHA512 e96e17045fee7056c5cad764d77c79a995c0f969a12d7c0b8eb8e55235bd72d97fd6836c8ee283f09ab1447bf0ae931766db5db0703fb8d5ac647556c417c254
-DIST rust-1.41.0-arm-unknown-linux-gnueabi.tar.xz 99328148 BLAKE2B cf8426b77db7bcb310a0cf95322371b79df22f5f1c048675f460bd8eaac4d2a2e84ce0fc478287fc140fdfee54bcd7eb903be9aa37d59e9a6b562b3997533fcf SHA512 6a0a96967094ac9502c880158b163f2e33134bc849ffb01ef88dfed22d96483d82166e695ca21d9e9e96e56e5c83ede5dba9573f3225a3418c71e625f8e98470
-DIST rust-1.41.0-arm-unknown-linux-gnueabihf.tar.xz 99310972 BLAKE2B dfdb003e95034fe72287a0c2527e9a7b5c02cf3682263c225037e86a0d5a71250f067f757e0b099c4b8a639993ba9e9353562d64b750ceb31d67f98c9a8835d9 SHA512 3da429f804dd5c61375bedd06f1e6262b44dbed487644aeebadc0ea3438584855d48c67c75021e551e5527465213a9699ce4a8595f93c8ef3df2ed4bbd9b8c76
-DIST rust-1.41.0-armv7-unknown-linux-gnueabihf.tar.xz 103804972 BLAKE2B 7ecb1800f144f8ee0fa020b28cd5087cf20cb6583fcd334f0d07ab722a5cd078a4a94649e464c6778222ba197aec95154ed6ebdbff76aa83067695439bd4a255 SHA512 b699eb497145e36fbda283abd2881b0e879bc6713b170be04be3919fb2064153779e4535c6a513c667a79b6aa21c775dbd479af131db1a55c7caa4504e808fbd
-DIST rust-1.41.0-i686-unknown-linux-gnu.tar.xz 120547488 BLAKE2B cf5b240c6f116f4d54092c9d466e2eb8408584f3fb4b0759601ad0bcba59ff3d639debca1cc45ce490964a09b02a071fea0d2cbcac0f3a5ac0bbb5aedef6d6af SHA512 b9541e07bd92b9135c538e0d8d3b47577fd4a7019a7ba4ce99a85c568a724b9a31f76d8b547e944818f215af8f8347a7674f14b4e61b2f5fc09b83595415583b
-DIST rust-1.41.0-mips-unknown-linux-gnu.tar.xz 90976844 BLAKE2B eef629a270e53299df4a3e2beef6962c028e1c1380c86264ac72d80b3837e7ef44100ab6484b9f9bdc5e4415ce9897bdb14d9643d164ec3c2eb12825a8833bc3 SHA512 823d2f8ccd70b9f1506134d027972ae021aa2867ac53d2e8d77deaac2ab55310c5c6978ad17f259d82adfe79ed4973029052407e3412f30988d890e20745b812
-DIST rust-1.41.0-mips64-unknown-linux-gnuabi64.tar.xz 98858296 BLAKE2B 57c73264a8a82d32854fba3d3283b53068c4200b54b0cf90d7e185cec6392fef26a1128079f5c056ae5cf77d86a3cd25c2d96d089de60e5a43fc3f312f099f32 SHA512 4c67f719b4d6573d5a48b31922c76bf475ee025fcc66b23fcda1a5713da1fd02aac9d407af703af017b2ff9d76822d3ab3f452fb2081a52a6610cdc61bfd6b39
-DIST rust-1.41.0-mipsel-unknown-linux-gnu.tar.xz 92840348 BLAKE2B 6a94aa8999eaffcff1788d60b196a432840850383bb2b3530cc2097b1533ff139ae4ce47aff15e85352682e869c24f8680dd5126f37ba31f6b49562ccf74ce94 SHA512 e3ff18a44a79f7d1625ecd20963e9831d30d5eccb0b41f09cdceb1306671e53b9519c399a25b9d71890c1d2cd490b4bcdc59fc92b38db8f4f25e28cada5ce45c
-DIST rust-1.41.0-powerpc-unknown-linux-gnu.tar.xz 98469628 BLAKE2B f7b7cad2b7f702b5a67309bdae3ac94b3118c05e9a429ebeec22312ac8bd37d268f6e9f23acc59f35e89664d01fecc9216739346fa395d688e3266d994aaa961 SHA512 4af61af924dc103ee582b273cb7e4d66f45b8ea3955b90f3c59a11b2d057eba5ac915a33579761053b4f22216dc56de1ae4984ce3ddb789189a787888ec45306
-DIST rust-1.41.0-powerpc64-unknown-linux-gnu.tar.xz 104761152 BLAKE2B ff05e6ba0fd4a2bf74d01c459ad73c17503cf6fa877989130b0949e67300dfaa8f5a16be7e56c594d38aa1df680775fadc556686f7dd89630528a0db38e36339 SHA512 0c40a966ab9d8b485cc8e542b74fc7fec74e00f409744be79d38bddeff74b12e6a130fead8f13531210d123fd95be1fc476434cf26cedf25f74774de8fff42ee
-DIST rust-1.41.0-powerpc64le-unknown-linux-gnu.tar.xz 110799904 BLAKE2B c89548ec66be561fccca42922e418ba8bb952bd5848f69ad4606bf388076b1b0bb9d04bc7181792f1df3e9cf8d9014abe08fdc0a65eb8a73c0ccb79f6e3324b0 SHA512 5b9faee91ae2f4c472ba3155149ac9e3a300a149209e62393502a2d69730cba0361e4ddcbb0d5f1d3c26a93b7ebe1fc497d8573bad049e492156ca743603ef06
-DIST rust-1.41.0-s390x-unknown-linux-gnu.tar.xz 115153476 BLAKE2B 1646b42f5a2001f63b653c59d5e30d1b6c9f3a8c2d2d07a779cc530242fee1f5e92ae8dc1af2a81c57f93d615ad519d40ec6f5ceea79e56048ccae7a37d4a5ba SHA512 458b9877bf2569e6e3a0a6692228d4dda68506336587880f6a51254bab5cbb60c5f82673b0d44842137a426411f25146c08447f22e1a5b883dee99f52e30aeb0
-DIST rust-1.41.0-x86_64-unknown-linux-gnu.tar.xz 111122952 BLAKE2B e1380cf72c8db8279c7b0d4349f09efb040117b1ca70ed599cd5197c6c8a257a846213db372e5b2df93ee266124a8a410e348dc8d5502a537a9b86159afe7bbb SHA512 1f08ba8b82ee17e4ae8130a092913767bd448a580efa4eb06ca2c926234efc72d9b73e2b846102296b80e324697c0ac6f5d3768fbd159d49d248f307efc244ff
-DIST rust-1.41.0-x86_64-unknown-linux-musl.tar.xz 96497736 BLAKE2B 3a193cc6d607891c2c7800498dc499d13bc50ce1249cb553271ab3eef69ea8e309f5048bfca9470c61056469a933824527002d5cc3f10f2ef1aea5519226710a SHA512 bcffacbb48b1d76cbf2951e7233951d6d58c4696f13b3ae616ca661bd8c20ebefd9420c494327d91999b76a34a6afe957281187e8fb5ce9cb968a3cfa8c23ea8
 DIST rust-1.41.1-aarch64-unknown-linux-gnu.tar.xz 96755608 BLAKE2B f8635737089bb028cfac6d6478c4226a78c2c8a8aa12f28cba267744e2e915e062f49edb505f26b6deaeca0d2fdb4ec4b83e791f87bf1eab6c0536dc41e2c641 SHA512 54eac5c380b418c1714931ead7d6284b225bb427fcc501e147240000b71d31b667e308aea7f38f3299b1311ab04f19011b914d37a4581c7a64028965569cd58e
 DIST rust-1.41.1-arm-unknown-linux-gnueabi.tar.xz 98856136 BLAKE2B dbb3996a9ae302290886bf1cd4642d99a9b3f883f9d39817bb15f105565147e416e23d19e0d08314b08ed441f1ac528c20d8bee27ccef68cb585d8ef64a19e45 SHA512 1b01acd430af3cf99d838aa367dec4f6e4bfcec91388d4a2323cd781d53246edae0f14687b087b73b87c349f243e3acabe193538ce31303f07d59c6a03c31565
 DIST rust-1.41.1-arm-unknown-linux-gnueabihf.tar.xz 99107336 BLAKE2B 0dd84e7ad6081b8fdcfcb2691496ed3a493e08db4757e6d3bb2aa9a36fc6f020772a84bc21d0c60efeecf635512f25737b8d6b49a53020c4045c89c5b89881d7 SHA512 462e6d354a4b3b848781bb059decc5eb1ebb4d8a31651623d076a2654e2c8fd02f0f87ddafb124efa40cb134c9438eb252035c2b5bfdf936881b14a23bfbfe9f
diff --git a/dev-lang/rust-bin/rust-bin-1.41.0.ebuild b/dev-lang/rust-bin/rust-bin-1.41.0.ebuild
deleted file mode 100644
index e61242a31c03..000000000000
--- a/dev-lang/rust-bin/rust-bin-1.41.0.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 rust-toolchain toolchain-funcs
-
-MY_P="rust-${PV}"
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="https://www.rust-lang.org/"
-SRC_URI="$(rust_all_arch_uris ${MY_P})"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-SLOT="stable"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-IUSE="clippy cpu_flags_x86_sse2 doc libressl rustfmt"
-
-DEPEND=""
-RDEPEND=">=app-eselect/eselect-rust-20190311
-	sys-libs/zlib
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-libs/libssh2
-	net-misc/curl[ssl]
-	!dev-lang/rust:0
-	!dev-util/cargo
-	rustfmt? ( !dev-util/rustfmt )"
-REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )"
-
-QA_PREBUILT="
-	opt/${P}/bin/*-${PV}
-	opt/${P}/lib/*.so
-	opt/${P}/lib/rustlib/*/bin/*
-	opt/${P}/lib/rustlib/*/lib/*.so
-	opt/${P}/lib/rustlib/*/lib/*.rlib*
-"
-
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
-		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
-	fi
-}
-
-src_unpack() {
-	default
-	mv "${WORKDIR}/${MY_P}-$(rust_abi)" "${S}" || die
-}
-
-src_install() {
-	local std=$(grep 'std' ./components)
-	local components="rustc,cargo,${std}"
-	use doc && components="${components},rust-docs"
-	use clippy && components="${components},clippy-preview"
-	use rustfmt && components="${components},rustfmt-preview"
-	./install.sh \
-		--components="${components}" \
-		--disable-verify \
-		--prefix="${ED}/opt/${P}" \
-		--mandir="${ED}/usr/share/${P}/man" \
-		--disable-ldconfig \
-		|| die
-
-	local rustc=rustc-bin-${PV}
-	local rustdoc=rustdoc-bin-${PV}
-	local rustgdb=rust-gdb-bin-${PV}
-	local rustgdbgui=rust-gdbgui-bin-${PV}
-	local rustlldb=rust-lldb-bin-${PV}
-
-	mv "${ED}/opt/${P}/bin/rustc" "${ED}/opt/${P}/bin/${rustc}" || die
-	mv "${ED}/opt/${P}/bin/rustdoc" "${ED}/opt/${P}/bin/${rustdoc}" || die
-	mv "${ED}/opt/${P}/bin/rust-gdb" "${ED}/opt/${P}/bin/${rustgdb}" || die
-	mv "${ED}/opt/${P}/bin/rust-gdbgui" "${ED}/opt/${P}/bin/${rustgdbgui}" || die
-	mv "${ED}/opt/${P}/bin/rust-lldb" "${ED}/opt/${P}/bin/${rustlldb}" || die
-
-	dosym "${rustc}" "/opt/${P}/bin/rustc"
-	dosym "${rustdoc}" "/opt/${P}/bin/rustdoc"
-	dosym "${rustgdb}" "/opt/${P}/bin/rust-gdb"
-	dosym "${rustgdbgui}" "/opt/${P}/bin/rust-gdbgui"
-	dosym "${rustlldb}" "/opt/${P}/bin/rust-lldb"
-
-	dosym "../../opt/${P}/bin/${rustc}" "/usr/bin/${rustc}"
-	dosym "../../opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}"
-	dosym "../../opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}"
-	dosym "../../opt/${P}/bin/${rustgdbgui}" "/usr/bin/${rustgdbgui}"
-	dosym "../../opt/${P}/bin/${rustlldb}" "/usr/bin/${rustlldb}"
-
-	local cargo=cargo-bin-${PV}
-	mv "${ED}/opt/${P}/bin/cargo" "${ED}/opt/${P}/bin/${cargo}" || die
-	dosym "${cargo}" "/opt/${P}/bin/cargo"
-	dosym "../../opt/${P}/bin/${cargo}" "/usr/bin/${cargo}"
-
-	if use clippy; then
-		local clippy_driver=clippy-driver-bin-${PV}
-		local cargo_clippy=cargo-clippy-bin-${PV}
-		mv "${ED}/opt/${P}/bin/clippy-driver" "${ED}/opt/${P}/bin/${clippy_driver}" || die
-		mv "${ED}/opt/${P}/bin/cargo-clippy" "${ED}/opt/${P}/bin/${cargo_clippy}" || die
-		dosym "${clippy_driver}" "/opt/${P}/bin/clippy-driver"
-		dosym "${cargo_clippy}" "/opt/${P}/bin/cargo-clippy"
-		dosym "../../opt/${P}/bin/${clippy_driver}" "/usr/bin/${clippy_driver}"
-		dosym "../../opt/${P}/bin/${cargo_clippy}" "/usr/bin/${cargo_clippy}"
-	fi
-	if use rustfmt; then
-		local rustfmt=rustfmt-bin-${PV}
-		local cargo_fmt=cargo-fmt-bin-${PV}
-		mv "${ED}/opt/${P}/bin/rustfmt" "${ED}/opt/${P}/bin/${rustfmt}" || die
-		mv "${ED}/opt/${P}/bin/cargo-fmt" "${ED}/opt/${P}/bin/${cargo_fmt}" || die
-		dosym "${rustfmt}" "/opt/${P}/bin/rustfmt"
-		dosym "${cargo_fmt}" "/opt/${P}/bin/cargo-fmt"
-		dosym "../../opt/${P}/bin/${rustfmt}" "/usr/bin/${rustfmt}"
-		dosym "../../opt/${P}/bin/${cargo_fmt}" "/usr/bin/${cargo_fmt}"
-	fi
-
-	cat <<-EOF > "${T}"/50${P}
-	LDPATH="/opt/${P}/lib"
-	MANPATH="/usr/share/${P}/man"
-	EOF
-	doenvd "${T}"/50${P}
-
-	# note: eselect-rust adds EROOT to all paths below
-	cat <<-EOF > "${T}/provider-${P}"
-	/usr/bin/rustdoc
-	/usr/bin/rust-gdb
-	/usr/bin/rust-gdbgui
-	/usr/bin/rust-lldb
-	EOF
-	echo /usr/bin/cargo >> "${T}/provider-${P}"
-	if use clippy; then
-		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
-		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
-	fi
-	if use rustfmt; then
-		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
-		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
-	fi
-
-	insinto /etc/env.d/rust
-	doins "${T}/provider-${P}"
-}
-
-pkg_postinst() {
-	eselect rust update --if-unset
-
-	elog "Rust installs a helper script for calling GDB now,"
-	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV},"
-
-	if has_version app-editors/emacs; then
-		elog "install app-emacs/rust-mode to get emacs support for rust."
-	fi
-
-	if has_version app-editors/gvim || has_version app-editors/vim; then
-		elog "install app-vim/rust-vim to get vim support for rust."
-	fi
-
-	if use elibc_musl; then
-		ewarn "${PN} on *-musl targets is configured with crt-static"
-		ewarn ""
-		ewarn "you will need to set RUSTFLAGS=\"-C target-feature=-crt-static\" in make.conf"
-		ewarn "to use it with portage, otherwise you may see failures like"
-		ewarn "error: cannot produce proc-macro for serde_derive v1.0.98 as the target "
-		ewarn "x86_64-unknown-linux-musl does not support these crate types"
-	fi
-}
-
-pkg_postrm() {
-	eselect rust cleanup
-}
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index a38ac2d2b291..c26da6db2c7e 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -72,5 +72,4 @@ DIST rustc-1.37.0-src.tar.xz 98654252 BLAKE2B ddee92c7959a0e1ee11ffe5ded6017703c
 DIST rustc-1.38.0-src.tar.xz 96163304 BLAKE2B 1e900b44db64727477ccf8e58e0ebb9ec209bbeb349816b5f7937e58c165db8befae33c5667732e5aaaa677c5a6c1e0229d9969ab8967fda9b8d7a593e6c5eb6 SHA512 b756d29a7a222bc7b5c7f42ff397346ab840f78e559f93e6e36b65e76eea525cf429899fe4de9fb8966623a2225b552feef9fa831bee50f9e25c976fa2af8c0a
 DIST rustc-1.39.0-src.tar.xz 96495140 BLAKE2B 6df6bf0c3b38c28753713acdc477ea6929740c32893171dd9b8620992439e45730ef6f9489a6fc411ff5884c661ac4c07b7b93f5a4174207ed53351d2dea09bf SHA512 8610b2ec77722087c572bd84ac562a5b7c5f1a644aea58c5d5daa07a9aed242703b7816e73e2eaa049f773d5907859e259744a0de700622df005584fd798dab0
 DIST rustc-1.40.0-src.tar.xz 92306352 BLAKE2B 762b9592414e5c816540f6fd37d07b3b0ffe97a151968cc8ae77be2fda03a6d66905192985edc65055cc7811dbd90faa2b2c056481f72161c6f7ccbcce13671a SHA512 b5ac3079acefb62d3c985b77f624d7fb68de23a59396fed9ccb292db61641c064f3146ee54d3cf59067b17ebfaadd14a6b2b466def60316bb5b13ba3aef01e1f
-DIST rustc-1.41.0-src.tar.xz 93763052 BLAKE2B a68524fb6e3abb43d52ae6676a1e9de1c5d33606eaea6e93bb518f10b196d620f2f370c631c32e39a624af71a3bf6911662a9df7eecb8dde78a20c8054a349fc SHA512 0e30fe53b77860085bea0f1f60315eb835b00dd796c5d1b98ed44fe6fc27336dfb064908c86e1669a9cbe81c9ca1495e1c259a8a268bef23b23805a719cef0dd
 DIST rustc-1.41.1-src.tar.xz 93754192 BLAKE2B 235ece650d0c75e1c8700ce73d3811997cd0d827b850a6dd435a269f3f86d85849d54755ea346c5ddcbe0d1224836fd78213f6abeab4a9a8c4c3e2d8a05ff7b4 SHA512 ef33565c9cf4e27ca279072bfed3301e0276c09407d49727640746ba78d289de285278d64b1cce8708461fd6c97c7ab2ea8d56e7a4c4a23b2e66e2d164c35fc9
diff --git a/dev-lang/rust/rust-1.40.0-r1.ebuild b/dev-lang/rust/rust-1.40.0-r1.ebuild
index 8ac9b0156ead..87dae358f2ed 100644
--- a/dev-lang/rust/rust-1.40.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.40.0-r1.ebuild
@@ -82,7 +82,7 @@ DEPEND="${COMMON_DEPEND}
 		>=sys-devel/clang-3.5
 	)
 	system-bootstrap? ( ${BOOTSTRAP_DEPEND}	)
-	system-llvm? (
+	!system-llvm? (
 		dev-util/cmake
 		dev-util/ninja
 	)
diff --git a/dev-lang/rust/rust-1.41.0.ebuild b/dev-lang/rust/rust-1.41.0.ebuild
deleted file mode 100644
index c3b18cdfc52d..000000000000
--- a/dev-lang/rust/rust-1.41.0.ebuild
+++ /dev/null
@@ -1,369 +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 bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
-
-if [[ ${PV} = *beta* ]]; then
-	betaver=${PV//*beta}
-	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"
-else
-	ABI_VER="$(ver_cut 1-2)"
-	SLOT="stable/${ABI_VER}"
-	MY_P="rustc-${PV}"
-	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-fi
-
-RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
-
-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
-	!system-bootstrap? ( $(rust_all_arch_uris rust-${RUST_STAGE0_VERSION}) )
-"
-
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-
-IUSE="clippy cpu_flags_x86_sse2 debug doc libressl nightly parallel-compiler rls rustfmt system-bootstrap system-llvm wasm ${ALL_LLVM_TARGETS[*]}"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling more than one slot
-# simultaneously.
-
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_DEPEND="
-	|| (
-		sys-devel/llvm:9[llvm_targets_WebAssembly?]
-		wasm? ( =sys-devel/lld-9* )
-	)
-	<sys-devel/llvm-10:=
-"
-LLVM_MAX_SLOT=9
-
-BOOTSTRAP_DEPEND="|| ( >=dev-lang/rust-1.$(($(ver_cut 2) - 1)).0-r1 >=dev-lang/rust-bin-1.$(($(ver_cut 2) - 1)) )"
-
-COMMON_DEPEND="
-	net-libs/libssh2:=
-	net-libs/http-parser:=
-	net-misc/curl:=[ssl]
-	sys-libs/zlib:=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	elibc_musl? ( sys-libs/libunwind )
-	system-llvm? (
-		${LLVM_DEPEND}
-	)
-"
-
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	|| (
-		>=sys-devel/gcc-4.7
-		>=sys-devel/clang-3.5
-	)
-	system-bootstrap? ( ${BOOTSTRAP_DEPEND}	)
-	system-llvm? (
-		dev-util/cmake
-		dev-util/ninja
-	)
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-eselect/eselect-rust-20190311
-"
-
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
-	parallel-compiler? ( nightly )
-	wasm? ( llvm_targets_WebAssembly )
-	x86? ( cpu_flags_x86_sse2 )
-"
-
-QA_FLAGS_IGNORED="
-	usr/bin/*-${PV}
-	usr/lib*/lib*.so
-	usr/lib/rustlib/*/codegen-backends/librustc_codegen_llvm-llvm.so
-	usr/lib/rustlib/*/lib/lib*.so
-"
-
-QA_SONAME="usr/lib.*/librustc_macros.*.so"
-
-PATCHES=(
-	"${FILESDIR}"/1.40.0-add-soname.patch
-	"${FILESDIR}"/llvm-gcc10.patch
-)
-
-S="${WORKDIR}/${MY_P}-src"
-
-toml_usex() {
-	usex "$1" true false
-}
-
-pre_build_checks() {
-	CHECKREQS_DISK_BUILD="10G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="15G"
-	fi
-	eshopts_pop
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-	python-any-r1_pkg_setup
-
-	# use bundled for now, #707746
-	# will need dev-libs/libgit2 slotted dep if re-enabled
-	#export LIBGIT2_SYS_USE_PKG_CONFIG=1
-	export LIBSSH2_SYS_USE_PKG_CONFIG=1
-	export PKG_CONFIG_ALLOW_CROSS=1
-
-	if use system-llvm; then
-		llvm_pkg_setup
-
-		local llvm_config="$(get_llvm_prefix "$LLVM_MAX_SLOT")/bin/llvm-config"
-
-		export LLVM_LINK_SHARED=1
-		export RUSTFLAGS="${RUSTFLAGS} -Lnative=$("${llvm_config}" --libdir)"
-	fi
-}
-
-src_prepare() {
-	if ! use system-bootstrap; then
-		local rust_stage0_root="${WORKDIR}"/rust-stage0
-		local rust_stage0="rust-${RUST_STAGE0_VERSION}-$(rust_abi)"
-
-		"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig \
-			--destdir="${rust_stage0_root}" --prefix=/ || die
-	fi
-
-	default
-}
-
-src_configure() {
-	local rust_target="" rust_targets="" arch_cflags
-
-	# Collect rust target names to compile standard libs for all ABIs.
-	for v in $(multilib_get_enabled_abi_pairs); do
-		rust_targets="${rust_targets},\"$(rust_abi $(get_abi_CHOST ${v##*.}))\""
-	done
-	if use wasm; then
-		rust_targets="${rust_targets},\"wasm32-unknown-unknown\""
-	fi
-	rust_targets="${rust_targets#,}"
-
-	local extended="true" tools="\"cargo\","
-	if use clippy; then
-		tools="\"clippy\",$tools"
-	fi
-	if use rls; then
-		tools="\"rls\",\"analysis\",\"src\",$tools"
-	fi
-	if use rustfmt; then
-		tools="\"rustfmt\",$tools"
-	fi
-
-	local rust_stage0_root
-	if use system-bootstrap; then
-		rust_stage0_root="$(rustc --print sysroot)"
-	else
-		rust_stage0_root="${WORKDIR}"/rust-stage0
-	fi
-
-	rust_target="$(rust_abi)"
-
-	cat <<- EOF > "${S}"/config.toml
-		[llvm]
-		optimize = $(toml_usex !debug)
-		release-debuginfo = $(toml_usex debug)
-		assertions = $(toml_usex debug)
-		targets = "${LLVM_TARGETS// /;}"
-		experimental-targets = ""
-		link-shared = $(toml_usex system-llvm)
-		[build]
-		build = "${rust_target}"
-		host = ["${rust_target}"]
-		target = [${rust_targets}]
-		cargo = "${rust_stage0_root}/bin/cargo"
-		rustc = "${rust_stage0_root}/bin/rustc"
-		docs = $(toml_usex doc)
-		compiler-docs = $(toml_usex doc)
-		submodules = false
-		python = "${EPYTHON}"
-		locked-deps = true
-		vendor = true
-		extended = ${extended}
-		tools = [${tools}]
-		verbose = 2
-		[install]
-		prefix = "${EPREFIX}/usr"
-		libdir = "lib"
-		docdir = "share/doc/${PF}"
-		mandir = "share/man"
-		[rust]
-		optimize = $(toml_usex !debug)
-		debug = $(toml_usex debug)
-		debug-assertions = $(toml_usex debug)
-		default-linker = "$(tc-getCC)"
-		parallel-compiler = $(toml_usex parallel-compiler)
-		channel = "$(usex nightly nightly stable)"
-		rpath = false
-		lld = $(usex system-llvm false $(toml_usex wasm))
-		[dist]
-		src-tarball = false
-	EOF
-
-	for v in $(multilib_get_enabled_abi_pairs); do
-		rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
-		arch_cflags="$(get_abi_CFLAGS ${v##*.})"
-
-		cat <<- EOF >> "${S}"/config.env
-			CFLAGS_${rust_target}=${arch_cflags}
-		EOF
-
-		cat <<- EOF >> "${S}"/config.toml
-			[target.${rust_target}]
-			cc = "$(tc-getBUILD_CC)"
-			cxx = "$(tc-getBUILD_CXX)"
-			linker = "$(tc-getCC)"
-			ar = "$(tc-getAR)"
-		EOF
-		# librustc_target/spec/linux_musl_base.rs sets base.crt_static_default = true;
-		if use elibc_musl; then
-			cat <<- EOF >> "${S}"/config.toml
-				crt-static = false
-			EOF
-		fi
-		if use system-llvm; then
-			cat <<- EOF >> "${S}"/config.toml
-				llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
-			EOF
-		fi
-	done
-
-	if use wasm; then
-		cat <<- EOF >> "${S}"/config.toml
-			[target.wasm32-unknown-unknown]
-			linker = "$(usex system-llvm lld rust-lld)"
-		EOF
-	fi
-}
-
-src_compile() {
-	env $(cat "${S}"/config.env)\
-		"${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) \
-		--exclude src/tools/miri || die # https://github.com/rust-lang/rust/issues/52305
-}
-
-src_install() {
-	env DESTDIR="${D}" "${EPYTHON}" ./x.py install -vv --config="${S}"/config.toml \
-	--exclude src/tools/miri || die
-
-	# bug #689562, #689160
-	rm "${D}/etc/bash_completion.d/cargo" || die
-	rmdir "${D}"/etc{/bash_completion.d,} || die
-	dobashcomp build/tmp/dist/cargo-image/etc/bash_completion.d/cargo
-
-	mv "${ED}/usr/bin/rustc" "${ED}/usr/bin/rustc-${PV}" || die
-	mv "${ED}/usr/bin/rustdoc" "${ED}/usr/bin/rustdoc-${PV}" || die
-	mv "${ED}/usr/bin/rust-gdb" "${ED}/usr/bin/rust-gdb-${PV}" || die
-	mv "${ED}/usr/bin/rust-gdbgui" "${ED}/usr/bin/rust-gdbgui-${PV}" || die
-	mv "${ED}/usr/bin/rust-lldb" "${ED}/usr/bin/rust-lldb-${PV}" || die
-	mv "${ED}/usr/bin/cargo" "${ED}/usr/bin/cargo-${PV}" || die
-	if use clippy; then
-		mv "${ED}/usr/bin/clippy-driver" "${ED}/usr/bin/clippy-driver-${PV}" || die
-		mv "${ED}/usr/bin/cargo-clippy" "${ED}/usr/bin/cargo-clippy-${PV}" || die
-	fi
-	if use rls; then
-		mv "${ED}/usr/bin/rls" "${ED}/usr/bin/rls-${PV}" || die
-	fi
-	if use rustfmt; then
-		mv "${ED}/usr/bin/rustfmt" "${ED}/usr/bin/rustfmt-${PV}" || die
-		mv "${ED}/usr/bin/cargo-fmt" "${ED}/usr/bin/cargo-fmt-${PV}" || die
-	fi
-
-	# Move public shared libs to abi specific libdir
-	# Private and target specific libs MUST stay in /usr/lib/rustlib/${rust_target}/lib
-	if [[ $(get_libdir) != lib ]]; then
-		dodir /usr/$(get_libdir)
-		mv "${ED}/usr/lib"/*.so "${ED}/usr/$(get_libdir)/" || die
-	fi
-
-	dodoc COPYRIGHT
-
-	# note: eselect-rust adds EROOT to all paths below
-	cat <<-EOF > "${T}/provider-${P}"
-		/usr/bin/rustdoc
-		/usr/bin/rust-gdb
-		/usr/bin/rust-gdbgui
-		/usr/bin/rust-lldb
-	EOF
-	echo /usr/bin/cargo >> "${T}/provider-${P}"
-	if use clippy; then
-		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
-		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
-	fi
-	if use rls; then
-		echo /usr/bin/rls >> "${T}/provider-${P}"
-	fi
-	if use rustfmt; then
-		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
-		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
-	fi
-
-	insinto /etc/env.d/rust
-	doins "${T}/provider-${P}"
-}
-
-pkg_postinst() {
-	eselect rust update --if-unset
-
-	elog "Rust installs a helper script for calling GDB and LLDB,"
-	elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
-
-	ewarn "cargo is now installed from dev-lang/rust{,-bin} instead of dev-util/cargo."
-	ewarn "This might have resulted in a dangling symlink for /usr/bin/cargo on some"
-	ewarn "systems. This can be resolved by calling 'sudo eselect rust set ${P}'."
-
-	if has_version app-editors/emacs; then
-		elog "install app-emacs/rust-mode to get emacs support for rust."
-	fi
-
-	if has_version app-editors/gvim || has_version app-editors/vim; then
-		elog "install app-vim/rust-vim to get vim support for rust."
-	fi
-
-	if use elibc_musl; then
-		ewarn "${PN} on *-musl targets is configured with crt-static"
-		ewarn ""
-		ewarn "you will need to set RUSTFLAGS=\"-C target-feature=-crt-static\" in make.conf"
-		ewarn "to use it with portage, otherwise you may see failures like"
-		ewarn "error: cannot produce proc-macro for serde_derive v1.0.98 as the target "
-		ewarn "x86_64-unknown-linux-musl does not support these crate types"
-	fi
-}
-
-pkg_postrm() {
-	eselect rust cleanup
-}
diff --git a/dev-lang/rust/rust-1.41.1.ebuild b/dev-lang/rust/rust-1.41.1.ebuild
index 1c3432bfa5bc..bcd7281b8c81 100644
--- a/dev-lang/rust/rust-1.41.1.ebuild
+++ b/dev-lang/rust/rust-1.41.1.ebuild
@@ -79,7 +79,7 @@ DEPEND="${COMMON_DEPEND}
 		>=sys-devel/clang-3.5
 	)
 	system-bootstrap? ( ${BOOTSTRAP_DEPEND}	)
-	system-llvm? (
+	!system-llvm? (
 		dev-util/cmake
 		dev-util/ninja
 	)
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index bf4ac4bcf896..eb957250f86d 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -5,4 +5,4 @@ DIST vala-0.40.19.tar.xz 3435688 BLAKE2B caacacd0ed33a5a1fd465c7494d326941225f4c
 DIST vala-0.44.11.tar.xz 3370248 BLAKE2B c111b6175e6339148e30bedc77f62a9ef3ec912ad0621c9303fc5dba31694173b49ccc433d3681303d64a1e442ed9b7b064f27931369cb13fa028bfc25ffa3c9 SHA512 6111699039ed37084426d7603b82dfa9bd497c66ba7353ee22e8541bf15a2cbb634d315593c093f18c20bac877ae34884e5b570cd25237ce12aa73e941c4c540
 DIST vala-0.44.9.tar.xz 3363004 BLAKE2B b87f8f7d9cda5a77486720b8c542c42ed448cfbb6a1bae899591a799dcf25882a0539c3acef282d0ba42a7ea78d68e7a5d99aa4daa306a70afe6938732d03c25 SHA512 9af559a6cb1680013886a4d425e619503d60394f2c7b1ab897cc7830ee566f8122dcd4380b78b551fbf556cead623c245adc1f7f3357b8315be8c120412a3e9f
 DIST vala-0.46.6.tar.xz 3383032 BLAKE2B c7f38cf617f3a0d5a5915ebedd320ef6a5c3714e21618e95756529e1fb09abc12417f31aeefc0111e828da5c2dabd6195b07bb1cc69c6e74f73d72fe7403637a SHA512 ab24c3ad37af62e38289fd085a33f72e178e0b58c1f24c27c58c1010270a4b0e5cb4cc510b6147c51e5796a7ae63aed3a4ac219b24ff985f2546e25c9ad48992
-DIST vala-0.48.0.tar.xz 3423156 BLAKE2B 4577e468d186afb4ff237068c29204f220d64cb244953cfc10b74a1792841f6d3db8d69b2d3119a4ab35aed1ca7743e0d84a3a786efdea9ed58fdfced0472d09 SHA512 77c85ee60bee92f2488fc1f7d21d1ab6886698ff5c303dff539c7aa3a178ed9ea402498e97b79b5a306ad4a25b19ae13e8ce78e389f8310315545422a11dd7d9
+DIST vala-0.48.1.tar.xz 3426388 BLAKE2B b5ba777ef76c01875e89322097ea2da9ac3e7641f13453c9d0d5b2c0309af5a89069f3d16b1e78b69fe7b93d12e22712511277925c5b3eaaaec3e76a1d81e7e2 SHA512 f399f81b77eb6acb7f7dcd8eb88c9f4597c7c47a4c6311a0d70db24080f0faa34d1077bf4e644ee2f3b3a8d4993c6561e17583a2010ca5f6850d53e2af532e51
diff --git a/dev-lang/vala/vala-0.48.0.ebuild b/dev-lang/vala/vala-0.48.1.ebuild
similarity index 100%
rename from dev-lang/vala/vala-0.48.0.ebuild
rename to dev-lang/vala/vala-0.48.1.ebuild
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index d2af7577adf3..9a35d07de031 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/intel-neo/Manifest b/dev-libs/intel-neo/Manifest
index 2e3340a7f2d3..da3fb1383987 100644
--- a/dev-libs/intel-neo/Manifest
+++ b/dev-libs/intel-neo/Manifest
@@ -1,2 +1,2 @@
-DIST intel-neo-19.48.14977.tar.gz 2633172 BLAKE2B 296c85c89833e49f66c428b62fda9753de260bfc819ee24846bc100021f103d2dcc432a9a8a60d310737470c7a4afece4fef557f72da40470ea950f8198bda0e SHA512 24a5f5306b90c763e803c34d3f20227ae0f22e6ff4192a0550e9e3050173b50f2b2e391250f1733676eca45002a061e2c753e7546db7dd21af7c1ed0857f329f
 DIST intel-neo-20.03.15346.tar.gz 2671869 BLAKE2B cf1e242563a377d533b1e5adc89257e3fdd879a0f275f069e9c1c3c8436e269a1ec57e951394d2a487148bfc5393fed0ce1f3feb6954c7ece9de59cccffd628c SHA512 4d2cc8fdcba714832306e6353e8688e12c44eb0f848aad981951ee092274ba8ae032db462b49e874b7ac72e1b8b2b9ba71a84b6715ca241c06a1c70e753e5ed3
+DIST intel-neo-20.10.16087.tar.gz 2942516 BLAKE2B ed77e5dfe950794e9e34cc6a0d8c053292b5673b9fa244ef7b861da93bb6aa58161ad890719013c838b0bbd80f3c22aaafc60dcb72a1e1e565cab51e5467c810 SHA512 8a728a3cffb5960dba8e8ecc160a6f0dd9c2cbadead3db3af2df71af492fdb346628a20c55112e64debb32eb25cf549e42dc78a606ef4bb8f746913781dbb446
diff --git a/dev-libs/intel-neo/intel-neo-19.48.14977.ebuild b/dev-libs/intel-neo/intel-neo-20.10.16087.ebuild
similarity index 81%
rename from dev-libs/intel-neo/intel-neo-19.48.14977.ebuild
rename to dev-libs/intel-neo/intel-neo-20.10.16087.ebuild
index 09ff894e4be2..0e9d2b7efd27 100644
--- a/dev-libs/intel-neo/intel-neo-19.48.14977.ebuild
+++ b/dev-libs/intel-neo/intel-neo-20.10.16087.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 cmake-utils
+inherit cmake
 
 MY_PN="compute-runtime"
 MY_P="${MY_PN}-${PV}"
@@ -19,11 +19,11 @@ IUSE="vaapi"
 
 BDEPEND="virtual/pkgconfig"
 COMMON="dev-libs/ocl-icd
-	>=dev-util/intel-graphics-compiler-1.0.2990
-	>=media-libs/gmmlib-19.3.4
+	>=dev-util/intel-graphics-compiler-1.0.3445
+	>=media-libs/gmmlib-19.4.1
 	vaapi? (
 		x11-libs/libdrm[video_cards_intel]
-		>=x11-libs/libva-2.0.0
+		x11-libs/libva
 	)"
 DEPEND="${COMMON}
 	media-libs/mesa"	# for Khronos OpenGL headers
@@ -31,8 +31,7 @@ RDEPEND="${COMMON}"
 
 DOCS=(
 	README.md
-	documentation/FAQ.md
-	documentation/LIMITATIONS.md
+	FAQ.md
 )
 
 S="${WORKDIR}"/${MY_P}
@@ -46,7 +45,7 @@ src_configure() {
 		# the hardware.
 		-DSKIP_UNIT_TESTS=ON
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/dev-libs/nss-pem/nss-pem-1.0.5.ebuild b/dev-libs/nss-pem/nss-pem-1.0.5.ebuild
index 0364f65447a6..8c408455b23d 100644
--- a/dev-libs/nss-pem/nss-pem-1.0.5.ebuild
+++ b/dev-libs/nss-pem/nss-pem-1.0.5.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+CMAKE_ECLASS="cmake"
+
 inherit cmake-multilib
 
 DESCRIPTION="PEM file reader for Network Security Services (NSS)"
@@ -21,3 +23,10 @@ DEPEND="!<=dev-libs/nss-3.50
 	${RDEPEND}"
 
 S="${WORKDIR}/${P}/src"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 34a05819e152..4172093ba857 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,4 +1,4 @@
 DIST vala-0.44.11.tar.xz 3370248 BLAKE2B c111b6175e6339148e30bedc77f62a9ef3ec912ad0621c9303fc5dba31694173b49ccc433d3681303d64a1e442ed9b7b064f27931369cb13fa028bfc25ffa3c9 SHA512 6111699039ed37084426d7603b82dfa9bd497c66ba7353ee22e8541bf15a2cbb634d315593c093f18c20bac877ae34884e5b570cd25237ce12aa73e941c4c540
 DIST vala-0.44.9.tar.xz 3363004 BLAKE2B b87f8f7d9cda5a77486720b8c542c42ed448cfbb6a1bae899591a799dcf25882a0539c3acef282d0ba42a7ea78d68e7a5d99aa4daa306a70afe6938732d03c25 SHA512 9af559a6cb1680013886a4d425e619503d60394f2c7b1ab897cc7830ee566f8122dcd4380b78b551fbf556cead623c245adc1f7f3357b8315be8c120412a3e9f
 DIST vala-0.46.6.tar.xz 3383032 BLAKE2B c7f38cf617f3a0d5a5915ebedd320ef6a5c3714e21618e95756529e1fb09abc12417f31aeefc0111e828da5c2dabd6195b07bb1cc69c6e74f73d72fe7403637a SHA512 ab24c3ad37af62e38289fd085a33f72e178e0b58c1f24c27c58c1010270a4b0e5cb4cc510b6147c51e5796a7ae63aed3a4ac219b24ff985f2546e25c9ad48992
-DIST vala-0.48.0.tar.xz 3423156 BLAKE2B 4577e468d186afb4ff237068c29204f220d64cb244953cfc10b74a1792841f6d3db8d69b2d3119a4ab35aed1ca7743e0d84a3a786efdea9ed58fdfced0472d09 SHA512 77c85ee60bee92f2488fc1f7d21d1ab6886698ff5c303dff539c7aa3a178ed9ea402498e97b79b5a306ad4a25b19ae13e8ce78e389f8310315545422a11dd7d9
+DIST vala-0.48.1.tar.xz 3426388 BLAKE2B b5ba777ef76c01875e89322097ea2da9ac3e7641f13453c9d0d5b2c0309af5a89069f3d16b1e78b69fe7b93d12e22712511277925c5b3eaaaec3e76a1d81e7e2 SHA512 f399f81b77eb6acb7f7dcd8eb88c9f4597c7c47a4c6311a0d70db24080f0faa34d1077bf4e644ee2f3b3a8d4993c6561e17583a2010ca5f6850d53e2af532e51
diff --git a/dev-libs/vala-common/vala-common-0.48.0.ebuild b/dev-libs/vala-common/vala-common-0.48.1.ebuild
similarity index 100%
rename from dev-libs/vala-common/vala-common-0.48.0.ebuild
rename to dev-libs/vala-common/vala-common-0.48.1.ebuild
diff --git a/dev-python/git-python/git-python-2.1.11.ebuild b/dev-python/GitPython/GitPython-2.1.11.ebuild
similarity index 100%
rename from dev-python/git-python/git-python-2.1.11.ebuild
rename to dev-python/GitPython/GitPython-2.1.11.ebuild
diff --git a/dev-python/git-python/git-python-3.1.0.ebuild b/dev-python/GitPython/GitPython-3.1.0.ebuild
similarity index 82%
rename from dev-python/git-python/git-python-3.1.0.ebuild
rename to dev-python/GitPython/GitPython-3.1.0.ebuild
index b1a476254713..8d0903d98997 100644
--- a/dev-python/git-python/git-python-3.1.0.ebuild
+++ b/dev-python/GitPython/GitPython-3.1.0.ebuild
@@ -8,26 +8,21 @@ PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
-MY_PN=GitPython
-MY_P=${MY_PN}-${PV}
 GITDB_P=gitdb-4.0.2
 SMMAP_P=smmap-3.0.1
 
 DESCRIPTION="Library used to interact with Git repositories"
 HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/"
-SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
 	test? (
-		https://dev.gentoo.org/~mgorny/dist/${MY_P}.gitbundle
+		https://dev.gentoo.org/~mgorny/dist/${P}.gitbundle
 		https://dev.gentoo.org/~mgorny/dist/${GITDB_P}.gitbundle
 		https://dev.gentoo.org/~mgorny/dist/${SMMAP_P}.gitbundle
 	)"
-S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-# Tests only work when inside the GitPython repo
-#RESTRICT="test"
 
 RDEPEND="
 	dev-vcs/git
@@ -43,7 +38,7 @@ src_test() {
 	git config --global user.email "you@example.com" || die
 	git config --global user.name "Your Name" || die
 
-	git clone "${DISTDIR}/${MY_P}.gitbundle" "${T}"/test || die
+	git clone "${DISTDIR}/${P}.gitbundle" "${T}"/test || die
 	git clone "${DISTDIR}/${GITDB_P}.gitbundle" \
 		"${T}"/test/git/ext/gitdb || die
 	git clone "${DISTDIR}/${SMMAP_P}.gitbundle" \
diff --git a/dev-python/git-python/Manifest b/dev-python/GitPython/Manifest
similarity index 100%
rename from dev-python/git-python/Manifest
rename to dev-python/GitPython/Manifest
diff --git a/dev-python/git-python/metadata.xml b/dev-python/GitPython/metadata.xml
similarity index 100%
rename from dev-python/git-python/metadata.xml
rename to dev-python/GitPython/metadata.xml
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 9bc67c29299c..ff103c67a36b 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/bandit/bandit-1.5.1-r1.ebuild b/dev-python/bandit/bandit-1.5.1-r1.ebuild
index 99300f639b21..998ae418d415 100644
--- a/dev-python/bandit/bandit-1.5.1-r1.ebuild
+++ b/dev-python/bandit/bandit-1.5.1-r1.ebuild
@@ -36,7 +36,7 @@ DEPEND="
 	)"
 RDEPEND="
 	${CDEPEND}
-	>=dev-python/git-python-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/GitPython-1.0.1[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/bandit/bandit-1.6.2.ebuild b/dev-python/bandit/bandit-1.6.2.ebuild
index 3f077f18a76b..f4cbf20f2c3f 100644
--- a/dev-python/bandit/bandit-1.6.2.ebuild
+++ b/dev-python/bandit/bandit-1.6.2.ebuild
@@ -36,7 +36,7 @@ DEPEND="
 	)"
 RDEPEND="
 	${CDEPEND}
-	>=dev-python/git-python-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/GitPython-1.0.1[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.13.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 69fae8cdd73a..dc76b30aee87 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,6 +1,2 @@
 DIST libvirt-python-5.10.0.tar.gz 203187 BLAKE2B 25f16381fe127579494ec54af38b6da8cf2e38cc3ccc32b8a2e17b77ed33b829fffd74d4631531f87513811abd510205b6678fd0cc50ddc4b7b51ab80bee96ac SHA512 19bf1608fa83572b9b557371efc44bffe298a654db0fca90e49fae8e69a7b2228d9e5a1ae0ab5d34fda3256498e5d53e09b5ea889d600c9d56254730d50faf79
-DIST libvirt-python-5.2.0.tar.gz 193270 BLAKE2B fecd1a07091746779a91e0cfeb9c3068048ee7e51d2f79064b4ee529a19b78d04ba53a5abab68182a1fa9c4a82f459fa9e971c33fcd10b42fe7011be17f7c6e2 SHA512 afee2dcaf08d530e6298fdf2db674af217b9e4115941258b5815aba00087d96db6eb421c9854d7dca0f9dfe24069df72aadd969c924545e72be216f01bc173cc
-DIST libvirt-python-5.5.0.tar.gz 200364 BLAKE2B 198c9858573c383ab818deae6bd42c6ad7efd58b9a661a80f06f4f0fc0d72e9da98546b07443397609d4c9454ece4e02759b53016f078bdae84580474e2bb49d SHA512 3098c5a0315488aa515a9b00e69add8de3dc372d2f82a8b1cbc6d01287a133855095f7c34510ad900adbd1c56e6a53bdfe3d251c48411acd243c2300d659332b
-DIST libvirt-python-5.6.0.tar.gz 201352 BLAKE2B 16f88b9c15214af0ec97ee39912139d6ab07473a9f65a735303f5241d10d75e46db68378b33c9c139f6a9e43f7143a4c30fdbe187e50e004cfb5205dda03d0a3 SHA512 a6bf7c661127ae0ed5962ed7bc9cefe09907e82969525ee0ea8f8f70b5fee8f200b6ba9d35aefcb7b132f59e34162ba40e75e93aff297808bc1dd23f548da428
-DIST libvirt-python-5.8.0.tar.gz 202807 BLAKE2B 82111cdaa5f22ff2a8e5aa16c789535a0e8665c5076137c24bda0698ce0dd1eca2f39db1eba0f3288b208f809d3d44b6b4f05c82b60438222ec7fa66bb2fdabe SHA512 89e02e04c26738180c244a46c1d5ff4c6e839df70ec1cc045997cba25f5182ff616f36821ae180f92901c381e6471f629b4ffd9a69e45843e9412e4e715ba91d
 DIST libvirt-python-6.0.0.tar.gz 196791 BLAKE2B 8fa524d76277fc0278158205f25da8a4331c732a7cbdbe7d9ef9c697b8d5758d8f4182ac749212f4b7c147cde5648fa8cd245cbe0ae809e9079ef654def3c4a1 SHA512 1d64bdb430d099c6e72259e49d99aa985b9ba745c543d3a12ad614c48e1334a3607e093d93612c34e8ec3990e880f3d66fd33199605f2ec9a419193bbb839d58
diff --git a/dev-python/libvirt-python/libvirt-python-5.2.0.ebuild b/dev-python/libvirt-python/libvirt-python-5.2.0.ebuild
deleted file mode 100644
index 810917f24188..000000000000
--- a/dev-python/libvirt-python/libvirt-python-5.2.0.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
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
-	SRC_URI=""
-	KEYWORDS="amd64 x86"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/libvirt-python/libvirt-python-5.5.0.ebuild b/dev-python/libvirt-python/libvirt-python-5.5.0.ebuild
deleted file mode 100644
index 810917f24188..000000000000
--- a/dev-python/libvirt-python/libvirt-python-5.5.0.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
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
-	SRC_URI=""
-	KEYWORDS="amd64 x86"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/libvirt-python/libvirt-python-5.6.0.ebuild b/dev-python/libvirt-python/libvirt-python-5.6.0.ebuild
deleted file mode 100644
index e54729f32d80..000000000000
--- a/dev-python/libvirt-python/libvirt-python-5.6.0.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
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
-	SRC_URI=""
-	KEYWORDS=""
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/libvirt-python/libvirt-python-5.8.0.ebuild b/dev-python/libvirt-python/libvirt-python-5.8.0.ebuild
deleted file mode 100644
index 79a9f02c1ffd..000000000000
--- a/dev-python/libvirt-python/libvirt-python-5.8.0.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
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
-	SRC_URI=""
-	KEYWORDS="amd64 x86"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/nltk-data/Manifest b/dev-python/nltk-data/Manifest
new file mode 100644
index 000000000000..fa415ee7f30e
--- /dev/null
+++ b/dev-python/nltk-data/Manifest
@@ -0,0 +1,107 @@
+DIST nltk-abc-20200312.zip 1487851 BLAKE2B ba28be6f7d5fcd1840af11bae1e669233a151f9d6a5ae1a958ab5b5b8bf33eaac03a5172f87bd0dd481b1cd069fa107d0fadd6f5cf037eee4350652a58e21bcc SHA512 e2ee1fc1738c1ebfac50271e9c8d8396a603ceef2b1a6471fb38ba78a1a74e639f5c51bf93ada93f70832462bd7bc42621d1c5ccfeba0315abe8408f28788db0
+DIST nltk-alpino-20200312.zip 2797255 BLAKE2B 54cff649a36e0eefd74b217ee5c4fa1be464edebb5b4bbf004960487fe172e6e623b5fb9b104da34e109eac3dbed02397119b7998ed8db8b32dfd62ab436f4bd SHA512 0f0b40ca8c36068dabde193299fc00754b42f0ef42f562b96ec413b8f6400db9fe874fa750b198ac92fa7eb3cb8e4bf1ecd463aa95005dd4fb23825e47c4a772
+DIST nltk-averaged_perceptron_tagger-20200312.zip 2526731 BLAKE2B bc6bfc544c78df029727c4f809749902539310b1894803f83b07add698455bbd9ca0f5fbd358ef91978414714b2041c757a1bfbd1db985ba92e81fbf7ae937a8 SHA512 bda565462823373905ed73073aaa78fc390077f370fdd942e7681e7e9b6f78d41bc4b71e7aa9b4d601de5a5a886d4bbb14b062e1e7761629980a508054f7facc
+DIST nltk-averaged_perceptron_tagger_ru-20200312.zip 8628828 BLAKE2B 026ca0e6a511098029b45efa46dd336d37123575bd77682f8a6084c39327097c85052818921a5b0ce2f202924ddf2a24418025f8c979bef034aa0086cb583a17 SHA512 fd56c7f8188c2ddd6b6239189ffa701c56f2e47376a210bb0c92881969304874f720f27a6965e853db2bf43aff202f09dfea7bb30420590e1a75940493797db6
+DIST nltk-basque_grammars-20200312.zip 4704 BLAKE2B 024c6d86844bb3ea368b6dd71d065b4bd38b551576b3919f26e6c32139ebb3b5338c17453d766cef4dc7f5c358220b2738d16baf58c8cf794954e10a460100fa SHA512 52d07166551dadbf99830052595982b93c0f8c611c4051efc00dc2054a4a219b8a3ee57072f8bac51b34e5eb8e1e5631fc2668bf319d252fca201d798a58455a
+DIST nltk-biocreative_ppi-20200312.zip 223566 BLAKE2B ca749a1713992045363a7e4af7c912a750f6a17cc729f60fe1ccbe62cbb565a2c349c09764e91946753e630409382b4b1a1578a17b29e10d7bdba9818c6ef098 SHA512 b6dd5eee7849c1161afca851d22106671ba27cef63d4bf7f500b6c92625b31cbf4aa7593ae65c7eac25f532ce93f06faeb78e7131e35b5cc0c2d74a2c06d43d7
+DIST nltk-bllip_wsj_no_aux-20200312.zip 24516205 BLAKE2B cb52ef99d7505b956b31ecf0c02ae5538946ef6b9b639eaf7b2808795a3bb6e05188da20b8495d80a4a3077a6e8f1d53b2ebbadf5d14382e245841ae1919a839 SHA512 03bb1c3b6c27e0049e7b5fc7721e2903c1dea80b55fe35208a4acd67116618a646d98fc5184d3a43ac9ce3dc693fb8ca768a18f20d9d6eb69d91fd2a101cc9e5
+DIST nltk-book_grammars-20200312.zip 9103 BLAKE2B 4087df6322534a8b012df25587151afe6121ad857ed99cdac1cfa5c8f9aca4d2c623876fb65fa21b9f391c0e96401ef18a0f403bce343755fff38c7d85292012 SHA512 8cfa085e8203f9c415d18c0afb3e3cf9963214929f4de71cf5933234e3623e432cfca3a167cd7c2d9cdd4d22496cf959249790789782675cec392d0e0ef5549d
+DIST nltk-brown-20200312.zip 3314357 BLAKE2B f9c54f01d08ce2da90238a94e74c693ca60ad63b0cfdc141897942b4c01235f505d9b60f4ab0eb0aa63fc4b414922f5d71eed404486d4b31788f167e068c300c SHA512 f425e022f8f3eb459cf9ad7c90c326920430f7f0ad3e15d5961dfb5146ac355f7e13ba7681a78a26d3c5b146979eb778012aac4ce3dc5d59421a60798dede85d
+DIST nltk-brown_tei-20200312.zip 8737738 BLAKE2B 5386fc3c818e8f772760f8c8288fab1fb6f67d5f27e8aa47bc9366716b66c1b4c5fb52e0c9d52f1d2884ab426fe45afcb5d07dc497cf1a2e86dc4c06dd498cac SHA512 f3dcc36bcab63d481e4d833c8946f10163f732166114c8fdd63932fff9fba3c236593a082ebcdf96f74aea6d33e424b7be4c645fd0f5ee5090f0335544c02c47
+DIST nltk-cess_cat-20200312.zip 5396688 BLAKE2B b2c79b6d938b98118ed0f541ed75509bd47d2309123c97aff2aa1f03fe6da298c5270a9cd6fe3da91e57402b6bbf3953c88eab7e25c47b9a12720ff0367499e1 SHA512 6f14beaa98a5f0731fe126c7e10110045c7cac8f7893bea0a6895bc64e6953622f989e93c2e77f6d66d5a3024acc11422584d6563fc3efa84766757e2c5d4127
+DIST nltk-cess_esp-20200312.zip 2220392 BLAKE2B 16695534a2267c20d204e6ce19a19fbf053d3f4e06d8b52bf480f9c775b05381a902f56b0793aabb20ad07ed6334c3f24217dcfffb33bf32bfb3aaa6736dcbf0 SHA512 daca83bbe8d725fad5775f5c71946ae534764a758ccf428b3f48674eaa4a5a8342cb35f38ae9715ffa75030771b91f1303bb2b98a55922337e6b39dfa2e7a94a
+DIST nltk-chat80-20200312.zip 19209 BLAKE2B a9dc4eb6d0a6d081cff840a8cd6b3249ca2e26a6aa783f33fba770f3c56917537cfb00706464767b70d4b10339b443615272b909fc43efe5ce1e8d8dbcb8df2e SHA512 2d590ac4a785132be92764dda5577f2d7e7209cc1d58302296707d9ba8dd312dc01cdb104183922de88ba72f7cc3cd4b8fd95b2b18fd41321a27f4b964e4a500
+DIST nltk-city_database-20200312.zip 1708 BLAKE2B 070a7d51fa2d39b891a52178a535c11ad7122b34fb1f847b87b86e84db85d140d8b2ca8b029375bb517d38a1c92afdd86f358068f6ea097873713037978a5df2 SHA512 ca87a07da6b1fa1ad786d43d2d7083797a4b81f033248d6951fe2162a3b4b35d20eb46d74dc9cb7c9eda202a8b6cfe8899a3b02cb768be9d1f0b4be1a290ec2e
+DIST nltk-cmudict-20200312.zip 896069 BLAKE2B bcef4718794c180f8641dedf2d85bd338d440c470715bd34eb843b2487cd2b2e746808f9420adebe0757987d09def5c5547e797f4cfd49b91ff3274538836211 SHA512 d3b5d3f9675e242487953ffea9b93e8a8f66462fb09321303064c618e2483e13456d7bbb307b2791926a1e843fdc1df0cb29cf185e2adb6fd08f6286295f42c8
+DIST nltk-comparative_sentences-20200312.zip 279121 BLAKE2B b7b12e9922a2688586aedde8a50e01c29387793955b45c87eee2ad43e41353cba7a449e5746f41eb1b239263274fb91b4a69bda2359b6abd90e46b38acc061eb SHA512 38b383a8cde09c1e8269f047b89c364177507c57a330c361792e92116743adec6ee25202ddf672af041798cc558b63e1e35478283cfb365ef33f8657a462e978
+DIST nltk-comtrans-20200312.zip 11904518 BLAKE2B ae26bec3290d83673d0d894d62c22fac36d0fa4fa03e3989c0b924de65fac12f496bd730fa7512737dbebd59bd48e6b621e4234b0e26ab840c672fab555fbcb8 SHA512 c631d2d21f5a997548ad979e116e9ac642808bea0faa07fa93c57e0d455abb151b9c7d6badbc0b4ff4390994cb7736e722217a9c3da1c8d51da94d6e85629664
+DIST nltk-conll2000-20200312.zip 756607 BLAKE2B 31b4254f9eeb6a3c728193cb89a6e5eff59100c108ac7b19707e86d04f314bb2362e4e6a4770632308a535121ff2e847d8cdbea52835097429fe2111b1e580ac SHA512 421eb51171614175c27bc82fe69e1a6d22b426777c5e62f850ecc288f348feee3cfdf29e8fae9f59c53d47684ba031e108d8a29c5b9c27fc0d2f0225ab83f4c6
+DIST nltk-conll2002-20200312.zip 1867449 BLAKE2B 127a22ebf3fc2ac99e0b24641f2da1d122c67cbfd25eb59bb81ea430f1a08ed74c64b54b87b6457a903a164d2fcd08d4cec6ff7b98943024bc10a4cf54fc729a SHA512 0b9e575ed09771ca4ae5b6f5acf66466def823d9daae20eba4ac291fd501f2b651e018874b3f91dfb42b998abe8c9e0fb1ff9f2ef883f462b29c01547ba0d4d4
+DIST nltk-conll2007-20200312.zip 1242958 BLAKE2B dc01ab90a2d82f2fbe0b4276dc8c139626193f696197629b9bdcb75ae5da14739b319a4455dca870ae968c3fb00473836c56fce6e02f9ef5cc86fc7e44261d72 SHA512 3be03a672c9a4b823ed8c7cd3b571a7c0120415ef293f0e3044bf967f69b6efd413ee57cfe27a1407ec6fa2aad8e625019ddfcf0eec7a48ef8d745064adefba2
+DIST nltk-crubadan-20200312.zip 5288655 BLAKE2B 2f5103c9801b965ce5d893b690dedc5f8524b1266e32a01251834c80cf291963657b3c1366ef6ed21f9f89c9ab4a696de72a752ce53b651d596ade99edaace2e SHA512 cbb6a8c53a89bb68238853da2409b3bf04e832ede977bee673ad966a74f4c732ee6ba844b8171de26a641fc24f2e9f6d4755adeef3524583f8765d3237057726
+DIST nltk-dependency_treebank-20200312.zip 457429 BLAKE2B a60a95f9bcbb72b4ee19a91c380eb620261687f23bd867ae4cf2d7937b60b8dacafb52c09d7bcbcb9fbbbda4e57954ee55a900d70e69e7e290e53c668dd0775f SHA512 b225ace2e2413f0b9ae0e142d81052e64a1bcacb71caf7b07a577c18dec45dc429116abfd12edd3bb1442a111f4fa6e3e33e2b5f113e26dfc4e917268d821736
+DIST nltk-dolch-20200312.zip 2116 BLAKE2B a79b5d5de2ab03be43e5fdb1b34c70a458af6efce0e35f42f3c4d748c84cd950c98981f969fea2b0507ee405438f84b50e526aa94a93f99de7567ccb5c462215 SHA512 29254c95d11fd2001f486a5c682f7ab7f23fa13472ac4142db3702e2fa994f74ffabc2f571f1feb94a2e65fcb8da97c57a519f24504379b0e369fd27f9f867f0
+DIST nltk-europarl_raw-20200312.zip 12594977 BLAKE2B 295e274880ae34c9618a70cabc1b1075e35c442158aabe437972caebbf36d09c4f5f5b66d8ae7ac953f4312f9dac8f5e0c6d3346a444afe98ac700fb3e622539 SHA512 47dcd5420df6ab294f75204355cf346257a821d491f65b856c41a77237df1d7aeb352ed1353da55bfb68fa9f0d8782b9aac9c33bd49af3b395cc780dc421e26d
+DIST nltk-floresta-20200312.zip 1882021 BLAKE2B 092886cb15c6215b4fe979ce62a1a137de97c4749c372426211d36117d367697d19ebe6a9337f702ee9dfc133318b1e7de51393c5a41afc31a960e10ebe7c498 SHA512 1a71453b9629d622c3468b1e00501683e0415996a62a30c498486354b82f0b3be76080dddc60117c8c9f29de3b34a2166a5de87376a0daeaf8b92bfe5dac668a
+DIST nltk-framenet_v15-20200312.zip 69337891 BLAKE2B 046087cb20013f3a597034458dd09b4cb7378b19f91f5ebf7196a92a02741a67b671f094262ac5d8e0e376743048c56dd1d65e6c37efb3b254bb3f8f6434addf SHA512 4b55a435f17afbb9cf5fb59691a03776784830cfa6f1f7b9c9c64770fa6dbb640bb3256a099328e44a0a6692ed52703b9f253e5229ef71ee300ace34027ba462
+DIST nltk-framenet_v17-20200312.zip 99207152 BLAKE2B b1a32c535d37fddba5c77922f3a6097859d8bf59a4bcf37dca4ff394fcf027fc68d781b3b6c0a8d5cd9a423a944687994ec6a2023dd45808dc697b4c90f28286 SHA512 3696c5bb0fdd59058a8723ba3ca962a0d6422b36d8dcfad0427caa21dae9579b85f2f9af431aa1fc1cb76e823676a996c5a26aca99782017270d03ef3bd77f0d
+DIST nltk-gazetteers-20200312.zip 8265 BLAKE2B aa4f8db99a7ae8c26911d33abb67713bc80ffe3d87b2b21f21360682327b51229c16e7bf2330ae44d998e4d9c9bdc0879000a07197891a70ef9788bf8f7aca80 SHA512 dee3a050b56bec85a97e85d867e404bbb4f5041bf4886f5a00eb3e4149db1ff6f8a5bfa67f0210c48539cbf0140aa2082e2d3e65b4919dc5d7a258dc9616257c
+DIST nltk-genesis-20200312.zip 473239 BLAKE2B 5234c2bcc31ae738bbd6cdfe1ee231a75ceacc74334e3b03fcefb409427406aee1700e0d8ca8fad1444736005b53fdb0fbdb9068085837f4bf7292cf61351b8b SHA512 e74f6a8f304bca292bf8e138a739a97633075cf9374c95f43ec75473cd7bbeb0921fe24f7864659e640e694d227e61debd67bc41150bd898b7241a274e28196f
+DIST nltk-gutenberg-20200312.zip 4251829 BLAKE2B 54448e919010f12faa92c0ffd4adb31a7d1d76c262d5ac99c10129d188830107621f90e4ba611ffc1541c25037fc916b451169a8ae1df276747890fea2b5e06f SHA512 7b4442d18b89f9bb8261f23ad2f4d513b470461255633cbebe2b0c310f003effe819f7a86b39a62a6cde1b3fdbf099dabbdaaed520268c99fd1bb933baa97ead
+DIST nltk-ieer-20200312.zip 166156 BLAKE2B 4c63be6f0f16e59584b7f97c21da0cf60a1efd3678ce662d683d8a6a9d05d333690b26ebb037d3047b26e3b51163ffa666f048ad8a89ee6c851ddd3edd2faf58 SHA512 b55545f0ac03282fb85c4a86bb69fd9988db8cc504114bff7b763007e20f559efa61b8ae5b7955c251c1c2dd9d23246e23515b1cd5d8d28225c20ec236c05cd8
+DIST nltk-inaugural-20200312.zip 329806 BLAKE2B 222e22742d93156b852ddd72ffccdd5be5c907f43973b0ceee8d8d383bc5387575d1f974b29fd6d59499ec86483f56270251e6a5e48d7840c577207849baed59 SHA512 096591769373019883b9a2f85d32bc86021aefb74deb26dc9005233ae7f317d587c247edc53f1a956b8e29911656419d9677c271fb59ded4ca4edf2a80ff86b7
+DIST nltk-indian-20200312.zip 199187 BLAKE2B 9f70f1f28bcb96d828ca2ed96d6f89cd8eca8391b64842c742e940aaf59f31e142a4919ab5a21bce954bbe2ed85add162ac67c9549758f9aa44b3e90d45d44a7 SHA512 08e9342567bcc607e9007aea8415af2cad1f8a289104b47a61bf569f1391629ebbe25f19aacf53e2b14725edfdf18076331f044e1c2e42d07c96d5c875ff8f9e
+DIST nltk-jeita-20200312.zip 16531215 BLAKE2B 7cf98b389d5c4b41d9d613c14c5116b83c520cfe7418ef982a6acc1294d8ecdb8a5d6d396409c9f13ca83df999793619d5eb5483612e87874766afe565c68362 SHA512 491e6dc27d70ebfd139be4dcd179b02c383f38edbe4290aed85638ecd7c987259b025e4f6f3f1d5bfe2b7aa3eff7188109205417d0acb64759988150f2753129
+DIST nltk-kimmo-20200312.zip 186958 BLAKE2B ca288f48c09a33b86449c780e5c8612c3521e22bfe70918629bf3144b75b5566a942c3cc1440a13c2d81e3a69c77928c336850cc9fac4c232deb77293bfbe4e6 SHA512 fe38d5298ffb6dd62223c2002278d9ddf2695f341a29477f44434644bc6766cfe2c73091067f9eb8aea201735eef5012f96ba267f2e6ea3aec41ac206a43cac2
+DIST nltk-knbc-20200312.zip 8760788 BLAKE2B edef7da714f81de69ca7f2d40d3c15dbe9e8ba30a044d72deb96572504ac1f539a3f51e75eceeabb196e3cc3ce4ec2756abd4e22833bc7cf9547b0805ae20784 SHA512 76f2be8b8841fad1a4ffe9b31711614d19090d1571f9d076686f6276908b8b2fa3c7258dc037f1ae7e4eee63aefc041203982bd9d2ea155c944bb713cb1f37e8
+DIST nltk-large_grammars-20200312.zip 283747 BLAKE2B dca821271941708d4ad44a2b0694a9471787ee4fac8ca3f98761404df3ee676f6e9bd529359a42292d00584ddd63658cd5ea4b455205c73f119cc4b15829c716 SHA512 86ac15613a918a924b6ffcfa4eca1491f76b4d3f92d9c3fed25257dbb0ebcf20fc69800f4bac07acb2915e3d75d41d309afb61d5354d71eef396ec3866e57f8a
+DIST nltk-lin_thesaurus-20200312.zip 89154019 BLAKE2B 7c039636911fbd96caaae6453f009fdb721efa7ae7b697c61279130f17cae5b6d96a8c8c12506212335925bd1ec7e58e609b72236cc0585bd26a8d144e4382ab SHA512 7972391164c7fcc90be80f4b673551cfbbaaf78653331023119a4296d6434c5a123dbdd4e631efc732531d1a5d0eb7ed1c9b46a2680d6493f3cb2bcf5c6f6d45
+DIST nltk-mac_morpho-20200312.zip 3013904 BLAKE2B a4a7e59cadf913179dd62a31c7e666e9dc134812405c3cdd78de2e772e457ff31d42b98e4f224756d921c584fd13c3708482007d575386bd21201c38492ab4a5 SHA512 cb892e0f414d12848d62012409cc1f19ce4c42490dd9ebb233110f75029670b1d413d82602a3b6cfbcc17fce448d7d5c2d1a811059280e154406eaa0e1b5c4a5
+DIST nltk-machado-20200312.zip 6151774 BLAKE2B 14642a214ec7e10b6451d1077e814dcfb2a5eb5f728ab368e5777d047c445b8d3e9f8808bfe9230107497a42fb87ad5c30295893352688923ee7efd456539fb3 SHA512 8ef0b5e768edd4a8b6c6831a6a4a1913ce82a57fc63f08cc29ad8442c49bd4eee27930c674f2ac141fb1f58eebde5486d12e6aa41681cb601ae9ef9562843a69
+DIST nltk-masc_tagged-20200312.zip 1602143 BLAKE2B 502d648d3af1689d81fa9e8f05f6c0dac51781f378e7cca0199a203eb98fbd61b038b075114e69f612b699c18a8353c5ab8314816422d402f84f9fd700004763 SHA512 558ee5fc652ca736f0f0238854e75d5d6e7f85e03bd19274b09bca616aaa8edd513db972f89c13232e616945cc3463fb4bfda96c2b3d897448d3b5d9ce370f20
+DIST nltk-maxent_ne_chunker-20200312.zip 13404747 BLAKE2B ef15eac5306f04adf23cce1810e80a5566b07b96616a27faf30ef6cde055eedecd82cb2b7d3f0ab8227e1e0d31fe998f0f4a93ed3ea80ba7d7f9d802fbee130c SHA512 2ac628c6a1d68a262031cb9dd0b3544da182cfe239a21996c7b7ccb540ce92b9fecb7a7f038ffdaa5c5e3a4d8b7194c7d699fb268004ab3bdb6cd671409c15d7
+DIST nltk-maxent_treebank_pos_tagger-20200312.zip 10156853 BLAKE2B ca58a0ca3e280d4acf77fc15102ab52d5fbbf2d83a6dfb91228eb7ca3585f8b1e567847c037221b3cf1650d086c1de2fcef3098a3859603f58a2cf24a6b77719 SHA512 ebcda9d7f843e47fb560530b9b75b44ae97e92102d341453202bdc42aa2e996c76833285134ca5c213d7af5b420065b28170cade92a67ba9a667b1b987b8331d
+DIST nltk-moses_sample-20200312.zip 10961490 BLAKE2B 29d4a055788f7fd87b2969a1396eb655dec29ff206e705c31bbfbecd88ab18e4dbfd7409f5c21cd5a53e3461c183628fe689634ccdbb8f24cdeef56bba230730 SHA512 54abd8add66ab286f3e016aa3fb7e74be0d4062117f382b13dc34b0091e823144f203e6c9b2c8ccaed6ffdd23e9667fee4aef57c7c95d7a3f4703eff7ee082a6
+DIST nltk-movie_reviews-20200312.zip 4004848 BLAKE2B fcdc45d77db5c89ec96ee327487e3ee17b89110c8b83f188bac868f476425e732a734e667ae3fab84cd0a2e7fdd49baf33304ffb443d17a3ebf3505a54c8e9d4 SHA512 d1271c8bc2585220418eae6f5b12137bee874ad6097875615bc254fad6a4f33e3a11878c41666fef4d16254d8489784fd3e296378ea1967acf73ba494140a1ab
+DIST nltk-mte_teip5-20200312.zip 14800561 BLAKE2B 32de06f0cc6111a4ccc1cbc99070e17018eafa45ebde6f99f8027beaacffbde1db7db9d6d2ad1044f431c52297d1809ed76a3b78543506c620bbddce88c8ea41 SHA512 10ffd9801bc665c4a3af47c0591a04144ead556cbc80604218d97f334139513c7a23ce90c76b2bfe873b16f94bdee5cae00bd99ae9da8c7d0e1e21aabfe99d74
+DIST nltk-mwa_ppdb-20200312.zip 1594711 BLAKE2B 2d9c4820da713072269a096c6c3414195888cfc4341a2d7a30e6be89efe0d9793e1cf830bf6fb396aac3da9236667c1246fad7c6d474810291e5addd250cbcd8 SHA512 4fbc2ea7c211298847c5fdfb187ea3d08fe385611fbc51d1a21efbf77c45ca886e4765007204ed03b03ee6431804d8cb4239416e95b7eea20f2f612549a60727
+DIST nltk-names-20200312.zip 21326 BLAKE2B 37389f44337724fac26eaad5a4c310ea244b471877dabcacbb05e927e486f28b696bb7898809c8f4e739566ad09bc2f5d5103e0f5c77fcf280127328e2709fa2 SHA512 72513955d69d57787ff6d74b563c53bef7e350acd7dbe1eeef0a00253a9862663d59588551d5deeb02b88fb691d72b630a65315f513b11dd6d683af5f2e4a6ea
+DIST nltk-nombank.1.0-20200312.zip 6728397 BLAKE2B 4dfb61fb651817086ad20957d02a39c99dff83ec45dc1a01e1dac055e0d7d9ef8108ef8df5218ce57b2b0866b748f5f76663a58e08f5e1731272173888e714e9 SHA512 81bcf29898ba1205ccbc8486d14518e95b0189b97b172a54580d4cb4584f4ef32a5284fe0abed0b954e67a318de8f10de5df1a20e6c08976df09cd2c9c66cb32
+DIST nltk-nonbreaking_prefixes-20200312.zip 25437 BLAKE2B 9f26efbcc429f2d36a5584014604d2ca9d4de3864aa6192a114e9e2cd55ff1df50d4321a8c40dbe96225fad6be51f7be66f8a4d58146e370a1d33a9305f7f95f SHA512 4cddfdacf1c7fe4e93a31333413a83ebea2ea7907f4e6fe99e1c6ff4aed8efc951f4399478cdb88e5d5dc01cfb734b6672f4007b2a17c4784896fecaf4a93cdf
+DIST nltk-nps_chat-20200312.zip 301366 BLAKE2B eadf0d0ee54c982765a124321fe6de161bfbfbfb0385d5d7e171666945ef313b960ba7b820e4fed02885ffc213173e2a7c97822513ae6e81e68858af21d9f424 SHA512 a716f3aaba3aedbbdaeaff1c6f1ef607476aa989eaef1c2971b827215f3167952477b203f1543d0fd27e5594c3efa01349c6a0efc1ac423048808f18eae94643
+DIST nltk-omw-20200312.zip 12110409 BLAKE2B 5ae634fdd89fcd2be2dea1511b2c434755e16b92804ea6bb5e2139113c644885d142e6290ab1d00c418f9df5241ebf6b7e227da120dc95d1e907d8f62a3d0cb8 SHA512 05b1b014e55738c49b34ea0371b95bd1d1aadfb0cc57325ec110ffbbb1250690e3a4aab45e877eb5433de08c7afe3ffa161e29976a0e28db9803fb637b24c843
+DIST nltk-opinion_lexicon-20200312.zip 24947 BLAKE2B 47f5a381647075f4bea0230939098a6e83b47860165595e72f076a5436e2aad78148606d86ec331b1cc323963cb2a7500669c6fc2aff2e889bbaec8fd8571722 SHA512 75b98afa24c4e0284b2858770d7655c5c399066f56c1b9aa03dd51d80f211a694856695f8192570f67f02f0827ab02c3f3b65feb5a56c04bebfae3b58ca56ba1
+DIST nltk-panlex_swadesh-20200312.zip 2861668 BLAKE2B e9ee3b2296c8738319a86dfb39d34fc5bcd346e725e0ad0df74571106ef05b71126aff70914e914cff436674c0d70c71ca36121331ab0327932505a2bdb26be1 SHA512 d096be1c6ea54814e448f61048f05df9107c0ca5f75eb3051a009efd4643c94188dde03505b0a4ae29d301268ffc5153eeee7012aae18310f9288fd4ccdb2287
+DIST nltk-paradigms-20200312.zip 24902 BLAKE2B 73b0e811f80b0dc64ae62f8a0ccb3906b723badd9b1ffd358194f7ea54373ecff4b75dcd4f06e3382793ea7bd31af98c6d31ebac5c793dd1446153e6d4371b13 SHA512 56ee67f12d2e794e3498183ee8cd90e7d691ab06f576ec413580fe1fa7ff49cbec01fc44c5b323fcd764600946a1866338c0babd6eb4cd658e006e4420205fba
+DIST nltk-pe08-20200312.zip 80735 BLAKE2B eff34d07cd6717e1e661ffb8b187f96f84b88fc53fec2d3c15c1591d3117c461a996cb1b9c4890c41f2d82e1a8253c3583149ef34c8c42858855ebac5659923a SHA512 c0d5fd7df03b0d3e69a45e4f3463cd3a9de76a4d66c39c0b0641ede9ddab34bae1df14d85c85c78b4d375b478b4a4cbefdbc5100aff6c4e59e550903537d3416
+DIST nltk-perluniprops-20200312.zip 100266 BLAKE2B 36459b87d3cffed0e1331c322b0eece674d2cf7a9ec9a8bf5ebebd6bb11dd417fdb0ce471bd7078a24e02b5477d162885a327fcb0b89ec5e845f81c58e74544a SHA512 3e18cb45063d3e2ea0dd5160d85efd672a1a4f94436f732470ef63c8dcb2b3faf92db38d2d4e9363759140a9380d212809cbcca0f4459fc35bbe9a77fa107b42
+DIST nltk-pil-20200312.zip 1510205 BLAKE2B 389a0df127ac521de7de262d7400252a7353b8842e5b27f948cfdddb7bf565702e08ad9341f0be6e0c7725882cda5a3db960c258d0ee42eb8023729291bf0640 SHA512 1964ed66f604e6c39c9cdc8a5a4d9603f00893d02129349d84cf4cce68034c04889e9346df7719d6f468c03ddbec4a892035f3330cb408a7f6aab0bfcb3b865d
+DIST nltk-pl196x-20200312.zip 7051453 BLAKE2B 2f5cb39fcea51d27992f5dd410dee8706c0c8146d216e4353f4e235a2df1833915ddc87cd20d78b9d7a503c10a6444842bf7d64fa6dbbb5bb1f28077b524f345 SHA512 2fbb2eec61562422ddbb7fad804c450a9b513dc10597c3341b811a3aa64a28ccaa836d736ac79319edba73c8c8eb85d4103573cfae51d649cfcbdd3a758e018d
+DIST nltk-porter_test-20200312.zip 200510 BLAKE2B dee1fda2cc678a4cdefbf2cf3084b1c8df08bdb195d2aa42fd3314870d5dd96f8d8219987b3285f9b040f3e493a97f0f306b0ee8309fb73a44ee25aa24fa97b2 SHA512 8be4d1faad2b64bb3b9bfb2831c5b870d4213929fd087a9c62e217b85df9f1c1946c9cbdefcc51c110b4980f44bccc45a61c683cfc951b0913270fc11517bee6
+DIST nltk-ppattach-20200312.zip 781714 BLAKE2B 26613312b15d391883679d26e528949cd8b50ed88b45776f87c40180f12a4a79dcd721a7d9849b97d6b86d5ddff871d29db674ae750b0dec94f042a78ab67458 SHA512 9afa462379522276c8cbb8e8dc14a57cd221272da40056a1ea82daaee44a8464283927a9fcd94b426257bc3a04374db058cfc4fa31435cf8993942d05444befd
+DIST nltk-problem_reports-20200312.zip 1032942 BLAKE2B 45b4536712c6eaa0c4b385792a22608737b3790c0e3b644695ac18b3327c216407d56c4b3a89c0d9123eaad4957104421b0c218822ab9f96000e9c0f422f332a SHA512 766c45a016171c7440ed2604db11f1ab1cf39d287bf9d10c87bc29fa76b0661a048fcc484328427c39d59556efec928a5fc687ba2d36e555c75826a28df2372a
+DIST nltk-product_reviews_1-20200312.zip 141287 BLAKE2B 18e83e267d3edadd7eb99dd87f9094b0fb426006e21497d373c190d17859dc50adc6dcac7101e2e0621df06c812287a7f969ea9c4149521b649ee7683c8c92b2 SHA512 511a719b2694bee35a39057a770005f0234beebc289e01aceddd432adabc5e580e99cc8a06c960855764709432b24b62508daa5414cd4b1e491379c3f07649de
+DIST nltk-product_reviews_2-20200312.zip 170698 BLAKE2B 395d5ac71b759a546a3e25fb6ef584eef5f6076fde9e3952f12a3b094360e493cf306fd07a3d266f46ceb37d94f000faf387b99ed7b4b9dec5cfa661b74d8318 SHA512 24ddd6e62a62ef81ec88fa5991507f3e7e479caf778d3738bb30ddc74898e03a8629a532147a0e0b899b3b2e0933fbefdd0ec0b0e774fc726c4145d66bf5cd29
+DIST nltk-propbank-20200312.zip 5323498 BLAKE2B 7abde7caca8fa267bdcfdacc507ecef133d80989909563380f9ac296213ddd94680c25b0e9eb339d2ed7f851eda185966f6be63ed86fae5d9d397d8758ec75bf SHA512 6bb6f88648c1f6044d30dbc56ce1924240ddc1420c7abe8ebecf3684d69bc2dc20f1c575a6ae368a39fff40c5ef09f80d94bf317a37301639321085f102b54bf
+DIST nltk-pros_cons-20200312.zip 746276 BLAKE2B 7a1aec593396f25c75949bde9627b0568e4d406fb2d42ccb6e7be6ff7d3b118bdfbf34b574e40cdb27d8e65e5a370f820c839bfbc0140b2b177c9dbdd89e3516 SHA512 9eea1070b67e648d5e6e84d5a336d95c9eb3192cd0fa4a66f298076ac5907783ecda5cfe1b6e66209a99ec4e326666b14e1cc89ffb4cc8b2b91fed7db77db75f
+DIST nltk-ptb-20200312.zip 6289 BLAKE2B cc4c91569a5a9bad0f3cfce8e0d98179a53b3caddfb66ece085b293b882e46328a108c3be86261dfd869ea2fcc33d3687bc41adac3ada88ea748cd3480c88836 SHA512 dd59d84f20ec52c38063f0961954c063f614b94696307a63fae21839c51c81435d0205fa276f6811d9da7fd083e93f51f0603b5c35dcddc539a9bf59b9dffb6e
+DIST nltk-punkt-20200312.zip 13707633 BLAKE2B 22a0b3aec8a72735fb39aeeb596601452a70cd69e91206e94c5204153da8dedea3b7ec00c460fe19962e223adfd9cffc05a00daa4df48e3f2da500da51e99d2f SHA512 d477823c0cab57a374822cf58dd8bad35b86a504a51dda10de33b27cfd2ca4c89bba946c09f1ed3b28ab4d1cc1e5f3d3781c5f78ebe87458e1df9d48c8841782
+DIST nltk-qc-20200312.zip 125456 BLAKE2B ae02a2cd727e1832ede5fa5b3ef561059c9c714ced80bca311a360dacec6e176c034d802838335437cb8fa25ea877c3774fbac6790cdf6b9b75a3908e76e2dcd SHA512 8cca288f51164f7a18e1c99f2b6a35a3d890bcc5471b5be26883dd87d9b5e06214d15cc1133598fee330f0daf74ceaaa862410f6d95dfd56842a2cb84dd67390
+DIST nltk-reuters-20200312.zip 6378691 BLAKE2B adcb783246f4fd6e73b32fa9419570d9c7e9ecff1c9e2ae39a587f9036ab5eaf9a6ed87b7794dfe2f0ba965cffca68e51c243e3396c179a0282555601caee55f SHA512 21b5a4e114137cd8a52b6e3567c2d72dbe7eac8a3234952896126d9d598fbfa72a7c1e6b7c424b8b016ed345d7350cc562c6d039e2fd6ec0d73c68e13e58605e
+DIST nltk-rslp-20200312.zip 3805 BLAKE2B bf4500dd0e28cb4f018b8d13c5b920294163e7a9735dda12935f6b25ce5c71f2181e3bcb33444d490ba7bb1a029ef50dcdb2df4bddb09bfaf9d91b91531b8461 SHA512 83994b9cf2c925e559c68a03abb1499e3cd308fdb5ac6e698c3b5e2458393d9eae2420b02b4c46fd04527913133a1f19b3a2e5312f07e222e8cf072886f94973
+DIST nltk-rte-20200312.zip 386303 BLAKE2B 384e22acb3ab9e37aeed26e85253a19bf14a4c0fff1030db5c530faa12380d7c8334278514e2e3a25ed6169f7310f960a116b10e1d021f5521f1271f2c039a05 SHA512 a091b04f9c63e4ee193f40cff7a60905a9f5bfbc687a27c7d66cc6f6896e5abd489dbb820f98baaa2a4d855e09b92203c3756d6eec31ed4f4c9dab9e689438d2
+DIST nltk-sample_grammars-20200312.zip 20293 BLAKE2B e59884ec6ed4e7699a7d066f332d09ca26e3abf53a801b37e8592c79f2a812a0fdb17d4f730ef5d820def8b78578c4ef8e60519e74a352f731884f91eccae75a SHA512 c4a99d38f6a85c6639d50b6fe9d0ce14bc87eb9dcb4a1a2dbc6756d756f903d6541d352401a42b20eb4a0df0ad1f41d75d33915b080345a9f88f4ad15f146b34
+DIST nltk-semcor-20200312.zip 4397021 BLAKE2B ef1a1915309bc4b829a6eae9cea0ce4a0a9e5caef731dfc107e634a6e6c2fc68173715d66b10d71931e4e46ef9eb09c13baf91fb909868a5d920d5a371e37a0f SHA512 a6d45b8c1043d94493fea3abebfb6fd1d690192243739d98f0df8a3e89de3a07da17078bce9797373c2312a249cdfbee41c952f1acce4e17c5cfd12e02d7267f
+DIST nltk-senseval-20200312.zip 2151350 BLAKE2B ec21463f7ffe27e3dda47e38e356346491ce64412f6d4f537fb73e72a0d6dad2667d75895add461dfebc729d44b091365020f7e9c93c7e7bcddb00c74f90ee30 SHA512 4c69145668cbc9d25d4d6893caea417258fc34c23527538f5799d96da19f45aeb271d08f48ea434ee21b7cb499579631556aa517c294743bc64e0f840854ba9b
+DIST nltk-sentence_polarity-20200312.zip 490256 BLAKE2B 56a1b4668875d5c73b220710e8af84410a273f394d68d7e9decb47c5370f0f7c1982d37710ab903d78dac0108ec2e1a26e8f1cdd3fee172487397c8b2ae01ee7 SHA512 d3772edc13d46fb835f40a9c6714b95885d3ba2eded37a24c8aad6d3e63ca49a9c79387218e2f67bda2e52d52449daf1dd1e603a4819ae46da78f4e0a38ba599
+DIST nltk-sentiwordnet-20200312.zip 4686546 BLAKE2B 98a45d9a5be971bd9e76ad5c154359c1800aa96ab1e8e301215e435cae6d659cc0fb38604435da4e9a391741a72ef7fcb842a1cf119348a7039f717843035f12 SHA512 cd0ff31abec3b85e3114546918c9152360e3da45fbbaf7b4c76a13a6d288f1d9ea7a4633638080cd0205cc293b4123445106e9b5daddb2ae379d6a08d1c992a5
+DIST nltk-shakespeare-20200312.zip 475458 BLAKE2B c60acbf2d90f5fffdae43bdf85191dbd694ec5ae19e37b145ad04af6d8481988f0c2ce644baff2e31707e86d95a9b3b03c1da4faaa46be92da2291cce565955e SHA512 72cbbdb237b78df1f6bf27b5504606f805433746b9862dd1ce544ab712783a41fb165f3a4f282a7f1bd58c7dfe6036c14ecb07a82c109f6d326eb95e470002fb
+DIST nltk-sinica_treebank-20200312.zip 899237 BLAKE2B e074dbdc7f1fe5958109f8ea019bead946bd2e3cd1c0849cf3ad49eaa34a1989baee7935a70e9103c121e5d375954d1dc53e4a1599e394ce6c2fda4e98769645 SHA512 724fb0905cbd0f903c3a75d70aee8a3e6f29e62971c1501efd8bfb3f4c6619e5fd8a285648e7792ea8e86bbda0a2afc6eecae45ad9f361983bf83b756ab52960
+DIST nltk-smultron-20200312.zip 166207 BLAKE2B d0c3e75dd108965e260d913e0c02137da8707a751a4f53a1f59ff6a26af9997e2f0193980b5087277b87b74d9aab3e3c8d066d7264311cec2a94f0f9d21caf44 SHA512 8872717994269caff4ccf3f52cef273b2ef007efeb8ab89392cb4db3b8e3ba4b8859ab2fd70762b8941bee4558aebba3021869772be17a64e1056968aa605e19
+DIST nltk-snowball_data-20200312.zip 6785405 BLAKE2B 44c10439b142540ac7eece967efa1431fd8f45342f0a90875dacf29ad374fe4c7d30af11d42ba45e0f1ec1836d56b2ff684ee352c5e8536cfb5db5eb7632285b SHA512 6c8a9259d88f6f7f499867d83b731de99d7fa4e8827ecedf836f653fc1a810efa9f6c5c6e2720a9e6610bc00978956b6a119bd08b70e3e241c4e9faccddd81d8
+DIST nltk-spanish_grammars-20200312.zip 4047 BLAKE2B d8a8dbb558850a6a60f1fe5ab0f617f3a0f3c64bc7d49980cf793d374c6679d1bd42afb7e61776737b5eec162f2520abf2ee3acc92ea9ee0f397c3089b3b5b28 SHA512 4513347156e9351c259c0e2448198d68354bbc95e0a54561c31a88f13f333ebcba3e294c820cb62036665f2904eb6a7137546cd580e361c0423c30a8aed950b2
+DIST nltk-state_union-20200312.zip 808757 BLAKE2B 2d352af0ced736d3c11a821eaba0b035b3b5b6b0f20db3bd5d4ac2451f99daf68bffd3ad984bd404ecc4a1e67ca9281c529af2cc9e295a3a7330f36ee9640bc8 SHA512 a6fc83e6230e57ba66a7af62f0d2a5d44a14530ed1e0e914590b3f8b5bf939967c126a5e6f6899ba9134843893f65212e836d311109393c1200191a5c3163485
+DIST nltk-stopwords-20200312.zip 23047 BLAKE2B a0677cc0d4a3d54ee6e27eab8fb7635d6cd29265204896870e57457a54459f1d6cabc0c4e76e749397f5eee299eed0b524fcbc2033ea17d81cdb6cd98c5ed968 SHA512 31774fd3db2e0fba0209db71c08f9b2d971311ea4a59739cfdc0a9ae34f6c6c593f2a991a14ee20b0de8b380215e609f8398ed50c546775322ab8c4c3f8d06dd
+DIST nltk-subjectivity-20200312.zip 521628 BLAKE2B 0a8777a5b91b1b825fbde41cc927d496480129f0a810349bddde2036ed16f37611f2bc3b007e74fe36523612529a92433d32d094be72d247f5faef8220c3c491 SHA512 a3cc4d2d20f26c5eabd86fbced2c013e69d46e607013278eb35831a62e57523a17aec1b580ba62c7a867e61a561e1b222d8430f0c1e2d429a9479e12b008c5b7
+DIST nltk-swadesh-20200312.zip 22828 BLAKE2B 1cd9d5355c6b53694ec545ca001b0807b4912a7878ba075b0f81ce8b9b22a5c7a18cf52cf2449483a1c89cd20d8d86986dc3d827fa93a7ef5824fddbc0922025 SHA512 90cb32532a5378d05ce34b84b5f8363dbb32f24afac58b0dcc5cdccba98fd7d37def7f4fbe76b11c8c64059bd19df745562bfbf5f4c721d65ce9f4be1348ab76
+DIST nltk-switchboard-20200312.zip 791161 BLAKE2B 211116a751ae246fa31b6aca96b396d3642d89ad112588a09f8d91a5b76dc41c7fb4d36c16c6358cd8e0da8056bc83598ed0dc635cf7b1fd8469a0e80b5f1761 SHA512 690e5392dc082c4ac550bde2848aa65117e7a25cbc4bce0887581c531d03be64e21f044ac0a3286648255f0edd7766b1161f5575ad5fd680c7303b34c3226b8f
+DIST nltk-tagsets-20200312.zip 34531 BLAKE2B 7966055f926f33cba5929f16623afdb232c6168049e07728fc6629641eb5e8bbeb47fa4c2e3ebb89b7f5f49855565ebdef17c9a9ac7e7cad58fd42ab53d5c333 SHA512 03a5a9643c3f242ae699f4d2f5269aacd167e1ddfdb826759dc5a51271e37efb89ac7d3d316e7573b00bb92ed2138c8c72cb0b67b7f28ca8ac93ed0a6d48c798
+DIST nltk-timit-20200312.zip 22251869 BLAKE2B a4ab4f5c1973bd748893f15ac47eedf7e1bc6de1ea40caa9e5687535a5e2e4f159ad98aed5b2ca78133146b76fc593e279502d3cd238fa3a96c5825d8b31d773 SHA512 0f7f853dec95431f2c3f404ec275a06ae43c3d4a506e787f94689521b381bc9cb4b76fc93b9829bcdc3265f8465e11e0ddc2e0d8a36c88b544dec21d679b9b7f
+DIST nltk-toolbox-20200312.zip 250616 BLAKE2B 34b0bda4cd229ab8beada332e43a1040a4cde652129b70b06e8409bf467423af6f15c8001ee9b162cd2714c9ac556e6d0c484572b36c85126851d1299e676e66 SHA512 33f50ff645bc359894de098000e117d7a077e9422a3318524b06bb895c10c33a583faa134d79f620ec95ef5b3ba9d502d15e68b531e6429845181da9b163307e
+DIST nltk-treebank-20200312.zip 1740034 BLAKE2B cd40ad3df05dae4d5e4f7a3a4154eb4ac239b0f41b1798da72e023c7878afb549d29ddba73111dba1e2f34554538f1f949d2622363deb1db9a8f5ac1b4dd455a SHA512 f2b3793329259c16b2544cfb544270e9c4b4d25eccbd997c086d3d5915981ceb038f719c097d4c71429aa9e7c4f0e19918db06b249166a2f6153d6b618c96a77
+DIST nltk-twitter_samples-20200312.zip 16007673 BLAKE2B dc100181ff129c2e9774c643cd0841220496443902ba57818c327929782b4d6e0434ac083c47cd362401d4aa804635fd2e008342755f1cd7962f23e0bb57e3f6 SHA512 1c950e0135e8da58540ca618a1d52f0359afde44b429bede4005182924736d3edbc0fe52638a2101664490fe7e2eb25d7ab704909b241b9349b8c5aa7a185892
+DIST nltk-udhr-20200312.zip 1170177 BLAKE2B cab5f8b4ffa9c0c303620a499f61bbe654545a5689aaa710df743054836a7843e826d97ee91f7b84ba2dcd32ffce432f1932c53797e791de2776eaf183870988 SHA512 730f83cb663974edc099427fad0a3c1cd16769f5ef82446a78aa0e12f01b68a4c52037bdb5e3717dd6b08c42655b03d9d0f2f5869c01b117ae2ab8a428df0dcc
+DIST nltk-udhr2-20200312.zip 1653975 BLAKE2B 43ee8c9c490a6a8ee5f0d9273bab83f77ba3d977da7eaeded3239b8c16f3432ef36478d0d290b1df9fe9af4e0c5de1902b8fe699788b7681003e5c8c426574e3 SHA512 eda644aedba1d0b9d2605dc6b1c8c77943692b4404c4a9c904c82956432c9ba7e27bb0f496e63d3eef7f29b4b34eb929f8d9228b4fd56613d5d4f743fa1d87e0
+DIST nltk-unicode_samples-20200312.zip 1212 BLAKE2B 715c6030baf56d766dce7b920500c29dc98ce4edc9b41fb4c858960a4630469fe5a269be6d0b2d33b54ee0208014b1e43f5d9ec49b878442963ea21e4e3acda6 SHA512 88cac1ef0f43fc491285c0638807f88f52d1baba8964cb2cf37c4ee3e8cd8c080071f108fb553fdc14ed17cb0e80343097c08ac7c1613b0abbd84f559e38fba8
+DIST nltk-universal_tagset-20200312.zip 19095 BLAKE2B 179297dac3a6a30a4a55e8affb480cc95a7a1dd1ee0ac6a0d4381c655c5dbf065e16f750ebd28846299f114d3355a9edf6cbed72242ebf5fd257f339fcd8f40d SHA512 ca8915e8c3bcb8515ffe0da21fb7066d213683ff702bf247d9fa9f7c966c66d06facafef1d600b7223d7aa1e4dfba1a2a75e1bb05b2c5d78beb312b8551d3fed
+DIST nltk-universal_treebanks_v20-20200312.zip 25908853 BLAKE2B 20f8a6c0e759ab15560e71f48527e26a0dac554b8996dcebcacd2c5d5e3cea8947481734a03680843176025fde6d5e484e9414dd239043dca380c79053d71d8f SHA512 3dcabe02ff8bb1044f7d9e1c5af294af05291ff33a6c8dc16d3a3c855ccbf3a8261d92ea926e15e0d7f9228ae81e7863a283b156812ad30575c9ea947ecbcc55
+DIST nltk-vader_lexicon-20200312.zip 90486 BLAKE2B aaa4a07a600d6ef53373250afd62a1a5e76cbeb28b56c06879d07a6cea593d7041300e6eaf2ce39b87dc0c04a536fae111df80604e7f517878e680fb9db16019 SHA512 55d41757736806a2a0dbcaedef28000b4461eb44dce308c9e06315feb55f843914f743c37b6cf220fc9e61c04f8f7f41dd338438059e2e803fc2b4e91f739923
+DIST nltk-verbnet-20200312.zip 323661 BLAKE2B af5b26a63853d1bc3fc99c9cba3c50a82bc148cb6d95a26045c9aa29ba83408db76b098354e99f07696d5e2373ed9d8a35ed8504ac9b20e1b4d16252a238bc85 SHA512 00368fb2d5cf1bf818f1d72762d2c40a98067937d71a65ece2ca0f4bfab6f8957b32ba66741901af34258cf3309d00dae433b1092d0b7adb145a791dc3bf859b
+DIST nltk-verbnet3-20200312.zip 482025 BLAKE2B 256b922160c6c8288d1a80d2eaab686988e1bdac2c7cd04b99f1662815e77881d97d4655a22480f3c3ba5fa5117d1098f416e5c460ca725e299e94a5e9bbd12b SHA512 aa8f0eab8d132d30039ae93d077970183ea87e26b3918b9760cd9c86cfe2a8b09e49569f8c4e12af9c3b964d9d341dfe10772377843ae9b6d888a439acf63268
+DIST nltk-webtext-20200312.zip 646297 BLAKE2B ca072fc38c144b659c76c36c9161641c91f814fd84e5cb8bebe5dfe9382e5813bfaafafba2cb8b2e23d014f071c5b5a9589b78a2028418ad61147b0de35b95bc SHA512 7c88ff4920d2b61bf7e7cf8265100d8781c061c0742852a8b49142eb9a4d48e34ecc0c6257cbb7d7c2e7ea7ee87e942305b03451522776fe09a91ca86c2fbe4b
+DIST nltk-wmt15_eval-20200312.zip 383096 BLAKE2B 119943db4240171077569b3302c678644c2c9547ba67bfd055751059e0a3ad3ab6a19e4eedf9108d313d46dcd36cf19e11d973981da8c70a01c4cb790a7bd739 SHA512 362395d4c77ebe92f4c19fa8c2000082dc7a2343acc19cccb596ca00db6c40c231b904d807f46e2691cc4c4a0c79d14873b2a1983a494f2ca1485d540d787ceb
+DIST nltk-word2vec_sample-20200312.zip 49396025 BLAKE2B 0512b9bb7121a528190079f578e82b4e8f8021bfc0062cfa5613d260f3eee17460aecfeaacb65d950e79d27a653c78633a88c3638ec16377e2dbc3006387ebaa SHA512 09c30a4ab8f9fb6a5b36974b5953260d01cb4f285827fb90a374d054ad775ac978602ab56c452f46f4f8601312e232fd739d2f54dafa44ab8b7b01831cf0d9d1
+DIST nltk-wordnet-20200312.zip 10775600 BLAKE2B dac56a8fb1fa6882b1871c394ad2acb2d3be739c424570e27c89fb6983df5f896a8f359092ba82752ddfc0531d83563a219e85f80124202f29bda93181efe4dc SHA512 1923a8bcd56fa0b9a9de91f53070dce28c3a7efbab11d2ef55c87134b1bf30de0f40abab59c39eb15dce54aec9491d8a5a259de212ff4cb25cde0ad09317009a
+DIST nltk-wordnet_ic-20200312.zip 12056682 BLAKE2B c2dc2a646015b23699a72f636b588ec5718c70e6941d9d56863257e1e0396c8cf59ac1dc6ed74e5d7f0c2ee9129d63221a03967bf66a3d335e99160f295ed44d SHA512 1c94451a13af6c76bff60a0cab2e70402a3d9abd2e8fc62a5473f24ab4229feb0afe4faa8d389734697a6cf86d2c8b1dc700bb3afa3cbc279b75d7e0ec19fc6d
+DIST nltk-words-20200312.zip 757777 BLAKE2B eaaaaab6c26e206e9b6ce45daf779e3cc6706a06132afeabf013026d0009caee2d678f3c4ea9125b9654f7143bef29ec7a5706b79e5650ea556c6821b7754e6f SHA512 2810f05d3fc7ee6b6f8636fa1ff7b4e8c8cdac12b415cc54d15c69102290122ea138ec4fa36cb483f790c1ac10b0f83ae4c2c3e0e8df7e67e90e962ee5dbb0be
+DIST nltk-ycoe-20200312.zip 477 BLAKE2B 574835aa011a06a06363e26facd6a6f583a1dc1cac2de39adff59d8ab48eefac030b43d935a2f79af855259f2a9a571193dae2811589483af97406ff05c76c9e SHA512 e39ce165074d10ff63cb84ea52905d7ecb937797c8123ed113c5609afe1f63ac44d04d48a681002c4eac21dc9076ac74164b886c6f9ce42f3a102c38d1e8e756
diff --git a/dev-python/nltk-data/metadata.xml b/dev-python/nltk-data/metadata.xml
new file mode 100644
index 000000000000..6fae393f618c
--- /dev/null
+++ b/dev-python/nltk-data/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<use>
+		<flag name="extra">
+			Install the complete set of data files.  Otherwise, only
+			files required by tests are installed.
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-python/nltk-data/nltk-data-20200312.ebuild b/dev-python/nltk-data/nltk-data-20200312.ebuild
new file mode 100644
index 000000000000..1d02afe6be7e
--- /dev/null
+++ b/dev-python/nltk-data/nltk-data-20200312.ebuild
@@ -0,0 +1,184 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs
+
+DESCRIPTION="Data files for NLTK"
+HOMEPAGE="https://www.nltk.org/nltk_data/"
+
+# at least some of the files have poorly documented licenses
+# TODO: create a USE flag for free-ish subset
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="extra"
+RESTRICT="bindist mirror"
+
+BDEPEND="app-arch/unzip"
+
+PACKAGES_ZIP=(
+	# wget -O - https://www.nltk.org/nltk_data/ | xml sel -t -m '//package[@unzip=0]' -v @subdir -o "/" -v @id -n - | sort
+	corpora/comtrans
+	corpora/conll2007
+	corpora/jeita
+	corpora/knbc
+	corpora/machado
+	corpora/masc_tagged
+	corpora/nombank.1.0
+	corpora/panlex_swadesh
+	corpora/propbank
+	corpora/reuters
+	corpora/semcor
+	corpora/universal_treebanks_v20
+	sentiment/vader_lexicon
+	stemmers/snowball_data
+)
+
+PACKAGES_UNPACK=(
+	# wget -O - https://www.nltk.org/nltk_data/ | xml sel -t -m '//package[@unzip=1]' -v @subdir -o "/" -v @id -n - | sort
+	corpora/abc
+	corpora/alpino
+	corpora/brown
+	corpora/cess_cat
+	corpora/cess_esp
+	corpora/chat80
+	corpora/city_database
+	corpora/cmudict
+	corpora/comparative_sentences
+	corpora/conll2000
+	corpora/conll2002
+	corpora/crubadan
+	corpora/dependency_treebank
+	corpora/dolch
+	corpora/europarl_raw
+	corpora/floresta
+	corpora/framenet_v15
+	corpora/framenet_v17
+	corpora/gazetteers
+	corpora/genesis
+	corpora/gutenberg
+	corpora/ieer
+	corpora/inaugural
+	corpora/indian
+	corpora/lin_thesaurus
+	corpora/mac_morpho
+	corpora/movie_reviews
+	corpora/mte_teip5
+	corpora/names
+	corpora/nonbreaking_prefixes
+	corpora/nps_chat
+	corpora/omw
+	corpora/opinion_lexicon
+	corpora/ppattach
+	corpora/product_reviews_1
+	corpora/product_reviews_2
+	corpora/pros_cons
+	corpora/ptb
+	corpora/qc
+	corpora/rte
+	corpora/senseval
+	corpora/sentence_polarity
+	corpora/sentiwordnet
+	corpora/shakespeare
+	corpora/sinica_treebank
+	corpora/state_union
+	corpora/stopwords
+	corpora/subjectivity
+	corpora/swadesh
+	corpora/switchboard
+	corpora/timit
+	corpora/toolbox
+	corpora/treebank
+	corpora/twitter_samples
+	corpora/udhr
+	corpora/udhr2
+	corpora/verbnet
+	corpora/webtext
+	corpora/wordnet
+	corpora/wordnet_ic
+	corpora/words
+	grammars/book_grammars
+	grammars/large_grammars
+	grammars/sample_grammars
+	misc/perluniprops
+	models/bllip_wsj_no_aux
+	models/moses_sample
+	models/wmt15_eval
+	models/word2vec_sample
+	stemmers/porter_test
+	stemmers/rslp
+	taggers/averaged_perceptron_tagger
+	taggers/averaged_perceptron_tagger_ru
+	taggers/universal_tagset
+	tokenizers/punkt
+)
+
+PACKAGES_UNPACK_EXTRA=(
+	chunkers/maxent_ne_chunker
+	corpora/biocreative_ppi
+	corpora/brown_tei
+	corpora/kimmo
+	corpora/paradigms
+	corpora/pe08
+	corpora/pil
+	corpora/pl196x
+	corpora/problem_reports
+	corpora/smultron
+	corpora/unicode_samples
+	corpora/verbnet3
+	corpora/ycoe
+	grammars/basque_grammars
+	grammars/spanish_grammars
+	help/tagsets
+	misc/mwa_ppdb
+	taggers/maxent_treebank_pos_tagger
+)
+
+add_data() {
+	local x
+	for x; do
+		SRC_URI+="
+			https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/${x}.zip
+				-> nltk-${x#*/}-${PV}.zip"
+	done
+}
+
+add_data "${PACKAGES_ZIP[@]}" "${PACKAGES_UNPACK[@]}"
+SRC_URI+="
+	extra? ("
+add_data "${PACKAGES_UNPACK_EXTRA[@]}"
+SRC_URI+="
+	)"
+
+CHECKREQS_DISK_USR=3G
+CHECKREQS_DISK_BUILD=${CHECKREQS_DISK_USR}
+
+src_unpack() {
+	local x
+	local to_unpack=( "${PACKAGES_UNPACK[@]}" )
+	use extra && to_unpack+=( "${PACKAGES_UNPACK_EXTRA[@]}" )
+	for x in "${to_unpack[@]}"; do
+		local cat=${x%/*}
+		local pkg=${x#*/}
+
+		mkdir -p "${S}/${cat}" || die
+		cd "${S}/${cat}" || die
+		unpack "nltk-${pkg}-${PV}.zip"
+	done
+}
+
+src_install() {
+	dodir /usr/share/nltk_data
+	mv * "${ED}/usr/share/nltk_data/" || die
+
+	local x
+	for x in "${PACKAGES_ZIP[@]}"; do
+		local cat=${x%/*}
+		local pkg=${x#*/}
+
+		insinto "/usr/share/nltk_data/${cat}"
+		newins "${DISTDIR}/nltk-${pkg}-${PV}.zip" "${pkg}.zip"
+	done
+}
diff --git a/dev-python/nltk/Manifest b/dev-python/nltk/Manifest
index 8d0786224485..79d80c3f67c2 100644
--- a/dev-python/nltk/Manifest
+++ b/dev-python/nltk/Manifest
@@ -1,2 +1,3 @@
 DIST nltk-3.2.3.tar.gz 1166282 BLAKE2B 803dc1a8ec80a17538c2164d5ee0eca201be2307bbf3e08093a55cee93e9a539d8b48ea42c8ad84b540922355bf0b151ae04338d8505378a89173159d7464b76 SHA512 2e5c0899c29f61166b2e161e62e81fd35e045bda979fbfa662bf9ad1349be4aae6aabe4b9de34905e2abbc05b06a096480829fd66638efa35cd5c866f76c62e8
 DIST nltk-3.2.5.tar.gz 1188856 BLAKE2B 316e5955d2f90c351673ee9d3f0cc159babbcae08104518db62e796b422dcbf51668001b06b5d5dc399613d4db0ed39ff7dd15ad15d6f6c64e10c73a4d53bc06 SHA512 967b209ce3dde5296dafac16b91bff3894ff1a3f073c76974fd9193912597c82d2d1c50d4419052da77ab66f798f230f725b83f31368a95cacf94d46e45055de
+DIST nltk-3.4.5.tar.gz 2821481 BLAKE2B 9d3d6df9a951b4dfbfec335386ba0fb13c484c74a066141ebdfdb541fbec421dd72163d4028e239abd58f95a73e0eef5861574fa9955e4ee11f2c4598c895f59 SHA512 0ca24cd2154e47a8c50fe8e2426fa01c80904ece4100b07cdb4e5835e423e31968e96f0e750e1936f1e758a608596c560aaaee05b844b334f6179249db05f969
diff --git a/dev-python/nltk/files/nltk-3.4.5-corpus-tests.patch b/dev-python/nltk/files/nltk-3.4.5-corpus-tests.patch
new file mode 100644
index 000000000000..0284aec02b91
--- /dev/null
+++ b/dev-python/nltk/files/nltk-3.4.5-corpus-tests.patch
@@ -0,0 +1,37 @@
+diff --git a/nltk/test/corpus.doctest b/nltk/test/corpus.doctest
+index 5509fe2fd..0a34c9522 100644
+--- a/nltk/test/corpus.doctest
++++ b/nltk/test/corpus.doctest
+@@ -94,7 +94,7 @@ If the reader methods are called without any arguments, they will
+ typically load all documents in the corpus.
+ 
+     >>> len(inaugural.words())
+-    145735
++    149797
+ 
+ If a corpus contains a README file, it can be accessed with a ``readme()`` method:
+ 
+@@ -387,8 +387,8 @@ examples illustrate the use of the wordlist corpora:
+ 
+     >>> stopwords.fileids() # doctest: +ELLIPSIS
+     ['arabic', 'azerbaijani', 'danish', 'dutch', 'english', 'finnish', 'french', ...]
+-    >>> stopwords.words('portuguese') # doctest: +ELLIPSIS
+-    ['de', 'a', 'o', 'que', 'e', 'do', 'da', 'em', 'um', 'para', ...]
++    >>> sorted(stopwords.words('portuguese')) # doctest: +ELLIPSIS
++    ['a', 'ao', 'aos', 'aquela', 'aquelas', 'aquele', 'aqueles', ...]
+     >>> names.fileids()
+     ['female.txt', 'male.txt']
+     >>> names.words('male.txt') # doctest: +ELLIPSIS
+diff --git a/nltk/test/unit/test_wordnet.py b/nltk/test/unit/test_wordnet.py
+index a7b26ac91..a1df3d396 100644
+--- a/nltk/test/unit/test_wordnet.py
++++ b/nltk/test/unit/test_wordnet.py
+@@ -204,7 +204,7 @@ class WordnNetDemo(unittest.TestCase):
+             u'preobrat',
+             u'preobrat_v_mišljenju'
+             ]
+-        self.assertEqual(S('about-face.n.02').lemma_names(lang='slv'), expected)
++        self.assertEqual(sorted(S('about-face.n.02').lemma_names(lang='slv')), sorted(expected))
+ 
+     def test_iterable_type_for_all_lemma_names(self):
+         # Duck-test for iterables.
diff --git a/dev-python/nltk/nltk-3.4.5.ebuild b/dev-python/nltk/nltk-3.4.5.ebuild
new file mode 100644
index 000000000000..b3165b5e4a61
--- /dev/null
+++ b/dev-python/nltk/nltk-3.4.5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite,tk?,xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Natural Language Toolkit"
+HOMEPAGE="https://www.nltk.org/ https://github.com/nltk/nltk/"
+SRC_URI="https://github.com/nltk/nltk/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="tk"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/nltk-data
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pyparsing[${PYTHON_USEDEP}]
+		dev-python/twython[${PYTHON_USEDEP}]
+		sci-libs/scikits_learn[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+	)"
+PDEPEND="dev-python/nltk-data"
+
+distutils_enable_tests nose
+
+PATCHES=(
+	"${FILESDIR}"/nltk-3.4.5-corpus-tests.patch
+)
+
+src_prepare() {
+	# requires unpackaged pycrfsuite
+	sed -i -e '/>>>/s@$@ # doctest: +SKIP@' nltk/tag/crf.py || die
+	# replace fetching from network with duplicate file URL
+	sed -e 's@https://raw.githubusercontent.com/nltk/nltk/develop/nltk/test/toy.cfg@nltk:grammars/sample_grammars/toy.cfg@' \
+		-i nltk/test/data.doctest || die
+	# requires X and hangs in Xvfb
+	sed -e 's:test_plot:_&:' \
+		-i nltk/test/unit/test_cfd_mutation.py || die
+
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	cd nltk/test || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	"${EPYTHON}" runtests.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/oauthlib/Manifest b/dev-python/oauthlib/Manifest
index 3c7a9a62a7d3..36cdff02387b 100644
--- a/dev-python/oauthlib/Manifest
+++ b/dev-python/oauthlib/Manifest
@@ -3,3 +3,4 @@ DIST oauthlib-2.0.2.tar.gz 125631 BLAKE2B d9d6efd396dd320573a4c95ce94f5465ca67e7
 DIST oauthlib-2.0.3.tar.gz 127155 BLAKE2B c3c69fe8e1f2a1672ad78755b35ef285be9e6d61ff5ba1792493d475eea1d47d38acfbc29ab150eddee83b3d41f60b14ba91074c213e5e92186842c25bdbc7ce SHA512 40eed9aacd6c239745523bf056afce8d76615ef9dcda8ee8a46e2900f940674f4178daf70c18c2bdef9f607db3fba84cc10b2306c608116ef2eb08414268125d
 DIST oauthlib-2.0.6.tar.gz 127675 BLAKE2B fb9db14e06007d575fc099381b9aea8f337666716ff8a6f7331febe9f41f38e5c5abceccbbac41da993a389ce2f171dcfb6fa7d75b09eb70d08e09d56b5e8a80 SHA512 3d966a540e3aeb2c4e72ecf60c28a596de1e11b986b68f2a2aa8b56efef12fd1a0181d64e083850843f38e329d9a6a401c244c02ae61f06af428d8188ea0864c
 DIST oauthlib-3.0.1.tar.gz 149303 BLAKE2B daf826a3959f56f70b7f52ac1fc98d8ec73161316235cf7f0dce17469999383faa1b11c50c9645748b39938ae1d24dc3dea3908b68daf8c838f99df763bc361d SHA512 88ee266f764488090b849c036d2475c31dab0d8b18bd6afd0450da6aa0982ba17cdada7d0c25791d5efcf89601f69ae40cd21c584540448c209f90d36e0e98f8
+DIST oauthlib-3.1.0.tar.gz 155362 BLAKE2B 83e9331589305c85acc755f9c4dab8558a19aa247aff5be0fe6c51d047fb9e96b64f17d07a3e33378f6ebc73a283e0162bab56e110aca581f73b628544042600 SHA512 c295de232e0215532c501d8f0803bd501a15fe89a746179ba4facca878e4927c8c05f07825f483c4a846922fb49d6d89f559a8b49bb72b19903f902d772b790e
diff --git a/dev-python/oauthlib/oauthlib-3.1.0.ebuild b/dev-python/oauthlib/oauthlib-3.1.0.ebuild
new file mode 100644
index 000000000000..284919b80a4c
--- /dev/null
+++ b/dev-python/oauthlib/oauthlib-3.1.0.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,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Spec-compliant and thorough implementation of the OAuth request-signing logic"
+HOMEPAGE="https://github.com/idan/oauthlib https://pypi.org/project/oauthlib/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+# optional extras hard set as RDEPs. See setup.py
+RDEPEND="
+	>=dev-python/pyjwt-1.0.0[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pydot/files/pydot-1.4.1-unittest.patch b/dev-python/pydot/files/pydot-1.4.1-unittest.patch
new file mode 100644
index 000000000000..b3c0d0e426b5
--- /dev/null
+++ b/dev-python/pydot/files/pydot-1.4.1-unittest.patch
@@ -0,0 +1,74 @@
+From a10ced4d132361027a545a471af4541dea8c5cf5 Mon Sep 17 00:00:00 2001
+From: Peter Nowee <peter@peternowee.com>
+Date: Wed, 26 Jun 2019 15:43:38 +0800
+Subject: [PATCH] Fix multi.dot Graphviz regression test
+
+Commit d6602ad of 2018-12-01 fixed the regression test broken by commit
+2d55978 of 2016-07-01. This revealed that `test/graphs/multi.dot` was
+failing.
+
+`multi.dot` was introduced in commit 2b3f088 of 2010-11-07 together
+with many of the other tests still here today. It has not been touched
+since. It is a DOT-file containing two digraphs. The regression test
+compares the JPEG images rendered from the DOT-file by pydot with those
+rendered by Graphviz's dot directly.
+
+Commit 66734d2 of 2016-07-01 is the actual cause of the failure. It
+changed one of the render methods of the regression test,
+`_render_with_pydot`, from calculating a single hash for all the JPEG
+images to calculating separate hashes for each JPEG image and then
+concatenating those hashes in one long string. The other render method,
+`_render_with_graphviz`, still calculates a single hash over all data.
+For DOT-files that generate only one image the end result is the same,
+but because `multi.dot` has two graphs, it produces two images and this
+leads to comparing a string of two hashes with one single hash.
+
+I do not think the change in generating the hash was intentional, for
+the following reasons:
+- Commit 66734d2 states that its purpose was to adapt the test to an
+  API change in pydot. It does not mention a deliberate choice to
+  change the testing method.
+- There was no effort to change `_render_with_graphviz` to also produce
+  multiple hashes.
+- Except for easier debugging in case of a failing test with multiple
+  images (AFAICT, only `multi.dot`), I do not see much added benefit in
+  checking a concatenation of the hashes of all images vs. checking one
+  hash of all images together: In both cases the test will fail if one
+  or more images is rendered differently.
+- Given that there were many commits authored that same hour, including
+  commit 2d55978 which broke the regression tests, I suspect the author
+  did not run the tests for each individual commit, but only at the end
+  of that batch, and was therefore also not alerted of this change by
+  the test suite.
+
+Assuming that the change was not intended, this commit will now revert
+`_render_with_pydot` to the old behavior of calculating a single hash
+from all JPEG image data.
+
+Tested with Debian 9.9, Graphviz 2.38.0-17, Python 2.7.13-2 and 3.5.3-1.
+
+Fixes https://github.com/pydot/pydot/issues/204.
+---
+ test/pydot_unittest.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/test/pydot_unittest.py b/test/pydot_unittest.py
+index 881ee16..64aa856 100644
+--- a/test/pydot_unittest.py
++++ b/test/pydot_unittest.py
+@@ -194,11 +194,11 @@ def _render_with_graphviz(self, filename, encoding):
+ 
+     def _render_with_pydot(self, filename, encoding):
+         c = pydot.graph_from_dot_file(filename, encoding=encoding)
+-        sha = ''
++        jpe_data = bytearray()
+         for g in c:
+-            jpe_data = g.create(prog=TEST_PROGRAM, format='jpe', encoding=encoding)
+-            sha += sha256(jpe_data).hexdigest()
+-        return sha
++            jpe_data.extend(g.create(prog=TEST_PROGRAM, format='jpe',
++                                     encoding=encoding))
++        return sha256(jpe_data).hexdigest()
+ 
+     def test_my_regression_tests(self):
+         path = os.path.join(test_dir, TESTS_DIR_1)
diff --git a/dev-python/pydot/pydot-1.4.1.ebuild b/dev-python/pydot/pydot-1.4.1.ebuild
index fb2062cdb6de..f3b565962921 100644
--- a/dev-python/pydot/pydot-1.4.1.ebuild
+++ b/dev-python/pydot/pydot-1.4.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -24,6 +24,10 @@ DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/chardet[${PYTHON_USEDEP}] )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-unittest.patch
+)
+
 python_test() {
 	cd test || die
 	"${PYTHON}" pydot_unittest.py || die "Test failed with ${EPYTHON}"
diff --git a/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild b/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild
index 754769b8f0a1..0fc21af6fbec 100644
--- a/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild
+++ b/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -14,24 +14,23 @@ SRC_URI="https://github.com/requests/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
 LICENSE="ISC"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-# tests fail with network-sandbox
-RESTRICT="!test? ( test )
-	test"
-
-DEPEND="test? (
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/requests-mock[${PYTHON_USEDEP}]
-		)"
+
 RDEPEND="
 	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]"
-
-#Refrain from a doc build for now
-#python_compile_all() {
-#	use doc && emake -C docs html
-#}
-
-python_test() {
-	esetup.py test
+	>=dev-python/oauthlib-3.0.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# require Internet access
+	sed -e 's:testCanPostBinaryData:_&:' \
+		-e 's:test_content_type_override:_&:' \
+		-e 's:test_url_is_native_str:_&:' \
+		-i tests/test_core.py || die
+
+	distutils-r1_src_prepare
 }
diff --git a/dev-python/schedule/Manifest b/dev-python/schedule/Manifest
index b4bda9f3e0d4..cfc14fdb0add 100644
--- a/dev-python/schedule/Manifest
+++ b/dev-python/schedule/Manifest
@@ -1,2 +1 @@
-DIST schedule-0.4.2.tar.gz 10104 BLAKE2B 84089e7dde29587f4044097b85ddf4b9e3639c59c63da2268d6e2c94e94192271a6d0d65c385c9492cefac49d7abee681ebb0f56ff78965b67402306124ede40 SHA512 f088f82a0449350658028b2035c5fbc71bda4d019856fe6ab3363798e9d8d940cce603be544401ecf5f844606e5891ab560c390f5c334a825bf611e6ebfb00ac
-DIST schedule-0.5.0.tar.gz 10850 BLAKE2B b79ceb77d0149cccad4bd12c6fe8f3524a33898039319c411bf202928316d74586626d84e6921595d0c0a79f87115cbc27beb03919c4252b8468dcddf469c95a SHA512 0d89afa3c9d986c53a8c61a92bfda08e23290c6556100d63f2c647003806398b8913c4bfa75a57617aeeda73f8f2eb26490c224ab70d621873453ca5dec35b0b
+DIST schedule-0.6.0.tar.gz 21671 BLAKE2B 6076aff0c906782e554175b7e90cfca1417a31170e99009caccb5cbe318b5eb1295b24dfe1835109aec78fee53b615e170f03a7ec4470f596a9a2775c1072d5f SHA512 48424707b57cbc7ce9440e1658784347b691a013552b9969fd95dd260efa2d8ba56b41920628540fc4ebebbc3dc78e8e919b83cfddfe9a3cc3d60ece6ef0998f
diff --git a/dev-python/schedule/schedule-0.4.2.ebuild b/dev-python/schedule/schedule-0.4.2.ebuild
deleted file mode 100644
index 9e6017cd861c..000000000000
--- a/dev-python/schedule/schedule-0.4.2.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 )
-inherit distutils-r1
-
-DESCRIPTION="Python job scheduling for humans"
-HOMEPAGE="https://github.com/dbader/schedule"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/mock-2.0.0
-		>=dev-python/pytest-3.0.3 )"
-
-python_test() {
-	py.test test_schedule.py || die
-}
diff --git a/dev-python/schedule/schedule-0.5.0.ebuild b/dev-python/schedule/schedule-0.5.0.ebuild
deleted file mode 100644
index 85fc997488d8..000000000000
--- a/dev-python/schedule/schedule-0.5.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Python job scheduling for humans"
-HOMEPAGE="https://github.com/dbader/schedule"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/mock-2.0.0
-		>=dev-python/pytest-3.0.3 )"
-
-python_test() {
-	py.test test_schedule.py || die
-}
diff --git a/dev-python/schedule/schedule-0.6.0.ebuild b/dev-python/schedule/schedule-0.6.0.ebuild
new file mode 100644
index 000000000000..24015ca28f12
--- /dev/null
+++ b/dev-python/schedule/schedule-0.6.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python job scheduling for humans"
+HOMEPAGE="https://github.com/dbader/schedule"
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/dbader/schedule"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/dbader/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="${PYTHON_DEPS}"
+
+DEPEND="${PYTHON_DEPS}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.0.3[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	python_export PYTHON_SITEDIR PYTHON_SCRIPTDIR
+	py.test test_schedule.py || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/schedule/schedule-9999.ebuild b/dev-python/schedule/schedule-9999.ebuild
new file mode 100644
index 000000000000..24015ca28f12
--- /dev/null
+++ b/dev-python/schedule/schedule-9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python job scheduling for humans"
+HOMEPAGE="https://github.com/dbader/schedule"
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/dbader/schedule"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/dbader/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="${PYTHON_DEPS}"
+
+DEPEND="${PYTHON_DEPS}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.0.3[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	python_export PYTHON_SITEDIR PYTHON_SCRIPTDIR
+	py.test test_schedule.py || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild
index 3564c323605d..35b4c3057a68 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~sparc ~x86"
 IUSE=""
 
 PDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/twython/Manifest b/dev-python/twython/Manifest
index b0ff30e9fff6..63e66fd13769 100644
--- a/dev-python/twython/Manifest
+++ b/dev-python/twython/Manifest
@@ -1,2 +1,3 @@
 DIST twython-3.3.0.tar.gz 34164 BLAKE2B 82320b4fc787c97a3b1f773fdd3d5c0c636e6062eb630cc7d78625f45fb8478789e4acc3c9a7ebf600d7abb591bb6113e167a11eaa7b6afebb419652f1d9833f SHA512 888f37c37f39c603b08605d2e209afc329e079c405adbe3a03fde4dab2b76b07d2badf1956d255d4b7ff0bf2a4c308b20f2a3333a7ccd0e7b9c046e9172b1d5f
 DIST twython-3.6.0.tar.gz 36268 BLAKE2B 24305d2221cf7856f5e51bc3ec0fb4c342a8ce19c248ccc680bb1847e20a262f15399b4fe904852a159fc83a85d5617bd57c3ea9de064a5a25069175ae02178d SHA512 b99ecb244598a489578e63cec8a470daca7efe019f6a5277a0fda70b3c61ba25b56688b0a383337ed1c46576e551c244da82cd808710c4b9bb8ba91c6bc29be1
+DIST twython-3.7.0.gh.tar.gz 373183 BLAKE2B a84e10c1d61736af3e93f265d92104dac15d5f7a43d7fbdce4e8c58b641f671a1c4c10f44c5b6d6ce9f0646860d35c14414b17e84daeb74f6e2c8871207b6fd4 SHA512 33eb35ea811ec1964fcd51fad54ba53d60e6caf3b5b7d11ae138f7228be9fb1eca7a02b1c6699a62cc2f6c39e035cb5a28f53ef67a98d019cdf91c9874867871
diff --git a/dev-python/twython/twython-3.7.0.ebuild b/dev-python/twython/twython-3.7.0.ebuild
new file mode 100644
index 000000000000..78ec75b623aa
--- /dev/null
+++ b/dev-python/twython/twython-3.7.0.ebuild
@@ -0,0 +1,34 @@
+# 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="An easy way to access Twitter data with Python"
+HOMEPAGE="https://github.com/ryanmcgrath/twython"
+SRC_URI="https://github.com/ryanmcgrath/twython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-oauthlib-0.4.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( dev-python/responses[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# tests are largely broken/outdated
+	sed -e 's:test_get_lastfunction_header_should_return_header:_&:' \
+		-e 's:test_request_should_handle_4:_&:' \
+		-e 's:test_request_should_handle_rate_limit:_&:' \
+		-i tests/test_core.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index c499d47b776f..e5d189654791 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index d04cd6501149..f9c978b75e37 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -2,4 +2,4 @@ DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20
 DIST cmake-3.14.6.tar.gz 8861359 BLAKE2B 257a9a89fe880f8945f47a4bb1980e66f0f28ee5cebeb161012860ae8578487e50c60060ad5144ec6f5b7ea860112edd01909ebceec24b8370e3769ff2a79e99 SHA512 8cf3afadec3fe931d9f954e3148a398939cd16c1fbcb4c5303ac635e2b5029960867f317fd13a46fceebe46e7328689e847f03d7d7c74bb31e23c9cc55838f56
 DIST cmake-3.16.4.tar.gz 9113021 BLAKE2B 5aa34cadec4ed09e4d0c46f6983b88cf81ea719c47a0848a21be36911b223d9e609bdc7f5b52086762ab83e4230a3ec9e38d9c9e3c9c6f508aa2118e769e3783 SHA512 4aa36608bac3b9e29ea765003cdc684733c025d7b18fbae057f3be1f726a159d4b0231b8b1be269206aa7dbd7177fe0110d5bac8d72fb0f6ad392bb284b1fce3
 DIST cmake-3.16.5.tar.gz 9111262 BLAKE2B 5f996113a4979563d7b9f298b4b1a32d6f91eebaa79af42e1cbf247884e443de47e30030fd0f16c7755c4086e2bff0c0741911753ea7c889b68c393c0b98c876 SHA512 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671
-DIST cmake-3.17.0-rc2.tar.gz 9461449 BLAKE2B 46213fb52ea2b40921d788dba1efa53d6fec2e463510dfdaebaca041121ffc418ce32a37f5851d12865b830c936e2ceab92fe2274e73ff3a107ff6a585d16f27 SHA512 c91040930a22c0b773ba3edaae6614fdae371214ed3eb44f124521a3201c5fdd0b67b170c46fc9d7b00fe053dbf2a7b7e9d984fde5ecf355eb18a2b5d38f8bb4
+DIST cmake-3.17.0-rc3.tar.gz 9463874 BLAKE2B 5987806e7d42030fa8ef533a40df66692e957cd6d61ad1655c7d647a02622678112a796ea1d5872cbd7f8a695e0871879773ec4d0aee8080084d0671887a2d93 SHA512 db37a74fa5750a4796b6c50e024d0ef739fa1ddce6f9ee63955c4cf2049c47e571fb0bb9141cfbf49df654a88a4162f48b5aa6c15ee05dcfe09b3eccbf06e907
diff --git a/dev-util/cmake/cmake-3.17.0_rc2.ebuild b/dev-util/cmake/cmake-3.17.0_rc3.ebuild
similarity index 100%
rename from dev-util/cmake/cmake-3.17.0_rc2.ebuild
rename to dev-util/cmake/cmake-3.17.0_rc3.ebuild
diff --git a/dev-util/gertty/gertty-1.6.0-r1.ebuild b/dev-util/gertty/gertty-1.6.0-r1.ebuild
index 357e03afb462..74a745757acf 100644
--- a/dev-util/gertty/gertty-1.6.0-r1.ebuild
+++ b/dev-util/gertty/gertty-1.6.0-r1.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	${CDEPEND}
 	>=dev-python/urwid-1.2.1[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/git-python-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/GitPython-0.3.7[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.5.3[${PYTHON_USEDEP}]
 	<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
diff --git a/dev-util/gertty/gertty-9999.ebuild b/dev-util/gertty/gertty-9999.ebuild
index 1f82d9932882..c22ac8ed0f14 100644
--- a/dev-util/gertty/gertty-9999.ebuild
+++ b/dev-util/gertty/gertty-9999.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	${CDEPEND}
 	>=dev-python/urwid-1.2.1[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/git-python-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/GitPython-0.3.7[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.5.3[${PYTHON_USEDEP}]
 	<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
diff --git a/dev-util/ninja/ninja-1.9.0.ebuild b/dev-util/ninja/ninja-1.9.0.ebuild
index c0e633894cb9..ee77f4aa4b0d 100644
--- a/dev-util/ninja/ninja-1.9.0.ebuild
+++ b/dev-util/ninja/ninja-1.9.0.ebuild
@@ -15,7 +15,7 @@ else
 	MY_P="ninja-${KITWARE_VERSION}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 3b7ea8556383..a433960acffa 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/cli/cli-0.6.1.ebuild b/dev-vcs/cli/cli-0.6.1.ebuild
index 0f4c7fd08d06..7deea7cf7bf0 100644
--- a/dev-vcs/cli/cli-0.6.1.ebuild
+++ b/dev-vcs/cli/cli-0.6.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit bash-completion-r1 go-module
+inherit go-module
 
 DESCRIPTION="GitHub CLI"
 HOMEPAGE="https://github.com/cli/cli"
@@ -250,24 +250,37 @@ EGO_SUM=(
 	"gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod"
 	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
 	)
-go-module_set_globals
-SRC_URI="https://github.com/cli/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		${EGO_SUM_SRC_URI}"
 
-LICENSE="MIT"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cli/cli.git"
+	PROPERTIES="live"
+else
+	go-module_set_globals
+	SRC_URI="https://github.com/cli/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz
+			${EGO_SUM_SRC_URI}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT Apache-2.0 BSD BSD-2 MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
 
 RDEPEND=">=dev-vcs/git-1.7.3"
 BDEPEND=">=dev-lang/go-1.13"
 
-src_compile() {
-	# Golang LDFLAGS are not the same as GCC/Binutils LDFLAGS
-	emake bin/gh GH_VERSION=${PV} LDFLAGS=""
+src_unpack() {
+	if has live "${PROPERTIES}"; then
+		git-r3_src_unpack
+		go-module_live_vendor
+	else
+		go-module_src_unpack
+	fi
 }
 
-src_test() {
-	emake test
+src_compile() {
+	has live "${PROPERTIES}" || export GH_VERSION="v${PV}"
+	# Golang LDFLAGS are not the same as GCC/Binutils LDFLAGS
+	LDFLAGS="" emake bin/gh
 }
 
 src_install() {
diff --git a/dev-vcs/cli/cli-9999.ebuild b/dev-vcs/cli/cli-9999.ebuild
new file mode 100644
index 000000000000..7deea7cf7bf0
--- /dev/null
+++ b/dev-vcs/cli/cli-9999.ebuild
@@ -0,0 +1,289 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="GitHub CLI"
+HOMEPAGE="https://github.com/cli/cli"
+
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"github.com/AlecAivazis/survey/v2 v2.0.7"
+	"github.com/AlecAivazis/survey/v2 v2.0.7/go.mod"
+	"github.com/BurntSushi/toml v0.3.1"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8"
+	"github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38"
+	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod"
+	"github.com/alecthomas/chroma v0.7.2-0.20200304075647-34d9c7143bf5"
+	"github.com/alecthomas/chroma v0.7.2-0.20200304075647-34d9c7143bf5/go.mod"
+	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721"
+	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod"
+	"github.com/alecthomas/kong v0.2.1-0.20190708041108-0548c6b1afae/go.mod"
+	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897"
+	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/briandowns/spinner v1.9.0"
+	"github.com/briandowns/spinner v1.9.0/go.mod"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/charmbracelet/glamour v0.1.1-0.20200304134224-7e5c90143acc"
+	"github.com/charmbracelet/glamour v0.1.1-0.20200304134224-7e5c90143acc/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/coreos/bbolt v1.3.2/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964"
+	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/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/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+	"github.com/dlclark/regexp2 v1.1.6"
+	"github.com/dlclark/regexp2 v1.1.6/go.mod"
+	"github.com/dlclark/regexp2 v1.2.0"
+	"github.com/dlclark/regexp2 v1.2.0/go.mod"
+	"github.com/fatih/color v1.7.0"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/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.1/go.mod"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f"
+	"github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f/go.mod"
+	"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510"
+	"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod"
+	"github.com/gorilla/websocket v1.4.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+	"github.com/hashicorp/go-version v1.2.0"
+	"github.com/hashicorp/go-version v1.2.0/go.mod"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/henvic/httpretty v0.0.4"
+	"github.com/henvic/httpretty v0.0.4/go.mod"
+	"github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174"
+	"github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/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/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"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/pty v1.1.1/go.mod"
+	"github.com/kr/pty v1.1.4"
+	"github.com/kr/pty v1.1.4/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/lucasb-eyer/go-colorful v1.0.3"
+	"github.com/lucasb-eyer/go-colorful v1.0.3/go.mod"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-colorable v0.1.2"
+	"github.com/mattn/go-colorable v0.1.2/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.4/go.mod"
+	"github.com/mattn/go-isatty v0.0.8/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.7"
+	"github.com/mattn/go-runewidth v0.0.7/go.mod"
+	"github.com/mattn/go-runewidth v0.0.8"
+	"github.com/mattn/go-runewidth v0.0.8/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b"
+	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod"
+	"github.com/microcosm-cc/bluemonday v1.0.2"
+	"github.com/microcosm-cc/bluemonday v1.0.2/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/muesli/reflow v0.1.0"
+	"github.com/muesli/reflow v0.1.0/go.mod"
+	"github.com/muesli/termenv v0.4.0"
+	"github.com/muesli/termenv v0.4.0/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/oklog/ulid v1.3.1/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.4"
+	"github.com/olekukonko/tablewriter v0.0.4/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.3/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+	"github.com/prometheus/common v0.4.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+	"github.com/prometheus/tsdb v0.7.1/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/sergi/go-diff v1.0.0"
+	"github.com/sergi/go-diff v1.0.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.2.0/go.mod"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/cast v1.3.0/go.mod"
+	"github.com/spf13/cobra v0.0.6"
+	"github.com/spf13/cobra v0.0.6/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0/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.4.0/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/testify v1.2.1/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0"
+	"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/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+	"github.com/ugorji/go v1.1.4/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+	"github.com/yuin/goldmark v1.1.24"
+	"github.com/yuin/goldmark v1.1.24/go.mod"
+	"go.etcd.io/bbolt v1.3.2/go.mod"
+	"go.uber.org/atomic v1.4.0/go.mod"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/zap v1.10.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5"
+	"golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod"
+	"golang.org/x/crypto v0.0.0-20200219234226-1ad67e1f0ef4"
+	"golang.org/x/crypto v0.0.0-20200219234226-1ad67e1f0ef4/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3"
+	"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-20200219183655-46282727080f"
+	"golang.org/x/net v0.0.0-20200219183655-46282727080f/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-20181221193216-37e7f081c4d4/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-20181107165924-66b7b1311ac8/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35/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-20190530182044-ad28b68e88f1/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/text v0.3.0"
+	"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/time v0.0.0-20190308202827-9d24e82272b4/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-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.21.0/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405"
+	"gopkg.in/check.v1 v0.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/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/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.8"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71"
+	"gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	)
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cli/cli.git"
+	PROPERTIES="live"
+else
+	go-module_set_globals
+	SRC_URI="https://github.com/cli/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz
+			${EGO_SUM_SRC_URI}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT Apache-2.0 BSD BSD-2 MPL-2.0"
+SLOT="0"
+
+RDEPEND=">=dev-vcs/git-1.7.3"
+BDEPEND=">=dev-lang/go-1.13"
+
+src_unpack() {
+	if has live "${PROPERTIES}"; then
+		git-r3_src_unpack
+		go-module_live_vendor
+	else
+		go-module_src_unpack
+	fi
+}
+
+src_compile() {
+	has live "${PROPERTIES}" || export GH_VERSION="v${PV}"
+	# Golang LDFLAGS are not the same as GCC/Binutils LDFLAGS
+	LDFLAGS="" emake bin/gh
+}
+
+src_install() {
+	dobin bin/gh
+	dodoc README.md
+}
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 5357b398f70f..d3c4fe4a21c9 100644
Binary files a/games-fps/Manifest.gz and b/games-fps/Manifest.gz differ
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index 5559eab7da9c..e3b18589c12b 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -5,4 +5,4 @@ DIST duke3d_psx-1.11.zip 7636016 BLAKE2B 63094c0eb2343e443f98844675ddc23a138d87c
 DIST duke3d_voxels-1.21.zip 2997999 BLAKE2B dcb3103a82b45cfcf906d00147a57fe47997680ff7550973ed9741e62e78f9a099c1a13f65eaa133076d6551fcdfbf34e28ff59f2ad59f91ece98753e7d39523 SHA512 4b55dcc192cb2aa8830250fd222664272176bea8f6c6e4ac6d488abfecb1332b5793986c164fde78901904e2bde37e6ee4aa020c5eb578002de8f6102f44df15
 DIST duke3d_xxx-1.33.zip 26586453 BLAKE2B 7e3c46172d3db1b2eb49eb07f243a9ead4f260d6b1dcae9f8bd599b8e9ba3a19068032afeb4ec2cf61742b6216e3a06c24f2b7e8903f9636f9d00f4d57ada47f SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf
 DIST eduke32_classic.png 5129 BLAKE2B 332ad44b7f6b4f51362387aa6870e7db54423ca5a1f0586cb5019322fb72317d8e88e0bbf46ac89b56290db7e2e4a8442179a6eb87a615fd741b5f00ce96a1c8 SHA512 b41dece8f1ddcadde3367a83f6029ffdc5805811b40380e270169684fb3b368258bd8caeb55623dadffb6fb9d72faf9a3d75907722623f4fac94a4347f8ce833
-DIST eduke32_src_20200201-8603.tar.xz 16390468 BLAKE2B 9112aeb7f5940f962c67c18b32a5a2b23053249468b415cf387bd789d311e0b5b412eea3b6197c8c425dc88e6292aa82ffe76eec222b1bff42a4d6f67e6dadb6 SHA512 a882c178201a21968ff86108ec0a393b40eb712e57d4fa172fea97ad2a6135fe970240395c985d7ebf68ce9794671ec0031a6651cb52c256c5123527122cded2
+DIST eduke32_src_20200311-8738.tar.xz 16544548 BLAKE2B 6f05a6384b4837dc5d4738cef83c4faace2233bf7bde7420d1e00fac45dbdfbd8f7da4b3702205fda914a853790fb0f730b564ae779bce29174337abb1e750fd SHA512 40b69472692bea703d6d6f911a8bff8d18f9fda1e19427ba23572d76717efbe2d13a023622cbfe86bcf9c30966e2fb5e3fe52baac8178587acb2aa092dd86617
diff --git a/games-fps/eduke32/eduke32-20200201.8603.ebuild b/games-fps/eduke32/eduke32-20200311.8738.ebuild
similarity index 100%
rename from games-fps/eduke32/eduke32-20200201.8603.ebuild
rename to games-fps/eduke32/eduke32-20200311.8738.ebuild
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 39a476e1439d..48b429cb28fc 100644
Binary files a/games-misc/Manifest.gz and b/games-misc/Manifest.gz differ
diff --git a/games-misc/xcowsay/Manifest b/games-misc/xcowsay/Manifest
index a4cd3b231962..2b7155b4d9fe 100644
--- a/games-misc/xcowsay/Manifest
+++ b/games-misc/xcowsay/Manifest
@@ -1 +1,2 @@
 DIST xcowsay-1.4.tar.gz 100014 BLAKE2B 59a82449bdefcfdb9f1fcf159e21374e36fb1e5af7db5bc61eb10166e5746bb0ce13f4321c904354f8e5b3bc8ae4625b0b12b339dd8013016e644c908f4b6ef0 SHA512 53370ba287ed2bf7d41cbf1bb8631e8da6933575956b38ee02f5aedae5bb49aede7e5e641fa7f93241f078a1a044920b387288ffbe2a10dd04fbe02932c67ca9
+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
new file mode 100644
index 000000000000..8010b4b29015
--- /dev/null
+++ b/games-misc/xcowsay/xcowsay-1.5.ebuild
@@ -0,0 +1,54 @@
+# 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"
+
+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-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index e3279011d098..e3f07ffce1ed 100644
Binary files a/games-puzzle/Manifest.gz and b/games-puzzle/Manifest.gz differ
diff --git a/games-puzzle/five-or-more/Manifest b/games-puzzle/five-or-more/Manifest
index 0637946416ca..45ee7051d2b8 100644
--- a/games-puzzle/five-or-more/Manifest
+++ b/games-puzzle/five-or-more/Manifest
@@ -1,2 +1,3 @@
 DIST five-or-more-3.28.0.tar.xz 1507188 BLAKE2B 992bc75847b7e51cb5b5a23c3d3aad89a6daee00546711cf1d273663d2ebf8c2801c7a42f2aae1154114715d56ab1395def074beb30944762e9c560311880377 SHA512 33bf396426401dde2b326af8e7d137c23679589568e78f8b7e0020c074169318ba7925ecbd23bc18a2cfe0abecfca05c3090b78f1f86801c84e6fa385ca23f8b
 DIST five-or-more-3.32.0.tar.xz 1238080 BLAKE2B ce810414ff58dff833560f1540f533aaa9fccf20af4a0b6ce42d6c4dafc21c72c210c0b710e1ae1ff04fa33f1e23ffbcc498a547169d216d26d02fd1fabbc1a4 SHA512 7a2eeed345754e8d27e626a63eb6ea00b22dd600e405899543c402490b953d3675597fa2c2df6f661108ac818664f82682f710652cfb2a0058c1da753d21df80
+DIST five-or-more-3.32.1.tar.xz 1238364 BLAKE2B eb6e0c93566c483738fbf9b27ac0c78850222b4bb07015a7fb1f7ddd6e9cf6368a52a05d9432b80edb9fe56e0233b7479391e5d47a5ae58222478f2ad61622b4 SHA512 3d2faadec8e9027c343a7ad18285e17a21d47155b517d42ded87a7e1ffc28a9229f37f6a8ab0ba29008ac15b78068b1cf828a6a6c303df82ba9e0bd82b6b046e
diff --git a/games-puzzle/five-or-more/five-or-more-3.32.1.ebuild b/games-puzzle/five-or-more/five-or-more-3.32.1.ebuild
new file mode 100644
index 000000000000..349ab537831b
--- /dev/null
+++ b/games-puzzle/five-or-more/five-or-more-3.32.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Remove colored balls from the board by forming lines"
+HOMEPAGE="https://wiki.gnome.org/Apps/Five%20or%20more"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/libgee:0.8=
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gtk+-3.20:3
+	dev-libs/libgnome-games-support:=
+	>=gnome-base/librsvg-2.32:2
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(vala_depend)
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index 18acb2759881..e9cff7a33ef8 100644
Binary files a/games-server/Manifest.gz and b/games-server/Manifest.gz differ
diff --git a/games-server/bedrock-server/Manifest b/games-server/bedrock-server/Manifest
index 956e393f0b27..ccae1151a05d 100644
--- a/games-server/bedrock-server/Manifest
+++ b/games-server/bedrock-server/Manifest
@@ -1,2 +1,2 @@
 DIST bedrock-server-1.14.1.4.zip 49395245 BLAKE2B 987de7d8e009dedb87e01b14e81ba857dd374f7d6621d3f13e137d7a51ad763d952452a1f8d34ff943add8ae3df8c7aff7fc5fe315d2ee29986fe967926a3969 SHA512 765d31aa3fd75c3e654ae65e5888ef3fc094fb12a49d9f0d5b0d94c58dfb508884218288dd4bb1cbda007305bff969219d6d438db4d9732295590678561bfcc3
-DIST bedrock-server-1.14.21.0.zip 49423726 BLAKE2B b461f5925c52b4cdb70718429c02df44df5a19daf7c6412a8304af1c1272a10a1495eeca2a6e03bebeca7c95e85158a9a6b22239273c7a73e075fb5b106b3733 SHA512 37608b446e54ac151a884c401be5dbcd5650c9796a7ce655a355b4cb33d0e261b786e796b75b29abf164f5634d5a346f844ece1f1c504698a587e8bb46e6cc92
+DIST bedrock-server-1.14.32.1.zip 49449540 BLAKE2B 293b366cd3455775b0cd4145cac474030c6eeb7df83397cc0f80c2f97515e2f2aaf256cc4ca7372e3795534d1ccefba515fbd054914c7e93b65ed5e8f1ef122a SHA512 e998565f04cd2703f125fb5627aeae8b1f010600e0880f0aee009dc26544f251c5555d2b503d27ecbc721ee62b7f07afaf357ae631042094d18884310b9518a8
diff --git a/games-server/bedrock-server/bedrock-server-1.14.21.0.ebuild b/games-server/bedrock-server/bedrock-server-1.14.32.1.ebuild
similarity index 100%
rename from games-server/bedrock-server/bedrock-server-1.14.21.0.ebuild
rename to games-server/bedrock-server/bedrock-server-1.14.32.1.ebuild
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index d27aff2d16f5..9f21b8e10cd7 100644
Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ
diff --git a/games-strategy/widelands/files/widelands-0.20-glvnd.patch b/games-strategy/widelands/files/widelands-0.20-glvnd.patch
new file mode 100644
index 000000000000..94d1aa3850c7
--- /dev/null
+++ b/games-strategy/widelands/files/widelands-0.20-glvnd.patch
@@ -0,0 +1,25 @@
+From 4661768699c4651df1668fbfe0e24bb02bf10db1 Mon Sep 17 00:00:00 2001
+From: franku <somal@arcor.de>
+Date: Thu, 18 Jul 2019 19:30:34 +0200
+Subject: [PATCH] use link_libraries instead of set(CMAKE_EXE_LINKER_FLAGS...
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5c5ca8a60b..bcff2db2ff 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -181,7 +181,7 @@ endif(OPTION_ASAN)
+ 
+ # This is set to avoid linker errors when using GLVND-libs on Linux
+ if("${OpenGL_GL_PREFERENCE}" STREQUAL "GLVND")
+-   set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lGL")
++   link_libraries("GL")
+    add_compile_definitions(WL_USE_GLVND)
+    message(STATUS "Adding linker flags for GLVND.")
+ endif()
+-- 
+2.25.1
+
diff --git a/games-strategy/widelands/widelands-0.20.ebuild b/games-strategy/widelands/widelands-0.20-r1.ebuild
similarity index 97%
rename from games-strategy/widelands/widelands-0.20.ebuild
rename to games-strategy/widelands/widelands-0.20-r1.ebuild
index e714c6e11a94..335598744fef 100644
--- a/games-strategy/widelands/widelands-0.20.ebuild
+++ b/games-strategy/widelands/widelands-0.20-r1.ebuild
@@ -44,6 +44,7 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.20_rc1-cxxflags.patch"
+	"${FILESDIR}/${PN}-0.20-glvnd.patch"
 )
 
 src_prepare() {
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 01d89322afaa..025718762f3c 100644
Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ
diff --git a/gui-libs/libwpe/libwpe-1.4.0.1.ebuild b/gui-libs/libwpe/libwpe-1.4.0.1.ebuild
index 38f9792407d3..df42a5e3df27 100644
--- a/gui-libs/libwpe/libwpe-1.4.0.1.ebuild
+++ b/gui-libs/libwpe/libwpe-1.4.0.1.ebuild
@@ -13,7 +13,7 @@ LICENSE="BSD-2"
 SLOT="1.0"
 IUSE=""
 
-KEYWORDS="amd64 ~arm64 ~ia64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm64 ~ia64 ~ppc64 ~sparc x86"
 
 RDEPEND="
 	media-libs/mesa[egl]
diff --git a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.4.0.ebuild b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.4.0.ebuild
index a1c25037f52c..dd5e1106235d 100644
--- a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.4.0.ebuild
+++ b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.4.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="BSD-2"
 SLOT="1.0"
 IUSE=""
 
-KEYWORDS="amd64 ~arm64 ~ia64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm64 ~ia64 ~ppc64 ~sparc x86"
 
 RDEPEND="
 	media-libs/mesa[egl]
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index f25a2c7d1b55..c558269327d8 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index cefad2e88f4b..a9ab87e4dbe7 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,7 +1,6 @@
-DIST neomutt-20180512.tar.gz 2758674 BLAKE2B 47a8d1fe5d5e2725a6ee868b937eea3807ab35dc8eefe47f0d9b1db3aeaa97e69c36e3b8544fc43f1ce0a9980017d654bace8d342094fd7d26ecdb13cdf54253 SHA512 033faa27b01998895d2452d541ed5942cf7dede7a935fc807e6a7f88f3a8c182ea0ab5b4ed7db852ff2afb4d3b990db05477d9ff0dcf7dee186c393244d1db66
-DIST neomutt-20180622.tar.gz 2769280 BLAKE2B 57e708a0502d8de795a08150dd92c4b2a8ba9d0594102f4d4d4b183f29caad147e233586882ca68aa23df6e69b0c55345120ca40ddc9db80e76c734409ff5a3b SHA512 8085bf2bcf25ee4a4531cc5f950f862f58e3bf6ebfb96450479132ed60b4d87e35bc54f9b5e110d93dbd8e9684c1eceb36012753fc7bf5d3fb5046d9d42b69e0
 DIST neomutt-20180716.tar.gz 2778105 BLAKE2B b367407baf2187347971a0327a0c037861f648ebef12ce7b006b756bf60e696ff7a2c986848a9f15815aa95638dd5a3a90f47e97a9c0573950be8cdcc93b13ad SHA512 ee4093217cc1409262b96ab33ed78a38f5c6a72f62fcd7b25027f9373687ce67af8a4e1793b1d7d843bee5b4a7e0c69b30b3badf88a4e1a8fadd8b21441faaae
 DIST neomutt-20191102.tar.gz 3224856 BLAKE2B ff645bb0521f97e7935aef3e3b286643e30e78e10c6322b93da635cdba82496c3bc8f8b4b95fb4c197439bae3ddcfb5b207803900ab434e01b63e9989a5f2458 SHA512 fa4f488110560b25a4d208cf059c44bdfb514b4904964a0928f1491afc2b0d748fa7075d8465e066683f44a5741454b9c73391ecfe20842aae34f3848b9c0bc8
 DIST neomutt-20191111.tar.gz 3225507 BLAKE2B ce43a000b2807a45e4e21d667fd2c5259d751ce2ea3bb2cd3a7857f0f0fca3fb462d7179454d2da1736461e2d804bf6ecf61445768a049e053947d7821c60174 SHA512 cfc1e488b4f0938a26b9c3474d96827b00d97daa0406472e0f694897c286e6eea88e99b1a0cf6da0b7ba181d26ede4ad8ee0379d086eadc562ff1c3ab0dafaa7
 DIST neomutt-20191129.tar.gz 3227652 BLAKE2B 50c598d83a53048cec14787b7b05a7e9e3d212fc7b74245f9bb493940be1aa3971433297ea748ba30cc79aa71eb2b86f37fd3b4d02540faf749d819377de1c47 SHA512 5c39664820ed1a9ac00f5f158f8e96974a700df1edf8ba0615e761140c9ceba9b65ab7a9b87a31f5d6636c6b678b730483f3a15ea239144ce2ec36aa4b649f1d
 DIST neomutt-20191207.tar.gz 3229018 BLAKE2B 44c3674d28abeef26614b1b05978417ffb2e4e1e88c7bd5902f0af87b5d06e9b9145a2d589258ccfec8de5e15f7b904ef309627a105c476a88328d698c16cbe9 SHA512 77faa95e6f6065a62c69814cae2c0dbc56083ec1d99524bedcec6672816223f2b6bd7e4478f916cf00e774a504fd73288857a9e79606ccf1a99601f29734c5f1
+DIST neomutt-20200313.tar.gz 3295200 BLAKE2B 78d0f3a01f44c1bae8d3a99b86e799216e545674c5966364c347f8fc9ff0ef0b085ce44d0ade72e885b55ff47220d3931e22fe0b04a9cfbac639159a55377aa0 SHA512 989bff6e0748e76664ee0df8fa49f71d5c2ce7c9493441d9c080b34a5ddaef2870ec6aa665f8c2dbb290f16a578328efe92722f50389911cd9393181106a3116
diff --git a/mail-client/neomutt/metadata.xml b/mail-client/neomutt/metadata.xml
index 74d44a228000..1f7c112a0b28 100644
--- a/mail-client/neomutt/metadata.xml
+++ b/mail-client/neomutt/metadata.xml
@@ -24,10 +24,8 @@
 			and traditional/inline PGP</flag>
 		<flag name="pgp-classic">Build classic_pgp backend to support PGP/MIME
 			and traditional/inline PGP</flag>
-		<flag name="gpg">Enable support for <pkg>app-crypt/gpgme</pkg></flag>
 		<flag name="gpgme">Build gpgme backend to support S/MIME, PGP/MIME and
 			traditional/inline PGP</flag>
-		<flag name="smime">Enable support for smime</flag>
 		<flag name="smime_classic">Build classic_smime backend to support
 			S/MIME</flag>
 		<flag name="smime-classic">Build classic_smime backend to support
diff --git a/mail-client/neomutt/neomutt-20180512.ebuild b/mail-client/neomutt/neomutt-20180512.ebuild
deleted file mode 100644
index c746dd2fc3b3..000000000000
--- a/mail-client/neomutt/neomutt-20180512.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-if [[ ${PV} =~ 9999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="https://neomutt.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet
-	libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime
-	smime_classic ssl tokyocabinet"
-
-CDEPEND="
-	app-misc/mime-types
-	berkdb? (
-		|| (
-			sys-libs/db:6.2
-			sys-libs/db:5.3
-			sys-libs/db:4.8
-		)
-		<sys-libs/db-6.3:=
-	)
-	gdbm? ( sys-libs/gdbm )
-	kyotocabinet? ( dev-db/kyotocabinet )
-	lmdb? ( dev-db/lmdb )
-	nls? ( virtual/libintl )
-	qdbm? ( dev-db/qdbm )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	gnutls? ( >=net-libs/gnutls-1.0.17 )
-	gpg? ( >=app-crypt/gpgme-0.9.0 )
-	gpgme? ( >=app-crypt/gpgme-0.9.0 )
-	idn? ( net-dns/libidn:= )
-	kerberos? ( virtual/krb5 )
-	notmuch? ( net-mail/notmuch )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	!slang? ( sys-libs/ncurses:0 )
-	slang? ( sys-libs/slang )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6:0 )
-		libressl? ( dev-libs/libressl )
-	)
-"
-DEPEND="${CDEPEND}
-	dev-lang/tcl
-	net-mail/mailbase
-	doc? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		|| ( www-client/lynx www-client/w3m www-client/elinks )
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mutt )
-"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_configure() {
-	local myconf=(
-		"$(use_enable doc)"
-		"$(use_enable nls)"
-		"$(use_enable notmuch)"
-
-		# During the transition of the crypto USE flags we need to support
-		# both sets of flags. We do not want to emit a configuration setting
-		# twice, since the second flag overrides the first, potentially
-		# leading to unwanted settings. See https://bugs.gentoo.org/640824 for
-		# details.
-		"$(if use gpg || use gpgme; then echo "--enable"; else echo "--disable"; fi)-gpgme"
-		"$(if use crypt || use pgp_classic; then echo "--enable"; else echo "--disable"; fi)-pgp"
-		"$(if use smime || use smime_classic; then echo "--enable"; else echo "--disable"; fi)-smime"
-
-		# Database backends.
-		"$(use_enable berkdb bdb)"
-		"$(use_enable gdbm)"
-		"$(use_enable kyotocabinet)"
-		"$(use_enable qdbm)"
-		"$(use_enable tokyocabinet)"
-
-		"$(use_enable idn)"
-		"$(use_enable kerberos gss)"
-		"$(use_enable lmdb)"
-		"$(use_enable sasl)"
-		"--with-ui=$(usex slang slang ncurses)"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"$(use_enable ssl)"
-		"$(use_enable gnutls)"
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# A man-page is always handy, so fake one – here neomuttrc.5
-	# (neomutt.1 already exists)
-	if use !doc; then
-		sed -n \
-			-e '/^\(CC_FOR_BUILD\|CFLAGS_FOR_BUILD\)\s*=/p' \
-			-e '/^\(EXTRA_CFLAGS_FOR_BUILD\|LDFLAGS_FOR_BUILD\)\s*=/p' \
-			-e '/^\(EXEEXT\|SRCDIR\)\s*=/p' \
-			Makefile > doc/Makefile.fakedoc || die
-		sed -n \
-			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
-			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
-			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
-		emake -f doc/Makefile.fakedoc doc/neomutt.1
-		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
-		doman doc/neomutt.1 doc/neomuttrc.5
-	fi
-
-	dodoc LICENSE* ChangeLog* README*
-}
-
-pkg_postinst() {
-	if use crypt || use gpg || use smime; then
-		ewarn "Pleae note that the crypto related USE flags of neomutt have changed."
-		ewarn "(https://bugs.gentoo.org/637176)"
-		ewarn "crypt -> pgp_classic"
-		ewarn "gpg -> gpgme"
-		ewarn "smime -> smime_classic"
-		ewarn "The old USE flags still work but their use is deprecated and will"
-		ewarn "be removed in a future release."
-		if use gpg && ( use crypt || use smime ); then
-			ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
-			ewarn "  support.  You can probably remove pgp_classic (old crypt)"
-			ewarn "  and smime_classic (old smime) from your USE-flags and"
-			ewarn "  only enable gpgme."
-		fi
-	fi
-}
diff --git a/mail-client/neomutt/neomutt-20180622.ebuild b/mail-client/neomutt/neomutt-20180622.ebuild
deleted file mode 100644
index 4d1742196c36..000000000000
--- a/mail-client/neomutt/neomutt-20180622.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-if [[ ${PV} =~ 99999999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="https://neomutt.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
-	lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime_classic
-	ssl tokyocabinet"
-
-CDEPEND="
-	app-misc/mime-types
-	berkdb? (
-		|| (
-			sys-libs/db:6.2
-			sys-libs/db:5.3
-			sys-libs/db:4.8
-		)
-		<sys-libs/db-6.3:=
-	)
-	gdbm? ( sys-libs/gdbm )
-	kyotocabinet? ( dev-db/kyotocabinet )
-	lmdb? ( dev-db/lmdb )
-	nls? ( virtual/libintl )
-	qdbm? ( dev-db/qdbm )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	gnutls? ( >=net-libs/gnutls-1.0.17 )
-	gpgme? ( >=app-crypt/gpgme-0.9.0 )
-	idn? ( net-dns/libidn:= )
-	kerberos? ( virtual/krb5 )
-	notmuch? ( net-mail/notmuch )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	!slang? ( sys-libs/ncurses:0 )
-	slang? ( sys-libs/slang )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6:0 )
-		libressl? ( dev-libs/libressl )
-	)
-"
-DEPEND="${CDEPEND}
-	dev-lang/tcl
-	net-mail/mailbase
-	doc? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		|| ( www-client/lynx www-client/w3m www-client/elinks )
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mutt )
-"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_configure() {
-	local myconf=(
-		"$(use_enable doc)"
-		"$(use_enable nls)"
-		"$(use_enable notmuch)"
-
-		"$(use_enable gpgme)"
-		"$(use_enable pgp_classic pgp)"
-		"$(use_enable smime_classic smime)"
-
-		# Database backends.
-		"$(use_enable berkdb bdb)"
-		"$(use_enable gdbm)"
-		"$(use_enable kyotocabinet)"
-		"$(use_enable qdbm)"
-		"$(use_enable tokyocabinet)"
-
-		"$(use_enable idn)"
-		"$(use_enable kerberos gss)"
-		"$(use_enable lmdb)"
-		"$(use_enable sasl)"
-		"--with-ui=$(usex slang slang ncurses)"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"$(use_enable ssl)"
-		"$(use_enable gnutls)"
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# A man-page is always handy, so fake one – here neomuttrc.5
-	# (neomutt.1 already exists)
-	if use !doc; then
-		sed -n \
-			-e '/^\(CC_FOR_BUILD\|CFLAGS_FOR_BUILD\)\s*=/p' \
-			-e '/^\(EXTRA_CFLAGS_FOR_BUILD\|LDFLAGS_FOR_BUILD\)\s*=/p' \
-			-e '/^\(EXEEXT\|SRCDIR\)\s*=/p' \
-			Makefile > doc/Makefile.fakedoc || die
-		sed -n \
-			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
-			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
-			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
-		emake -f doc/Makefile.fakedoc doc/neomutt.1
-		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
-		doman doc/neomutt.1 doc/neomuttrc.5
-	fi
-
-	dodoc LICENSE* ChangeLog* README*
-}
-
-pkg_postinst() {
-	if use gpgme && ( use pgp_classic || use smime_classic ); then
-		ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
-		ewarn "  support.  You can probably remove pgp_classic (old crypt)"
-		ewarn "  and smime_classic (old smime) from your USE-flags and"
-		ewarn "  only enable gpgme."
-	fi
-}
diff --git a/mail-client/neomutt/neomutt-20180716-r1.ebuild b/mail-client/neomutt/neomutt-20200313.ebuild
similarity index 96%
rename from mail-client/neomutt/neomutt-20180716-r1.ebuild
rename to mail-client/neomutt/neomutt-20200313.ebuild
index 29a5fb64d013..d195e95a243e 100644
--- a/mail-client/neomutt/neomutt-20180716-r1.ebuild
+++ b/mail-client/neomutt/neomutt-20200313.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
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
 else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -65,8 +65,6 @@ RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-mutt )
 "
 
-S="${WORKDIR}/${PN}-${P}"
-
 src_configure() {
 	local myconf=(
 		"$(usex doc --full-doc --disable-doc)"
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index ca99aa4417f1..93feb689ea20 100644
Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index f97b37bd5be4..2a93ac10c535 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,3 +1,4 @@
+DIST postfix-3.4.10.tar.gz 4573370 BLAKE2B 57ed51539de2c06bdc8d5105ab28b06d9d9ae782255971571c57310b54e187ef5da5191b7145ada81863e247a72fcc576e571848f5ad7ad720afb06ac77c2cf3 SHA512 b337fff8212bfec100d4f415ddb04a4539fad31c7cb555a37e778e7807d70a2a6879ac6d79af96a0593c23189cfaf65e5021fd4e8d39c641ccaabdd06cb7daad
 DIST postfix-3.4.5.tar.gz 4581301 BLAKE2B 9de66cab6eea610fc83e4629980b3e201b4e3f9185729cb84933aa940b64b7818d0439c5145ea0b635666db92c970e1974f4f439cd3b733c58e1fe5794c046fa SHA512 af59d960b40799f7667935bef8fafb93ae6dcb70abaa77a15cf498571f37fa0429f411f9f08b1b6bfa588d3f572260d14d6d5409f0cd1e82b1c59928b2124c94
 DIST postfix-3.4.6.tar.gz 4571771 BLAKE2B e08b2e6c01fe54fcc7439182783190f4adb81758a1bbcc1bfec71e02dca91a779308f624e081837f7e2deec8666f10bc51238e90cc952de6c8371fb18790604f SHA512 96430d60cf58b9876e52a742dbfe3ca1da4ec82eeea5cd35c6ee4e69714ddd5601561a6663aac51a34b2d64db4f7678d7c5d720ec9ead807b5d7e87e37434961
 DIST postfix-3.4.7.tar.gz 4572758 BLAKE2B 8d811293672fc2a1e0e3276fadd172d9e130a3e0b5ccbaf27ddf183a50f25ca9bbf5c0a28806bb1f79d5648c4de44edd8ee98192355077e29a0c69a2685878dc SHA512 2bc29a87a65c46d06b6fc51c4cdf22da773e63f19488871e040eba6250bf686eecc7de11e14224018c35b061e66e1759c69dc649d7388f724a58080195209e68
diff --git a/mail-mta/postfix/postfix-3.4.10.ebuild b/mail-mta/postfix/postfix-3.4.10.ebuild
new file mode 100644
index 000000000000..f62330bb7af8
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.4.10.ebuild
@@ -0,0 +1,319 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic pam systemd toolchain-funcs
+
+MY_PV="${PV/_rc/-RC}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
+
+LICENSE="|| ( IBM EPL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
+
+DEPEND=">=dev-libs/libpcre-3.4
+	dev-lang/perl
+	berkdb? ( >=sys-libs/db-3.2:* )
+	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
+	eai? ( dev-libs/icu:= )
+	ldap? ( net-nds/openldap )
+	ldap-bind? ( net-nds/openldap[sasl] )
+	lmdb? ( >=dev-db/lmdb-0.9.11 )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nis? ( net-libs/libnsl )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:* )
+	sasl? (  >=dev-libs/cyrus-sasl-2 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( >=dev-libs/libressl-2.9.1:0= )
+	)"
+
+RDEPEND="${DEPEND}
+	acct-group/postfix
+	acct-group/postdrop
+	acct-user/postfix
+	memcached? ( net-misc/memcached )
+	net-mail/mailbase
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
+	!net-mail/fastforward
+	selinux? ( sec-policy/selinux-postfix )"
+
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-libressl-certkey.patch"
+	"${FILESDIR}/${PN}-libressl-server.patch"
+	"${FILESDIR}/${PN}-glibc230.patch"
+	"${FILESDIR}/${PN}-gcc10.patch"
+)
+
+src_prepare() {
+	default
+	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+}
+
+src_configure() {
+	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+	do
+		local AUXLIBS_${name}=""
+	done
+
+	# Make sure LDFLAGS get passed down to the executables.
+	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
+	AUXLIBS_PCRE="$(pcre-config --libs)"
+
+	use pam && mylibs="${mylibs} -lpam"
+
+	if use ldap; then
+		mycc="${mycc} -DHAS_LDAP"
+		AUXLIBS_LDAP="-lldap -llber"
+	fi
+
+	if use mysql; then
+		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+		AUXLIBS_MYSQL="$(mysql_config --libs)"
+	fi
+
+	if use postgres; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+	fi
+
+	if use sqlite; then
+		mycc="${mycc} -DHAS_SQLITE"
+		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+	fi
+
+	if use ssl; then
+		mycc="${mycc} -DUSE_TLS"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+
+	if use lmdb; then
+		mycc="${mycc} -DHAS_LMDB"
+		AUXLIBS_LMDB="-llmdb -lpthread"
+	fi
+
+	if ! use eai; then
+		mycc="${mycc} -DNO_EAI"
+	fi
+
+	# broken. and "in other words, not supported" by upstream.
+	# Use inet_protocols setting in main.cf
+	#if ! use ipv6; then
+	#	mycc="${mycc} -DNO_IPV6"
+	#fi
+
+	if use sasl; then
+		if use dovecot-sasl; then
+			# Set dovecot as default.
+			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+		fi
+		if use ldap-bind; then
+			mycc="${mycc} -DUSE_LDAP_SASL"
+		fi
+		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	elif use dovecot-sasl; then
+		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+	fi
+
+	if ! use nis; then
+		mycc="${mycc} -DNO_NIS"
+	fi
+
+	if ! use berkdb; then
+		mycc="${mycc} -DNO_DB"
+		if use cdb; then
+			# change default hash format from Berkeley DB to cdb
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+		fi
+	fi
+
+	if use cdb; then
+		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			einfo "Building with dev-db/tinycdb"
+			AUXLIBS_CDB="-lcdb"
+		else
+			einfo "Building with dev-db/cdb"
+			CDB_PATH="/usr/$(get_libdir)"
+			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+			done
+		fi
+	fi
+
+	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
+	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+	filter-lfs-flags
+
+	# Workaround for bug #76512
+	if use hardened; then
+		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+	fi
+
+	# Remove annoying C++ comment style warnings - bug #378099
+	append-flags -Wno-comment
+
+	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+	emake makefiles shared=yes dynamicmaps=no pie=yes \
+		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install() {
+	LD_LIBRARY_PATH="${S}/lib" \
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/etc/postfix" \
+		manpage_directory="/usr/share/man" \
+		command_directory="/usr/sbin" \
+		mailq_path="/usr/bin/mailq" \
+		newaliases_path="/usr/bin/newaliases" \
+		sendmail_path="/usr/sbin/sendmail" \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}"/var
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# Provide another link for legacy FSH
+	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
+
+	# Install qshape, posttls-finger and collate
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+	dobin bin/posttls-finger
+	doman man/man1/posttls-finger.1
+	dobin auxiliary/collate/collate.pl
+	newdoc auxiliary/collate/README README.collate
+
+	# Performance tuning tools and their manuals
+	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+	# Set proper permissions on required files/directories
+	keepdir /var/lib/postfix
+	fowners -R postfix:postfix /var/lib/postfix
+	fperms 0750 /var/lib/postfix
+	fowners root:postdrop /usr/sbin/post{drop,queue}
+	fperms 02755 /usr/sbin/post{drop,queue}
+
+	keepdir /etc/postfix
+	keepdir /etc/postfix/postfix-files.d
+	if use mbox; then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	else
+		mypostconf="home_mailbox=.maildir/"
+	fi
+	LD_LIBRARY_PATH="${S}/lib" \
+	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+		-e ${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}"/smtp.pass saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+	# do not start mysql/postgres unnecessarily - bug #359913
+	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+	# postfix set-permissions expects uncompressed man files
+	docompress -x /usr/share/man
+
+	pamd_mimic_system smtp auth account
+
+	if use sasl; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}"/smtp.sasl smtpd.conf
+	fi
+
+	# header files
+	insinto /usr/include/postfix
+	doins include/*.h
+
+	if has_version mail-mta/postfix; then
+		# let the sysadmin decide when to change the compatibility_level
+		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+	fi
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_preinst() {
+	if has_version '<mail-mta/postfix-3.4'; then
+		elog
+		elog "Postfix-3.4 introduces a new master.cf service 'postlog'"
+		elog "with type 'unix-dgram' that is used by the new postlogd(8) daemon."
+		elog "Before backing out to an older Postfix version, edit the master.cf"
+		elog "file and remove the postlog entry."
+		elog
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -e /etc/mail/aliases.db ]] ; then
+		ewarn
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+		ewarn
+	fi
+
+	# check and fix file permissions
+	"${EROOT}"/usr/sbin/postfix set-permissions
+
+	# configure tls
+	if use ssl ; then
+		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
+			elog "To configure client side TLS settings:"
+			elog "${EROOT}"/usr/sbin/postfix tls enable-client
+		fi
+		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
+			elog "To configure server side TLS settings:"
+			elog "${EROOT}"/usr/sbin/postfix tls enable-server
+		fi
+	fi
+}
diff --git a/mail-mta/protonmail-bridge-bin/Manifest b/mail-mta/protonmail-bridge-bin/Manifest
index 2b55cfcb9c5f..ccaecb6a6deb 100644
--- a/mail-mta/protonmail-bridge-bin/Manifest
+++ b/mail-mta/protonmail-bridge-bin/Manifest
@@ -1,3 +1,2 @@
-DIST protonmail-bridge-1.1.6-1.x86_64.rpm 52547264 BLAKE2B abfc9657e7f15596f12609b9541a7616a405a86d02539340aa406f78c5abf1b766283dd6d954a15ebbb439402290f4a937d6c9a3d5b61de57383142dc878a379 SHA512 65524367fe9bf2a9fee7bb0be1cefc01eadf60494b65be9cb03c7ce73949d92c3312589a6f2801ca3cac89db226250529eefea12b0af744ca1c95ee4fc175435
-DIST protonmail-bridge-1.2.2-1.x86_64.rpm 52777739 BLAKE2B 84c11176e57586f11e0fb511bcdbc98fbc85a563ba68dd44454a9b10e493a01b4414bf776929afa0990f3e1677fd47ab1b6c16e7799e964cff617f8cc5190bd7 SHA512 7dad4fd0ef99925a0e70fa2fbce89b16d900b4fdbe8da7c914451aa60ac47121da0de2a5b475b8e3e5bd024bbe7b67667c8c9733b6e7435c222f034ca9406c58
 DIST protonmail-bridge-1.2.3-1.x86_64.rpm 52847419 BLAKE2B 604a1990ced2f9e64e99aad7f729ac48750f2b620036c7e953cc9b16e25187f201d2a148bb03a03bcf48fc72db3faefedd8102a4c099dca2c9c71e766804a6cc SHA512 98a92d1365baac975e3007a4a8d920aa8b5d0166d9c69deb4c9dd4f96cb314a5a60fb7bd43c35c33c89419b63dba5e4dc1526cf8518a0f6db4e3315b4eb8a420
+DIST protonmail-bridge-1.2.5-1.x86_64.rpm 53090683 BLAKE2B 050780e01559a39d5243cd319e63930be5cffd99b95041733f8fa2ed3f53f48986ddd7ab5b18fd2a8e1e4c767e1047caec2a39a17f1540146d9a5024dc22768e SHA512 86cd9cd4145b38ee9f3ed556741fe9dec73e52e89777e5ddd66aa2c4d4617134e5ac36fabd4a10117bf16259ad8a782e4ed05ce715abab96f0a41e62eba6550a
diff --git a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.2.2.ebuild b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.2.2.ebuild
deleted file mode 100644
index f3a5ead03295..000000000000
--- a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.2.2.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rpm
-
-DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
-HOMEPAGE="https://protonmail.com/bridge/"
-SRC_URI="https://protonmail.com/download/${P/-bin/}-1.x86_64.rpm"
-
-RESTRICT="bindist mirror"
-
-LICENSE="MIT protonmail-bridge-EULA"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-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
-"
-BDEPEND="dev-util/patchelf"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="*"
-
-src_prepare() {
-	# Some bogus files got into package.
-	rm -rf usr/lib/.build-id
-
-	# Bug #660366. To workaround preserving libs, set RUNPATH and rm unused libs
-	cd "${S}/usr/lib/protonmail/bridge" || die
-	patchelf --set-rpath '$ORIGIN/lib' protonmail-bridge || die "patchelf failed"
-	patchelf --set-rpath '$ORIGIN' lib/libicui18n.so.56 || die "patchelf failed"
-	patchelf --set-rpath '$ORIGIN' lib/libicuuc.so.56 || die "patchelf failed"
-
-	rm "lib/libQt53DCore.so.5" || die
-	rm "lib/libQt53DExtras.so.5" || die
-	rm "lib/libQt53DInput.so.5" || die
-	rm "lib/libQt53DLogic.so.5" || die
-	rm "lib/libQt53DQuick.so.5" || die
-	rm "lib/libQt53DQuickExtras.so.5" || die
-	rm "lib/libQt53DQuickInput.so.5" || die
-	rm "lib/libQt53DQuickRender.so.5" || die
-	rm "lib/libQt53DRender.so.5" || die
-	rm "lib/libQt5Concurrent.so.5" || die
-	rm "lib/libQt5Gamepad.so.5" || die
-	rm "lib/libQt5QuickParticles.so.5" || die
-	rm "plugins/audio/libqtaudio_alsa.so" || die
-	rm "plugins/audio/libqtmedia_pulse.so" || die
-	rm "plugins/bearer/libqconnmanbearer.so" || die
-	rm "plugins/bearer/libqgenericbearer.so" || die
-	rm "plugins/bearer/libqnmbearer.so" || die
-	rm "plugins/canbus/libqtpeakcanbus.so" || die
-	rm "plugins/canbus/libqtsocketcanbus.so" || die
-	rm "plugins/canbus/libqttinycanbus.so" || die
-	rm "plugins/designer/libqquickwidget.so" || die
-	rm "plugins/designer/libqwebengineview.so" || die
-	rm "plugins/egldeviceintegrations/libqeglfs-emu-integration.so" || die
-	rm "plugins/egldeviceintegrations/libqeglfs-x11-integration.so" || die
-	rm "plugins/gamepads/libevdevgamepad.so" || die
-	rm "plugins/generic/libqevdevkeyboardplugin.so" || die
-	rm "plugins/generic/libqevdevmouseplugin.so" || die
-	rm "plugins/generic/libqevdevtabletplugin.so" || die
-	rm "plugins/generic/libqevdevtouchplugin.so" || die
-	rm "plugins/generic/libqtuiotouchplugin.so" || die
-	rm "plugins/geometryloaders/libdefaultgeometryloader.so" || die
-	rm "plugins/geometryloaders/libgltfgeometryloader.so" || die
-	rm "plugins/geoservices/libqtgeoservices_esri.so" || die
-	rm "plugins/geoservices/libqtgeoservices_itemsoverlay.so" || die
-	rm "plugins/geoservices/libqtgeoservices_mapbox.so" || die
-	rm "plugins/geoservices/libqtgeoservices_mapboxgl.so" || die
-	rm "plugins/geoservices/libqtgeoservices_nokia.so" || die
-	rm "plugins/geoservices/libqtgeoservices_osm.so" || die
-	rm "plugins/iconengines/libqsvgicon.so" || die
-	rm "plugins/mediaservice/libgstaudiodecoder.so" || die
-	rm "plugins/mediaservice/libgstcamerabin.so" || die
-	rm "plugins/mediaservice/libgstmediacapture.so" || die
-	rm "plugins/mediaservice/libgstmediaplayer.so" || die
-	rm "plugins/platforminputcontexts/libibusplatforminputcontextplugin.so" || die
-	rm "plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so" || die
-	rm "plugins/platforms/libqeglfs.so" || die
-	rm "plugins/platforms/libqlinuxfb.so" || die
-	rm "plugins/platforms/libqminimal.so" || die
-	rm "plugins/platforms/libqminimalegl.so" || die
-	rm "plugins/platforms/libqoffscreen.so" || die
-	rm "plugins/platforms/libqvnc.so" || die
-	rm "plugins/platformthemes/libqgtk3.so" || die
-	rm "plugins/playlistformats/libqtmultimedia_m3u.so" || die
-	rm "plugins/position/libqtposition_geoclue.so" || die
-	rm "plugins/position/libqtposition_positionpoll.so" || die
-	rm "plugins/printsupport/libcupsprintersupport.so" || die
-	rm "plugins/qmltooling/libqmldbg_inspector.so" || die
-	rm "plugins/qmltooling/libqmldbg_local.so" || die
-	rm "plugins/qmltooling/libqmldbg_messages.so" || die
-	rm "plugins/qmltooling/libqmldbg_native.so" || die
-	rm "plugins/qmltooling/libqmldbg_nativedebugger.so" || die
-	rm "plugins/qmltooling/libqmldbg_profiler.so" || die
-	rm "plugins/qmltooling/libqmldbg_quickprofiler.so" || die
-	rm "plugins/qmltooling/libqmldbg_server.so" || die
-	rm "plugins/qmltooling/libqmldbg_tcp.so" || die
-	rm "plugins/renderplugins/libscene2d.so" || die
-	rm "plugins/sceneparsers/libassimpsceneimport.so" || die
-	rm "plugins/sceneparsers/libgltfsceneexport.so" || die
-	rm "plugins/sceneparsers/libgltfsceneimport.so" || die
-	rm "plugins/sensorgestures/libqtsensorgestures_plugin.so" || die
-	rm "plugins/sensorgestures/libqtsensorgestures_shakeplugin.so" || die
-	rm "plugins/sensors/libqtsensors_generic.so" || die
-	rm "plugins/sensors/libqtsensors_iio-sensor-proxy.so" || die
-	rm "plugins/sensors/libqtsensors_linuxsys.so" || die
-	rm "plugins/sqldrivers/libqsqlite.so" || die
-	rm "plugins/sqldrivers/libqsqlmysql.so" || die
-	rm "plugins/sqldrivers/libqsqlpsql.so" || die
-	rm "plugins/xcbglintegrations/libqxcb-egl-integration.so" || die
-	rm "qml/Qt/labs/calendar/libqtlabscalendarplugin.so" || die
-	rm "qml/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so" || die
-	rm "qml/Qt/labs/platform/libqtlabsplatformplugin.so" || die
-	rm "qml/Qt/labs/settings/libqmlsettingsplugin.so" || die
-	rm "qml/Qt/labs/sharedimage/libsharedimageplugin.so" || die
-	rm "qml/Qt3D/Animation/libquick3danimationplugin.so" || die
-	rm "qml/Qt3D/Core/libquick3dcoreplugin.so" || die
-	rm "qml/Qt3D/Extras/libquick3dextrasplugin.so" || die
-	rm "qml/Qt3D/Input/libquick3dinputplugin.so" || die
-	rm "qml/Qt3D/Logic/libquick3dlogicplugin.so" || die
-	rm "qml/Qt3D/Render/libquick3drenderplugin.so" || die
-	rm "qml/QtBluetooth/libdeclarative_bluetooth.so" || die
-	rm "qml/QtCanvas3D/libqtcanvas3d.so" || die
-	rm "qml/QtGamepad/libdeclarative_gamepad.so" || die
-	rm "qml/QtLocation/libdeclarative_location.so" || die
-	rm "qml/QtMultimedia/libdeclarative_multimedia.so" || die
-	rm "qml/QtNfc/libdeclarative_nfc.so" || die
-	rm "qml/QtPositioning/libdeclarative_positioning.so" || die
-	rm "qml/QtQml/Models.2/libmodelsplugin.so" || die
-	rm "qml/QtQml/StateMachine/libqtqmlstatemachine.so" || die
-	rm "qml/QtQuick/Controls.2/Material/libqtquickcontrols2materialstyleplugin.so" || die
-	rm "qml/QtQuick/Controls.2/Universal/libqtquickcontrols2universalstyleplugin.so" || die
-	rm "qml/QtQuick/Controls/Styles/Flat/libqtquickextrasflatplugin.so" || die
-	rm "qml/QtQuick/Controls/libqtquickcontrolsplugin.so" || die
-	rm "qml/QtQuick/Dialogs/Private/libdialogsprivateplugin.so" || die
-	rm "qml/QtQuick/Dialogs/libdialogplugin.so" || die
-	rm "qml/QtQuick/Extras/libqtquickextrasplugin.so" || die
-	rm "qml/QtQuick/LocalStorage/libqmllocalstorageplugin.so" || die
-	rm "qml/QtQuick/Particles.2/libparticlesplugin.so" || die
-	rm "qml/QtQuick/PrivateWidgets/libwidgetsplugin.so" || die
-	rm "qml/QtQuick/Scene2D/libqtquickscene2dplugin.so" || die
-	rm "qml/QtQuick/Scene3D/libqtquickscene3dplugin.so" || die
-	rm "qml/QtQuick/XmlListModel/libqmlxmllistmodelplugin.so" || die
-	rm "qml/QtScxml/libdeclarative_scxml.so" || die
-	rm "qml/QtSensors/libdeclarative_sensors.so" || die
-	rm "qml/QtTest/libqmltestplugin.so" || die
-	rm "qml/QtWebChannel/libdeclarative_webchannel.so" || die
-	rm "qml/QtWebEngine/libqtwebengineplugin.so" || die
-	rm "qml/QtWebSockets/libdeclarative_qmlwebsockets.so" || die
-	rm "qml/QtWebView/libdeclarative_webview.so" || die
-	rm "lib/libQt5MultimediaGstTools.so.5" || die
-	rm "lib/libQt5OpenGL.so.5" || die
-	rm "lib/libQt5QuickWidgets.so.5" || die
-	rm "lib/libQt5EglFsKmsSupport.so.5" || die
-	rm "plugins/position/libqtposition_serialnmea.so" || die
-	rm "plugins/webview/libqtwebview_webengine.so" || die
-	rm "plugins/egldeviceintegrations/libqeglfs-kms-egldevice-integration.so" || die
-	rm "plugins/texttospeech/libqtexttospeech_speechd.so" || die
-	rm "plugins/canbus/libqtpassthrucanbus.so" || die
-	rm "qml/QtQuick/Shapes/libqmlshapesplugin.so" || die
-	rm "qml/QtQuick/Controls.2/Fusion/libqtquickcontrols2fusionstyleplugin.so" || die
-	rm "qml/QtQuick/Controls.2/Imagine/libqtquickcontrols2imaginestyleplugin.so" || die
-	rm "qml/QtQml/RemoteObjects/libqtqmlremoteobjects.so" || die
-	rm "qml/Qt/labs/location/liblocationlabsplugin.so" || die
-
-	default
-}
-
-src_install() {
-	# Using doins -r would strip executable bits from all binaries
-	cp -pPR usr "${D}"/ || die "Failed to copy files"
-
-	dosym "protonmail-bridge" "/usr/bin/${PN}"
-
-	insinto /etc/revdep-rebuild
-	newins - "50-${PN}" <<-EOF
-		SEARCH_DIRS_MASK="/usr/lib*/protonmail/bridge"
-	EOF
-}
diff --git a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.1.6.ebuild b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.2.5.ebuild
similarity index 73%
rename from mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.1.6.ebuild
rename to mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.2.5.ebuild
index f3a5ead03295..eff632ea197c 100644
--- a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.1.6.ebuild
+++ b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.2.5.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
@@ -123,7 +123,6 @@ src_prepare() {
 	rm "plugins/sensors/libqtsensors_iio-sensor-proxy.so" || die
 	rm "plugins/sensors/libqtsensors_linuxsys.so" || die
 	rm "plugins/sqldrivers/libqsqlite.so" || die
-	rm "plugins/sqldrivers/libqsqlmysql.so" || die
 	rm "plugins/sqldrivers/libqsqlpsql.so" || die
 	rm "plugins/xcbglintegrations/libqxcb-egl-integration.so" || die
 	rm "qml/Qt/labs/calendar/libqtlabscalendarplugin.so" || die
@@ -138,7 +137,6 @@ src_prepare() {
 	rm "qml/Qt3D/Logic/libquick3dlogicplugin.so" || die
 	rm "qml/Qt3D/Render/libquick3drenderplugin.so" || die
 	rm "qml/QtBluetooth/libdeclarative_bluetooth.so" || die
-	rm "qml/QtCanvas3D/libqtcanvas3d.so" || die
 	rm "qml/QtGamepad/libdeclarative_gamepad.so" || die
 	rm "qml/QtLocation/libdeclarative_location.so" || die
 	rm "qml/QtMultimedia/libdeclarative_multimedia.so" || die
@@ -180,6 +178,51 @@ src_prepare() {
 	rm "qml/QtQuick/Controls.2/Imagine/libqtquickcontrols2imaginestyleplugin.so" || die
 	rm "qml/QtQml/RemoteObjects/libqtqmlremoteobjects.so" || die
 	rm "qml/Qt/labs/location/liblocationlabsplugin.so" || die
+	rm "lib/libQt5WaylandClient.so.5" || die
+	rm "lib/libQt5WaylandCompositor.so.5" || die
+	rm "plugins/canbus/libqtvirtualcanbus.so" || die
+	rm "plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.so" || die
+	rm "plugins/platforms/libqwayland-egl.so" || die
+	rm "plugins/platforms/libqwayland-generic.so" || die
+	rm "plugins/platforms/libqwayland-xcomposite-egl.so" || die
+	rm "plugins/platforms/libqwayland-xcomposite-glx.so" || die
+	rm "plugins/platforms/libqwebgl.so" || die
+	rm "plugins/position/libqtposition_geoclue2.so" || die
+	rm "plugins/sqldrivers/libqsqlodbc.so" || die
+	rm "plugins/virtualkeyboard/libqtvirtualkeyboard_hangul.so" || die
+	rm "plugins/virtualkeyboard/libqtvirtualkeyboard_openwnn.so" || die
+	rm "plugins/virtualkeyboard/libqtvirtualkeyboard_pinyin.so" || die
+	rm "plugins/virtualkeyboard/libqtvirtualkeyboard_tcime.so" || die
+	rm "plugins/virtualkeyboard/libqtvirtualkeyboard_thai.so" || die
+	rm "plugins/wayland-decoration-client/libbradient.so" || die
+	rm "plugins/wayland-graphics-integration-client/libdmabuf-server.so" || die
+	rm "plugins/wayland-graphics-integration-client/libdrm-egl-server.so" || die
+	rm "plugins/wayland-graphics-integration-client/libqt-plugin-wayland-egl.so" || die
+	rm "plugins/wayland-graphics-integration-client/libshm-emulation-server.so" || die
+	rm "plugins/wayland-graphics-integration-client/libxcomposite-egl.so" || die
+	rm "plugins/wayland-graphics-integration-client/libxcomposite-glx.so" || die
+	rm "plugins/wayland-graphics-integration-server/libdmabuf-server.so" || die
+	rm "plugins/wayland-graphics-integration-server/libdrm-egl-server.so" || die
+	rm "plugins/wayland-graphics-integration-server/liblinux-dmabuf-unstable-v1.so" || die
+	rm "plugins/wayland-graphics-integration-server/libqt-plugin-wayland-egl.so" || die
+	rm "plugins/wayland-graphics-integration-server/libshm-emulation-server.so" || die
+	rm "plugins/wayland-graphics-integration-server/libwayland-eglstream-controller.so" || die
+	rm "plugins/wayland-graphics-integration-server/libxcomposite-egl.so" || die
+	rm "plugins/wayland-graphics-integration-server/libxcomposite-glx.so" || die
+	rm "plugins/wayland-shell-integration/libfullscreen-shell-v1.so" || die
+	rm "plugins/wayland-shell-integration/libivi-shell.so" || die
+	rm "plugins/wayland-shell-integration/libwl-shell.so" || die
+	rm "plugins/wayland-shell-integration/libxdg-shell-v5.so" || die
+	rm "plugins/wayland-shell-integration/libxdg-shell-v6.so" || die
+	rm "plugins/wayland-shell-integration/libxdg-shell.so" || die
+	rm "qml/QtCharts/libqtchartsqml2.so" || die
+	rm "qml/QtDataVisualization/libdatavisualizationqml2.so" || die
+	rm "qml/QtPurchasing/libdeclarative_purchasing.so" || die
+	rm "qml/QtQuick/VirtualKeyboard/Settings/libqtquickvirtualkeyboardsettingsplugin.so" || die
+	rm "qml/QtQuick/VirtualKeyboard/Styles/libqtquickvirtualkeyboardstylesplugin.so" || die
+	rm "qml/QtQuick/VirtualKeyboard/libqtquickvirtualkeyboardplugin.so" || die
+	rm "qml/QtRemoteObjects/libqtremoteobjects.so" || die
+	rm "qml/QtWayland/Compositor/libqwaylandcompositorplugin.so" || die
 
 	default
 }
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index c053fce72529..b52cb6eeb9f7 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/clutter/Manifest b/media-libs/clutter/Manifest
index f799ee6aec18..ea1067dcfce6 100644
--- a/media-libs/clutter/Manifest
+++ b/media-libs/clutter/Manifest
@@ -1,2 +1,3 @@
 DIST clutter-1.26.2-patchset.tar.xz 10204 BLAKE2B d3515420600a7d7df7df608f5091ccd1df5e23a5e75cc1e3cc3856de94a935234280d3648eace3220a299214a4715860c74d24a994b7f6e36901d8c80e10a7dc SHA512 2659b9a4ec3db59bc5a35ce09f974271a7a3f5e7bfbc7f741b5a5e87b2a017f4a779aafd97386fe448b94a5285d9eecad661cc320620c7c56928e296939bb708
 DIST clutter-1.26.2.tar.xz 5353736 BLAKE2B ac30cee3c5a8ed786c38820b7afb86e80929c2a797b737b35650ae6dd856576d72cc7f5407a984f418e255d6ab43c8d3ca9d7efd6f50650b2e0c733ecca19114 SHA512 c8008a1a1f111313d9abaff8d4415f112ddc32a02e08845f3735d33bb25b72b082f133daba06749bb9595eaf1ba83b308d30a413fbbe8dcdc1afdd7077a30937
+DIST clutter-1.26.4.tar.xz 5403168 BLAKE2B 642179423cc5f883f1920e90fafc3119fb735d2d7045d120e73b5a82bfec8750101e0cea51f5241f5326b801d5f881ffcc334d565184145e01b019c9350315b5 SHA512 6d43ac09df7671fa2bda74d1231166e8331f3ef1dbe0d167225033b3ddae7377d1062db81b73fc498c2e9f0db467bf4febb7306a6f40c9ef0266dac2a397f43a
diff --git a/media-libs/clutter/clutter-1.26.4.ebuild b/media-libs/clutter/clutter-1.26.4.ebuild
new file mode 100644
index 000000000000..fae8663ca7a5
--- /dev/null
+++ b/media-libs/clutter/clutter-1.26.4.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 virtualx
+
+DESCRIPTION="Clutter is a library for creating graphical user interfaces"
+HOMEPAGE="https://wiki.gnome.org/Projects/Clutter"
+
+LICENSE="LGPL-2.1+ FDL-1.1+"
+SLOT="1.0"
+
+IUSE="aqua debug doc egl gtk +introspection test wayland X"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	wayland? ( egl )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+# NOTE: glx flavour uses libdrm + >=mesa-7.3
+# >=libX11-1.3.1 needed for X Generic Event support
+# do not depend on tslib, it does not build and is disabled by default upstream
+RDEPEND="
+	>=dev-libs/glib-2.53.4:2
+	>=dev-libs/atk-2.5.3[introspection?]
+	>=dev-libs/json-glib-0.12[introspection?]
+	>=media-libs/cogl-1.21.2:1.0=[introspection?,pango,wayland?]
+	>=x11-libs/cairo-1.14:=[aqua?,glib]
+	>=x11-libs/pango-1.30[introspection?]
+
+	virtual/opengl
+	x11-libs/libdrm:=
+
+	egl? (
+		>=dev-libs/libinput-0.19.0
+		media-libs/cogl[gles2,kms]
+		>=dev-libs/libgudev-136
+		x11-libs/libxkbcommon
+	)
+	gtk? ( >=x11-libs/gtk+-3.22.6:3[aqua?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
+	X? (
+		media-libs/fontconfig
+		>=x11-libs/libX11-1.3.1
+		x11-libs/libXext
+		x11-libs/libXdamage
+		>=x11-libs/libXi-1.3
+		>=x11-libs/libXcomposite-0.4 )
+	wayland? (
+		dev-libs/wayland
+		x11-libs/gdk-pixbuf:2 )
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.20
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	doc? (
+		>=dev-util/gtk-doc-1.20
+		>=app-text/docbook-sgml-utils-0.6.14[jadetex]
+		dev-libs/libxslt )
+	X? ( x11-base/xorg-proto )
+	test? ( x11-libs/gdk-pixbuf )
+"
+
+src_prepare() {
+	# We only need conformance tests, the rest are useless for us
+	sed -e 's/^\(SUBDIRS =\).*/\1 accessibility conform/g' \
+		-i tests/Makefile.am || die "am tests sed failed"
+	sed -e 's/^\(SUBDIRS =\)[^\]*/\1  accessibility conform/g' \
+		-i tests/Makefile.in || die "in tests sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# XXX: Conformance test suite (and clutter itself) does not work under Xvfb
+	# (GLX error blabla)
+	# XXX: coverage disabled for now
+	# XXX: What about cex100/win32 backends?
+	gnome2_src_configure \
+		--disable-maintainer-flags \
+		--disable-mir-backend \
+		--disable-gcov \
+		--disable-cex100-backend \
+		--disable-win32-backend \
+		--disable-tslib-input \
+		$(use_enable aqua quartz-backend) \
+		$(usex debug --enable-debug=yes --enable-debug=minimum) \
+		$(use_enable doc docs) \
+		$(use_enable egl egl-backend) \
+		$(use_enable egl evdev-input) \
+		$(use_enable gtk gdk-backend) \
+		$(use_enable introspection) \
+		$(use_enable test gdk-pixbuf) \
+		$(use_enable wayland wayland-backend) \
+		$(use_enable wayland wayland-compositor) \
+		$(use_enable X xinput) \
+		$(use_enable X x11-backend)
+}
+
+src_test() {
+	virtx emake check -C tests/conform
+}
diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
index 490e821584da..ca86cc216509 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -1 +1,2 @@
 DIST cogl-1.22.4.tar.xz 1723856 BLAKE2B 9e8532e3a0d17662042e2e61e45a7ddab6d3a35c7fbb070426b574292d7d3ed81e42a05cde9ab9a58ecda4eb6d560d0dca6c44b7791bba195e2ab2a33e8c0dc1 SHA512 85f3af49c16dd2e545a3b91c076ac10107a4b9d0dc785cefe489e91eabdd82837f732685f1f0dca1695fc2f8095f42d5f30f145b659eb4295964787f06c1e37a
+DIST cogl-1.22.6.tar.xz 1744240 BLAKE2B d3483c972705ec72d2ccbd06106bdd37ea23a7940c7d5f5d8c45da43a8e5ed7bc2fb5f07838b5a0cfe9b54d3681120008c03945ee8bac39042a9c263e84d3549 SHA512 b3475fa4fff3b6725f643b0d17d2de242fce1503cd83bd18031d98495501917bf5173152fb1aba7f2614fcf6553029fbb6f26bda5a497f5f12e2849ed301a483
diff --git a/media-libs/cogl/cogl-1.22.6.ebuild b/media-libs/cogl/cogl-1.22.6.ebuild
new file mode 100644
index 000000000000..8ab89e053214
--- /dev/null
+++ b/media-libs/cogl/cogl-1.22.6.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GNOME2_EAUTORECONF="yes"
+inherit gnome2 multilib
+
+DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
+HOMEPAGE="https://www.cogl3d.org/"
+
+LICENSE="MIT BSD"
+SLOT="1.0/20" # subslot = .so version
+
+# doc and profile disable for now due to bugs #484750 and #483332
+IUSE="debug examples gles2 gstreamer +introspection +kms +opengl +pango wayland" # doc profile
+REQUIRED_USE="
+	wayland? ( gles2 )
+	|| ( gles2 opengl )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32:2
+	x11-libs/cairo:=
+	>=x11-libs/gdk-pixbuf-2:2
+	x11-libs/libX11
+	>=x11-libs/libXcomposite-0.4
+	x11-libs/libXdamage
+	x11-libs/libXext
+	>=x11-libs/libXfixes-3
+	>=x11-libs/libXrandr-1.2
+	virtual/opengl
+	gles2? ( media-libs/mesa[gles2] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.34.2:= )
+	kms? (
+		media-libs/mesa[egl,gbm]
+		x11-libs/libdrm:= )
+	pango? ( >=x11-libs/pango-1.20.0[introspection?] )
+	wayland? (
+		>=dev-libs/wayland-1.1.90
+		media-libs/mesa[egl,wayland] )
+"
+# before clutter-1.7, cogl was part of clutter
+RDEPEND="${COMMON_DEPEND}
+	!<media-libs/clutter-1.7
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.13
+	>=sys-devel/gettext-0.19
+	virtual/pkgconfig
+"
+
+# Need classic mesa swrast for tests, llvmpipe causes a test failure
+# For some reason GL3 conformance test all fails again...
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-eglmesaext-include.patch
+)
+
+src_prepare() {
+	# Do not build examples
+	sed -e "s/^\(SUBDIRS +=.*\)examples\(.*\)$/\1\2/" \
+		-i Makefile.am Makefile.in || die
+
+	#if ! use test ; then
+	# For some reason the configure switch will not completely disable
+	# tests being built
+	sed -e "s/^\(SUBDIRS =.*\)test-fixtures\(.*\)$/\1\2/" \
+		-e "s/^\(SUBDIRS +=.*\)tests\(.*\)$/\1\2/" \
+		-e "s/^\(.*am__append.* \)tests\(.*\)$/\1\2/" \
+		-i Makefile.am Makefile.in || die
+	#fi
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# TODO: think about quartz, sdl
+	# Prefer gl over gles2 if both are selected
+	# Profiling needs uprof, which is not available in portage yet, bug #484750
+	# FIXME: Doesn't provide prebuilt docs, but they can neither be rebuilt, bug #483332
+	gnome2_src_configure \
+		--disable-examples-install \
+		--disable-maintainer-flags \
+		--enable-cairo             \
+		--enable-deprecated        \
+		--enable-gdk-pixbuf        \
+		--enable-glib              \
+		$(use_enable debug)        \
+		$(use_enable opengl glx)   \
+		$(use_enable opengl gl)    \
+		$(use_enable gles2)        \
+		$(use_enable gles2 cogl-gles2) \
+		$(use_enable gles2 xlib-egl-platform) \
+		$(usex gles2 --with-default-driver=$(usex opengl gl gles2)) \
+		$(use_enable gstreamer cogl-gst)    \
+		$(use_enable introspection) \
+		$(use_enable kms kms-egl-platform) \
+		$(use_enable pango cogl-pango) \
+		--disable-unit-tests \
+		$(use_enable wayland wayland-egl-platform) \
+		$(use_enable wayland wayland-egl-server) \
+		--disable-profile
+#		$(use_enable profile)
+}
+
+src_install() {
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/{*.c,*.jpg}
+	fi
+
+	gnome2_src_install
+
+	# Remove silly examples-data directory
+	rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
+}
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 0d671f12eb17..5a3749de6a6d 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,4 +1,2 @@
-DIST Image-ExifTool-11.80.tar.gz 4697210 BLAKE2B 682ab224188f0094ca964d217bc2547aa928fdfffdc47423c9684626ac9211fe2518ea89d2162d33322718fd1abe062cbc8ff478cecb55ccdcf289894271058b SHA512 302c358f8d727ad37030bb0678ee1ad6f235f842037485e2cad52a53a3b9e7e091b30c69e1b3f1ab8f42a4d1d674a4207276abb896abf5370a3a237d50eeb228
-DIST Image-ExifTool-11.84.tar.gz 4699618 BLAKE2B 3ecb800c39edf06c567fa65df0c5c09919fb97477d78208e21275ed200016c724aafe7ceda745183b069915060f11609cd7566eccd13bff8528159d044964886 SHA512 b0bc535da0081c21349f116de51b8dd113dc23bf78491cc48d08ab3c82f5da09687b6cc6d5f096f876b9042146e30fccdd17f6f9d9de0e608df9b73ead7807da
-DIST Image-ExifTool-11.85.tar.gz 4700232 BLAKE2B 5c722edb05b2ca910950abfd291ef74dd28b2c5e118a36e9f8494c5c1bfae40b83b807850bcb0a833edd162f77bd300f1825518113301e9b1a2616aa72fb570b SHA512 36c3073c292ca68f62f1598ae0f30b806e7db86123cdb7f448dec14837fab543db846ee37c9b02da862d7a169759638eae700b8de5563d30e42e3330a2ce8b9e
 DIST Image-ExifTool-11.86.tar.gz 4702009 BLAKE2B 9f81bfa51daa5023092d6da887ff400ac8cddf9a406ad72a1bbb2cc735f72bfd7b4de2729e045e8b8ff49a2e0fef2fdc1db16ecd9500b79373b6d95fe93937ea SHA512 61725883f607bdb0e8d60b34596683fc42f4c653bbe5cbb974d181ad8544cb529558dc0eafb601bae126db31182a33adbbaf65b5a0d1d8163e38a76534694e3c
+DIST Image-ExifTool-11.91.tar.gz 4723460 BLAKE2B 186d7f4df45fd67b42a7cc509873e234f8a29c7889daf10608405c2795db2cd7e8be16401d2894b5e0831ace7f96f2e676fdf2ed257e5a2534290cdc2a1ba706 SHA512 5d00ac834f44908346a8b8125064bbfeb1887d5024d04a346a9a679248a45ebaf76c067511a245b96553a3881d1d3b06845cc6a39fef7293b9ad13bc70ebd650
diff --git a/media-libs/exiftool/exiftool-11.80.ebuild b/media-libs/exiftool/exiftool-11.80.ebuild
deleted file mode 100644
index 556e4d04a9d2..000000000000
--- a/media-libs/exiftool/exiftool-11.80.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_NAME=Image-ExifTool
-inherit perl-module
-
-DESCRIPTION="Read and write meta information in image, audio and video files"
-HOMEPAGE="https://exiftool.org/"
-SRC_URI="https://exiftool.org/${DIST_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 x86 ~x64-macos"
-IUSE="doc"
-
-SRC_TEST="do"
-
-src_install() {
-	perl-module_src_install
-	use doc && dodoc -r html/
-
-	insinto /usr/share/${PN}
-	doins -r fmt_files config_files arg_files
-}
diff --git a/media-libs/exiftool/exiftool-11.85.ebuild b/media-libs/exiftool/exiftool-11.85.ebuild
deleted file mode 100644
index 58ee12770a1c..000000000000
--- a/media-libs/exiftool/exiftool-11.85.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_NAME=Image-ExifTool
-inherit perl-module
-
-DESCRIPTION="Read and write meta information in image, audio and video files"
-HOMEPAGE="https://exiftool.org/"
-SRC_URI="https://exiftool.org/${DIST_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
-IUSE="doc"
-
-SRC_TEST="do"
-
-src_install() {
-	perl-module_src_install
-	use doc && dodoc -r html/
-
-	insinto /usr/share/${PN}
-	doins -r fmt_files config_files arg_files
-}
diff --git a/media-libs/exiftool/exiftool-11.86.ebuild b/media-libs/exiftool/exiftool-11.86.ebuild
index 58ee12770a1c..556e4d04a9d2 100644
--- a/media-libs/exiftool/exiftool-11.86.ebuild
+++ b/media-libs/exiftool/exiftool-11.86.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://exiftool.org/"
 SRC_URI="https://exiftool.org/${DIST_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 arm64 ppc ppc64 x86 ~x64-macos"
 IUSE="doc"
 
 SRC_TEST="do"
diff --git a/media-libs/exiftool/exiftool-11.84.ebuild b/media-libs/exiftool/exiftool-11.91.ebuild
similarity index 100%
rename from media-libs/exiftool/exiftool-11.84.ebuild
rename to media-libs/exiftool/exiftool-11.91.ebuild
diff --git a/media-libs/giflib/giflib-5.2.1-r1.ebuild b/media-libs/giflib/giflib-5.2.1-r1.ebuild
index 9f0f6afe78ee..ba6e92ee3b88 100644
--- a/media-libs/giflib/giflib-5.2.1-r1.ebuild
+++ b/media-libs/giflib/giflib-5.2.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/giflib/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/7"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 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 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( app-text/xmlto )"
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 5aa7e30f759a..c47ef878ccc0 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1,5 +1,2 @@
-DIST intel-gmmlib-19.2.1.tar.gz 633194 BLAKE2B fe6105bd76d18f3c4e0d42550fa91a1cfa75413b7289d4cfd89c6edbd9c2104f11dbb9c549f3331259d3629eba5f3698f8289da5f551f55f9a76cb704680e9fb SHA512 686b47d9de54f96ff1b4b75e595175a08e5a619d1b3f3e71388d851263dcb12315be7834721c88c698d4dbf6f68845d7850ce7a238f4e639ca0896de724c408d
-DIST intel-gmmlib-19.2.3.tar.gz 633252 BLAKE2B 81fcb541cc1a5fe3bd8ebbb2d98b5d4d7d6af409f1b837327c4cc322da7cc77c80992cc22ef6920cfe3704d6cd030bbf5e36936cb7f205e38f65807297a58dcb SHA512 d82973a18804474708e252cd1f0d5205e72dea0b7b14401ff7bad351f94ad7a53ada7def16f62da0810bfa6a747135fb2c7649e4a1fa6fbc4e8f5a38cf948d6b
-DIST intel-gmmlib-19.2.4.tar.gz 633227 BLAKE2B e7ce9143ced27c8be87b807eeb6fa66dec7f0931dda83d7f1ee597682e593798fda6edf665471723df23bb0ca8b730ff88070211728b83478340d80ad982b089 SHA512 7921b11abc2c0658b614decf5bad92a63155aadd35439eb1885e0314ece1b9a983d44ed28b48ae2259f949cb913272583a0c4f064cfacd698dd5c7013d6bff52
 DIST intel-gmmlib-19.3.4.tar.gz 706943 BLAKE2B 12eef2d0bed76e94770295461935b4056f40dab97bb24acf8e700d2b83198bb8a2800ab9155aebba5138a3269d4aefe645390524d34e57706de750f8e967d106 SHA512 77c7cf1cd3e7f0c2476badca6ae7a36504afb4af5f2c2282e790744a9b8ef668f24c4db8be171eef02394966021b5647921c0faf710e26689cebbd879b786a9d
 DIST intel-gmmlib-19.4.1.tar.gz 707375 BLAKE2B 0627889bebf763a8225c691e7ec6a2b3c1f403f62e5d11b557e3578e02b6cc3fe032e8b0d79483f34e9310bcfcd7667c407b1c4e549a2bb414247468b020f796 SHA512 264f111348bbaccd6c14c31ab15c7b02e63def56b0d3effa01067fb5e696d6d3e2ad3d5a9cc3a36f33b835dda12ec3916a31d3a812443de9d5dd815e2e4cde53
diff --git a/media-libs/gmmlib/gmmlib-19.2.1.ebuild b/media-libs/gmmlib/gmmlib-19.2.1.ebuild
deleted file mode 100644
index 814f7e0d4a70..000000000000
--- a/media-libs/gmmlib/gmmlib-19.2.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Intel Graphics Memory Management Library"
-HOMEPAGE="https://github.com/intel/gmmlib"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
-	S="${WORKDIR}/${PN}-intel-${P}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-multilib_src_configure() {
-# once upstream makes this optional
-#	local mycmakeargs=(
-#		-DMEDIA_RUN_TEST_SUITE=OFF
-#	)
-
-	cmake_src_configure
-}
diff --git a/media-libs/gmmlib/gmmlib-19.2.3.ebuild b/media-libs/gmmlib/gmmlib-19.2.3.ebuild
deleted file mode 100644
index 814f7e0d4a70..000000000000
--- a/media-libs/gmmlib/gmmlib-19.2.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Intel Graphics Memory Management Library"
-HOMEPAGE="https://github.com/intel/gmmlib"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
-	S="${WORKDIR}/${PN}-intel-${P}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-multilib_src_configure() {
-# once upstream makes this optional
-#	local mycmakeargs=(
-#		-DMEDIA_RUN_TEST_SUITE=OFF
-#	)
-
-	cmake_src_configure
-}
diff --git a/media-libs/gmmlib/gmmlib-19.2.4.ebuild b/media-libs/gmmlib/gmmlib-19.2.4.ebuild
deleted file mode 100644
index 814f7e0d4a70..000000000000
--- a/media-libs/gmmlib/gmmlib-19.2.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Intel Graphics Memory Management Library"
-HOMEPAGE="https://github.com/intel/gmmlib"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
-	S="${WORKDIR}/${PN}-intel-${P}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-multilib_src_configure() {
-# once upstream makes this optional
-#	local mycmakeargs=(
-#		-DMEDIA_RUN_TEST_SUITE=OFF
-#	)
-
-	cmake_src_configure
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 3baadd75fa68..5573a4bd050f 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 9096b3b0e8a8..87544fa14bc2 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 12 Mar 2020 16:38:54 +0000
+Fri, 13 Mar 2020 18:08:50 +0000
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index 07b7a7ec9a25..2ea5cf0ca169 100644
Binary files a/metadata/glsa/Manifest.files.gz and b/metadata/glsa/Manifest.files.gz differ
diff --git a/metadata/glsa/glsa-202003-01.xml b/metadata/glsa/glsa-202003-01.xml
new file mode 100644
index 000000000000..6a4beffcf47b
--- /dev/null
+++ b/metadata/glsa/glsa-202003-01.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202003-01">
+  <title>Groovy: Arbitrary code execution</title>
+  <synopsis>A vulnerability within serialization might allow remote attackers
+    to execute arbitrary code.
+  </synopsis>
+  <product type="ebuild">groovy</product>
+  <announced>2020-03-07</announced>
+  <revised count="3">2020-03-12</revised>
+  <bug>605690</bug>
+  <access>remote</access>
+  <affected>
+    <package name="dev-java/groovy" auto="yes" arch="*">
+      <vulnerable range="le">2.4.5</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>A multi-faceted language for the Java platform</p>
+  </background>
+  <description>
+    <p>It was discovered that there was a vulnerability within the Java
+      serialization/deserialization process.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>An attacker, by crafting a special serialized object, could execute
+      arbitrary code.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>Gentoo has discontinued support for Groovy. We recommend that users
+      unmerge Groovy:
+    </p>
+    
+    <code>
+      # emerge --unmerge "dev-java/groovy"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2016-6814">CVE-2016-6814</uri>
+  </references>
+  <metadata tag="requester" timestamp="2019-09-15T02:25:56Z">b-man</metadata>
+  <metadata tag="submitter" timestamp="2020-03-12T19:07:51Z">b-man</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202003-02.xml b/metadata/glsa/glsa-202003-02.xml
new file mode 100644
index 000000000000..38ac4d055367
--- /dev/null
+++ b/metadata/glsa/glsa-202003-02.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202003-02">
+  <title>Mozilla Firefox: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Mozilla Firefox, the
+    worst of which may allow execution of arbitrary code.
+  </synopsis>
+  <product type="ebuild">firefox</product>
+  <announced>2020-03-12</announced>
+  <revised count="2">2020-03-12</revised>
+  <bug>702638</bug>
+  <bug>705000</bug>
+  <bug>709346</bug>
+  <bug>712182</bug>
+  <access>remote</access>
+  <affected>
+    <package name="www-client/firefox" auto="yes" arch="*">
+      <unaffected range="ge">68.6.0</unaffected>
+      <vulnerable range="lt">68.6.0</vulnerable>
+    </package>
+    <package name="www-client/firefox-bin" auto="yes" arch="*">
+      <unaffected range="ge">68.6.0</unaffected>
+      <vulnerable range="lt">68.6.0</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Mozilla Firefox is a popular open-source web browser from the Mozilla
+      Project.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Mozilla Firefox. Please
+      review the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could entice a user to view a specially crafted web
+      page, possibly resulting in the execution of arbitrary code with the
+      privileges of the process or a Denial of Service condition. Furthermore,
+      a remote attacker may be able to perform Man-in-the-Middle attacks,
+      obtain sensitive information, spoof the address bar, conduct clickjacking
+      attacks, bypass security restrictions and protection mechanisms, or have
+      other unspecified impact.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Mozilla Firefox users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=www-client/firefox-68.6.0"
+    </code>
+    
+    <p>All Mozilla Firefox binary users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=www-client/firefox-bin-68.6.0"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-11745">CVE-2019-11745</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-17005">CVE-2019-17005</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-17008">CVE-2019-17008</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-17010">CVE-2019-17010</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-17011">CVE-2019-17011</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-17012">CVE-2019-17012</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-17016">CVE-2019-17016</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-17017">CVE-2019-17017</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-17022">CVE-2019-17022</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-17024">CVE-2019-17024</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-17026">CVE-2019-17026</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-20503">CVE-2019-20503</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6796">CVE-2020-6796</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6797">CVE-2020-6797</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6798">CVE-2020-6798</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6799">CVE-2020-6799</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6800">CVE-2020-6800</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6805">CVE-2020-6805</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6806">CVE-2020-6806</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6807">CVE-2020-6807</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6811">CVE-2020-6811</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6812">CVE-2020-6812</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6814">CVE-2020-6814</uri>
+    <uri link="https://www.mozilla.org/en-US/security/advisories/mfsa2019-37/">
+      MFSA-2019-37
+    </uri>
+    <uri link="https://www.mozilla.org/en-US/security/advisories/mfsa2020-03/">
+      MFSA-2020-03
+    </uri>
+    <uri link="https://www.mozilla.org/en-US/security/advisories/mfsa2020-06/">
+      MFSA-2020-06
+    </uri>
+    <uri link="https://www.mozilla.org/en-US/security/advisories/mfsa2020-09/">
+      MFSA-2020-09
+    </uri>
+  </references>
+  <metadata tag="requester" timestamp="2020-03-07T16:47:24Z">BlueKnight</metadata>
+  <metadata tag="submitter" timestamp="2020-03-12T19:17:30Z">BlueKnight</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202003-03.xml b/metadata/glsa/glsa-202003-03.xml
new file mode 100644
index 000000000000..65df80e511e4
--- /dev/null
+++ b/metadata/glsa/glsa-202003-03.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202003-03">
+  <title>PostgreSQL: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in PostgreSQL, the worst
+    of which could result in the execution of arbitrary code.
+  </synopsis>
+  <product type="ebuild">postgresql</product>
+  <announced>2020-03-12</announced>
+  <revised count="2">2020-03-12</revised>
+  <bug>685846</bug>
+  <bug>688420</bug>
+  <bug>709708</bug>
+  <access>local, remote</access>
+  <affected>
+    <package name="dev-db/postgresql" auto="yes" arch="*">
+      <unaffected range="ge" slot="9.4">9.4.26</unaffected>
+      <unaffected range="ge" slot="9.5">9.5.21</unaffected>
+      <unaffected range="ge" slot="9.6">9.6.17</unaffected>
+      <unaffected range="ge" slot="10">10.12</unaffected>
+      <unaffected range="ge" slot="11">11.7</unaffected>
+      <unaffected range="ge" slot="12">12.2</unaffected>
+      <vulnerable range="lt" slot="9.4">9.4.26</vulnerable>
+      <vulnerable range="lt" slot="9.5">9.5.21</vulnerable>
+      <vulnerable range="lt" slot="9.6">9.6.17</vulnerable>
+      <vulnerable range="lt" slot="10">10.12</vulnerable>
+      <vulnerable range="lt" slot="11">11.7</vulnerable>
+      <vulnerable range="lt" slot="12">12.2</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>PostgreSQL is an open source object-relational database management
+      system.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in PostgreSQL. Please
+      review the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could possibly execute arbitrary code with the
+      privileges of the process, bypass certain client-side connection security
+      features, read arbitrary server memory, alter certain data or cause a
+      Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All PostgreSQL 9.4.x users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-db/postgresql-9.4.26:9.4"
+    </code>
+    
+    <p>All PostgreSQL 9.5.x users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-db/postgresql-9.5.21:9.5"
+    </code>
+    
+    <p>All PostgreSQL 9.6.x users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-db/postgresql-9.6.17:9.6"
+    </code>
+    
+    <p>All PostgreSQL 10.x users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-db/postgresql-10.12:10"
+    </code>
+    
+    <p>All PostgreSQL 11.x users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-db/postgresql-11.7:11"
+    </code>
+    
+    <p>All PostgreSQL 12.x users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-db/postgresql-12.2:12"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-10129">CVE-2019-10129</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-10130">CVE-2019-10130</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-10164">CVE-2019-10164</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-1720">CVE-2020-1720</uri>
+  </references>
+  <metadata tag="requester" timestamp="2019-10-26T23:59:26Z">whissi</metadata>
+  <metadata tag="submitter" timestamp="2020-03-12T20:20:41Z">whissi</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202003-04.xml b/metadata/glsa/glsa-202003-04.xml
new file mode 100644
index 000000000000..c822e21abf22
--- /dev/null
+++ b/metadata/glsa/glsa-202003-04.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202003-04">
+  <title>Vim, gVim: Remote execution of arbitrary code</title>
+  <synopsis>A vulnerability has been found in Vim and gVim concerning how
+    certain modeline options are treated.
+  </synopsis>
+  <product type="ebuild">vim,gvim</product>
+  <announced>2020-03-12</announced>
+  <revised count="1">2020-03-12</revised>
+  <bug>687394</bug>
+  <access>local, remote</access>
+  <affected>
+    <package name="app-editors/vim" auto="yes" arch="*">
+      <unaffected range="ge">8.1.1486</unaffected>
+      <vulnerable range="lt">8.1.1486</vulnerable>
+    </package>
+    <package name="app-editors/gvim" auto="yes" arch="*">
+      <unaffected range="ge">8.1.1486</unaffected>
+      <vulnerable range="lt">8.1.1486</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Vim is an efficient, highly configurable improved version of the classic
+      ‘vi’ text editor. gVim is the GUI version of Vim.
+    </p>
+  </background>
+  <description>
+    <p>
+      It was found that the <code>:source!</code> command was not restricted by
+      the sandbox mode. If modeline was explicitly enabled, opening a specially
+      crafted text file in vim could result in arbitrary command execution.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could entice a user to open a specially crafted file
+      using Vim or gVim, possibly resulting in execution of arbitrary code with
+      the privileges of the process or a Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Vim users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=app-editors/vim-8.1.1486"
+    </code>
+    
+    <p>All gVim users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=app-editors/gvim-8.1.1486"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-12735">CVE-2019-12735</uri>
+  </references>
+  <metadata tag="requester" timestamp="2019-10-27T00:04:29Z">whissi</metadata>
+  <metadata tag="submitter" timestamp="2020-03-12T20:37:36Z">whissi</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202003-05.xml b/metadata/glsa/glsa-202003-05.xml
new file mode 100644
index 000000000000..ee3c3f3c4499
--- /dev/null
+++ b/metadata/glsa/glsa-202003-05.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202003-05">
+  <title>e2fsprogs: Arbitrary code execution</title>
+  <synopsis>A vulnerability in e2fsprogs might allow an attacker to execute
+    arbitrary code.
+  </synopsis>
+  <product type="ebuild">e2fsprogs</product>
+  <announced>2020-03-13</announced>
+  <revised count="1">2020-03-13</revised>
+  <bug>695522</bug>
+  <access>local, remote</access>
+  <affected>
+    <package name="sys-fs/e2fsprogs" auto="yes" arch="*">
+      <unaffected range="ge">1.45.4</unaffected>
+      <vulnerable range="lt">1.45.4</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>e2fsprogs is a set of utilities for maintaining the ext2, ext3 and ext4
+      file systems.
+    </p>
+  </background>
+  <description>
+    <p>It was discovered that e2fsprogs incorrectly handled certain ext4
+      partitions.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could entice a user to process a specially crafted
+      corrupted file system using e2fsck, possibly resulting in execution of
+      arbitrary code with the privileges of the process or a Denial of Service
+      condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All e2fsprogs users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=sys-fs/e2fsprogs-1.45.4"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-5094">CVE-2019-5094</uri>
+  </references>
+  <metadata tag="requester" timestamp="2019-10-29T10:09:38Z">ackle</metadata>
+  <metadata tag="submitter" timestamp="2020-03-13T01:50:25Z">whissi</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202003-06.xml b/metadata/glsa/glsa-202003-06.xml
new file mode 100644
index 000000000000..8dd5cbb7ee92
--- /dev/null
+++ b/metadata/glsa/glsa-202003-06.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202003-06">
+  <title>Ruby: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Ruby, the worst of
+    which could lead to the remote execution of arbitrary code.
+  </synopsis>
+  <product type="ebuild">ruby</product>
+  <announced>2020-03-13</announced>
+  <revised count="1">2020-03-13</revised>
+  <bug>696004</bug>
+  <access>remote</access>
+  <affected>
+    <package name="dev-lang/ruby" auto="yes" arch="*">
+      <unaffected range="ge" slot="2.4">2.4.9</unaffected>
+      <unaffected range="ge" slot="2.5">2.5.7</unaffected>
+      <vulnerable range="lt" slot="2.4">2.4.9</vulnerable>
+      <vulnerable range="lt" slot="2.5">2.5.7</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Ruby is an interpreted object-oriented programming language. The
+      elaborate standard library includes an HTTP server (“WEBRick”) and a
+      class for XML parsing (“REXML”).
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Ruby. Please review the
+      CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could execute arbitrary code, have unauthorized access
+      by bypassing intended path matching or cause a Denial of Service
+      condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Ruby 2.4.x users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-lang/ruby-2.4.9:2.4"
+    </code>
+    
+    <p>All Ruby 2.5.x users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-lang/ruby-2.5.7:2.5"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-15845">CVE-2019-15845</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-16201">CVE-2019-16201</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-16254">CVE-2019-16254</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-16255">CVE-2019-16255</uri>
+  </references>
+  <metadata tag="requester" timestamp="2019-10-26T17:40:41Z">whissi</metadata>
+  <metadata tag="submitter" timestamp="2020-03-13T02:29:30Z">whissi</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202003-07.xml b/metadata/glsa/glsa-202003-07.xml
new file mode 100644
index 000000000000..ef7f30132b20
--- /dev/null
+++ b/metadata/glsa/glsa-202003-07.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202003-07">
+  <title>RabbitMQ C client: Arbitrary code execution</title>
+  <synopsis>A vulnerability in RabbitMQ C client might allow an attacker to
+    execute arbitrary code.
+  </synopsis>
+  <product type="ebuild">rabbitmq-c</product>
+  <announced>2020-03-13</announced>
+  <revised count="1">2020-03-13</revised>
+  <bug>701810</bug>
+  <access>remote</access>
+  <affected>
+    <package name="net-libs/rabbitmq-c" auto="yes" arch="*">
+      <unaffected range="ge">0.10.0</unaffected>
+      <vulnerable range="lt">0.10.0</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>A C-language AMQP client library for use with v2.0+ of the RabbitMQ
+      broker.
+    </p>
+  </background>
+  <description>
+    <p>It was discovered that RabbitMQ C client incorrectly handled certain
+      inputs.
+    </p>
+  </description>
+  <impact type="high">
+    <p>A remote attacker, by sending a specially crafted request, could
+      possibly execute arbitrary code with the privileges of the process or
+      cause a Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All RabbitMQ C client users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=net-libs/rabbitmq-c-0.10.0"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-18609">CVE-2019-18609</uri>
+  </references>
+  <metadata tag="requester" timestamp="2019-12-26T15:20:01Z">whissi</metadata>
+  <metadata tag="submitter" timestamp="2020-03-13T02:48:45Z">whissi</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202003-08.xml b/metadata/glsa/glsa-202003-08.xml
new file mode 100644
index 000000000000..2860dda152c1
--- /dev/null
+++ b/metadata/glsa/glsa-202003-08.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202003-08">
+  <title>Chromium, Google Chrome: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Chromium and Google
+    Chrome, the worst of which could allow remote attackers to execute
+    arbitrary code.
+  </synopsis>
+  <product type="ebuild">chromium,google-chrome</product>
+  <announced>2020-03-13</announced>
+  <revised count="1">2020-03-13</revised>
+  <bug>699676</bug>
+  <bug>700588</bug>
+  <bug>702498</bug>
+  <bug>703286</bug>
+  <bug>704960</bug>
+  <bug>705638</bug>
+  <bug>708322</bug>
+  <bug>710760</bug>
+  <bug>711570</bug>
+  <access>local, remote</access>
+  <affected>
+    <package name="www-client/chromium" auto="yes" arch="*">
+      <unaffected range="ge">80.0.3987.132</unaffected>
+      <vulnerable range="lt">80.0.3987.132</vulnerable>
+    </package>
+    <package name="www-client/google-chrome" auto="yes" arch="*">
+      <unaffected range="ge">80.0.3987.132</unaffected>
+      <vulnerable range="lt">80.0.3987.132</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 referenced CVE identifiers and Google Chrome
+      Releases for details.
+    </p>
+  </description>
+  <impact type="high">
+    <p>A remote attacker could execute arbitrary code, escalate privileges,
+      obtain sensitive information, spoof an URL or cause a Denial of Service
+      condition.
+    </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-80.0.3987.132"
+    </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-80.0.3987.132"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13723">CVE-2019-13723</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13724">CVE-2019-13724</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13725">CVE-2019-13725</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13726">CVE-2019-13726</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13727">CVE-2019-13727</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13728">CVE-2019-13728</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13729">CVE-2019-13729</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13730">CVE-2019-13730</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13732">CVE-2019-13732</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13734">CVE-2019-13734</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13735">CVE-2019-13735</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13736">CVE-2019-13736</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13737">CVE-2019-13737</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13738">CVE-2019-13738</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13739">CVE-2019-13739</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13740">CVE-2019-13740</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13741">CVE-2019-13741</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13742">CVE-2019-13742</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13743">CVE-2019-13743</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13744">CVE-2019-13744</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13745">CVE-2019-13745</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13746">CVE-2019-13746</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13747">CVE-2019-13747</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13748">CVE-2019-13748</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13749">CVE-2019-13749</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13750">CVE-2019-13750</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13751">CVE-2019-13751</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13752">CVE-2019-13752</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13753">CVE-2019-13753</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13754">CVE-2019-13754</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13755">CVE-2019-13755</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13756">CVE-2019-13756</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13757">CVE-2019-13757</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13758">CVE-2019-13758</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13759">CVE-2019-13759</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13761">CVE-2019-13761</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13762">CVE-2019-13762</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13763">CVE-2019-13763</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13764">CVE-2019-13764</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13767">CVE-2019-13767</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6377">CVE-2020-6377</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6378">CVE-2020-6378</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6379">CVE-2020-6379</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6380">CVE-2020-6380</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6381">CVE-2020-6381</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6382">CVE-2020-6382</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6385">CVE-2020-6385</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6387">CVE-2020-6387</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6388">CVE-2020-6388</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6389">CVE-2020-6389</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6390">CVE-2020-6390</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6391">CVE-2020-6391</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6392">CVE-2020-6392</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6393">CVE-2020-6393</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6394">CVE-2020-6394</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6395">CVE-2020-6395</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6396">CVE-2020-6396</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6397">CVE-2020-6397</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6398">CVE-2020-6398</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6399">CVE-2020-6399</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6400">CVE-2020-6400</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6401">CVE-2020-6401</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6402">CVE-2020-6402</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6403">CVE-2020-6403</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6404">CVE-2020-6404</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6406">CVE-2020-6406</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6407">CVE-2020-6407</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6408">CVE-2020-6408</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6409">CVE-2020-6409</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6410">CVE-2020-6410</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6411">CVE-2020-6411</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6412">CVE-2020-6412</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6413">CVE-2020-6413</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6414">CVE-2020-6414</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6415">CVE-2020-6415</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6416">CVE-2020-6416</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6418">CVE-2020-6418</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6420">CVE-2020-6420</uri>
+  </references>
+  <metadata tag="requester" timestamp="2020-03-01T17:56:52Z">whissi</metadata>
+  <metadata tag="submitter" timestamp="2020-03-13T03:16:21Z">whissi</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 9096b3b0e8a8..87544fa14bc2 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 12 Mar 2020 16:38:54 +0000
+Fri, 13 Mar 2020 18:08:50 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index 14ac9c2950b4..b63cacd55929 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-751af6f91da06f53265195cff434eb66a145af73 1574641117 2019-11-25T00:18:37+00:00
+93c7ae67fbd64864f8702f58d9366abd51035b22 1584069456 2020-03-13T03:17:36+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index bb6f6722b3da..7edc768ebe9a 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 9ae9ab810e9c..7821087eca7f 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/conky-1.10.8-r9 b/metadata/md5-cache/app-admin/conky-1.10.8-r9
new file mode 100644
index 000000000000..f09f0e316781
--- /dev/null
+++ b/metadata/md5-cache/app-admin/conky-1.10.8-r9
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] ) lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXext xmms2? ( media-sound/xmms2 ) ) cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) irc? ( net-libs/libircclient ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) || ( dev-lang/lua:0 dev-lang/lua:5.1 ) app-text/docbook2X
+DESCRIPTION=An advanced, highly configurable system monitor for X
+EAPI=7
+HOMEPAGE=https://github.com/brndnmtthws/conky
+IUSE=apcupsd cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax weather-metar webserver wifi X xmms2 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3 BSD LGPL-2.1 MIT
+RDEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] ) lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXext xmms2? ( media-sound/xmms2 ) ) cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) irc? ( net-libs/libircclient ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) || ( dev-lang/lua:0 dev-lang/lua:5.1 ) apcupsd? ( sys-power/apcupsd ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) nano-syntax? ( app-editors/nano ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+SLOT=0
+SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.10.8.tar.gz -> conky-1.10.8.tar.gz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c2338e75d7460ce927b8dc45639530b4
diff --git a/metadata/md5-cache/app-admin/helm-3.1.2 b/metadata/md5-cache/app-admin/helm-3.1.2
new file mode 100644
index 000000000000..02a11aeeafe8
--- /dev/null
+++ b/metadata/md5-cache/app-admin/helm-3.1.2
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst prepare unpack
+DESCRIPTION=Kubernetes Package Manager
+EAPI=7
+HOMEPAGE=https://github.com/helm/helm https://helm.sh
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/helm/helm/archive/v3.1.2.tar.gz -> helm-3.1.2.tar.gz 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.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.2.1+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.2.1+incompatible.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/v13.3.2+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv13.3.2+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v13.3.2+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv13.3.2+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.zip 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/adal/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.zip 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/date/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.zip 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/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.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.zip 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/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/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.zip -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.zip mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.mod -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.mod mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.0.zip -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.0.mod -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.0.3.zip -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.zip mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.0.3.mod -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.mod mirror://goproxy//github.com/!masterminds/sprig/v3/@v/v3.0.2.zip -> github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.0.2.zip mirror://goproxy//github.com/!masterminds/sprig/v3/@v/v3.0.2.mod -> github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//github.com/!masterminds/vcs/@v/v1.13.1.zip -> github.com%2F!masterminds%2Fvcs%2F@v%2Fv1.13.1.zip mirror://goproxy//github.com/!masterminds/vcs/@v/v1.13.1.mod -> github.com%2F!masterminds%2Fvcs%2F@v%2Fv1.13.1.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/purell/@v/v1.1.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.zip -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.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/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.zip -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod mirror://goproxy//github.com/!shopify/logrus-bugsnag/@v/v0.0.0-20171204204709-577dee27f20d.zip -> github.com%2F!shopify%2Flogrus-bugsnag%2F@v%2Fv0.0.0-20171204204709-577dee27f20d.zip mirror://goproxy//github.com/!shopify/logrus-bugsnag/@v/v0.0.0-20171204204709-577dee27f20d.mod -> github.com%2F!shopify%2Flogrus-bugsnag%2F@v%2Fv0.0.0-20171204204709-577dee27f20d.mod mirror://goproxy//github.com/agnivade/levenshtein/@v/v1.0.1.mod -> github.com%2Fagnivade%2Flevenshtein%2F@v%2Fv1.0.1.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/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/andreyvit/diff/@v/v0.0.0-20170406064948-c7f18ee00883.mod -> github.com%2Fandreyvit%2Fdiff%2F@v%2Fv0.0.0-20170406064948-c7f18ee00883.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/asaskevich/govalidator/@v/v0.0.0-20180720115003-f9ffefc3facf.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20200108200545-475eaeb16496.zip -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20200108200545-475eaeb16496.zip mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20200108200545-475eaeb16496.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20200108200545-475eaeb16496.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.11.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.11.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20160804104726-4c0e84591b9a.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20160804104726-4c0e84591b9a.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.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/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bitly/go-simplejson/@v/v0.5.0.zip -> github.com%2Fbitly%2Fgo-simplejson%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/bitly/go-simplejson/@v/v0.5.0.mod -> github.com%2Fbitly%2Fgo-simplejson%2F@v%2Fv0.5.0.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/blang/semver/@v/v3.5.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.0+incompatible.mod mirror://goproxy//github.com/bmizerany/assert/@v/v0.0.0-20160611221934-b7ed37b82869.zip -> github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.zip mirror://goproxy//github.com/bmizerany/assert/@v/v0.0.0-20160611221934-b7ed37b82869.mod -> github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.mod mirror://goproxy//github.com/bshuster-repo/logrus-logstash-hook/@v/v0.4.1.zip -> github.com%2Fbshuster-repo%2Flogrus-logstash-hook%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/bshuster-repo/logrus-logstash-hook/@v/v0.4.1.mod -> github.com%2Fbshuster-repo%2Flogrus-logstash-hook%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/bugsnag/bugsnag-go/@v/v0.0.0-20141110184014-b1d153021fcd.zip -> github.com%2Fbugsnag%2Fbugsnag-go%2F@v%2Fv0.0.0-20141110184014-b1d153021fcd.zip mirror://goproxy//github.com/bugsnag/bugsnag-go/@v/v0.0.0-20141110184014-b1d153021fcd.mod -> github.com%2Fbugsnag%2Fbugsnag-go%2F@v%2Fv0.0.0-20141110184014-b1d153021fcd.mod mirror://goproxy//github.com/bugsnag/osext/@v/v0.0.0-20130617224835-0dd3f918b21b.zip -> github.com%2Fbugsnag%2Fosext%2F@v%2Fv0.0.0-20130617224835-0dd3f918b21b.zip mirror://goproxy//github.com/bugsnag/osext/@v/v0.0.0-20130617224835-0dd3f918b21b.mod -> github.com%2Fbugsnag%2Fosext%2F@v%2Fv0.0.0-20130617224835-0dd3f918b21b.mod mirror://goproxy//github.com/bugsnag/panicwrap/@v/v0.0.0-20151223152923-e2c28503fcd0.zip -> github.com%2Fbugsnag%2Fpanicwrap%2F@v%2Fv0.0.0-20151223152923-e2c28503fcd0.zip mirror://goproxy//github.com/bugsnag/panicwrap/@v/v0.0.0-20151223152923-e2c28503fcd0.mod -> github.com%2Fbugsnag%2Fpanicwrap%2F@v%2Fv0.0.0-20151223152923-e2c28503fcd0.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/chai2010/gettext-go/@v/v0.0.0-20160711120539-c6fed771bfd5.mod -> github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.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/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190919134610-bf292b21730f.zip -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190919134610-bf292b21730f.zip 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.2.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.3.2.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.2.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/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-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.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-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod 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/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod 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.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/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.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/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/daviddengcn/go-colortext/@v/v0.0.0-20160507010035-511bcaf42ccd.mod -> github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.mod mirror://goproxy//github.com/deislabs/oras/@v/v0.8.1.zip -> github.com%2Fdeislabs%2Foras%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/deislabs/oras/@v/v0.8.1.mod -> github.com%2Fdeislabs%2Foras%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20190125010748-a747050bb1ba.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20190125010748-a747050bb1ba.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v0.0.0-20170104182250-a601269ab70c.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv0.0.0-20170104182250-a601269ab70c.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip 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/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/cli/@v/v0.0.0-20200130152716-5d0cf8839492.zip -> github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20200130152716-5d0cf8839492.zip mirror://goproxy//github.com/docker/cli/@v/v0.0.0-20200130152716-5d0cf8839492.mod -> github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20200130152716-5d0cf8839492.mod mirror://goproxy//github.com/docker/distribution/@v/v0.0.0-20191216044856-a8371794149d.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv0.0.0-20191216044856-a8371794149d.zip mirror://goproxy//github.com/docker/distribution/@v/v0.0.0-20191216044856-a8371794149d.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv0.0.0-20191216044856-a8371794149d.mod mirror://goproxy//github.com/docker/docker/@v/v0.7.3-0.20190327010347-be7ac8be2ae0.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv0.7.3-0.20190327010347-be7ac8be2ae0.mod mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20200203170920-46ec8731fbce.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20200203170920-46ec8731fbce.zip mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20200203170920-46ec8731fbce.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20200203170920-46ec8731fbce.mod mirror://goproxy//github.com/docker/docker-credential-helpers/@v/v0.6.3.zip -> github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.3.zip mirror://goproxy//github.com/docker/docker-credential-helpers/@v/v0.6.3.mod -> github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.3.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.0-20180209012529-399ea8c73916.zip -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.0-20180209012529-399ea8c73916.zip mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.0-20180209012529-399ea8c73916.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.0-20180209012529-399ea8c73916.mod mirror://goproxy//github.com/docker/go-units/@v/v0.3.3.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.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/libtrust/@v/v0.0.0-20150114040149-fa567046d9b1.zip -> github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20150114040149-fa567046d9b1.zip mirror://goproxy//github.com/docker/libtrust/@v/v0.0.0-20150114040149-fa567046d9b1.mod -> github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20150114040149-fa567046d9b1.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/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.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.zip -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.zip 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/emicklei/go-restful/@v/v2.9.5+incompatible.zip -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.zip mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.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/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.5.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.5.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.5.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.5.0+incompatible.mod mirror://goproxy//github.com/exponent-io/jsonpath/@v/v0.0.0-20151013193312-d6023ce2651d.zip -> github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.zip mirror://goproxy//github.com/exponent-io/jsonpath/@v/v0.0.0-20151013193312-d6023ce2651d.mod -> github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.mod mirror://goproxy//github.com/fatih/camelcase/@v/v1.0.0.mod -> github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.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/garyburd/redigo/@v/v0.0.0-20150301180006-535138d7bcd7.zip -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv0.0.0-20150301180006-535138d7bcd7.zip mirror://goproxy//github.com/garyburd/redigo/@v/v0.0.0-20150301180006-535138d7bcd7.mod -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv0.0.0-20150301180006-535138d7bcd7.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.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip 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/globalsign/mgo/@v/v0.0.0-20180905125535-1ca0a4f7cbcb.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20180905125535-1ca0a4f7cbcb.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20181015135952-eeefdecb41b8.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20181015135952-eeefdecb41b8.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.25.4.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.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-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.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-openapi/analysis/@v/v0.0.0-20180825180245-b006789cd277.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.0.0-20180825180245-b006789cd277.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.2.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/jsonpointer/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.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/jsonreference/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.0.0-20180920151709-4f900dc2ade9.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.0.0-20180920151709-4f900dc2ade9.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.4.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/spec/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.3.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-openapi/swag/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.5.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/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/gofrs/flock/@v/v0.7.1.zip -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.zip 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/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.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.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/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/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/golangplus/bytes/@v/v0.0.0-20160111154220-45c989fe5450.mod -> github.com%2Fgolangplus%2Fbytes%2F@v%2Fv0.0.0-20160111154220-45c989fe5450.mod mirror://goproxy//github.com/golangplus/fmt/@v/v0.0.0-20150411045040-2a5d6d7d2995.mod -> github.com%2Fgolangplus%2Ffmt%2F@v%2Fv0.0.0-20150411045040-2a5d6d7d2995.mod mirror://goproxy//github.com/golangplus/testing/@v/v0.0.0-20180327235837-af21d9c3145e.mod -> github.com%2Fgolangplus%2Ftesting%2F@v%2Fv0.0.0-20180327235837-af21d9c3145e.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.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip 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/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.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/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/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.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/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.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip 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/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/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.zip 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/gophercloud/gophercloud/@v/v0.1.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip 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.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/handlers/@v/v0.0.0-20150720190736-60c7bfde3e33.zip -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv0.0.0-20150720190736-60c7bfde3e33.zip mirror://goproxy//github.com/gorilla/handlers/@v/v0.0.0-20150720190736-60c7bfde3e33.mod -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv0.0.0-20150720190736-60c7bfde3e33.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/v0.0.0-20170926233335-4201258b820c.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gosuri/uitable/@v/v0.0.4.zip -> github.com%2Fgosuri%2Fuitable%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/gosuri/uitable/@v/v0.0.4.mod -> github.com%2Fgosuri%2Fuitable%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.zip -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.zip 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/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.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/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.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip 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/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/huandu/xstrings/@v/v1.2.0.zip -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/huandu/xstrings/@v/v1.2.0.mod -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.2.0.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.7.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.7.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.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/jmespath/go-jmespath/@v/v0.0.0-20160202185014-0b12d6b521d8.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160803190731-bd40a432e4c7.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160803190731-bd40a432e4c7.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.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/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/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/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/konsorten/go-windows-terminal-sequences/@v/v1.0.1.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip 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.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/pty/@v/v1.1.5.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.5.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/liggitt/tabwriter/@v/v0.0.0-20181228230101-89fcab3d43de.zip -> github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.zip mirror://goproxy//github.com/liggitt/tabwriter/@v/v0.0.0-20181228230101-89fcab3d43de.mod -> github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.mod mirror://goproxy//github.com/lithammer/dedent/@v/v1.1.0.mod -> github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.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.0.0-20180823135443-60711f1a8329.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180823135443-60711f1a8329.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/mailru/easyjson/@v/v0.0.0-20190614124828-94de47d64c63.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190626092158-b2ccc519800e.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/marstr/guid/@v/v1.1.0.mod -> github.com%2Fmarstr%2Fguid%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.9.zip -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.9.zip mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.9.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.9.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/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.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/go-wordwrap/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.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/mitchellh/osext/@v/v0.0.0-20151018003038-5e2d6d41470f.zip -> github.com%2Fmitchellh%2Fosext%2F@v%2Fv0.0.0-20151018003038-5e2d6d41470f.zip mirror://goproxy//github.com/mitchellh/osext/@v/v0.0.0-20151018003038-5e2d6d41470f.mod -> github.com%2Fmitchellh%2Fosext%2F@v%2Fv0.0.0-20151018003038-5e2d6d41470f.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.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/munnerz/goautoneg/@v/v0.0.0-20191010083416-a7dc8b61c822.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.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/ncw/swift/@v/v1.0.47.mod -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.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.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/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.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-20170106003457-a6d0ee40d420.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20170106003457-a6d0ee40d420.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.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.zip 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/image-spec/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip 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/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/v0.1.1.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/opencontainers/runc/@v/v0.1.1.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.1.1.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-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/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.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/peterbourgon/diskv/@v/v2.0.1+incompatible.zip -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip 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/phayes/freeport/@v/v0.0.0-20180830031419-95f893ade6f2.zip -> github.com%2Fphayes%2Ffreeport%2F@v%2Fv0.0.0-20180830031419-95f893ade6f2.zip mirror://goproxy//github.com/phayes/freeport/@v/v0.0.0-20180830031419-95f893ade6f2.mod -> github.com%2Fphayes%2Ffreeport%2F@v%2Fv0.0.0-20180830031419-95f893ade6f2.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.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/pquerna/cachecontrol/@v/v0.0.0-20171018203845-0dec1b30a021.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.0.0-20180209125602-c332b6f63c06.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.0.0-20180209125602-c332b6f63c06.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.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.zip 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_model/@v/v0.0.0-20171117100541-99fa1f4be8e5.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20171117100541-99fa1f4be8e5.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.0.0-20180110214958-89604d197083.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180110214958-89604d197083.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/procfs/@v/v0.0.0-20180125133057-cb4147076ac7.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180125133057-cb4147076ac7.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.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/remyoudompheng/bigfft/@v/v0.0.0-20170806203942-52369c62f446.mod -> github.com%2Fremyoudompheng%2Fbigfft%2F@v%2Fv0.0.0-20170806203942-52369c62f446.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.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/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/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.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.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.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.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.zip 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.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.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.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.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.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.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/tidwall/pretty/@v/v1.0.0.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.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/v0.0.0-20171014202726-7bc6a0acffa5.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.mod 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/vektah/gqlparser/@v/v1.1.2.mod -> github.com%2Fvektah%2Fgqlparser%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.zip -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.zip 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/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/v1.1.0.zip -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v1.1.0.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xlab/handysort/@v/v0.0.0-20150421192137-fb3537ed64a1.mod -> github.com%2Fxlab%2Fhandysort%2F@v%2Fv0.0.0-20150421192137-fb3537ed64a1.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/yvasiyarov/go-metrics/@v/v0.0.0-20140926110328-57bccd1ccd43.zip -> github.com%2Fyvasiyarov%2Fgo-metrics%2F@v%2Fv0.0.0-20140926110328-57bccd1ccd43.zip mirror://goproxy//github.com/yvasiyarov/go-metrics/@v/v0.0.0-20140926110328-57bccd1ccd43.mod -> github.com%2Fyvasiyarov%2Fgo-metrics%2F@v%2Fv0.0.0-20140926110328-57bccd1ccd43.mod mirror://goproxy//github.com/yvasiyarov/gorelic/@v/v0.0.0-20141212073537-a9bba5b9ab50.zip -> github.com%2Fyvasiyarov%2Fgorelic%2F@v%2Fv0.0.0-20141212073537-a9bba5b9ab50.zip mirror://goproxy//github.com/yvasiyarov/gorelic/@v/v0.0.0-20141212073537-a9bba5b9ab50.mod -> github.com%2Fyvasiyarov%2Fgorelic%2F@v%2Fv0.0.0-20141212073537-a9bba5b9ab50.mod mirror://goproxy//github.com/yvasiyarov/newrelic_platform_go/@v/v0.0.0-20140908184405-b21fdbd4370f.zip -> github.com%2Fyvasiyarov%2Fnewrelic_platform_go%2F@v%2Fv0.0.0-20140908184405-b21fdbd4370f.zip mirror://goproxy//github.com/yvasiyarov/newrelic_platform_go/@v/v0.0.0-20140908184405-b21fdbd4370f.mod -> github.com%2Fyvasiyarov%2Fnewrelic_platform_go%2F@v%2Fv0.0.0-20140908184405-b21fdbd4370f.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.0.0-20191023171146-3cf2f69b5738.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.0.3.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.0.3.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.1.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.1.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.2.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.2.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.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.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-20190320223903-b7391e95e576.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190320223903-b7391e95e576.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190617133340-57b3e21c3d56.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190617133340-57b3e21c3d56.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190911031432-227b76d455e7.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190911031432-227b76d455e7.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200128174031-69ecbb4d6d5d.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200128174031-69ecbb4d6d5d.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200128174031-69ecbb4d6d5d.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200128174031-69ecbb4d6d5d.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-20190125153040-c74c464bbbf2.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190125153040-c74c464bbbf2.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190312203227-4b39c73a6495.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190312203227-4b39c73a6495.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/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/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/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-20181005035420-146acd28ed58.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181005035420-146acd28ed58.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-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.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-20190320064053-1272bf9dcd53.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190320064053-1272bf9dcd53.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-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-20190619014844-b5b0513f8c1b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190619014844-b5b0513f8c1b.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-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.zip 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/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-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.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/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-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.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-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-20190321052220-f7bb7a8bee54.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190321052220-f7bb7a8bee54.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-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-20190602015325-4c4f7f33c9ed.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190602015325-4c4f7f33c9ed.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-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.zip 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/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-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-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-20190125232054-d66bd3c5d5a6.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190125232054-d66bd3c5d5a6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190206041539-40960b6deb8e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190206041539-40960b6deb8e.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-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-20190614205625-5aca471b1d59.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190614205625-5aca471b1d59.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190617190820-da514acc4774.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190617190820-da514acc4774.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190920225731-5eefd052ad72.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190920225731-5eefd052ad72.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-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//gonum.org/v1/gonum/@v/v0.0.0-20190331200053-3d26580ed485.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20190331200053-3d26580ed485.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190313105609-8cb42192e0e0.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190313105609-8cb42192e0e0.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190331212654-76723241ea4e.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190331212654-76723241ea4e.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20160322025152-9bf6e6e569ff.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20160322025152-9bf6e6e569ff.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/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/appengine/@v/v1.5.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.zip 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/cloud/@v/v0.0.0-20151119220103-975617b05ea8.mod -> google.golang.org%2Fcloud%2F@v%2Fv0.0.0-20151119220103-975617b05ea8.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-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip 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/grpc/@v/v0.0.0-20160317175043-d3ddb4469d5a.mod -> google.golang.org%2Fgrpc%2F@v%2Fv0.0.0-20160317175043-d3ddb4469d5a.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.23.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.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-20141024133853-64131543e789.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20141024133853-64131543e789.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/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.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/natefinch/lumberjack.v2/@v/v2.0.0.mod -> gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.2.2.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.2.2.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.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.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.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//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-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//k8s.io/api/@v/v0.17.2.zip -> k8s.io%2Fapi%2F@v%2Fv0.17.2.zip mirror://goproxy//k8s.io/api/@v/v0.17.2.mod -> k8s.io%2Fapi%2F@v%2Fv0.17.2.mod mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.17.2.zip -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.17.2.zip mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.17.2.mod -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.17.2.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.17.2.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.17.2.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.17.2.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.17.2.mod mirror://goproxy//k8s.io/apiserver/@v/v0.17.2.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.17.2.mod mirror://goproxy//k8s.io/cli-runtime/@v/v0.17.2.zip -> k8s.io%2Fcli-runtime%2F@v%2Fv0.17.2.zip mirror://goproxy//k8s.io/cli-runtime/@v/v0.17.2.mod -> k8s.io%2Fcli-runtime%2F@v%2Fv0.17.2.mod mirror://goproxy//k8s.io/client-go/@v/v0.17.2.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.17.2.zip mirror://goproxy//k8s.io/client-go/@v/v0.17.2.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.17.2.mod mirror://goproxy//k8s.io/code-generator/@v/v0.17.2.mod -> k8s.io%2Fcode-generator%2F@v%2Fv0.17.2.mod mirror://goproxy//k8s.io/component-base/@v/v0.17.2.zip -> k8s.io%2Fcomponent-base%2F@v%2Fv0.17.2.zip mirror://goproxy//k8s.io/component-base/@v/v0.17.2.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.17.2.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/gengo/@v/v0.0.0-20190822140433-26a664648505.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190822140433-26a664648505.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-20191107075043-30be4d16710a.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20191107075043-30be4d16710a.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20191107075043-30be4d16710a.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20191107075043-30be4d16710a.mod mirror://goproxy//k8s.io/kubectl/@v/v0.17.2.zip -> k8s.io%2Fkubectl%2F@v%2Fv0.17.2.zip mirror://goproxy//k8s.io/kubectl/@v/v0.17.2.mod -> k8s.io%2Fkubectl%2F@v%2Fv0.17.2.mod mirror://goproxy//k8s.io/kubernetes/@v/v1.13.0.mod -> k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.mod mirror://goproxy//k8s.io/metrics/@v/v0.17.2.mod -> k8s.io%2Fmetrics%2F@v%2Fv0.17.2.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20191114184206-e782cd3c129f.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20191114184206-e782cd3c129f.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20191114184206-e782cd3c129f.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20191114184206-e782cd3c129f.mod mirror://goproxy//modernc.org/cc/@v/v1.0.0.mod -> modernc.org%2Fcc%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/golex/@v/v1.0.0.mod -> modernc.org%2Fgolex%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/mathutil/@v/v1.0.0.mod -> modernc.org%2Fmathutil%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/strutil/@v/v1.0.0.mod -> modernc.org%2Fstrutil%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/xc/@v/v1.0.0.mod -> modernc.org%2Fxc%2F@v%2Fv1.0.0.mod mirror://goproxy//sigs.k8s.io/kustomize/@v/v2.0.3+incompatible.zip -> sigs.k8s.io%2Fkustomize%2F@v%2Fv2.0.3+incompatible.zip mirror://goproxy//sigs.k8s.io/kustomize/@v/v2.0.3+incompatible.mod -> sigs.k8s.io%2Fkustomize%2F@v%2Fv2.0.3+incompatible.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/structured-merge-diff/@v/v1.0.1-0.20191108220359-b1b620dd3f06.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv1.0.1-0.20191108220359-b1b620dd3f06.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//vbom.ml/util/@v/v0.0.0-20160121211510-db5cfe13f5cc.mod -> vbom.ml%2Futil%2F@v%2Fv0.0.0-20160121211510-db5cfe13f5cc.mod
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	go-module	cca12a5688562f107c14ffcf28195dd7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=231855d19cece43b268e930f972e642f
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index 4d31572df977..e434e9d69df2 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/stress-ng-0.10.18 b/metadata/md5-cache/app-benchmarks/stress-ng-0.11.02
similarity index 92%
rename from metadata/md5-cache/app-benchmarks/stress-ng-0.10.18
rename to metadata/md5-cache/app-benchmarks/stress-ng-0.11.02
index 21e48536fde3..edcfdf78df6f 100644
--- a/metadata/md5-cache/app-benchmarks/stress-ng-0.10.18
+++ b/metadata/md5-cache/app-benchmarks/stress-ng-0.11.02
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= net-misc/lksctp-tools sys-apps/attr sys-apps/keyutils:= sys-libs/libapparmor sys-libs/libcap sys-libs/zlib
 SLOT=0
-SRC_URI=https://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-0.10.18.tar.xz
+SRC_URI=https://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-0.11.02.tar.xz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5759dffa4cea67cb72568831045648b6
+_md5_=d702ec1f5efe02a2ef314cc9709a6551
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 817cfe7abe8c..88753aaa28c9 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/libvirt-5.10.0 b/metadata/md5-cache/app-emulation/libvirt-5.10.0
index d122b3d47088..01d83717cf9f 100644
--- a/metadata/md5-cache/app-emulation/libvirt-5.10.0
+++ b/metadata/md5-cache/app-emulation/libvirt-5.10.0
@@ -1,15 +1,15 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath virtual/pkgconfig
+DEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:0= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath virtual/pkgconfig
 DESCRIPTION=C toolkit to manipulate virtual machines
 EAPI=7
 HOMEPAGE=http://www.libvirt.org/
 IUSE=apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux +udev +vepa virtualbox virt-network wireshark-plugins xen zfs kernel_linux
 KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1
-RDEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs )
+RDEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:0= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs )
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/5.10.0
 SRC_URI=https://libvirt.org/sources/libvirt-5.10.0.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	python-any-r1	3b59474e577cf775a757884b62a6d9cf	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=fb7c9a2275c36bbd64e1a63a4ecb58fb
+_md5_=ad91665eebf130b65f9d12f17302f000
diff --git a/metadata/md5-cache/app-emulation/libvirt-5.2.0-r2 b/metadata/md5-cache/app-emulation/libvirt-5.2.0-r2
deleted file mode 100644
index 841e6fcf6bcc..000000000000
--- a/metadata/md5-cache/app-emulation/libvirt-5.2.0-r2
+++ /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 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode !sys-apps/systemd[-cgroup-hybrid(+)] >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath virtual/pkgconfig
-DESCRIPTION=C toolkit to manipulate virtual machines
-EAPI=7
-HOMEPAGE=http://www.libvirt.org/
-IUSE=apparmor audit +caps +dbus firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux +udev +vepa virtualbox virt-network wireshark-plugins xen zeroconf zfs kernel_linux
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=LGPL-2.1
-RDEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode !sys-apps/systemd[-cgroup-hybrid(+)] >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs )
-REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
-SLOT=0/5.2.0
-SRC_URI=https://libvirt.org/sources/libvirt-5.2.0.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	3b59474e577cf775a757884b62a6d9cf	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6ea96d84f3ed1a6bd5620ddfd3e46867
diff --git a/metadata/md5-cache/app-emulation/libvirt-5.5.0-r1 b/metadata/md5-cache/app-emulation/libvirt-5.5.0-r1
deleted file mode 100644
index 2db2d4331f95..000000000000
--- a/metadata/md5-cache/app-emulation/libvirt-5.5.0-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 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode !sys-apps/systemd[-cgroup-hybrid(+)] >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath virtual/pkgconfig
-DESCRIPTION=C toolkit to manipulate virtual machines
-EAPI=7
-HOMEPAGE=http://www.libvirt.org/
-IUSE=apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux +udev +vepa virtualbox virt-network wireshark-plugins xen zfs kernel_linux
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=LGPL-2.1
-RDEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode !sys-apps/systemd[-cgroup-hybrid(+)] >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs )
-REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
-SLOT=0/5.5.0
-SRC_URI=https://libvirt.org/sources/libvirt-5.5.0.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	3b59474e577cf775a757884b62a6d9cf	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8fb69cff74bddcf2eb395f973d3c7847
diff --git a/metadata/md5-cache/app-emulation/libvirt-5.6.0 b/metadata/md5-cache/app-emulation/libvirt-5.6.0
deleted file mode 100644
index d70c8613b36a..000000000000
--- a/metadata/md5-cache/app-emulation/libvirt-5.6.0
+++ /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 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode !sys-apps/systemd[-cgroup-hybrid(+)] >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath virtual/pkgconfig
-DESCRIPTION=C toolkit to manipulate virtual machines
-EAPI=7
-HOMEPAGE=http://www.libvirt.org/
-IUSE=apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux +udev +vepa virtualbox virt-network wireshark-plugins xen zfs kernel_linux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode !sys-apps/systemd[-cgroup-hybrid(+)] >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs )
-REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
-SLOT=0/5.6.0
-SRC_URI=https://libvirt.org/sources/libvirt-5.6.0.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	3b59474e577cf775a757884b62a6d9cf	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b84fe88d9295b1928398e7ca71725a9c
diff --git a/metadata/md5-cache/app-emulation/libvirt-5.8.0 b/metadata/md5-cache/app-emulation/libvirt-5.8.0
deleted file mode 100644
index cdbe44020ba6..000000000000
--- a/metadata/md5-cache/app-emulation/libvirt-5.8.0
+++ /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 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) pm-utils? ( sys-power/pm-utils ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath virtual/pkgconfig
-DESCRIPTION=C toolkit to manipulate virtual machines
-EAPI=7
-HOMEPAGE=http://www.libvirt.org/
-IUSE=apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp pm-utils policykit +qemu rbd sasl selinux +udev +vepa virtualbox virt-network wireshark-plugins xen zfs kernel_linux
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) pm-utils? ( sys-power/pm-utils ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs )
-REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
-SLOT=0/5.8.0
-SRC_URI=https://libvirt.org/sources/libvirt-5.8.0.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	3b59474e577cf775a757884b62a6d9cf	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f1a594b5f7f12d453241ce72e0f86915
diff --git a/metadata/md5-cache/app-emulation/libvirt-6.0.0-r1 b/metadata/md5-cache/app-emulation/libvirt-6.0.0-r1
index 93b513ce6727..6497c66a6b9b 100644
--- a/metadata/md5-cache/app-emulation/libvirt-6.0.0-r1
+++ b/metadata/md5-cache/app-emulation/libvirt-6.0.0-r1
@@ -1,15 +1,15 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig
+DEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:0= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig
 DESCRIPTION=C toolkit to manipulate virtual machines
 EAPI=7
 HOMEPAGE=http://www.libvirt.org/
 IUSE=apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux +udev +vepa virtualbox virt-network wireshark-plugins xen zfs kernel_linux
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs )
+RDEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:0= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs )
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/6.0.0
 SRC_URI=https://libvirt.org/sources/libvirt-6.0.0.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	python-any-r1	3b59474e577cf775a757884b62a6d9cf	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=70bb067a82fcf08e7f4b7ec3da68141b
+_md5_=2e7e49f3702a47dbf3a86aa455384920
diff --git a/metadata/md5-cache/app-emulation/vagrant-2.2.7 b/metadata/md5-cache/app-emulation/vagrant-2.2.7-r1
similarity index 99%
rename from metadata/md5-cache/app-emulation/vagrant-2.2.7
rename to metadata/md5-cache/app-emulation/vagrant-2.2.7-r1
index 1cd76dca8a3a..2840595de4fa 100644
--- a/metadata/md5-cache/app-emulation/vagrant-2.2.7
+++ b/metadata/md5-cache/app-emulation/vagrant-2.2.7-r1
@@ -12,4 +12,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vagrant/archive/v2.2.7.tar.gz -> vagrant-2.2.7.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e54e69c01d6a5871d5651016b919cbae
+_md5_=7659da174e6ab3eb32e2c03fb3a5dade
diff --git a/metadata/md5-cache/app-emulation/xen-4.11.3-r1 b/metadata/md5-cache/app-emulation/xen-4.11.3-r1
deleted file mode 100644
index ec1ca5c2ec5f..000000000000
--- a/metadata/md5-cache/app-emulation/xen-4.11.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 )
-DESCRIPTION=The Xen virtual machine monitor
-EAPI=7
-HOMEPAGE=https://www.xenproject.org
-IUSE=debug efi flask
-KEYWORDS=amd64 ~arm -x86
-LICENSE=GPL-2
-PDEPEND=~app-emulation/xen-tools-4.11.3
-REQUIRED_USE=arm? ( debug )
-RESTRICT=test splitdebug strip
-SLOT=0
-SRC_URI=https://downloads.xenproject.org/release/xen/4.11.3/xen-4.11.3.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.11.3-upstream-patches-1.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.11.3-upstream-patches-1.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	3b59474e577cf775a757884b62a6d9cf	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=12eece0caeaa9755a18f15da2b561599
diff --git a/metadata/md5-cache/app-emulation/xen-pvgrub-4.11.3 b/metadata/md5-cache/app-emulation/xen-pvgrub-4.11.3
deleted file mode 100644
index f9c4523fc9df..000000000000
--- a/metadata/md5-cache/app-emulation/xen-pvgrub-4.11.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=sys-devel/gettext sys-devel/bin86 sys-apps/texinfo x11-libs/pixman
-DESCRIPTION=allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem
-EAPI=7
-HOMEPAGE=https://www.xenproject.org
-IUSE=custom-cflags +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml,threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-emulation/xen-tools-4.11.3
-REQUIRED_USE=^^ ( python_single_target_python2_7 )
-SLOT=0
-SRC_URI=https://downloads.xenproject.org/release/xen/4.11.3/xen-4.11.3.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz http://xenbits.xensource.com/xen-extfiles/zlib-1.2.3.tar.gz ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-2.2.9.tar.bz2 http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz http://xenbits.xensource.com/xen-extfiles/newlib/newlib-1.16.0.tar.gz http://xenbits.xensource.com/xen-extfiles/polarssl-1.1.4-gpl.tgz https://dev.gentoo.org/~dlan/distfiles/xen-4.11.3-upstream-patches-0.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.11.3-upstream-patches-0.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	01eeb2dae449b6155b46f8deb0a2087d	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4b6803d57c97895b83d81689e9a2b3e6
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.11.3-r1 b/metadata/md5-cache/app-emulation/xen-tools-4.11.3-r1
deleted file mode 100644
index 473514ec6af8..000000000000
--- a/metadata/md5-cache/app-emulation/xen-tools-4.11.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=sys-kernel/linux-headers-4.11 python_single_target_python2_7? ( dev-python/lxml[python_targets_python2_7(-)] pam? ( dev-python/pypam[python_targets_python2_7(-)] ) ) x86? ( sys-devel/dev86 sys-firmware/ipxe[qemu] sys-power/iasl ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-devel/bin86 sys-devel/dev86 sys-firmware/ipxe[qemu] sys-power/iasl system-seabios? ( sys-firmware/seabios ) ) dev-lang/perl app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc python_single_target_python2_7? ( dev-python/markdown[python_targets_python2_7(-)] ) dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= x11-libs/pixman sdl? ( media-libs/libsdl[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 )
-DESCRIPTION=Xen tools including QEMU and xl
-EAPI=7
-HOMEPAGE=https://www.xenproject.org
-IUSE=api debug doc flask +hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios +python_single_target_python2_7
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) ovmf? ( hvm ) pygrub? ( python ) ?? ( qemu system-qemu )
-RESTRICT=test
-SLOT=0/4.11
-SRC_URI=https://downloads.xenproject.org/release/xen/4.11.3/xen-4.11.3.tar.gz https://git.seabios.org/cgit/seabios.git/snapshot/seabios-rel-1.11.1.tar.gz ovmf? ( https://github.com/tianocore/edk2/archive/ef529e6ab7c31290a33045bb1f1837447cc0eb56.tar.gz -> edk2-ef529e6ab7c31290a33045bb1f1837447cc0eb56.tar.gz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.11.3-upstream-patches-0.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.11.3-upstream-patches-0.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-19.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-19.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	01eeb2dae449b6155b46f8deb0a2087d	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2b26a49372fd0561af0c410bb5c03cc7
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index b76fcfcbd0fe..a5b2731dcbfe 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/calcurse-4.4.0 b/metadata/md5-cache/app-office/calcurse-4.4.0
deleted file mode 100644
index 58d21cfcf357..000000000000
--- a/metadata/md5-cache/app-office/calcurse-4.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/httplib2 sys-libs/ncurses: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=a text-based calendar and scheduling application
-EAPI=6
-HOMEPAGE=https://calcurse.org/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=BSD-2
-RDEPEND=dev-python/httplib2 sys-libs/ncurses:0=
-RESTRICT=test
-SLOT=0
-SRC_URI=https://calcurse.org/files/calcurse-4.4.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6c2fca0fdb223dd8fb62a92caede7c4a
diff --git a/metadata/md5-cache/app-office/calcurse-4.4.0-r1 b/metadata/md5-cache/app-office/calcurse-4.4.0-r1
new file mode 100644
index 000000000000..6af61263e3cb
--- /dev/null
+++ b/metadata/md5-cache/app-office/calcurse-4.4.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile prepare 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_6? ( dev-python/httplib2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/httplib2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/httplib2[python_targets_python3_8(-)] ) sys-libs/ncurses: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=a text-based calendar and scheduling application
+EAPI=6
+HOMEPAGE=https://calcurse.org/
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=amd64 ppc ppc64 x86
+LICENSE=BSD-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_6? ( dev-python/httplib2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/httplib2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/httplib2[python_targets_python3_8(-)] ) sys-libs/ncurses:0=
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://calcurse.org/files/calcurse-4.4.0.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	01eeb2dae449b6155b46f8deb0a2087d	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=23c70054bda68bdaf8026613dd203c6e
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index ad1e453689cf..0be0a8b96b96 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.8 b/metadata/md5-cache/app-portage/gentoolkit-0.4.8
new file mode 100644
index 000000000000..00f645c95885
--- /dev/null
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.4.8
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0=[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+),threads(+)] ) >=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 postinst preinst prepare test
+DEPEND=sys-apps/portage[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=Collection of administration scripts for Gentoo
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage-Tools
+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 ~riscv ~s390 ~sh ~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-apps/portage[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(-)] sys-apps/gawk sys-apps/gentoo-functions python_targets_pypy3? ( >=dev-python/pypy3-5:0=[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+),threads(+)] ) >=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=https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/gentoolkit-0.4.8.tar.gz
+_eclasses_=distutils-r1	741ee6361e3e62791ae1f32ec416afc4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4dfa39908a2b26ac08e45ca546f7c9b6	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=57ef26ab45b9753a9bbab5a2cde85273
diff --git a/metadata/md5-cache/app-portage/prefix-toolkit-4 b/metadata/md5-cache/app-portage/prefix-toolkit-4
deleted file mode 100644
index d3dcfede48af..000000000000
--- a/metadata/md5-cache/app-portage/prefix-toolkit-4
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=!app-portage/prefix-chain-setup !sys-apps/prefix-chain-utils >sys-apps/portage-2.3.62
-DEFINED_PHASES=configure install preinst unpack
-DEPEND=!app-portage/prefix-chain-setup !sys-apps/prefix-chain-utils
-DESCRIPTION=Utilities for users of Gentoo Prefix
-EAPI=7
-HOMEPAGE=https://prefix.gentoo.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=GPL-3
-RDEPEND=!app-portage/prefix-chain-setup !sys-apps/prefix-chain-utils prefix-stack? ( >=sys-apps/baselayout-prefix-2.6 sys-apps/gentoo-functions app-portage/elt-patches sys-devel/gnuconfig sys-devel/gcc-config )
-SLOT=0
-_md5_=958f0f5972693a73ed1f672339fcc7c1
diff --git a/metadata/md5-cache/app-portage/prefix-toolkit-5 b/metadata/md5-cache/app-portage/prefix-toolkit-5
deleted file mode 100644
index ed7f93aff0c0..000000000000
--- a/metadata/md5-cache/app-portage/prefix-toolkit-5
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=!app-portage/prefix-chain-setup !sys-apps/prefix-chain-utils >sys-apps/portage-2.3.62
-DEFINED_PHASES=configure install preinst unpack
-DEPEND=!app-portage/prefix-chain-setup !sys-apps/prefix-chain-utils
-DESCRIPTION=Utilities for users of Gentoo Prefix
-EAPI=7
-HOMEPAGE=https://prefix.gentoo.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=GPL-3
-RDEPEND=!app-portage/prefix-chain-setup !sys-apps/prefix-chain-utils prefix-stack? ( >=sys-apps/baselayout-prefix-2.6 sys-apps/gentoo-functions app-portage/elt-patches sys-devel/gnuconfig sys-devel/gcc-config )
-SLOT=0
-_md5_=b6f2906db8b5b618649268a45a3c1c13
diff --git a/metadata/md5-cache/app-portage/prefix-toolkit-6 b/metadata/md5-cache/app-portage/prefix-toolkit-6
deleted file mode 100644
index 33979fcc09af..000000000000
--- a/metadata/md5-cache/app-portage/prefix-toolkit-6
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=!app-portage/prefix-chain-setup !sys-apps/prefix-chain-utils >sys-apps/portage-2.3.62
-DEFINED_PHASES=configure install preinst unpack
-DEPEND=!app-portage/prefix-chain-setup !sys-apps/prefix-chain-utils
-DESCRIPTION=Utilities for users of Gentoo Prefix
-EAPI=7
-HOMEPAGE=https://prefix.gentoo.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=GPL-3
-RDEPEND=!app-portage/prefix-chain-setup !sys-apps/prefix-chain-utils prefix-stack? ( >=sys-apps/baselayout-prefix-2.6 sys-apps/gentoo-functions app-portage/elt-patches sys-devel/gnuconfig sys-devel/gcc-config elibc_Winnt? ( dev-libs/pthreads4w ) )
-SLOT=0
-_md5_=4cb3d94cf479eec7571d6f4129b66b89
diff --git a/metadata/md5-cache/app-portage/prefix-toolkit-7 b/metadata/md5-cache/app-portage/prefix-toolkit-9
similarity index 74%
rename from metadata/md5-cache/app-portage/prefix-toolkit-7
rename to metadata/md5-cache/app-portage/prefix-toolkit-9
index 46f5132c086b..ffbaae9db4ad 100644
--- a/metadata/md5-cache/app-portage/prefix-toolkit-7
+++ b/metadata/md5-cache/app-portage/prefix-toolkit-9
@@ -6,6 +6,6 @@ EAPI=7
 HOMEPAGE=https://prefix.gentoo.org/
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=GPL-3
-RDEPEND=!app-portage/prefix-chain-setup !sys-apps/prefix-chain-utils prefix-stack? ( >=sys-apps/baselayout-prefix-2.6 sys-apps/gentoo-functions app-portage/elt-patches sys-devel/gnuconfig sys-devel/gcc-config elibc_Winnt? ( dev-libs/pthreads4w ) )
+RDEPEND=!app-portage/prefix-chain-setup !sys-apps/prefix-chain-utils prefix-stack? ( >=sys-apps/baselayout-prefix-2.6 sys-devel/gcc-config elibc_Winnt? ( dev-libs/pthreads4w ) app-portage/elt-patches sys-apps/gentoo-functions sys-devel/gnuconfig )
 SLOT=0
-_md5_=a0d0f3fa7a19039952097d558e03e703
+_md5_=4182847a242aed7fd8933c634d4b3dc1
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 133a9d6c6e3c..d01ffd4d8c92 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/aspell-0.60.8 b/metadata/md5-cache/app-text/aspell-0.60.8
index d7756a3aab41..f16d2d91b356 100644
--- a/metadata/md5-cache/app-text/aspell-0.60.8
+++ b/metadata/md5-cache/app-text/aspell-0.60.8
@@ -5,11 +5,11 @@ DESCRIPTION=A spell checker replacement for ispell
 EAPI=7
 HOMEPAGE=http://aspell.net/
 IUSE=nls unicode l10n_af l10n_be l10n_bg l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_de-1901 l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_fi l10n_fo l10n_fr l10n_ga l10n_gl l10n_he l10n_hr l10n_hu l10n_hy l10n_is l10n_it l10n_la l10n_lt l10n_nl l10n_no l10n_pl l10n_pt l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sl l10n_sr l10n_sv l10n_uk l10n_vi
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2
 PDEPEND=app-dicts/aspell-en l10n_af? ( app-dicts/aspell-af ) l10n_be? ( app-dicts/aspell-be ) l10n_bg? ( app-dicts/aspell-bg ) l10n_br? ( app-dicts/aspell-br ) l10n_ca? ( app-dicts/aspell-ca ) l10n_cs? ( app-dicts/aspell-cs ) l10n_cy? ( app-dicts/aspell-cy ) l10n_da? ( app-dicts/aspell-da ) l10n_de? ( app-dicts/aspell-de ) l10n_de-1901? ( app-dicts/aspell-de-alt ) l10n_el? ( app-dicts/aspell-el ) l10n_en? ( app-dicts/aspell-en ) l10n_eo? ( app-dicts/aspell-eo ) l10n_es? ( app-dicts/aspell-es ) l10n_et? ( app-dicts/aspell-et ) l10n_fi? ( app-dicts/aspell-fi ) l10n_fo? ( app-dicts/aspell-fo ) l10n_fr? ( app-dicts/aspell-fr ) l10n_ga? ( app-dicts/aspell-ga ) l10n_gl? ( app-dicts/aspell-gl ) l10n_he? ( app-dicts/aspell-he ) l10n_hr? ( app-dicts/aspell-hr ) l10n_hu? ( app-dicts/aspell-hu ) l10n_hy? ( app-dicts/aspell-hy ) l10n_is? ( app-dicts/aspell-is ) l10n_it? ( app-dicts/aspell-it ) l10n_la? ( app-dicts/aspell-la ) l10n_lt? ( app-dicts/aspell-lt ) l10n_nl? ( app-dicts/aspell-nl ) l10n_no? ( app-dicts/aspell-no ) l10n_pl? ( app-dicts/aspell-pl ) l10n_pt? ( app-dicts/aspell-pt ) l10n_pt-BR? ( app-dicts/aspell-pt-br ) l10n_ro? ( app-dicts/aspell-ro ) l10n_ru? ( app-dicts/aspell-ru ) l10n_sk? ( app-dicts/aspell-sk ) l10n_sl? ( app-dicts/aspell-sl ) l10n_sr? ( app-dicts/aspell-sr ) l10n_sv? ( app-dicts/aspell-sv ) l10n_uk? ( app-dicts/aspell-uk ) l10n_vi? ( app-dicts/aspell-vi )
 RDEPEND=sys-libs/ncurses:0=[unicode?] nls? ( virtual/libintl ) !=app-dicts/aspell-en-0.5*
 SLOT=0
 SRC_URI=mirror://gnu/aspell/aspell-0.60.8.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=278d50c6956b800be28849a29322fe92
+_md5_=93829c9639d4fa2efd09226d5167fc5d
diff --git a/metadata/md5-cache/dev-go/Manifest.gz b/metadata/md5-cache/dev-go/Manifest.gz
index 71a9d33bea79..774659e68a9b 100644
Binary files a/metadata/md5-cache/dev-go/Manifest.gz and b/metadata/md5-cache/dev-go/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-go/golint-0_pre20200301 b/metadata/md5-cache/dev-go/golint-0_pre20200301
new file mode 100644
index 000000000000..d23a70711f0f
--- /dev/null
+++ b/metadata/md5-cache/dev-go/golint-0_pre20200301
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=a linter for Go
+EAPI=7
+HOMEPAGE=https://github.com/golang/lint
+KEYWORDS=~amd64
+LICENSE=BSD
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/golang/lint/archive/738671d3881b9731cc63024d5d88cf28db875626.tar.gz -> golint-0_pre20200301.tar.gz 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-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.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-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/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-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-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.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/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.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
+_eclasses_=go-module	cca12a5688562f107c14ffcf28195dd7
+_md5_=f7bd9d8543ad8617ccdb4214a3dba33b
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 8ee854597349..2c891ec05a91 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/mmix-20160804-r1 b/metadata/md5-cache/dev-lang/mmix-20160804-r1
index 8250740e11d9..daa4f0919e9a 100644
--- a/metadata/md5-cache/dev-lang/mmix-20160804-r1
+++ b/metadata/md5-cache/dev-lang/mmix-20160804-r1
@@ -10,4 +10,4 @@ RDEPEND=!!media-sound/mmix
 SLOT=0
 SRC_URI=http://mmix.cs.hm.edu/src/mmix-20160804.tgz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c9cca9a4420473d8a2a1e12bd1219e47
+_md5_=9d2fa2ffc9280aff34906bcea38e59f5
diff --git a/metadata/md5-cache/dev-lang/rust-1.40.0-r1 b/metadata/md5-cache/dev-lang/rust-1.40.0-r1
index e1a050ac4b64..5372121acfb1 100644
--- a/metadata/md5-cache/dev-lang/rust-1.40.0-r1
+++ b/metadata/md5-cache/dev-lang/rust-1.40.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] elibc_musl? ( sys-libs/libunwind ) system-llvm? ( || ( sys-devel/llvm:9[llvm_targets_WebAssembly?] wasm? ( =sys-devel/lld-9* ) ) <sys-devel/llvm-10:= ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) system-bootstrap? ( || ( =dev-lang/rust-1.40.0-r1 =dev-lang/rust-bin-1.40.0* ) ) system-llvm? ( dev-util/cmake dev-util/ninja )
+DEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] elibc_musl? ( sys-libs/libunwind ) system-llvm? ( || ( sys-devel/llvm:9[llvm_targets_WebAssembly?] wasm? ( =sys-devel/lld-9* ) ) <sys-devel/llvm-10:= ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) system-bootstrap? ( || ( =dev-lang/rust-1.40.0-r1 =dev-lang/rust-bin-1.40.0* ) ) !system-llvm? ( dev-util/cmake dev-util/ninja )
 DESCRIPTION=Systems programming language from Mozilla
 EAPI=7
 HOMEPAGE=https://www.rust-lang.org/
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 SLOT=stable/1.40
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.40.0-src.tar.xz -> rustc-1.40.0-src.tar.xz !system-bootstrap? ( amd64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.39.0-x86_64-unknown-linux-gnu.tar.xz ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.39.0-x86_64-unknown-linux-musl.tar.xz ) ) arm? ( https://static.rust-lang.org/dist/rust-1.39.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.39.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.39.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.39.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.39.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.39.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.39.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.39.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.39.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.39.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.39.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.39.0-i686-unknown-linux-gnu.tar.xz ) )
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	llvm	11596869538b5e2be887810f05390a21	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	dfda7934df092a96e439c05b4aeac519	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	3b59474e577cf775a757884b62a6d9cf	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	rust-toolchain	e5344d7fd74efbbd91484ea3a47ebf66	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ed1dfa0465f19746ba95cee094f84713
+_md5_=46c287c955ffb438dff0329be52fece0
diff --git a/metadata/md5-cache/dev-lang/rust-1.41.0 b/metadata/md5-cache/dev-lang/rust-1.41.0
deleted file mode 100644
index 862892ca898a..000000000000
--- a/metadata/md5-cache/dev-lang/rust-1.41.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=net-libs/libssh2:= net-libs/http-parser:= net-misc/curl:=[ssl] sys-libs/zlib:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) elibc_musl? ( sys-libs/libunwind ) system-llvm? ( || ( sys-devel/llvm:9[llvm_targets_WebAssembly?] wasm? ( =sys-devel/lld-9* ) ) <sys-devel/llvm-10:= ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) system-bootstrap? ( || ( >=dev-lang/rust-1.40.0-r1 >=dev-lang/rust-bin-1.40 ) ) system-llvm? ( dev-util/cmake dev-util/ninja )
-DESCRIPTION=Systems programming language from Mozilla
-EAPI=7
-HOMEPAGE=https://www.rust-lang.org/
-IUSE=clippy cpu_flags_x86_sse2 debug doc libressl nightly parallel-compiler rls rustfmt system-bootstrap system-llvm wasm 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 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
-LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
-RDEPEND=net-libs/libssh2:= net-libs/http-parser:= net-misc/curl:=[ssl] sys-libs/zlib:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) elibc_musl? ( sys-libs/libunwind ) system-llvm? ( || ( sys-devel/llvm:9[llvm_targets_WebAssembly?] wasm? ( =sys-devel/lld-9* ) ) <sys-devel/llvm-10:= ) >=app-eselect/eselect-rust-20190311
-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 ) parallel-compiler? ( nightly ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
-SLOT=stable/1.41
-SRC_URI=https://static.rust-lang.org/dist/rustc-1.41.0-src.tar.xz -> rustc-1.41.0-src.tar.xz !system-bootstrap? ( amd64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.40.0-x86_64-unknown-linux-gnu.tar.xz ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.40.0-x86_64-unknown-linux-musl.tar.xz ) ) arm? ( https://static.rust-lang.org/dist/rust-1.40.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.40.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.40.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.40.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.40.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.40.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.40.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.40.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.40.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.40.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.40.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.40.0-i686-unknown-linux-gnu.tar.xz ) )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	llvm	11596869538b5e2be887810f05390a21	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	dfda7934df092a96e439c05b4aeac519	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	3b59474e577cf775a757884b62a6d9cf	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	rust-toolchain	e5344d7fd74efbbd91484ea3a47ebf66	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ed9defca6aa4a840eff62e0aace31cf4
diff --git a/metadata/md5-cache/dev-lang/rust-1.41.1 b/metadata/md5-cache/dev-lang/rust-1.41.1
index 55424a57f159..2a9fdcbed286 100644
--- a/metadata/md5-cache/dev-lang/rust-1.41.1
+++ b/metadata/md5-cache/dev-lang/rust-1.41.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=net-libs/libssh2:= net-libs/http-parser:= net-misc/curl:=[ssl] sys-libs/zlib:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) elibc_musl? ( sys-libs/libunwind ) system-llvm? ( || ( sys-devel/llvm:9[llvm_targets_WebAssembly?] wasm? ( =sys-devel/lld-9* ) ) <sys-devel/llvm-10:= ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) system-bootstrap? ( || ( >=dev-lang/rust-1.40.0-r1 >=dev-lang/rust-bin-1.40 ) ) system-llvm? ( dev-util/cmake dev-util/ninja )
+DEPEND=net-libs/libssh2:= net-libs/http-parser:= net-misc/curl:=[ssl] sys-libs/zlib:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) elibc_musl? ( sys-libs/libunwind ) system-llvm? ( || ( sys-devel/llvm:9[llvm_targets_WebAssembly?] wasm? ( =sys-devel/lld-9* ) ) <sys-devel/llvm-10:= ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) system-bootstrap? ( || ( >=dev-lang/rust-1.40.0-r1 >=dev-lang/rust-bin-1.40 ) ) !system-llvm? ( dev-util/cmake dev-util/ninja )
 DESCRIPTION=Systems programming language from Mozilla
 EAPI=7
 HOMEPAGE=https://www.rust-lang.org/
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 SLOT=stable/1.41
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.41.1-src.tar.xz -> rustc-1.41.1-src.tar.xz !system-bootstrap? ( amd64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.40.0-x86_64-unknown-linux-gnu.tar.xz ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.40.0-x86_64-unknown-linux-musl.tar.xz ) ) arm? ( https://static.rust-lang.org/dist/rust-1.40.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.40.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.40.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.40.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.40.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.40.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.40.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.40.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.40.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.40.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.40.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.40.0-i686-unknown-linux-gnu.tar.xz ) )
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	llvm	11596869538b5e2be887810f05390a21	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	dfda7934df092a96e439c05b4aeac519	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	3b59474e577cf775a757884b62a6d9cf	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	rust-toolchain	e5344d7fd74efbbd91484ea3a47ebf66	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0641871fe465664a03d452be376b3ef9
+_md5_=74cb36ccaef16e7390747ce5820fd415
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.41.0 b/metadata/md5-cache/dev-lang/rust-bin-1.41.0
deleted file mode 100644
index aa6538c3f5e3..000000000000
--- a/metadata/md5-cache/dev-lang/rust-bin-1.41.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm pretend unpack
-DESCRIPTION=Systems programming language from Mozilla
-EAPI=7
-HOMEPAGE=https://www.rust-lang.org/
-IUSE=clippy cpu_flags_x86_sse2 doc libressl rustfmt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
-LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
-RDEPEND=>=app-eselect/eselect-rust-20190311 sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-misc/curl[ssl] !dev-lang/rust:0 !dev-util/cargo rustfmt? ( !dev-util/rustfmt )
-REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
-SLOT=stable
-SRC_URI=amd64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.41.0-x86_64-unknown-linux-gnu.tar.xz ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.41.0-x86_64-unknown-linux-musl.tar.xz ) ) arm? ( https://static.rust-lang.org/dist/rust-1.41.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.41.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.41.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.41.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.41.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.41.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.41.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.41.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.41.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.41.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.41.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.41.0-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	dfda7934df092a96e439c05b4aeac519	rust-toolchain	e5344d7fd74efbbd91484ea3a47ebf66	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=65c95b837d69421f4b3a6e2dc91e65ab
diff --git a/metadata/md5-cache/dev-lang/vala-0.48.0 b/metadata/md5-cache/dev-lang/vala-0.48.1
similarity index 88%
rename from metadata/md5-cache/dev-lang/vala-0.48.0
rename to metadata/md5-cache/dev-lang/vala-0.48.1
index 2af7ddcd4f3d..e71d13714888 100644
--- a/metadata/md5-cache/dev-lang/vala-0.48.0
+++ b/metadata/md5-cache/dev-lang/vala-0.48.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.48.0 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala] dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.48.1 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala] dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 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 ~sh ~sparc ~x86 ~x86-linux
 LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.48.0 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala]
+RDEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.48.1 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.0.tar.xz
+SRC_URI=mirror://gnome/sources/vala/0.48/vala-0.48.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7c9cbf8ae0ec25b87122a5b529c64adf
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 4b56c66b411b..ae4ed04892a2 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/intel-neo-19.48.14977 b/metadata/md5-cache/dev-libs/intel-neo-19.48.14977
deleted file mode 100644
index bb1fafbc62bc..000000000000
--- a/metadata/md5-cache/dev-libs/intel-neo-19.48.14977
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/ocl-icd >=dev-util/intel-graphics-compiler-1.0.2990 >=media-libs/gmmlib-19.3.4 vaapi? ( x11-libs/libdrm[video_cards_intel] >=x11-libs/libva-2.0.0 ) media-libs/mesa
-DESCRIPTION=Intel Graphics Compute Runtime for OpenCL, for Gen8 (Broadwell) and beyond
-EAPI=7
-HOMEPAGE=https://github.com/intel/compute-runtime
-IUSE=vaapi
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-libs/ocl-icd >=dev-util/intel-graphics-compiler-1.0.2990 >=media-libs/gmmlib-19.3.4 vaapi? ( x11-libs/libdrm[video_cards_intel] >=x11-libs/libva-2.0.0 )
-SLOT=0
-SRC_URI=https://github.com/intel/compute-runtime/archive/19.48.14977.tar.gz -> intel-neo-19.48.14977.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c3b896b952ded802ac162ee1bca10b3b
diff --git a/metadata/md5-cache/dev-libs/intel-neo-20.10.16087 b/metadata/md5-cache/dev-libs/intel-neo-20.10.16087
new file mode 100644
index 000000000000..e55e7ce47b05
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/intel-neo-20.10.16087
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/ocl-icd >=dev-util/intel-graphics-compiler-1.0.3445 >=media-libs/gmmlib-19.4.1 vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva ) media-libs/mesa
+DESCRIPTION=Intel Graphics Compute Runtime for OpenCL, for Gen8 (Broadwell) and beyond
+EAPI=7
+HOMEPAGE=https://github.com/intel/compute-runtime
+IUSE=vaapi
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/ocl-icd >=dev-util/intel-graphics-compiler-1.0.3445 >=media-libs/gmmlib-19.4.1 vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva )
+SLOT=0
+SRC_URI=https://github.com/intel/compute-runtime/archive/20.10.16087.tar.gz -> intel-neo-20.10.16087.tar.gz
+_eclasses_=cmake	88799418ef3db9d88b6232a483143608	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=57257b5febea1df488a11dddd618abf1
diff --git a/metadata/md5-cache/dev-libs/nss-pem-1.0.5 b/metadata/md5-cache/dev-libs/nss-pem-1.0.5
index 3111266fa503..ed3cbce3307e 100644
--- a/metadata/md5-cache/dev-libs/nss-pem-1.0.5
+++ b/metadata/md5-cache/dev-libs/nss-pem-1.0.5
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-libs/nss-3.50-r1 dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=>=dev-libs/nss-3.50-r1 dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=!<=dev-libs/nss-3.50 >=dev-libs/nss-3.50-r1
 DESCRIPTION=PEM file reader for Network Security Services (NSS)
@@ -10,5 +10,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=dev-libs/nss-3.50-r1
 SLOT=0
 SRC_URI=https://github.com/kdudka/nss-pem/releases/download/nss-pem-1.0.5/nss-pem-1.0.5.tar.xz
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b722558d6193f3ad6edcf1847a6a0867
+_eclasses_=cmake	88799418ef3db9d88b6232a483143608	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3b6fb766b6b8d28c8aa508ff893c1ac7
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.48.0 b/metadata/md5-cache/dev-libs/vala-common-0.48.1
similarity index 87%
rename from metadata/md5-cache/dev-libs/vala-common-0.48.0
rename to metadata/md5-cache/dev-libs/vala-common-0.48.1
index fbb83ce6b6a8..f729386881f3 100644
--- a/metadata/md5-cache/dev-libs/vala-common-0.48.0
+++ b/metadata/md5-cache/dev-libs/vala-common-0.48.1
@@ -6,6 +6,6 @@ HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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.0.tar.xz
+SRC_URI=mirror://gnome/sources/vala/0.48/vala-0.48.1.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a
 _md5_=ebac26299c792f650074a39b9d2c8a43
diff --git a/metadata/md5-cache/dev-python/git-python-2.1.11 b/metadata/md5-cache/dev-python/GitPython-2.1.11
similarity index 100%
rename from metadata/md5-cache/dev-python/git-python-2.1.11
rename to metadata/md5-cache/dev-python/GitPython-2.1.11
diff --git a/metadata/md5-cache/dev-python/git-python-3.1.0 b/metadata/md5-cache/dev-python/GitPython-3.1.0
similarity index 98%
rename from metadata/md5-cache/dev-python/git-python-3.1.0
rename to metadata/md5-cache/dev-python/GitPython-3.1.0
index 961c8411480c..6166bd9fc648 100644
--- a/metadata/md5-cache/dev-python/git-python-3.1.0
+++ b/metadata/md5-cache/dev-python/GitPython-3.1.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/G/GitPython/GitPython-3.1.0.tar.gz test? ( https://dev.gentoo.org/~mgorny/dist/GitPython-3.1.0.gitbundle https://dev.gentoo.org/~mgorny/dist/gitdb-4.0.2.gitbundle https://dev.gentoo.org/~mgorny/dist/smmap-3.0.1.gitbundle )
 _eclasses_=distutils-r1	741ee6361e3e62791ae1f32ec416afc4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4dfa39908a2b26ac08e45ca546f7c9b6	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=84d2a2fc318002094be78b1a8d38d5f0
+_md5_=755d2aeeeb57c3d28174da30866ebafa
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 51d74fad5f20..124a751fc24b 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/bandit-1.5.1-r1 b/metadata/md5-cache/dev-python/bandit-1.5.1-r1
index 9b5a78a60f90..082ff9fbdc57 100644
--- a/metadata/md5-cache/dev-python/bandit-1.5.1-r1
+++ b/metadata/md5-cache/dev-python/bandit-1.5.1-r1
@@ -6,10 +6,10 @@ HOMEPAGE=https://openstack.org
 IUSE=test python_targets_python3_6 python_targets_python3_7
 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_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/git-python-1.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12.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/stevedore-1.20.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(-)]
+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/GitPython-1.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12.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/stevedore-1.20.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/b/bandit/bandit-1.5.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	741ee6361e3e62791ae1f32ec416afc4	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4dfa39908a2b26ac08e45ca546f7c9b6	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ef7a9f68b2ae30e72c49fcf934221217
+_md5_=7ac9892e4dce08f232b7ad5fd9484b54
diff --git a/metadata/md5-cache/dev-python/bandit-1.6.2 b/metadata/md5-cache/dev-python/bandit-1.6.2
index 0947f3dd509a..d80a20712c9c 100644
--- a/metadata/md5-cache/dev-python/bandit-1.6.2
+++ b/metadata/md5-cache/dev-python/bandit-1.6.2
@@ -7,10 +7,10 @@ HOMEPAGE=https://github.com/PyCQA/bandit
 IUSE=test python_targets_python3_6 python_targets_python3_7
 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_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/git-python-1.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.13.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/stevedore-1.20.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(-)]
+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/GitPython-1.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.13.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/stevedore-1.20.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/b/bandit/bandit-1.6.2.tar.gz
 _eclasses_=distutils-r1	741ee6361e3e62791ae1f32ec416afc4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4dfa39908a2b26ac08e45ca546f7c9b6	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e975317415ed9b0850b8dfa6df5bbf69
+_md5_=7f201eb3fbad340dd152f8a0929a0635
diff --git a/metadata/md5-cache/dev-python/libvirt-python-5.2.0 b/metadata/md5-cache/dev-python/libvirt-python-5.2.0
deleted file mode 100644
index 2250377b9f21..000000000000
--- a/metadata/md5-cache/dev-python/libvirt-python-5.2.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[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=app-emulation/libvirt:0/5.2.0 virtual/pkgconfig test? ( dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=libvirt Python bindings
-EAPI=7
-HOMEPAGE=https://www.libvirt.org
-IUSE=examples test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=LGPL-2
-RDEPEND=app-emulation/libvirt:0/5.2.0 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=https://libvirt.org/sources/python/libvirt-python-5.2.0.tar.gz
-_eclasses_=distutils-r1	741ee6361e3e62791ae1f32ec416afc4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4dfa39908a2b26ac08e45ca546f7c9b6	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=78675b7045dff9887d8ab4084339117e
diff --git a/metadata/md5-cache/dev-python/libvirt-python-5.5.0 b/metadata/md5-cache/dev-python/libvirt-python-5.5.0
deleted file mode 100644
index d7d2b4917d2c..000000000000
--- a/metadata/md5-cache/dev-python/libvirt-python-5.5.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[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=app-emulation/libvirt:0/5.5.0 virtual/pkgconfig test? ( dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=libvirt Python bindings
-EAPI=7
-HOMEPAGE=https://www.libvirt.org
-IUSE=examples test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=LGPL-2
-RDEPEND=app-emulation/libvirt:0/5.5.0 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=https://libvirt.org/sources/python/libvirt-python-5.5.0.tar.gz
-_eclasses_=distutils-r1	741ee6361e3e62791ae1f32ec416afc4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4dfa39908a2b26ac08e45ca546f7c9b6	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=78675b7045dff9887d8ab4084339117e
diff --git a/metadata/md5-cache/dev-python/libvirt-python-5.6.0 b/metadata/md5-cache/dev-python/libvirt-python-5.6.0
deleted file mode 100644
index c5cc159ddcdc..000000000000
--- a/metadata/md5-cache/dev-python/libvirt-python-5.6.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[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=app-emulation/libvirt:0/5.6.0 virtual/pkgconfig test? ( dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=libvirt Python bindings
-EAPI=7
-HOMEPAGE=https://www.libvirt.org
-IUSE=examples test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2
-RDEPEND=app-emulation/libvirt:0/5.6.0 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=https://libvirt.org/sources/python/libvirt-python-5.6.0.tar.gz
-_eclasses_=distutils-r1	741ee6361e3e62791ae1f32ec416afc4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4dfa39908a2b26ac08e45ca546f7c9b6	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f4b17683a7cf4540b144e58e99537b39
diff --git a/metadata/md5-cache/dev-python/libvirt-python-5.8.0 b/metadata/md5-cache/dev-python/libvirt-python-5.8.0
deleted file mode 100644
index 86638318f918..000000000000
--- a/metadata/md5-cache/dev-python/libvirt-python-5.8.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[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=app-emulation/libvirt:0/5.8.0 virtual/pkgconfig test? ( dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=libvirt Python bindings
-EAPI=7
-HOMEPAGE=https://www.libvirt.org
-IUSE=examples test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
-LICENSE=LGPL-2
-RDEPEND=app-emulation/libvirt:0/5.8.0 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=https://libvirt.org/sources/python/libvirt-python-5.8.0.tar.gz
-_eclasses_=distutils-r1	741ee6361e3e62791ae1f32ec416afc4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4dfa39908a2b26ac08e45ca546f7c9b6	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=98de32193adf40de29aafa5ea9d118ee
diff --git a/metadata/md5-cache/dev-python/nltk-3.4.5 b/metadata/md5-cache/dev-python/nltk-3.4.5
new file mode 100644
index 000000000000..d627a231a59e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nltk-3.4.5
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/nltk-data dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/twython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sci-libs/scikits_learn[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) test? ( dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite,tk?,xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Natural Language Toolkit
+EAPI=7
+HOMEPAGE=https://www.nltk.org/ https://github.com/nltk/nltk/
+IUSE=tk test python_targets_python3_6
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=Apache-2.0
+PDEPEND=dev-python/nltk-data
+RDEPEND=dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6[sqlite,tk?,xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/nltk/nltk/archive/3.4.5.tar.gz -> nltk-3.4.5.tar.gz
+_eclasses_=distutils-r1	741ee6361e3e62791ae1f32ec416afc4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4dfa39908a2b26ac08e45ca546f7c9b6	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=e19a97fcd78c19e8ac30e4f87d374490
diff --git a/metadata/md5-cache/dev-python/nltk-data-20200312 b/metadata/md5-cache/dev-python/nltk-data-20200312
new file mode 100644
index 000000000000..bdd4009ad26d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nltk-data-20200312
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install pretend setup unpack
+DESCRIPTION=Data files for NLTK
+EAPI=7
+HOMEPAGE=https://www.nltk.org/nltk_data/
+IUSE=extra
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/comtrans.zip -> nltk-comtrans-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/conll2007.zip -> nltk-conll2007-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/jeita.zip -> nltk-jeita-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/knbc.zip -> nltk-knbc-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/machado.zip -> nltk-machado-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/masc_tagged.zip -> nltk-masc_tagged-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/nombank.1.0.zip -> nltk-nombank.1.0-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/panlex_swadesh.zip -> nltk-panlex_swadesh-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/propbank.zip -> nltk-propbank-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/reuters.zip -> nltk-reuters-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/semcor.zip -> nltk-semcor-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/universal_treebanks_v20.zip -> nltk-universal_treebanks_v20-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/sentiment/vader_lexicon.zip -> nltk-vader_lexicon-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/stemmers/snowball_data.zip -> nltk-snowball_data-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/abc.zip -> nltk-abc-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/alpino.zip -> nltk-alpino-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/brown.zip -> nltk-brown-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/cess_cat.zip -> nltk-cess_cat-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/cess_esp.zip -> nltk-cess_esp-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/chat80.zip -> nltk-chat80-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/city_database.zip -> nltk-city_database-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/cmudict.zip -> nltk-cmudict-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/comparative_sentences.zip -> nltk-comparative_sentences-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/conll2000.zip -> nltk-conll2000-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/conll2002.zip -> nltk-conll2002-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/crubadan.zip -> nltk-crubadan-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/dependency_treebank.zip -> nltk-dependency_treebank-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/dolch.zip -> nltk-dolch-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/europarl_raw.zip -> nltk-europarl_raw-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/floresta.zip -> nltk-floresta-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/framenet_v15.zip -> nltk-framenet_v15-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/framenet_v17.zip -> nltk-framenet_v17-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/gazetteers.zip -> nltk-gazetteers-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/genesis.zip -> nltk-genesis-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/gutenberg.zip -> nltk-gutenberg-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/ieer.zip -> nltk-ieer-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/inaugural.zip -> nltk-inaugural-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/indian.zip -> nltk-indian-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/lin_thesaurus.zip -> nltk-lin_thesaurus-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/mac_morpho.zip -> nltk-mac_morpho-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/movie_reviews.zip -> nltk-movie_reviews-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/mte_teip5.zip -> nltk-mte_teip5-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/names.zip -> nltk-names-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/nonbreaking_prefixes.zip -> nltk-nonbreaking_prefixes-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/nps_chat.zip -> nltk-nps_chat-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/omw.zip -> nltk-omw-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/opinion_lexicon.zip -> nltk-opinion_lexicon-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/ppattach.zip -> nltk-ppattach-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/product_reviews_1.zip -> nltk-product_reviews_1-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/product_reviews_2.zip -> nltk-product_reviews_2-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/pros_cons.zip -> nltk-pros_cons-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/ptb.zip -> nltk-ptb-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/qc.zip -> nltk-qc-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/rte.zip -> nltk-rte-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/senseval.zip -> nltk-senseval-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/sentence_polarity.zip -> nltk-sentence_polarity-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/sentiwordnet.zip -> nltk-sentiwordnet-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/shakespeare.zip -> nltk-shakespeare-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/sinica_treebank.zip -> nltk-sinica_treebank-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/state_union.zip -> nltk-state_union-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/stopwords.zip -> nltk-stopwords-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/subjectivity.zip -> nltk-subjectivity-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/swadesh.zip -> nltk-swadesh-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/switchboard.zip -> nltk-switchboard-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/timit.zip -> nltk-timit-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/toolbox.zip -> nltk-toolbox-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/treebank.zip -> nltk-treebank-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/twitter_samples.zip -> nltk-twitter_samples-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/udhr.zip -> nltk-udhr-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/udhr2.zip -> nltk-udhr2-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/verbnet.zip -> nltk-verbnet-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/webtext.zip -> nltk-webtext-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/wordnet.zip -> nltk-wordnet-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/wordnet_ic.zip -> nltk-wordnet_ic-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/words.zip -> nltk-words-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/grammars/book_grammars.zip -> nltk-book_grammars-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/grammars/large_grammars.zip -> nltk-large_grammars-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/grammars/sample_grammars.zip -> nltk-sample_grammars-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/misc/perluniprops.zip -> nltk-perluniprops-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/models/bllip_wsj_no_aux.zip -> nltk-bllip_wsj_no_aux-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/models/moses_sample.zip -> nltk-moses_sample-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/models/wmt15_eval.zip -> nltk-wmt15_eval-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/models/word2vec_sample.zip -> nltk-word2vec_sample-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/stemmers/porter_test.zip -> nltk-porter_test-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/stemmers/rslp.zip -> nltk-rslp-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/taggers/averaged_perceptron_tagger.zip -> nltk-averaged_perceptron_tagger-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/taggers/averaged_perceptron_tagger_ru.zip -> nltk-averaged_perceptron_tagger_ru-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/taggers/universal_tagset.zip -> nltk-universal_tagset-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/tokenizers/punkt.zip -> nltk-punkt-20200312.zip extra? ( https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/chunkers/maxent_ne_chunker.zip -> nltk-maxent_ne_chunker-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/biocreative_ppi.zip -> nltk-biocreative_ppi-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/brown_tei.zip -> nltk-brown_tei-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/kimmo.zip -> nltk-kimmo-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/paradigms.zip -> nltk-paradigms-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/pe08.zip -> nltk-pe08-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/pil.zip -> nltk-pil-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/pl196x.zip -> nltk-pl196x-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/problem_reports.zip -> nltk-problem_reports-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/smultron.zip -> nltk-smultron-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/unicode_samples.zip -> nltk-unicode_samples-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/verbnet3.zip -> nltk-verbnet3-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/ycoe.zip -> nltk-ycoe-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/grammars/basque_grammars.zip -> nltk-basque_grammars-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/grammars/spanish_grammars.zip -> nltk-spanish_grammars-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/help/tagsets.zip -> nltk-tagsets-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/misc/mwa_ppdb.zip -> nltk-mwa_ppdb-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/taggers/maxent_treebank_pos_tagger.zip -> nltk-maxent_treebank_pos_tagger-20200312.zip )
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73
+_md5_=74494ba26f507f3aacc4d4f08529d298
diff --git a/metadata/md5-cache/dev-python/oauthlib-3.1.0 b/metadata/md5-cache/dev-python/oauthlib-3.1.0
new file mode 100644
index 000000000000..c6f8f1656318
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oauthlib-3.1.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( >=dev-python/pyjwt-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/blinker[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cryptography[python_targets_python3_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[python_targets_python3_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=Spec-compliant and thorough implementation of the OAuth request-signing logic
+EAPI=7
+HOMEPAGE=https://github.com/idan/oauthlib https://pypi.org/project/oauthlib/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/pyjwt-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/blinker[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/o/oauthlib/oauthlib-3.1.0.tar.gz
+_eclasses_=distutils-r1	741ee6361e3e62791ae1f32ec416afc4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4dfa39908a2b26ac08e45ca546f7c9b6	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=5e848d3f614fdad3e9c384ee05365321
diff --git a/metadata/md5-cache/dev-python/pydot-1.4.1 b/metadata/md5-cache/dev-python/pydot-1.4.1
index 21956f9c108c..705691bb24e0 100644
--- a/metadata/md5-cache/dev-python/pydot-1.4.1
+++ b/metadata/md5-cache/dev-python/pydot-1.4.1
@@ -1,16 +1,16 @@
-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[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+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[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pyparsing-2.1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-gfx/graphviz dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=>=dev-python/pyparsing-2.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(-)] media-gfx/graphviz dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Python interface to Graphviz's Dot language
 EAPI=7
 HOMEPAGE=https://github.com/erocarrera/pydot https://pypi.org/project/pydot/
-IUSE=test python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=MIT
-RDEPEND=>=dev-python/pyparsing-2.1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-gfx/graphviz 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 )
+RDEPEND=>=dev-python/pyparsing-2.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(-)] 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 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/erocarrera/pydot/archive/v1.4.1.tar.gz -> pydot-1.4.1.tar.gz
 _eclasses_=distutils-r1	741ee6361e3e62791ae1f32ec416afc4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4dfa39908a2b26ac08e45ca546f7c9b6	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8d4134ee60fcb12959380bc93cb75b9a
+_md5_=b8840b9509ba8a4b36bdc193cea5aa73
diff --git a/metadata/md5-cache/dev-python/requests-oauthlib-1.3.0 b/metadata/md5-cache/dev-python/requests-oauthlib-1.3.0
index 5e74516082e6..578809361602 100644
--- a/metadata/md5-cache/dev-python/requests-oauthlib-1.3.0
+++ b/metadata/md5-cache/dev-python/requests-oauthlib-1.3.0
@@ -1,16 +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[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=test? ( dev-python/requests-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(-)] ) test? ( >=dev-python/requests-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/oauthlib-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(-)] ) python_targets_python3_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[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests-mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=This project provides first-class OAuth library support for Requests
 EAPI=7
 HOMEPAGE=https://github.com/requests/requests-oauthlib
-IUSE=test python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
-RDEPEND=>=dev-python/requests-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oauthlib-0.6.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(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test ) test
+RDEPEND=>=dev-python/requests-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/oauthlib-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(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/requests/requests-oauthlib/archive/v1.3.0.tar.gz -> requests-oauthlib-1.3.0.tar.gz
 _eclasses_=distutils-r1	741ee6361e3e62791ae1f32ec416afc4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4dfa39908a2b26ac08e45ca546f7c9b6	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=da7f29ad4a47febc033387b7e3b7010c
+_md5_=b3e5997c71f7ac19bdd0df8bdb45033d
diff --git a/metadata/md5-cache/dev-python/schedule-0.4.2 b/metadata/md5-cache/dev-python/schedule-0.4.2
deleted file mode 100644
index 5433909e7d89..000000000000
--- a/metadata/md5-cache/dev-python/schedule-0.4.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( >=dev-python/mock-2.0.0 >=dev-python/pytest-3.0.3 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Python job scheduling for humans
-EAPI=6
-HOMEPAGE=https://github.com/dbader/schedule
-IUSE=test python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/schedule/schedule-0.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	741ee6361e3e62791ae1f32ec416afc4	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4dfa39908a2b26ac08e45ca546f7c9b6	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fa813379d5d149ea31afec77d63a95dc
diff --git a/metadata/md5-cache/dev-python/schedule-0.5.0 b/metadata/md5-cache/dev-python/schedule-0.5.0
deleted file mode 100644
index 265b2d207891..000000000000
--- a/metadata/md5-cache/dev-python/schedule-0.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( >=dev-python/mock-2.0.0 >=dev-python/pytest-3.0.3 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Python job scheduling for humans
-EAPI=6
-HOMEPAGE=https://github.com/dbader/schedule
-IUSE=test python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/schedule/schedule-0.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	741ee6361e3e62791ae1f32ec416afc4	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4dfa39908a2b26ac08e45ca546f7c9b6	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8dc89873304d31b197f35e4926841561
diff --git a/metadata/md5-cache/dev-python/schedule-0.6.0 b/metadata/md5-cache/dev-python/schedule-0.6.0
new file mode 100644
index 000000000000..fc8d30d3cefe
--- /dev/null
+++ b/metadata/md5-cache/dev-python/schedule-0.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( >=dev-python/mock-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/pytest-3.0.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(-)] ) python_targets_python3_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[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=Python job scheduling for humans
+EAPI=6
+HOMEPAGE=https://github.com/dbader/schedule
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+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(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/dbader/schedule/archive/0.6.0.tar.gz -> schedule-0.6.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	741ee6361e3e62791ae1f32ec416afc4	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4dfa39908a2b26ac08e45ca546f7c9b6	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d2aba2822522ff2c9394d863e00391cf
diff --git a/metadata/md5-cache/dev-python/schedule-9999 b/metadata/md5-cache/dev-python/schedule-9999
new file mode 100644
index 000000000000..2be7fc773c47
--- /dev/null
+++ b/metadata/md5-cache/dev-python/schedule-9999
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( >=dev-python/mock-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/pytest-3.0.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(-)] ) python_targets_python3_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[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Python job scheduling for humans
+EAPI=6
+HOMEPAGE=https://github.com/dbader/schedule
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+LICENSE=MIT
+PROPERTIES=live
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_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
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	741ee6361e3e62791ae1f32ec416afc4	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4dfa39908a2b26ac08e45ca546f7c9b6	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d2aba2822522ff2c9394d863e00391cf
diff --git a/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.4.3-r1 b/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.4.3-r1
index c9c2111e883a..b81a8fc33969 100644
--- a/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.4.3-r1
+++ b/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.4.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=ReadTheDocs.org theme for Sphinx
 EAPI=7
 HOMEPAGE=https://github.com/readthedocs/sphinx_rtd_theme
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~sparc ~x86
 LICENSE=MIT
 PDEPEND=dev-python/sphinx[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(-)]
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5: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[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(-)]
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3.tar.gz
 _eclasses_=distutils-r1	741ee6361e3e62791ae1f32ec416afc4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4dfa39908a2b26ac08e45ca546f7c9b6	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=41d086ac102166ffac9331e8795a2248
+_md5_=f5742bd36dbf7cf1cd341f362260a6c1
diff --git a/metadata/md5-cache/dev-python/twython-3.7.0 b/metadata/md5-cache/dev-python/twython-3.7.0
new file mode 100644
index 000000000000..be0b9ffd96bd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/twython-3.7.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/responses[python_targets_python3_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/requests-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/requests-oauthlib-0.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(-)] ) python_targets_python3_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[python_targets_python3_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=An easy way to access Twitter data with Python
+EAPI=7
+HOMEPAGE=https://github.com/ryanmcgrath/twython
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/requests-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/requests-oauthlib-0.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(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ryanmcgrath/twython/archive/3.7.0.tar.gz -> twython-3.7.0.gh.tar.gz
+_eclasses_=distutils-r1	741ee6361e3e62791ae1f32ec416afc4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4dfa39908a2b26ac08e45ca546f7c9b6	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=1e16edffaaa759398ab43b9cfaebef64
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index a5bdad9f5614..0b6a7553abfd 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/cmake-3.17.0_rc2 b/metadata/md5-cache/dev-util/cmake-3.17.0_rc3
similarity index 96%
rename from metadata/md5-cache/dev-util/cmake-3.17.0_rc2
rename to metadata/md5-cache/dev-util/cmake-3.17.0_rc3
index 89ffca9a1ff7..877e55f3020c 100644
--- a/metadata/md5-cache/dev-util/cmake-3.17.0_rc2
+++ b/metadata/md5-cache/dev-util/cmake-3.17.0_rc3
@@ -9,6 +9,6 @@ LICENSE=CMake
 RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://cmake.org/files/v3.17/cmake-3.17.0-rc2.tar.gz
+SRC_URI=https://cmake.org/files/v3.17/cmake-3.17.0-rc3.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake	88799418ef3db9d88b6232a483143608	elisp-common	504a3383c45504fde86b00426619a709	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f6bc746ff4ebe39c7c8fe729b08ddf23
diff --git a/metadata/md5-cache/dev-util/gertty-1.6.0-r1 b/metadata/md5-cache/dev-util/gertty-1.6.0-r1
index a641e18b0e0c..85b8a4b03170 100644
--- a/metadata/md5-cache/dev-util/gertty-1.6.0-r1
+++ b/metadata/md5-cache/dev-util/gertty-1.6.0-r1
@@ -7,9 +7,9 @@ HOMEPAGE=https://pypi.org/project/gertty/
 IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-0.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/urwid-1.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/git-python-0.3.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.5.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/requests-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/alembic-0.6.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/voluptuous-0.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ply-3.4[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(-)] 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(-)]
+RDEPEND=>=dev-python/pbr-0.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/urwid-1.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/GitPython-0.3.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.5.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/requests-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/alembic-0.6.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/voluptuous-0.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ply-3.4[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(-)] 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/g/gertty/gertty-1.6.0.tar.gz
 _eclasses_=distutils-r1	741ee6361e3e62791ae1f32ec416afc4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4dfa39908a2b26ac08e45ca546f7c9b6	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=03d401cd2aa461cad96418654be83742
+_md5_=ac0772399bab2c14cd449b756705226c
diff --git a/metadata/md5-cache/dev-util/gertty-9999 b/metadata/md5-cache/dev-util/gertty-9999
index 3dd728eda4bb..a7213a01fc82 100644
--- a/metadata/md5-cache/dev-util/gertty-9999
+++ b/metadata/md5-cache/dev-util/gertty-9999
@@ -7,8 +7,8 @@ HOMEPAGE=https://pypi.org/project/gertty/
 IUSE=python_targets_python3_6 python_targets_python3_7
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=>=dev-python/pbr-0.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/urwid-1.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/git-python-0.3.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.5.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/requests-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/alembic-0.6.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/voluptuous-0.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ply-3.4[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(-)] 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(-)]
+RDEPEND=>=dev-python/pbr-0.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/urwid-1.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/GitPython-0.3.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.5.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/requests-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/alembic-0.6.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/voluptuous-0.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ply-3.4[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(-)] 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
 _eclasses_=distutils-r1	741ee6361e3e62791ae1f32ec416afc4	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4dfa39908a2b26ac08e45ca546f7c9b6	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=63e0813e7ad3b8e20fd6d192689295e8
+_md5_=86020cdd8b873300a3e205b3988fac25
diff --git a/metadata/md5-cache/dev-util/ninja-1.9.0 b/metadata/md5-cache/dev-util/ninja-1.9.0
index 507c3b0566c8..15442ae1249c 100644
--- a/metadata/md5-cache/dev-util/ninja-1.9.0
+++ b/metadata/md5-cache/dev-util/ninja-1.9.0
@@ -4,11 +4,11 @@ DESCRIPTION=A small build system similar to make
 EAPI=7
 HOMEPAGE=https://ninja-build.org/
 IUSE=doc emacs test vim-syntax
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Kitware/ninja/archive/v1.9.0.g99df1.kitware.dyndep-1.jobserver-1.tar.gz -> ninja-1.9.0.g99df1.kitware.dyndep-1.jobserver-1.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	elisp-common	504a3383c45504fde86b00426619a709	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	3b59474e577cf775a757884b62a6d9cf	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b6ce34a3440ed999bbe58b58ce263464
+_md5_=882b8ccf1e314e6b8fb558194e4fc706
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 8e91e95b5c1c..a1f9dd6f85a0 100644
Binary files a/metadata/md5-cache/dev-vcs/Manifest.gz and b/metadata/md5-cache/dev-vcs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-vcs/cli-0.6.1 b/metadata/md5-cache/dev-vcs/cli-0.6.1
index 20cd88e9ed63..e08325e81f0f 100644
--- a/metadata/md5-cache/dev-vcs/cli-0.6.1
+++ b/metadata/md5-cache/dev-vcs/cli-0.6.1
@@ -1,13 +1,13 @@
 BDEPEND=>=dev-lang/go-1.13 >=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst test unpack
+DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=GitHub CLI
 EAPI=7
 HOMEPAGE=https://github.com/cli/cli
 KEYWORDS=~amd64
-LICENSE=MIT
+LICENSE=MIT Apache-2.0 BSD BSD-2 MPL-2.0
 RDEPEND=>=dev-vcs/git-1.7.3
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/cli/cli/archive/v0.6.1.tar.gz -> cli-0.6.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//github.com/!alec!aivazis/survey/v2/@v/v2.0.7.zip -> github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.0.7.zip mirror://goproxy//github.com/!alec!aivazis/survey/v2/@v/v2.0.7.mod -> github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.0.7.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/!netflix/go-expect/@v/v0.0.0-20180615182759-c93bf25de8e8.zip -> github.com%2F!netflix%2Fgo-expect%2F@v%2Fv0.0.0-20180615182759-c93bf25de8e8.zip mirror://goproxy//github.com/!netflix/go-expect/@v/v0.0.0-20180615182759-c93bf25de8e8.mod -> github.com%2F!netflix%2Fgo-expect%2F@v%2Fv0.0.0-20180615182759-c93bf25de8e8.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.zip -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.zip mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.mod -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.2-0.20200304075647-34d9c7143bf5.zip -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.2-0.20200304075647-34d9c7143bf5.zip mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.2-0.20200304075647-34d9c7143bf5.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.2-0.20200304075647-34d9c7143bf5.mod mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.zip -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.zip mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.mod -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.1-0.20190708041108-0548c6b1afae.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.1-0.20190708041108-0548c6b1afae.mod mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.zip -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.zip mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.mod -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.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/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.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.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/briandowns/spinner/@v/v1.9.0.zip -> github.com%2Fbriandowns%2Fspinner%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/briandowns/spinner/@v/v1.9.0.mod -> github.com%2Fbriandowns%2Fspinner%2F@v%2Fv1.9.0.mod 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/charmbracelet/glamour/@v/v0.1.1-0.20200304134224-7e5c90143acc.zip -> github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.1.1-0.20200304134224-7e5c90143acc.zip mirror://goproxy//github.com/charmbracelet/glamour/@v/v0.1.1-0.20200304134224-7e5c90143acc.mod -> github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.1.1-0.20200304134224-7e5c90143acc.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/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.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-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.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.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/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.zip -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.zip mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.mod -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.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/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/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.6.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.6.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.6.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.2.0.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.2.0.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 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/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.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-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-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.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/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-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.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.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.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/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/goterm/@v/v0.0.0-20190703233501-fc88cf888a3f.zip -> github.com%2Fgoogle%2Fgoterm%2F@v%2Fv0.0.0-20190703233501-fc88cf888a3f.zip mirror://goproxy//github.com/google/goterm/@v/v0.0.0-20190703233501-fc88cf888a3f.mod -> github.com%2Fgoogle%2Fgoterm%2F@v%2Fv0.0.0-20190703233501-fc88cf888a3f.mod mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.zip -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.zip mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.mod -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.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/henvic/httpretty/@v/v0.0.4.zip -> github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/henvic/httpretty/@v/v0.0.4.mod -> github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/hinshun/vt10x/@v/v0.0.0-20180616224451-1954e6464174.zip -> github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180616224451-1954e6464174.zip mirror://goproxy//github.com/hinshun/vt10x/@v/v0.0.0-20180616224451-1954e6464174.mod -> github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180616224451-1954e6464174.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/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.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.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.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.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/pty/@v/v1.1.4.zip -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.4.zip mirror://goproxy//github.com/kr/pty/@v/v1.1.4.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.4.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/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/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.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.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.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.7.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.8.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.8.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/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.2.zip -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.2.mod -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.2.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/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/muesli/reflow/@v/v0.1.0.zip -> github.com%2Fmuesli%2Freflow%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/muesli/reflow/@v/v0.1.0.mod -> github.com%2Fmuesli%2Freflow%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/muesli/termenv/@v/v0.4.0.zip -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/muesli/termenv/@v/v0.4.0.mod -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.4.0.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/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.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/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/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/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.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/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.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-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.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/sergi/go-diff/@v/v1.0.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/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.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.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/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.6.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.6.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.6.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.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/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.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/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.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.1.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.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/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.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/goldmark/@v/v1.1.24.zip -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.24.zip mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.24.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.24.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.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-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-20190530122614-20be4c3c3ed5.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190530122614-20be4c3c3ed5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200219234226-1ad67e1f0ef4.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200219234226-1ad67e1f0ef4.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200219234226-1ad67e1f0ef4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200219234226-1ad67e1f0ef4.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-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-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-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-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.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.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.zip 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-20200219183655-46282727080f.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200219183655-46282727080f.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200219183655-46282727080f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200219183655-46282727080f.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-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.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-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.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-20181128092732-4ed8d59d0b35.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181128092732-4ed8d59d0b35.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-20190530182044-ad28b68e88f1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190530182044-ad28b68e88f1.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/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.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-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-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-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-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.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/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/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.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.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip 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.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/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.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.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.v3/@v/v3.0.0-20200121175148-a6ecf24a6d71.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200121175148-a6ecf24a6d71.zip 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//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	go-module	cca12a5688562f107c14ffcf28195dd7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c7c808f5fe5602f58b96c5b9d1d1caba
+_eclasses_=go-module	cca12a5688562f107c14ffcf28195dd7
+_md5_=4bb003341296c52102e96f8296fa521c
diff --git a/metadata/md5-cache/dev-vcs/cli-9999 b/metadata/md5-cache/dev-vcs/cli-9999
new file mode 100644
index 000000000000..eac314d3764a
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/cli-9999
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.13 >=dev-lang/go-1.12 app-arch/unzip >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=GitHub CLI
+EAPI=7
+HOMEPAGE=https://github.com/cli/cli
+LICENSE=MIT Apache-2.0 BSD BSD-2 MPL-2.0
+PROPERTIES=live
+RDEPEND=>=dev-vcs/git-1.7.3
+RESTRICT=strip
+SLOT=0
+_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	go-module	cca12a5688562f107c14ffcf28195dd7
+_md5_=4bb003341296c52102e96f8296fa521c
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index 54a6043a0e65..11c2f988b5c4 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/eduke32-20200201.8603 b/metadata/md5-cache/games-fps/eduke32-20200311.8738
similarity index 94%
rename from metadata/md5-cache/games-fps/eduke32-20200201.8603
rename to metadata/md5-cache/games-fps/eduke32-20200311.8738
index 5b2995fd7788..4c09b61ad950 100644
--- a/metadata/md5-cache/games-fps/eduke32-20200201.8603
+++ b/metadata/md5-cache/games-fps/eduke32-20200311.8738
@@ -11,6 +11,6 @@ RDEPEND=media-libs/libsdl2[joystick,opengl?,sound,video] media-libs/sdl2-mixer[f
 REQUIRED_USE=cdinstall? ( !demo ) demo? ( !cdinstall ) hrp? ( ^^ ( demo cdinstall ) !voxels ) offensive? ( ^^ ( demo cdinstall ) ) opl? ( ^^ ( demo cdinstall ) !sc-55 ) psx? ( ^^ ( demo cdinstall ) ) sc-55? ( ^^ ( demo cdinstall ) !opl ) voxels? ( !hrp ) vpx? ( opengl )
 RESTRICT=bindist test
 SLOT=0
-SRC_URI=https://dukeworld.com/eduke32/synthesis/20200201-8603/eduke32_src_20200201-8603.tar.xz https://www.eduke32.com/images/eduke32_classic.png hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-5.4.zip ) offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-1.33.zip ) opl? ( https://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-2.01.zip ) psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-1.11.zip ) sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-4.02.zip ) voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-1.21.zip )
+SRC_URI=https://dukeworld.com/eduke32/synthesis/20200311-8738/eduke32_src_20200311-8738.tar.xz https://www.eduke32.com/images/eduke32_classic.png hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-5.4.zip ) offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-1.33.zip ) opl? ( https://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-2.01.zip ) psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-1.11.zip ) sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-4.02.zip ) voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-1.21.zip )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b2e3992205903d1d7b94fe39d560d639
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index ad38e7e740e8..c74caa33feeb 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/xcowsay-1.5 b/metadata/md5-cache/games-misc/xcowsay-1.5
new file mode 100644
index 000000000000..808e17268bbc
--- /dev/null
+++ b/metadata/md5-cache/games-misc/xcowsay-1.5
@@ -0,0 +1,14 @@
+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 )
+SLOT=0
+SRC_URI=https://github.com/nickg/xcowsay/archive/v1.5.tar.gz -> xcowsay-1.5.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=ed3d8210f7ab88e93a2e50115fc5feec
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index dfd966cb9188..fdb66aaaac6c 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/five-or-more-3.32.1 b/metadata/md5-cache/games-puzzle/five-or-more-3.32.1
new file mode 100644
index 000000000000..50dc3974cb2d
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/five-or-more-3.32.1
@@ -0,0 +1,13 @@
+BDEPEND=|| ( dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) dev-libs/appstream-glib dev-libs/libxml2:2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/libgee:0.8= >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.20:3 dev-libs/libgnome-games-support:= >=gnome-base/librsvg-2.32:2 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Remove colored balls from the board by forming lines
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Five%20or%20more
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ CC-BY-SA-3.0
+RDEPEND=dev-libs/libgee:0.8= >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.20:3 dev-libs/libgnome-games-support:= >=gnome-base/librsvg-2.32:2
+SLOT=0
+SRC_URI=mirror://gnome/sources/five-or-more/3.32/five-or-more-3.32.1.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	0b22603e8787cab8d798c23c5e711ca5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1106dad09e72c98f0c7b62c986fce084
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index 7f85ee6aa9ed..043a21123698 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/bedrock-server-1.14.21.0 b/metadata/md5-cache/games-server/bedrock-server-1.14.32.1
similarity index 96%
rename from metadata/md5-cache/games-server/bedrock-server-1.14.21.0
rename to metadata/md5-cache/games-server/bedrock-server-1.14.32.1
index 2585e31bc0f9..158e98bcb8e8 100644
--- a/metadata/md5-cache/games-server/bedrock-server-1.14.21.0
+++ b/metadata/md5-cache/games-server/bedrock-server-1.14.32.1
@@ -8,5 +8,5 @@ LICENSE=Mojang
 RDEPEND=acct-group/bedrock acct-user/bedrock app-misc/dtach dev-libs/openssl:0/1.1 net-misc/curl[ssl]
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.14.21.0.zip
+SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.14.32.1.zip
 _md5_=750d19479a907169dfa5d8656ea36a9d
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 4ad45f08e2ed..97091b40363a 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/widelands-0.20 b/metadata/md5-cache/games-strategy/widelands-0.20-r1
similarity index 97%
rename from metadata/md5-cache/games-strategy/widelands-0.20
rename to metadata/md5-cache/games-strategy/widelands-0.20-r1
index 9e94bfa0f1b5..b07e0c1629fe 100644
--- a/metadata/md5-cache/games-strategy/widelands-0.20
+++ b/metadata/md5-cache/games-strategy/widelands-0.20-r1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/boost-1.48:= dev-libs/icu:= media-libs/glew:0= media-libs/lib
 SLOT=0
 SRC_URI=https://launchpad.net/widelands/build20/build20/+download/widelands-build20.tar.bz2
 _eclasses_=cmake	88799418ef3db9d88b6232a483143608	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	3b59474e577cf775a757884b62a6d9cf	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1c37728bc80eb4bce92c99fa38da5ee3
+_md5_=04b348787c0ab48f852301f14c1108d7
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 79eced11872d..2c6e09351180 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/libwpe-1.4.0.1 b/metadata/md5-cache/gui-libs/libwpe-1.4.0.1
index 47b53e53957d..892676a95988 100644
--- a/metadata/md5-cache/gui-libs/libwpe-1.4.0.1
+++ b/metadata/md5-cache/gui-libs/libwpe-1.4.0.1
@@ -4,10 +4,10 @@ DEPEND=media-libs/mesa[egl] x11-libs/libxkbcommon
 DESCRIPTION=Platform-agnostic interfaces for WPE WebKit
 EAPI=7
 HOMEPAGE=https://wpewebkit.org/
-KEYWORDS=amd64 ~arm64 ~ia64 ~ppc64 ~sparc x86
+KEYWORDS=amd64 arm64 ~ia64 ~ppc64 ~sparc x86
 LICENSE=BSD-2
 RDEPEND=media-libs/mesa[egl] x11-libs/libxkbcommon
 SLOT=1.0
 SRC_URI=https://wpewebkit.org/releases/libwpe-1.4.0.1.tar.xz
 _eclasses_=cmake	88799418ef3db9d88b6232a483143608	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=53d991038ed231b64de84ca59c4a5cda
+_md5_=34368c925e53d1e6342ed5d3df554f6b
diff --git a/metadata/md5-cache/gui-libs/wpebackend-fdo-1.4.0 b/metadata/md5-cache/gui-libs/wpebackend-fdo-1.4.0
index 09293fd34db6..395f26ed183b 100644
--- a/metadata/md5-cache/gui-libs/wpebackend-fdo-1.4.0
+++ b/metadata/md5-cache/gui-libs/wpebackend-fdo-1.4.0
@@ -4,10 +4,10 @@ DEPEND=media-libs/mesa[egl] dev-libs/glib:2 >=dev-libs/wayland-1.10 gui-libs/lib
 DESCRIPTION=WPE backend designed for Linux desktop systems
 EAPI=7
 HOMEPAGE=https://wpewebkit.org/
-KEYWORDS=amd64 ~arm64 ~ia64 ~ppc64 ~sparc x86
+KEYWORDS=amd64 arm64 ~ia64 ~ppc64 ~sparc x86
 LICENSE=BSD-2
 RDEPEND=media-libs/mesa[egl] dev-libs/glib:2 >=dev-libs/wayland-1.10 gui-libs/libwpe:1.0
 SLOT=1.0
 SRC_URI=https://wpewebkit.org/releases/wpebackend-fdo-1.4.0.tar.xz
 _eclasses_=cmake	88799418ef3db9d88b6232a483143608	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c85f7bb87f1f8f4a1ddacfe5c6a01e2f
+_md5_=b038a9711ffaa2887896a65bc720b2e9
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 11d2eeb25895..d2b6527b2ea6 100644
Binary files a/metadata/md5-cache/mail-client/Manifest.gz and b/metadata/md5-cache/mail-client/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-client/neomutt-20180512 b/metadata/md5-cache/mail-client/neomutt-20180512
deleted file mode 100644
index c100212d25b1..000000000000
--- a/metadata/md5-cache/mail-client/neomutt-20180512
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) dev-lang/tcl net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) )
-DESCRIPTION=A small but very powerful text-based mail client
-EAPI=6
-HOMEPAGE=https://neomutt.org/
-IUSE=berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime smime_classic ssl tokyocabinet
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
-SLOT=0
-SRC_URI=https://github.com/neomutt/neomutt/archive/neomutt-20180512.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=db75d8061b3f508204ab47be49d886a8
diff --git a/metadata/md5-cache/mail-client/neomutt-20180622 b/metadata/md5-cache/mail-client/neomutt-20180622
deleted file mode 100644
index c0a1d0e1e058..000000000000
--- a/metadata/md5-cache/mail-client/neomutt-20180622
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) dev-lang/tcl net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) )
-DESCRIPTION=A small but very powerful text-based mail client
-EAPI=6
-HOMEPAGE=https://neomutt.org/
-IUSE=berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime_classic ssl tokyocabinet
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
-SLOT=0
-SRC_URI=https://github.com/neomutt/neomutt/archive/neomutt-20180622.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=958734cbe63aea4cb61e76343dbedf1d
diff --git a/metadata/md5-cache/mail-client/neomutt-20180716-r1 b/metadata/md5-cache/mail-client/neomutt-20200313
similarity index 94%
rename from metadata/md5-cache/mail-client/neomutt-20180716-r1
rename to metadata/md5-cache/mail-client/neomutt-20200313
index 3214c44bcc3d..60f88aca0633 100644
--- a/metadata/md5-cache/mail-client/neomutt-20180716-r1
+++ b/metadata/md5-cache/mail-client/neomutt-20200313
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
 SLOT=0
-SRC_URI=https://github.com/neomutt/neomutt/archive/neomutt-20180716.tar.gz
+SRC_URI=https://github.com/neomutt/neomutt/archive/20200313.tar.gz -> neomutt-20200313.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5d6a3f29e3c1daa57ccbf9762e1db774
+_md5_=b302f33bd90d6f1da3e348649ccb2a11
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 9cd62d8675e4..5f57e6d9da41 100644
Binary files a/metadata/md5-cache/mail-mta/Manifest.gz and b/metadata/md5-cache/mail-mta/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-mta/postfix-3.4.10 b/metadata/md5-cache/mail-mta/postfix-3.4.10
new file mode 100644
index 000000000000..d6de0bbfe118
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/postfix-3.4.10
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst preinst prepare
+DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( >=dev-libs/libressl-2.9.1:0= ) )
+DESCRIPTION=A fast and secure drop-in replacement for sendmail
+EAPI=7
+HOMEPAGE=http://www.postfix.org/
+IUSE=+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=|| ( IBM EPL-2.0 )
+RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( >=dev-libs/libressl-2.9.1:0= ) ) acct-group/postfix acct-group/postdrop acct-user/postfix memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
+REQUIRED_USE=ldap-bind? ( ldap sasl )
+SLOT=0
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.4.10.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=79a97415b29e1e316f8e0b2126477a45
diff --git a/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.2.2 b/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.2.2
deleted file mode 100644
index 31bb8680f00f..000000000000
--- a/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/patchelf
-DEFINED_PHASES=install prepare unpack
-DEPEND=>=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=Serves ProtonMail to IMAP/SMTP clients
-EAPI=7
-HOMEPAGE=https://protonmail.com/bridge/
-KEYWORDS=~amd64
-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.2.2-1.x86_64.rpm
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	rpm	c1d552831d4ee9c7bb82c35545c264c8
-_md5_=4a6f767dd1173f194cf3962648fbda0f
diff --git a/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.1.6 b/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.2.5
similarity index 86%
rename from metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.1.6
rename to metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.2.5
index 8933d588eebb..7737fcec2ae0 100644
--- a/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.1.6
+++ b/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.2.5
@@ -9,6 +9,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.1.6-1.x86_64.rpm
+SRC_URI=https://protonmail.com/download/protonmail-bridge-1.2.5-1.x86_64.rpm
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	rpm	c1d552831d4ee9c7bb82c35545c264c8
-_md5_=4a6f767dd1173f194cf3962648fbda0f
+_md5_=150ff9fc6b4b7246a539dc159a34e78d
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 59487eb2e3d2..c109c3c4d583 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/clutter-1.26.4 b/metadata/md5-cache/media-libs/clutter-1.26.4
new file mode 100644
index 000000000000..bff74d1367e8
--- /dev/null
+++ b/metadata/md5-cache/media-libs/clutter-1.26.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.53.4:2 >=dev-libs/atk-2.5.3[introspection?] >=dev-libs/json-glib-0.12[introspection?] >=media-libs/cogl-1.21.2:1.0=[introspection?,pango,wayland?] >=x11-libs/cairo-1.14:=[aqua?,glib] >=x11-libs/pango-1.30[introspection?] virtual/opengl x11-libs/libdrm:= egl? ( >=dev-libs/libinput-0.19.0 media-libs/cogl[gles2,kms] >=dev-libs/libgudev-136 x11-libs/libxkbcommon ) gtk? ( >=x11-libs/gtk+-3.22.6:3[aqua?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) X? ( media-libs/fontconfig >=x11-libs/libX11-1.3.1 x11-libs/libXext x11-libs/libXdamage >=x11-libs/libXi-1.3 >=x11-libs/libXcomposite-0.4 ) wayland? ( dev-libs/wayland x11-libs/gdk-pixbuf:2 ) dev-util/glib-utils >=dev-util/gtk-doc-am-1.20 >=sys-devel/gettext-0.17 virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.20 >=app-text/docbook-sgml-utils-0.6.14[jadetex] dev-libs/libxslt ) X? ( x11-base/xorg-proto ) test? ( x11-libs/gdk-pixbuf ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Clutter is a library for creating graphical user interfaces
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/Clutter
+IUSE=aqua debug doc egl gtk +introspection test wayland X test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1+ FDL-1.1+
+RDEPEND=>=dev-libs/glib-2.53.4:2 >=dev-libs/atk-2.5.3[introspection?] >=dev-libs/json-glib-0.12[introspection?] >=media-libs/cogl-1.21.2:1.0=[introspection?,pango,wayland?] >=x11-libs/cairo-1.14:=[aqua?,glib] >=x11-libs/pango-1.30[introspection?] virtual/opengl x11-libs/libdrm:= egl? ( >=dev-libs/libinput-0.19.0 media-libs/cogl[gles2,kms] >=dev-libs/libgudev-136 x11-libs/libxkbcommon ) gtk? ( >=x11-libs/gtk+-3.22.6:3[aqua?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) X? ( media-libs/fontconfig >=x11-libs/libX11-1.3.1 x11-libs/libXext x11-libs/libXdamage >=x11-libs/libXi-1.3 >=x11-libs/libXcomposite-0.4 ) wayland? ( dev-libs/wayland x11-libs/gdk-pixbuf:2 )
+REQUIRED_USE=|| ( aqua wayland X ) wayland? ( egl )
+RESTRICT=!test? ( test )
+SLOT=1.0
+SRC_URI=mirror://gnome/sources/clutter/1.26/clutter-1.26.4.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=605743c68a9c22fede14626037d4eaf4
diff --git a/metadata/md5-cache/media-libs/cogl-1.22.6 b/metadata/md5-cache/media-libs/cogl-1.22.6
new file mode 100644
index 000000000000..ffe52c2c2b32
--- /dev/null
+++ b/metadata/md5-cache/media-libs/cogl-1.22.6
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.32:2 x11-libs/cairo:= >=x11-libs/gdk-pixbuf-2:2 x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXrandr-1.2 virtual/opengl gles2? ( media-libs/mesa[gles2] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) introspection? ( >=dev-libs/gobject-introspection-1.34.2:= ) kms? ( media-libs/mesa[egl,gbm] x11-libs/libdrm:= ) pango? ( >=x11-libs/pango-1.20.0[introspection?] ) wayland? ( >=dev-libs/wayland-1.1.90 media-libs/mesa[egl,wayland] ) dev-util/glib-utils >=dev-util/gtk-doc-am-1.13 >=sys-devel/gettext-0.19 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 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A library for using 3D graphics hardware to draw pretty pictures
+EAPI=6
+HOMEPAGE=https://www.cogl3d.org/
+IUSE=debug examples gles2 gstreamer +introspection +kms +opengl +pango wayland
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT BSD
+RDEPEND=>=dev-libs/glib-2.32:2 x11-libs/cairo:= >=x11-libs/gdk-pixbuf-2:2 x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXrandr-1.2 virtual/opengl gles2? ( media-libs/mesa[gles2] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) introspection? ( >=dev-libs/gobject-introspection-1.34.2:= ) kms? ( media-libs/mesa[egl,gbm] x11-libs/libdrm:= ) pango? ( >=x11-libs/pango-1.20.0[introspection?] ) wayland? ( >=dev-libs/wayland-1.1.90 media-libs/mesa[egl,wayland] ) !<media-libs/clutter-1.7
+REQUIRED_USE=wayland? ( gles2 ) || ( gles2 opengl )
+RESTRICT=test
+SLOT=1.0/20
+SRC_URI=mirror://gnome/sources/cogl/1.22/cogl-1.22.6.tar.xz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7aca9619fcf6f4a802f28535ab03680a
diff --git a/metadata/md5-cache/media-libs/exiftool-11.80 b/metadata/md5-cache/media-libs/exiftool-11.80
deleted file mode 100644
index 6b7e1be78523..000000000000
--- a/metadata/md5-cache/media-libs/exiftool-11.80
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Read and write meta information in image, audio and video files
-EAPI=7
-HOMEPAGE=https://exiftool.org/
-IUSE=doc
-KEYWORDS=amd64 arm64 ppc ppc64 x86 ~x64-macos
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=https://exiftool.org/Image-ExifTool-11.80.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=41ae47c244dd7ebc1602262af381846d
diff --git a/metadata/md5-cache/media-libs/exiftool-11.84 b/metadata/md5-cache/media-libs/exiftool-11.84
deleted file mode 100644
index 44e182ec93fd..000000000000
--- a/metadata/md5-cache/media-libs/exiftool-11.84
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Read and write meta information in image, audio and video files
-EAPI=7
-HOMEPAGE=https://exiftool.org/
-IUSE=doc
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=https://exiftool.org/Image-ExifTool-11.84.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=55b8937e283fe62aae20f67b7af21f1a
diff --git a/metadata/md5-cache/media-libs/exiftool-11.86 b/metadata/md5-cache/media-libs/exiftool-11.86
index 58c44c000654..6cfebd46ae44 100644
--- a/metadata/md5-cache/media-libs/exiftool-11.86
+++ b/metadata/md5-cache/media-libs/exiftool-11.86
@@ -5,10 +5,10 @@ DESCRIPTION=Read and write meta information in image, audio and video files
 EAPI=7
 HOMEPAGE=https://exiftool.org/
 IUSE=doc
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos
+KEYWORDS=amd64 arm64 ppc ppc64 x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=https://exiftool.org/Image-ExifTool-11.86.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=55b8937e283fe62aae20f67b7af21f1a
+_md5_=41ae47c244dd7ebc1602262af381846d
diff --git a/metadata/md5-cache/media-libs/exiftool-11.85 b/metadata/md5-cache/media-libs/exiftool-11.91
similarity index 90%
rename from metadata/md5-cache/media-libs/exiftool-11.85
rename to metadata/md5-cache/media-libs/exiftool-11.91
index 4fd4dd0c6dff..e274fa92ac20 100644
--- a/metadata/md5-cache/media-libs/exiftool-11.85
+++ b/metadata/md5-cache/media-libs/exiftool-11.91
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
-SRC_URI=https://exiftool.org/Image-ExifTool-11.85.tar.gz
+SRC_URI=https://exiftool.org/Image-ExifTool-11.91.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
 _md5_=55b8937e283fe62aae20f67b7af21f1a
diff --git a/metadata/md5-cache/media-libs/giflib-5.2.1-r1 b/metadata/md5-cache/media-libs/giflib-5.2.1-r1
index 2553358bd5aa..15418c308595 100644
--- a/metadata/md5-cache/media-libs/giflib-5.2.1-r1
+++ b/metadata/md5-cache/media-libs/giflib-5.2.1-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Library to handle, display and manipulate GIF images
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/giflib/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0/7
 SRC_URI=mirror://sourceforge/giflib/giflib-5.2.1.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c6737cc256d1d9b51dd7e34ecaa7a3d1
+_md5_=23b37e220fade2c26bf643cafab195d7
diff --git a/metadata/md5-cache/media-libs/gmmlib-19.2.1 b/metadata/md5-cache/media-libs/gmmlib-19.2.1
deleted file mode 100644
index bae8c9241fdb..000000000000
--- a/metadata/md5-cache/media-libs/gmmlib-19.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Intel Graphics Memory Management Library
-EAPI=7
-HOMEPAGE=https://github.com/intel/gmmlib
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/intel/gmmlib/archive/intel-gmmlib-19.2.1.tar.gz
-_eclasses_=cmake	88799418ef3db9d88b6232a483143608	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8d8bb5aa2457d7b0f6656268e6882516
diff --git a/metadata/md5-cache/media-libs/gmmlib-19.2.3 b/metadata/md5-cache/media-libs/gmmlib-19.2.3
deleted file mode 100644
index af4be370626b..000000000000
--- a/metadata/md5-cache/media-libs/gmmlib-19.2.3
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Intel Graphics Memory Management Library
-EAPI=7
-HOMEPAGE=https://github.com/intel/gmmlib
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/intel/gmmlib/archive/intel-gmmlib-19.2.3.tar.gz
-_eclasses_=cmake	88799418ef3db9d88b6232a483143608	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8d8bb5aa2457d7b0f6656268e6882516
diff --git a/metadata/md5-cache/media-libs/gmmlib-19.2.4 b/metadata/md5-cache/media-libs/gmmlib-19.2.4
deleted file mode 100644
index 4bd73096ce39..000000000000
--- a/metadata/md5-cache/media-libs/gmmlib-19.2.4
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Intel Graphics Memory Management Library
-EAPI=7
-HOMEPAGE=https://github.com/intel/gmmlib
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/intel/gmmlib/archive/intel-gmmlib-19.2.4.tar.gz
-_eclasses_=cmake	88799418ef3db9d88b6232a483143608	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8d8bb5aa2457d7b0f6656268e6882516
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 32817d6f4709..511afd9f72e0 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/pidgin-2.13.0-r6 b/metadata/md5-cache/net-im/pidgin-2.13.0-r7
similarity index 83%
rename from metadata/md5-cache/net-im/pidgin-2.13.0-r6
rename to metadata/md5-cache/net-im/pidgin-2.13.0-r7
index b67a9da639f5..8e60105bbf4c 100644
--- a/metadata/md5-cache/net-im/pidgin-2.13.0-r6
+++ b/metadata/md5-cache/net-im/pidgin-2.13.0-r7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( sys-libs/ncurses:0=[unicode] dbus? ( 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? ( 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] ) ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM >=x11-libs/pango-1.4.0 xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] ) ) perl? ( >=dev-lang/perl-5.16:= ) gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls(+)] >=net-libs/libgadu-1.11.0[-ssl] ) ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/nspr dev-libs/nss ) meanwhile? ( net-libs/meanwhile ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn:= ) !<x11-plugins/pidgin-facebookchat-1.69-r1 dev-lang/perl dev-perl/XML-Parser virtual/pkgconfig gtk? ( x11-base/xorg-proto >=dev-util/intltool-0.41.1 sys-devel/gettext ) dbus? ( 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] ) ) doc? ( app-doc/doxygen ) !gtk? ( nls? ( >=dev-util/intltool-0.41.1 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 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( sys-libs/ncurses:0=[unicode] dbus? ( 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? ( 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] ) ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM >=x11-libs/pango-1.4.0 xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] ) ) perl? ( >=dev-lang/perl-5.16:= ) gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls(+)] >=net-libs/libgadu-1.11.0[-ssl] ) ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/nspr dev-libs/nss ) meanwhile? ( net-libs/meanwhile ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( <net-misc/networkmanager-1.19 ) idn? ( net-dns/libidn:= ) !<x11-plugins/pidgin-facebookchat-1.69-r1 dev-lang/perl dev-perl/XML-Parser virtual/pkgconfig gtk? ( x11-base/xorg-proto >=dev-util/intltool-0.41.1 sys-devel/gettext ) dbus? ( 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] ) ) doc? ( app-doc/doxygen ) !gtk? ( nls? ( >=dev-util/intltool-0.41.1 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 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GTK Instant Messenger client
 EAPI=6
 HOMEPAGE=http://pidgin.im/
 IUSE=aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl tk +xscreensaver zephyr zeroconf python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( sys-libs/ncurses:0=[unicode] dbus? ( 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? ( 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] ) ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM >=x11-libs/pango-1.4.0 xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] ) ) perl? ( >=dev-lang/perl-5.16:= ) gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls(+)] >=net-libs/libgadu-1.11.0[-ssl] ) ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/nspr dev-libs/nss ) meanwhile? ( net-libs/meanwhile ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn:= ) !<x11-plugins/pidgin-facebookchat-1.69-r1
+RDEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( sys-libs/ncurses:0=[unicode] dbus? ( 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? ( 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] ) ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM >=x11-libs/pango-1.4.0 xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] ) ) perl? ( >=dev-lang/perl-5.16:= ) gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls(+)] >=net-libs/libgadu-1.11.0[-ssl] ) ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/nspr dev-libs/nss ) meanwhile? ( net-libs/meanwhile ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( <net-misc/networkmanager-1.19 ) idn? ( net-dns/libidn:= ) !<x11-plugins/pidgin-facebookchat-1.69-r1
 REQUIRED_USE=dbus? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) ) networkmanager? ( dbus ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0/2
 SRC_URI=mirror://sourceforge/pidgin/pidgin-2.13.0.tar.bz2 https://dev.gentoo.org/~polynomial-c/pidgin-eds-3.6.patch.bz2 https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> pidgin-2.10.9-irc_join_sleep.patch
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	01eeb2dae449b6155b46f8deb0a2087d	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a451b98ca67f2f8aa9823c7b4b76470e
+_md5_=b8f34ee7202ec4a86f541413344d5356
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 7936aa98c255..dcb17f0f6224 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/quiche-0.3.0 b/metadata/md5-cache/net-libs/quiche-0.3.0
new file mode 100644
index 000000000000..9ac6d220ef8a
--- /dev/null
+++ b/metadata/md5-cache/net-libs/quiche-0.3.0
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/rust-1.39.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/cmake dev-lang/go dev-lang/perl >=virtual/rust-1.37.0 dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Implementation of the QUIC transport protocol and HTTP/3
+EAPI=7
+HOMEPAGE=https://github.com/cloudflare/quiche
+IUSE=debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=|| ( Apache-2.0 Boost-1.0 ) || ( Apache-2.0 MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT ) BSD-2 BSD ISC MIT || ( Unlicense MIT ) openssl
+SLOT=0/0
+SRC_URI=https://crates.io/api/v1/crates/anyhow/1.0.26/download -> anyhow-1.0.26.crate https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/arrayvec/0.4.11/download -> arrayvec-0.4.11.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.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/backtrace/0.3.37/download -> backtrace-0.3.37.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.31/download -> backtrace-sys-0.1.31.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.12/download -> bstr-0.2.12.crate https://crates.io/api/v1/crates/bumpalo/3.2.0/download -> bumpalo-3.2.0.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cast/0.2.3/download -> cast-0.2.3.crate https://crates.io/api/v1/crates/cc/1.0.50/download -> cc-1.0.50.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/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/cmake/0.1.42/download -> cmake-0.1.42.crate https://crates.io/api/v1/crates/criterion/0.3.1/download -> criterion-0.3.1.crate https://crates.io/api/v1/crates/criterion-plot/0.4.1/download -> criterion-plot-0.4.1.crate https://crates.io/api/v1/crates/crossbeam-deque/0.7.3/download -> crossbeam-deque-0.7.3.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.8.2/download -> crossbeam-epoch-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-queue/0.2.1/download -> crossbeam-queue-0.2.1.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/csv/1.1.3/download -> csv-1.1.3.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/either/1.5.3/download -> either-1.5.3.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/hermit-abi/0.1.8/download -> hermit-abi-0.1.8.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itertools/0.8.2/download -> itertools-0.8.2.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/js-sys/0.3.36/download -> js-sys-0.3.36.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/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.67/download -> libc-0.2.67.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.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/memoffset/0.5.3/download -> memoffset-0.5.3.crate https://crates.io/api/v1/crates/mio/0.6.21/download -> mio-0.6.21.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/net2/0.2.33/download -> net2-0.2.33.crate https://crates.io/api/v1/crates/num-traits/0.2.11/download -> num-traits-0.2.11.crate https://crates.io/api/v1/crates/num_cpus/1.12.0/download -> num_cpus-1.12.0.crate https://crates.io/api/v1/crates/oorandom/11.1.0/download -> oorandom-11.1.0.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/plotters/0.2.12/download -> plotters-0.2.12.crate https://crates.io/api/v1/crates/proc-macro2/1.0.9/download -> proc-macro2-1.0.9.crate https://crates.io/api/v1/crates/quote/1.0.3/download -> quote-1.0.3.crate https://crates.io/api/v1/crates/rayon/1.3.0/download -> rayon-1.3.0.crate https://crates.io/api/v1/crates/rayon-core/1.7.0/download -> rayon-core-1.7.0.crate https://crates.io/api/v1/crates/regex/1.3.5/download -> regex-1.3.5.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.17/download -> regex-syntax-0.6.17.crate https://crates.io/api/v1/crates/ring/0.16.11/download -> ring-0.16.11.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/ryu/1.0.3/download -> ryu-1.0.3.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/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.104/download -> serde-1.0.104.crate https://crates.io/api/v1/crates/serde_derive/1.0.104/download -> serde_derive-1.0.104.crate https://crates.io/api/v1/crates/serde_json/1.0.48/download -> serde_json-1.0.48.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.2.0/download -> smallvec-1.2.0.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/syn/1.0.16/download -> syn-1.0.16.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/tinytemplate/1.0.3/download -> tinytemplate-1.0.3.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.12/download -> unicode-normalization-0.1.12.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/untrusted/0.7.0/download -> untrusted-0.7.0.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.59/download -> wasm-bindgen-0.2.59.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.59/download -> wasm-bindgen-backend-0.2.59.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.59/download -> wasm-bindgen-macro-0.2.59.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.59/download -> wasm-bindgen-macro-support-0.2.59.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.59/download -> wasm-bindgen-shared-0.2.59.crate https://crates.io/api/v1/crates/wasm-bindgen-webidl/0.2.59/download -> wasm-bindgen-webidl-0.2.59.crate https://crates.io/api/v1/crates/web-sys/0.3.36/download -> web-sys-0.3.36.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.8/download -> winapi-0.3.8.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.3/download -> winapi-util-0.1.3.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/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/quiche/0.3.0/download -> quiche-0.3.0.crate
+_eclasses_=cargo	0d8df758ab867ff7c3a508dc3818b750	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	rust-toolchain	e5344d7fd74efbbd91484ea3a47ebf66	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8dd4abea3d10fbf683a927ee4bf6ee42
diff --git a/metadata/md5-cache/net-libs/quiche-9999 b/metadata/md5-cache/net-libs/quiche-9999
index 937e209a4b62..f357a81b07b6 100644
--- a/metadata/md5-cache/net-libs/quiche-9999
+++ b/metadata/md5-cache/net-libs/quiche-9999
@@ -8,4 +8,4 @@ LICENSE=|| ( Apache-2.0 Boost-1.0 ) || ( Apache-2.0 MIT ) || ( Apache-2.0-with-L
 PROPERTIES=live
 SLOT=0/0
 _eclasses_=cargo	0d8df758ab867ff7c3a508dc3818b750	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	rust-toolchain	e5344d7fd74efbbd91484ea3a47ebf66	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3d1c92360d28e375c02c15d7e7f015f5
+_md5_=8dd4abea3d10fbf683a927ee4bf6ee42
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.24.4 b/metadata/md5-cache/net-libs/webkit-gtk-2.24.4
index ce80025327d4..a8197916e9da 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.24.4
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.24.4
@@ -4,7 +4,7 @@ DESCRIPTION=Open source web browser engine
 EAPI=6
 HOMEPAGE=https://www.webkitgtk.org
 IUSE=aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X test
-KEYWORDS=~alpha ~arm arm64 ~ppc ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha ~arm ~ppc ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2+ BSD
 RDEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.48:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.8.0 media-libs/libwebp:= >=dev-libs/glib-2.40:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?] >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl] ) gles2? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) webgl? ( x11-libs/libXcomposite x11-libs/libXdamage )
 REQUIRED_USE=geolocation? ( introspection ) gles2? ( egl !opengl ) gstreamer? ( opengl? ( egl ) ) nsplugin? ( X ) webgl? ( gstreamer || ( gles2 opengl ) ) wayland? ( egl ) || ( aqua wayland X )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=4/37
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.24.4.tar.xz
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	3b59474e577cf775a757884b62a6d9cf	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dbf84ec2beb27a43e3ac9d6bbecc3982
+_md5_=abb6334efb96f732977093ce755f3071
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.26.4 b/metadata/md5-cache/net-libs/webkit-gtk-2.26.4
index c216531a4b59..0f3c0a8b4e6b 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.26.4
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.26.4
@@ -4,7 +4,7 @@ DESCRIPTION=Open source web browser engine
 EAPI=6
 HOMEPAGE=https://www.webkitgtk.org
 IUSE=aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X test
-KEYWORDS=amd64 ~arm64 ~ia64 ~ppc64 ~sparc x86
+KEYWORDS=amd64 arm64 ~ia64 ~ppc64 ~sparc x86
 LICENSE=LGPL-2+ BSD
 RDEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.44.0:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl] ) gles2-only? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) wayland? ( opengl? ( >=gui-libs/libwpe-1.3.0:1.0 >=gui-libs/wpebackend-fdo-1.3.1:1.0 ) gles2-only? ( >=gui-libs/libwpe-1.3.0:1.0 >=gui-libs/wpebackend-fdo-1.3.1:1.0 ) ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
 REQUIRED_USE=gles2-only? ( egl !opengl ) gstreamer? ( opengl? ( egl ) ) wayland? ( egl ) || ( aqua wayland X )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=4/37
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.26.4.tar.xz
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	3b59474e577cf775a757884b62a6d9cf	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=448dde558f6f0522ea00fc03daccda76
+_md5_=f4ef83ee71f56d4cf38f33c5f8773430
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index a0267cdeadc0..9a7619cb9714 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/curl-7.69.0 b/metadata/md5-cache/net-misc/curl-7.69.0
index 0ce447b93bf1..813911fc5d25 100644
--- a/metadata/md5-cache/net-misc/curl-7.69.0
+++ b/metadata/md5-cache/net-misc/curl-7.69.0
@@ -1,16 +1,16 @@
 BDEPEND=>=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( sys-apps/diffutils dev-lang/perl ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( net-libs/quiche[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=A Client that groks URLs
 EAPI=7
 HOMEPAGE=https://curl.haxx.se/
 IUSE=adns alt-svc brotli http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl nghttp3 quiche elibc_Winnt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( net-libs/quiche[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.69.0.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=98032859f4c358b2bce20dc6d8c55ca4
+_md5_=3095d6babc98d0ebb6af20e60fd71d08
diff --git a/metadata/md5-cache/net-misc/memcached-1.5.22 b/metadata/md5-cache/net-misc/memcached-1.5.22
index 56dc1c55e9ae..97a6cac49c5d 100644
--- a/metadata/md5-cache/net-misc/memcached-1.5.22
+++ b/metadata/md5-cache/net-misc/memcached-1.5.22
@@ -5,11 +5,11 @@ DESCRIPTION=High-performance, distributed memory object caching system
 EAPI=7
 HOMEPAGE=http://memcached.org/
 IUSE=debug sasl seccomp selinux slabs-reassign test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.memcached.org/files/memcached-1.5.22.tar.gz https://www.memcached.org/files/old/memcached-1.5.22.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b0dccbf90aa71ddd7339e2e61408ef8a
+_md5_=0e0f361353123c41e513c22a53c93f54
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.22.10 b/metadata/md5-cache/net-misc/networkmanager-1.22.10
new file mode 100644
index 000000000000..9730e812ad0f
--- /dev/null
+++ b/metadata/md5-cache/net-misc/networkmanager-1.22.10
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig introspection? ( || ( ( dev-lang/python:3.7 dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) dev-libs/libxslt dev-lang/perl ) vala? ( || ( dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=dev-libs/dbus-glib dev-libs/glib:2 net-libs/libndp sys-apps/dbus sys-kernel/linux-headers virtual/libudev audit? ( sys-process/audit ) bluetooth? ( net-wireless/bluez ) concheck? ( net-misc/curl ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) consolekit? ( sys-auth/consolekit ) dhclient? ( net-misc/dhcp[client] ) dhcpcd? ( net-misc/dhcpcd ) doc? ( dev-util/gtk-doc ) elogind? ( sys-auth/elogind ) gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls ) introspection? ( dev-libs/gobject-introspection:= ) json? ( dev-libs/jansson ) libpsl? ( net-libs/libpsl ) modemmanager? ( net-misc/mobile-broadband-provider-info net-misc/modemmanager ) nss? ( dev-libs/nss ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) policykit? ( sys-auth/polkit ) ppp? ( net-dialup/ppp[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:= ) teamd? ( dev-libs/jansson net-misc/libteam ) tools? ( dev-libs/newt sys-libs/ncurses sys-libs/readline:0= )
+DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=audit bluetooth +concheck connection-sharing consolekit +dhclient dhcpcd debug doc elogind examples +gnutls introspection iwd json kernel_linux libpsl lto modemmanager nss ofono ovs +policykit ppp resolvconf selinux syslog systemd teamd test +tools vala wext +wifi kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 net-libs/libndp sys-apps/dbus sys-kernel/linux-headers virtual/libudev audit? ( sys-process/audit ) bluetooth? ( net-wireless/bluez ) concheck? ( net-misc/curl ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) consolekit? ( sys-auth/consolekit ) dhclient? ( net-misc/dhcp[client] ) dhcpcd? ( net-misc/dhcpcd ) doc? ( dev-util/gtk-doc ) elogind? ( sys-auth/elogind ) gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls ) introspection? ( dev-libs/gobject-introspection:= ) json? ( dev-libs/jansson ) libpsl? ( net-libs/libpsl ) modemmanager? ( net-misc/mobile-broadband-provider-info net-misc/modemmanager ) nss? ( dev-libs/nss ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) policykit? ( sys-auth/polkit ) ppp? ( net-dialup/ppp[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:= ) teamd? ( dev-libs/jansson net-misc/libteam ) tools? ( dev-libs/newt sys-libs/ncurses sys-libs/readline:0= ) acct-group/plugdev || ( net-analyzer/arping net-misc/iputils[arping(+)] ) wifi? ( iwd? ( net-wireless/iwd ) !iwd? ( net-wireless/wpa_supplicant[dbus] ) )
+REQUIRED_USE=doc? ( introspection ) iwd? ( wifi ) vala? ( introspection ) ^^ ( gnutls nss ) ?? ( consolekit elogind systemd ) ?? ( dhclient dhcpcd ) ?? ( syslog systemd )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/archive/1.22.10/NetworkManager-1.22.10.tar.bz2
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	0b22603e8787cab8d798c23c5e711ca5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	3b59474e577cf775a757884b62a6d9cf	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	vala	5b72a65a36d681d65aef5f7b4b8b2cb6
+_md5_=5446fecceef29648aeb26083c56c6b56
diff --git a/metadata/md5-cache/net-misc/ntpsec-1.1.8 b/metadata/md5-cache/net-misc/ntpsec-1.1.8
index 38c3af0371de..f7e5de023192 100644
--- a/metadata/md5-cache/net-misc/ntpsec-1.1.8
+++ b/metadata/md5-cache/net-misc/ntpsec-1.1.8
@@ -12,4 +12,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.1.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4dfa39908a2b26ac08e45ca546f7c9b6	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=e0ab9694ddb32be3fd0b8bebad9b591b
+_md5_=2b70ccf4b0487f62da01ecd33b271c28
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 50a40263452e..89753e620412 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/networkmanager-fortisslvpn-1.2.6 b/metadata/md5-cache/net-vpn/networkmanager-fortisslvpn-1.2.6-r1
similarity index 74%
rename from metadata/md5-cache/net-vpn/networkmanager-fortisslvpn-1.2.6
rename to metadata/md5-cache/net-vpn/networkmanager-fortisslvpn-1.2.6-r1
index d0af5547fa66..127cae4d58d1 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-fortisslvpn-1.2.6
+++ b/metadata/md5-cache/net-vpn/networkmanager-fortisslvpn-1.2.6-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=net-misc/networkmanager-1.2:= >=dev-libs/glib-2.32:2 net-dialup/ppp:= >=net-vpn/openfortivpn-1.2.0 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 ) sys-devel/gettext >=dev-util/intltool-0.35 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 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=net-misc/networkmanager-1.2:= >=dev-libs/glib-2.32:2 net-dialup/ppp:= >=net-vpn/openfortivpn-1.2.0 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0[gtk] >=x11-libs/gtk+-3.4:3 ) sys-devel/gettext >=dev-util/intltool-0.35 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 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=NetworkManager Fortinet SSLVPN compatible plugin
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=gtk
 KEYWORDS=~amd64
 LICENSE=GPL-2+
-RDEPEND=>=net-misc/networkmanager-1.2:= >=dev-libs/glib-2.32:2 net-dialup/ppp:= >=net-vpn/openfortivpn-1.2.0 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 )
+RDEPEND=>=net-misc/networkmanager-1.2:= >=dev-libs/glib-2.32:2 net-dialup/ppp:= >=net-vpn/openfortivpn-1.2.0 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0[gtk] >=x11-libs/gtk+-3.4:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-fortisslvpn/1.2/NetworkManager-fortisslvpn-1.2.6.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a7b6dec75b0c29b29e7c7bcb5f7f7785
+_md5_=e269aecdcdaca07693e538e650dd1bf0
diff --git a/metadata/md5-cache/net-vpn/networkmanager-fortisslvpn-1.2.8 b/metadata/md5-cache/net-vpn/networkmanager-fortisslvpn-1.2.8-r1
similarity index 73%
rename from metadata/md5-cache/net-vpn/networkmanager-fortisslvpn-1.2.8
rename to metadata/md5-cache/net-vpn/networkmanager-fortisslvpn-1.2.8-r1
index e830702da491..61a92e9099c0 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-fortisslvpn-1.2.8
+++ b/metadata/md5-cache/net-vpn/networkmanager-fortisslvpn-1.2.8-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=net-misc/networkmanager-1.2:= >=dev-libs/glib-2.32:2 net-dialup/ppp:= >=net-vpn/openfortivpn-1.2.0 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 ) dev-util/gdbus-codegen sys-devel/gettext >=dev-util/intltool-0.35 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 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=net-misc/networkmanager-1.2:= >=dev-libs/glib-2.32:2 net-dialup/ppp:= >=net-vpn/openfortivpn-1.2.0 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0[gtk] >=x11-libs/gtk+-3.4:3 ) dev-util/gdbus-codegen sys-devel/gettext >=dev-util/intltool-0.35 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 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=NetworkManager Fortinet SSLVPN compatible plugin
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=gtk
 KEYWORDS=~amd64
 LICENSE=GPL-2+
-RDEPEND=>=net-misc/networkmanager-1.2:= >=dev-libs/glib-2.32:2 net-dialup/ppp:= >=net-vpn/openfortivpn-1.2.0 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 )
+RDEPEND=>=net-misc/networkmanager-1.2:= >=dev-libs/glib-2.32:2 net-dialup/ppp:= >=net-vpn/openfortivpn-1.2.0 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0[gtk] >=x11-libs/gtk+-3.4:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-fortisslvpn/1.2/NetworkManager-fortisslvpn-1.2.8.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=52fc88e657e0f1a1c373310f02eaf2ff
+_md5_=e07eb6530a751b6797f7692898b4f303
diff --git a/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.10 b/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.10-r1
similarity index 81%
rename from metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.10
rename to metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.10-r1
index e49cdb4dbac0..c74684e8bbd2 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.10
+++ b/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.10-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.7.0:= >=net-vpn/openvpn-2.1 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.7.0 >=x11-libs/gtk+-3.4:3 ) dev-libs/libxml2:2 sys-devel/gettext >=dev-util/intltool-0.35 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.7.0:= >=net-vpn/openvpn-2.1 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.7.0[gtk] >=x11-libs/gtk+-3.4:3 ) dev-libs/libxml2:2 sys-devel/gettext >=dev-util/intltool-0.35 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=NetworkManager OpenVPN plugin
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=gtk test
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.7.0:= >=net-vpn/openvpn-2.1 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.7.0 >=x11-libs/gtk+-3.4:3 )
+RDEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.7.0:= >=net-vpn/openvpn-2.1 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.7.0[gtk] >=x11-libs/gtk+-3.4:3 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.10.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1333bf89c69c3c7d097f402e44dfb391
+_md5_=c50eff9f32aa4673349cd09b8c3ce35e
diff --git a/metadata/md5-cache/net-vpn/networkmanager-pptp-1.2.8 b/metadata/md5-cache/net-vpn/networkmanager-pptp-1.2.8-r1
similarity index 82%
rename from metadata/md5-cache/net-vpn/networkmanager-pptp-1.2.8
rename to metadata/md5-cache/net-vpn/networkmanager-pptp-1.2.8-r1
index b1d4c005b79f..e8bd43f04227 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-pptp-1.2.8
+++ b/metadata/md5-cache/net-vpn/networkmanager-pptp-1.2.8-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=net-misc/networkmanager-1.2.0:= >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32:2 net-dialup/ppp:= net-dialup/pptpclient gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 ) sys-devel/gettext dev-libs/libxml2:2 dev-util/gdbus-codegen dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=net-misc/networkmanager-1.2.0:= >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32:2 net-dialup/ppp:= net-dialup/pptpclient gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0[gtk] >=x11-libs/gtk+-3.4:3 ) sys-devel/gettext dev-libs/libxml2:2 dev-util/gdbus-codegen dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=NetworkManager PPTP VPN plugin
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager/VPN
 IUSE=gtk
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
-RDEPEND=>=net-misc/networkmanager-1.2.0:= >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32:2 net-dialup/ppp:= net-dialup/pptpclient gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 )
+RDEPEND=>=net-misc/networkmanager-1.2.0:= >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32:2 net-dialup/ppp:= net-dialup/pptpclient gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0[gtk] >=x11-libs/gtk+-3.4:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-pptp/1.2/NetworkManager-pptp-1.2.8.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a526bf6fded00c131505093a87796ce7
+_md5_=1085ff7190737c19c84c4b5c596afd0d
diff --git a/metadata/md5-cache/net-vpn/networkmanager-strongswan-1.4.5 b/metadata/md5-cache/net-vpn/networkmanager-strongswan-1.4.5-r1
similarity index 62%
rename from metadata/md5-cache/net-vpn/networkmanager-strongswan-1.4.5
rename to metadata/md5-cache/net-vpn/networkmanager-strongswan-1.4.5-r1
index ef5da8662f2e..dc4aebd76ffb 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-strongswan-1.4.5
+++ b/metadata/md5-cache/net-vpn/networkmanager-strongswan-1.4.5-r1
@@ -1,13 +1,13 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install
-DEPEND=app-crypt/libsecret gnome-extra/nm-applet net-misc/networkmanager net-vpn/strongswan[networkmanager] x11-libs/gtk+:3 dev-util/intltool
+DEPEND=app-crypt/libsecret gnome-extra/nm-applet net-misc/networkmanager net-vpn/strongswan[networkmanager] x11-libs/gtk+:3 glib? ( gnome-extra/nm-applet[gtk] ) dev-util/intltool
 DESCRIPTION=NetworkManager StrongSwan plugin
 EAPI=7
 HOMEPAGE=https://www.strongswan.org/
 IUSE=+glib
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=app-crypt/libsecret gnome-extra/nm-applet net-misc/networkmanager net-vpn/strongswan[networkmanager] x11-libs/gtk+:3
+RDEPEND=app-crypt/libsecret gnome-extra/nm-applet net-misc/networkmanager net-vpn/strongswan[networkmanager] x11-libs/gtk+:3 glib? ( gnome-extra/nm-applet[gtk] )
 SLOT=0
 SRC_URI=https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-1.4.5.tar.bz2
-_md5_=6ebb96872c15bd1e5a59c8bcfa6306de
+_md5_=cff360a8ea18e74cb0aee6ac668cefc4
diff --git a/metadata/md5-cache/net-vpn/networkmanager-vpnc-1.2.6 b/metadata/md5-cache/net-vpn/networkmanager-vpnc-1.2.6-r1
similarity index 78%
rename from metadata/md5-cache/net-vpn/networkmanager-vpnc-1.2.6
rename to metadata/md5-cache/net-vpn/networkmanager-vpnc-1.2.6-r1
index 1f3c593ce380..a625e7af40d9 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-vpnc-1.2.6
+++ b/metadata/md5-cache/net-vpn/networkmanager-vpnc-1.2.6-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=net-misc/networkmanager-1.2.0:= >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32:2 >=net-vpn/vpnc-0.5.3_p550 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 ) sys-devel/gettext dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=net-misc/networkmanager-1.2.0:= >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32:2 >=net-vpn/vpnc-0.5.3_p550 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0[gtk] >=x11-libs/gtk+-3.4:3 ) sys-devel/gettext dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=NetworkManager VPNC plugin
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=gtk test
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
-RDEPEND=>=net-misc/networkmanager-1.2.0:= >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32:2 >=net-vpn/vpnc-0.5.3_p550 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 )
+RDEPEND=>=net-misc/networkmanager-1.2.0:= >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32:2 >=net-vpn/vpnc-0.5.3_p550 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0[gtk] >=x11-libs/gtk+-3.4:3 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-vpnc/1.2/NetworkManager-vpnc-1.2.6.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6cb82f710d15cadc748fa6b44bc3f9dc
+_md5_=22620c18cb6449db2afcbf33c2142b3d
diff --git a/metadata/md5-cache/net-vpn/networkmanager-wireguard-0_pre20191128-r2 b/metadata/md5-cache/net-vpn/networkmanager-wireguard-0_pre20191128-r3
similarity index 91%
rename from metadata/md5-cache/net-vpn/networkmanager-wireguard-0_pre20191128-r2
rename to metadata/md5-cache/net-vpn/networkmanager-wireguard-0_pre20191128-r3
index a9770fe4592a..009a4f14915a 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-wireguard-0_pre20191128-r2
+++ b/metadata/md5-cache/net-vpn/networkmanager-wireguard-0_pre20191128-r3
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig nls? ( dev-util/intltool 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=net-misc/networkmanager net-vpn/wireguard-tools[wg-quick] glib? ( dev-libs/glib ) gtk? ( app-crypt/libsecret gnome-extra/nm-applet x11-libs/gtk+:3 )
+DEPEND=net-misc/networkmanager net-vpn/wireguard-tools[wg-quick] glib? ( dev-libs/glib ) gtk? ( app-crypt/libsecret gnome-extra/nm-applet[gtk] x11-libs/gtk+:3 )
 DESCRIPTION=NetworkManager WireGuard plugin
 EAPI=7
 HOMEPAGE=https://github.com/max-moser/network-manager-wireguard
 IUSE=+glib +gtk +nls
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=net-misc/networkmanager net-vpn/wireguard-tools[wg-quick] glib? ( dev-libs/glib ) gtk? ( app-crypt/libsecret gnome-extra/nm-applet x11-libs/gtk+:3 )
+RDEPEND=net-misc/networkmanager net-vpn/wireguard-tools[wg-quick] glib? ( dev-libs/glib ) gtk? ( app-crypt/libsecret gnome-extra/nm-applet[gtk] x11-libs/gtk+:3 )
 REQUIRED_USE=glib? ( gtk )
 SLOT=0
 SRC_URI=https://github.com/max-moser/network-manager-wireguard/archive/0e1124df9e97129c5e0d9996a2c3876ae18f01c4.tar.gz -> networkmanager-wireguard-0_pre20191128.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5eaef1276e858b0c4614f77e19436ce6
+_md5_=bf908ee52a101b94f56b2dc7df3b34e6
diff --git a/metadata/md5-cache/net-vpn/networkmanager-wireguard-9999 b/metadata/md5-cache/net-vpn/networkmanager-wireguard-9999
index e563219d8f70..48caa82b0039 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-wireguard-9999
+++ b/metadata/md5-cache/net-vpn/networkmanager-wireguard-9999
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig nls? ( dev-util/intltool 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-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure prepare unpack
-DEPEND=net-misc/networkmanager net-vpn/wireguard-tools[wg-quick] glib? ( dev-libs/glib ) gtk? ( app-crypt/libsecret gnome-extra/nm-applet x11-libs/gtk+:3 )
+DEPEND=net-misc/networkmanager net-vpn/wireguard-tools[wg-quick] glib? ( dev-libs/glib ) gtk? ( app-crypt/libsecret gnome-extra/nm-applet[gtk] x11-libs/gtk+:3 )
 DESCRIPTION=NetworkManager WireGuard plugin
 EAPI=7
 HOMEPAGE=https://github.com/max-moser/network-manager-wireguard
 IUSE=+glib +gtk +nls
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=net-misc/networkmanager net-vpn/wireguard-tools[wg-quick] glib? ( dev-libs/glib ) gtk? ( app-crypt/libsecret gnome-extra/nm-applet x11-libs/gtk+:3 )
+RDEPEND=net-misc/networkmanager net-vpn/wireguard-tools[wg-quick] glib? ( dev-libs/glib ) gtk? ( app-crypt/libsecret gnome-extra/nm-applet[gtk] x11-libs/gtk+:3 )
 REQUIRED_USE=glib? ( gtk )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2c1250e45ef14c519208adefa6d288ea
+_md5_=cac5d7e241956483066dccb21b25ba58
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index c0fd09b6fbab..7afab3110915 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/kismet-2020.03.1 b/metadata/md5-cache/net-wireless/kismet-2020.03.1_p20200311
similarity index 84%
rename from metadata/md5-cache/net-wireless/kismet-2020.03.1
rename to metadata/md5-cache/net-wireless/kismet-2020.03.1_p20200311
index a9321271ed16..d0977493c48e 100644
--- a/metadata/md5-cache/net-wireless/kismet-2020.03.1
+++ b/metadata/md5-cache/net-wireless/kismet-2020.03.1_p20200311
@@ -1,16 +1,16 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=configure install postinst preinst prepare setup
 DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) libusb? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= python_single_target_python3_6? ( dev-python/protobuf-python[python_targets_python3_6(-)] ) sys-libs/ncurses:= lm-sensors? ( sys-apps/lm-sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) ubertooth? ( net-wireless/ubertooth:= ) virtual/pkgconfig
 DESCRIPTION=IEEE 802.11 wireless LAN sniffer
 EAPI=7
 HOMEPAGE=https://www.kismetwireless.net
-IUSE=libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth +python_single_target_python3_6
+IUSE=libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth udev +python_single_target_python3_6
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=GPL-2
 PDEPEND=rtlsdr? ( python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] ) net-wireless/rtl-sdr )
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) libusb? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= python_single_target_python3_6? ( dev-python/protobuf-python[python_targets_python3_6(-)] ) sys-libs/ncurses:= lm-sensors? ( sys-apps/lm-sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) ubertooth? ( net-wireless/ubertooth:= ) python_single_target_python3_6? ( dev-python/pyserial[python_targets_python3_6(-)] ) selinux? ( sec-policy/selinux-kismet )
 REQUIRED_USE=^^ ( python_single_target_python3_6 )
-SLOT=0/2020.03.1
-SRC_URI=https://www.kismetwireless.net/code/kismet-2020-03-R1.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	01eeb2dae449b6155b46f8deb0a2087d	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=1a19b731c75ba6e68ef6e7741feffa8f
+SLOT=0/2020.03.1_p20200311
+SRC_URI=https://github.com/kismetwireless/kismet/archive/9ca7e469cf115469f392db7436816151867e1654.tar.gz -> kismet-2020.03.1_p20200311.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	01eeb2dae449b6155b46f8deb0a2087d	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=adc07aef15db9cad3c337324a0d0f7de
diff --git a/metadata/md5-cache/net-wireless/kismet-9999 b/metadata/md5-cache/net-wireless/kismet-9999
index c93a04788208..0a4e8ee8a29e 100644
--- a/metadata/md5-cache/net-wireless/kismet-9999
+++ b/metadata/md5-cache/net-wireless/kismet-9999
@@ -1,10 +1,10 @@
-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]
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst preinst prepare setup unpack
 DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) libusb? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= python_single_target_python3_6? ( dev-python/protobuf-python[python_targets_python3_6(-)] ) sys-libs/ncurses:= lm-sensors? ( sys-apps/lm-sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) ubertooth? ( net-wireless/ubertooth:= ) virtual/pkgconfig
 DESCRIPTION=IEEE 802.11 wireless LAN sniffer
 EAPI=7
 HOMEPAGE=https://www.kismetwireless.net
-IUSE=libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth +python_single_target_python3_6
+IUSE=libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth udev +python_single_target_python3_6
 LICENSE=GPL-2
 PDEPEND=rtlsdr? ( python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] ) net-wireless/rtl-sdr )
 PROPERTIES=live
@@ -12,5 +12,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 )
 RESTRICT=strip
 SLOT=0/9999
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	01eeb2dae449b6155b46f8deb0a2087d	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=1a19b731c75ba6e68ef6e7741feffa8f
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	01eeb2dae449b6155b46f8deb0a2087d	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=3cef40461d5c2b821a56fdc67bb7e978
diff --git a/metadata/md5-cache/net-wireless/nanovna-saver-0.1.5 b/metadata/md5-cache/net-wireless/nanovna-saver-0.2.2
similarity index 90%
rename from metadata/md5-cache/net-wireless/nanovna-saver-0.1.5
rename to metadata/md5-cache/net-wireless/nanovna-saver-0.2.2
index 2bb2ff8f70ba..3336837c52f3 100644
--- a/metadata/md5-cache/net-wireless/nanovna-saver-0.1.5
+++ b/metadata/md5-cache/net-wireless/nanovna-saver-0.2.2
@@ -9,6 +9,6 @@ LICENSE=GPL-3+
 RDEPEND=dev-python/pyserial[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/PyQt5[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 )
 SLOT=0
-SRC_URI=https://github.com/mihtjel/nanovna-saver/archive/v0.1.5.tar.gz -> nanovna-saver-0.1.5.tar.gz
+SRC_URI=https://github.com/mihtjel/nanovna-saver/archive/v0.2.2.tar.gz -> nanovna-saver-0.2.2.tar.gz
 _eclasses_=distutils-r1	741ee6361e3e62791ae1f32ec416afc4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4dfa39908a2b26ac08e45ca546f7c9b6	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=43f13bb8dc1c8881bf0f8abc74b486e2
+_md5_=bff807ee6d404a75b00c17f5f973297c
diff --git a/metadata/md5-cache/net-wireless/nanovna-saver-9999 b/metadata/md5-cache/net-wireless/nanovna-saver-9999
index e3703d7037b6..8f4dbaf731a0 100644
--- a/metadata/md5-cache/net-wireless/nanovna-saver-9999
+++ b/metadata/md5-cache/net-wireless/nanovna-saver-9999
@@ -10,4 +10,4 @@ RDEPEND=dev-python/pyserial[python_targets_python3_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python3_7 )
 SLOT=0
 _eclasses_=distutils-r1	741ee6361e3e62791ae1f32ec416afc4	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4dfa39908a2b26ac08e45ca546f7c9b6	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=43f13bb8dc1c8881bf0f8abc74b486e2
+_md5_=bff807ee6d404a75b00c17f5f973297c
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 8c0df3ed3ba9..eb4602de349f 100644
Binary files a/metadata/md5-cache/sci-geosciences/Manifest.gz and b/metadata/md5-cache/sci-geosciences/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-geosciences/gpsbabel-9999 b/metadata/md5-cache/sci-geosciences/gpsbabel-9999
new file mode 100644
index 000000000000..c194acf48f55
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/gpsbabel-9999
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=dev-libs/expat dev-qt/qtcore:5 sci-libs/shapelib:= sys-libs/zlib[minizip] virtual/libusb:0 gui? ( dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) doc? ( app-text/docbook-xml-dtd:4.1.2 dev-lang/perl dev-libs/libxslt ) gui? ( dev-qt/linguist-tools:5 ) >=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=GPS waypoints, tracks and routes converter
+EAPI=6
+HOMEPAGE=https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel
+IUSE=doc +gui
+LICENSE=GPL-2
+PROPERTIES=live
+RDEPEND=dev-libs/expat dev-qt/qtcore:5 sci-libs/shapelib:= sys-libs/zlib[minizip] virtual/libusb:0 gui? ( dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=doc? ( https://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=27cc56a0e2329470b2571920c125dabd
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index d3d32fc8dfd9..1ea2897d8130 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/genius-1.0.25 b/metadata/md5-cache/sci-mathematics/genius-1.0.25
new file mode 100644
index 000000000000..7b45b30a9550
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/genius-1.0.25
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.41.1:2 dev-libs/gmp:0= dev-libs/mpfr:0= sys-libs/ncurses:0= sys-libs/readline:0= gui? ( >=x11-libs/gtk+-3.21.4:3 >=x11-libs/gtksourceview-3.99.7:4 gui-libs/amtk:5 >=x11-libs/vte-0.50.0:2.91 ) dev-util/gtk-update-icon-cache dev-util/intltool sys-devel/autoconf-archive sys-devel/flex 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 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Genius Mathematics Tool and the GEL Language
+EAPI=6
+HOMEPAGE=https://www.jirka.org/genius.html
+IUSE=doc +gui
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.41.1:2 dev-libs/gmp:0= dev-libs/mpfr:0= sys-libs/ncurses:0= sys-libs/readline:0= gui? ( >=x11-libs/gtk+-3.21.4:3 >=x11-libs/gtksourceview-3.99.7:4 gui-libs/amtk:5 >=x11-libs/vte-0.50.0:2.91 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/genius/1.0/genius-1.0.25.tar.xz doc? ( https://www.jirka.org/genius-reference.pdf )
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7eb36a25e57b6dc4a51b8406762fe610
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 5c79b35fa24e..c6654a2bb83b 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/cpuid-20200203 b/metadata/md5-cache/sys-apps/cpuid-20200211
similarity index 76%
rename from metadata/md5-cache/sys-apps/cpuid-20200203
rename to metadata/md5-cache/sys-apps/cpuid-20200211
index 9a6123efda0a..134016dc2279 100644
--- a/metadata/md5-cache/sys-apps/cpuid-20200203
+++ b/metadata/md5-cache/sys-apps/cpuid-20200211
@@ -7,6 +7,6 @@ HOMEPAGE=http://www.etallen.com/cpuid.html
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
-SRC_URI=http://www.etallen.com/cpuid/cpuid-20200203.src.tar.gz
+SRC_URI=http://www.etallen.com/cpuid/cpuid-20200211.src.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d8a2c1806c65528437dcf97f47b0df90
+_md5_=b23807e4159529327d6196b4ea6c098f
diff --git a/metadata/md5-cache/sys-apps/edid-decode-0_pre20200203 b/metadata/md5-cache/sys-apps/edid-decode-0_pre20200310
similarity index 62%
rename from metadata/md5-cache/sys-apps/edid-decode-0_pre20200203
rename to metadata/md5-cache/sys-apps/edid-decode-0_pre20200310
index 7b1bab376095..dfc2ed0f8aaa 100644
--- a/metadata/md5-cache/sys-apps/edid-decode-0_pre20200203
+++ b/metadata/md5-cache/sys-apps/edid-decode-0_pre20200310
@@ -6,6 +6,6 @@ IUSE=examples
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~conikost/files/edid-decode-c29b9433af16d4b31453b000e39bb1ce64aac065.tar.gz -> edid-decode-0_pre20200203.tar.gz
+SRC_URI=https://dev.gentoo.org/~conikost/files/edid-decode-24f1eb8acb4bf9365a66326a0b5d01eff23ba32e.tar.gz -> edid-decode-0_pre20200310.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b9bb9df98036f097c59604ee62a49b64
+_md5_=ab2a6435676bd700f5dedbf2759124ef
diff --git a/metadata/md5-cache/sys-apps/elivepatch-client-0.1 b/metadata/md5-cache/sys-apps/elivepatch-client-0.1
index 4047995e89de..dd0c2f723699 100644
--- a/metadata/md5-cache/sys-apps/elivepatch-client-0.1
+++ b/metadata/md5-cache/sys-apps/elivepatch-client-0.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-admin/sudo dev-python/git-python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=app-admin/sudo dev-python/GitPython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Live patch installer client working with elivepatch-server
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Elivepatch
 IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=app-admin/sudo dev-python/git-python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[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(-)]
+RDEPEND=app-admin/sudo dev-python/GitPython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[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 )
 SLOT=0
 SRC_URI=https://github.com/aliceinwire/elivepatch-client/archive/v0.1.tar.gz -> elivepatch-client-0.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	741ee6361e3e62791ae1f32ec416afc4	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4dfa39908a2b26ac08e45ca546f7c9b6	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c3686f08520c02c40365f2863d14c97f
+_md5_=e69c7d9a3f534fc0a8c519377992e779
diff --git a/metadata/md5-cache/sys-apps/elivepatch-client-9999 b/metadata/md5-cache/sys-apps/elivepatch-client-9999
index edf5ae28afea..0885a21dc8dd 100644
--- a/metadata/md5-cache/sys-apps/elivepatch-client-9999
+++ b/metadata/md5-cache/sys-apps/elivepatch-client-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-admin/sudo dev-python/git-python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=app-admin/sudo dev-python/GitPython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Live patch installer client working with elivepatch-server
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Elivepatch
 IUSE=python_targets_python3_6
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=app-admin/sudo dev-python/git-python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[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(-)]
+RDEPEND=app-admin/sudo dev-python/GitPython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[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 )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	741ee6361e3e62791ae1f32ec416afc4	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4dfa39908a2b26ac08e45ca546f7c9b6	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f32b5ad73927804f2d24be4957bb0891
+_md5_=3356eafe0e29d06281e9176f34a8ff03
diff --git a/metadata/md5-cache/sys-apps/ipmicfg-1.30.0.190710 b/metadata/md5-cache/sys-apps/ipmicfg-1.31.0.200205
similarity index 61%
rename from metadata/md5-cache/sys-apps/ipmicfg-1.30.0.190710
rename to metadata/md5-cache/sys-apps/ipmicfg-1.31.0.200205
index 8b79b260a221..d17892f12b95 100644
--- a/metadata/md5-cache/sys-apps/ipmicfg-1.30.0.190710
+++ b/metadata/md5-cache/sys-apps/ipmicfg-1.31.0.200205
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install nofetch
-DEPEND=app-arch/unzip
 DESCRIPTION=An in-band utility for configuring Supermicro IPMI devices
 EAPI=7
 HOMEPAGE=https://www.supermicro.com
@@ -7,5 +7,5 @@ KEYWORDS=-* ~amd64 ~x86
 LICENSE=supermicro
 RESTRICT=bindist fetch mirror
 SLOT=0
-SRC_URI=ftp://ftp.supermicro.com/utility/IPMICFG/IPMICFG_1.30.0_build.190710.zip
-_md5_=ff05836d5e874e127ac7ec70831d5d03
+SRC_URI=ftp://ftp.supermicro.com/utility/IPMICFG/IPMICFG_1.31.0_build.200205.zip
+_md5_=0708f159ded5c382041da188b3906971
diff --git a/metadata/md5-cache/sys-apps/xdg-dbus-proxy-0.1.2 b/metadata/md5-cache/sys-apps/xdg-dbus-proxy-0.1.2
index e4413eab4331..762036353e03 100644
--- a/metadata/md5-cache/sys-apps/xdg-dbus-proxy-0.1.2
+++ b/metadata/md5-cache/sys-apps/xdg-dbus-proxy-0.1.2
@@ -4,9 +4,9 @@ DEPEND=>=dev-libs/glib-2.40:2
 DESCRIPTION=Filtering proxy for D-Bus connections
 EAPI=7
 HOMEPAGE=https://github.com/flatpak/xdg-dbus-proxy
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
+KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.40:2
 SLOT=0
 SRC_URI=https://github.com/flatpak/xdg-dbus-proxy/releases/download/0.1.2/xdg-dbus-proxy-0.1.2.tar.xz
-_md5_=b98086d4bf3fa6a6a50c40562ff61d8e
+_md5_=5d500a2520d236a3e29774b1c74677a4
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 35089337521e..64e1f8b3c5a1 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/elogind-243.4 b/metadata/md5-cache/sys-auth/elogind-243.4
index 09d42f886413..a65cd0d3ce26 100644
--- a/metadata/md5-cache/sys-auth/elogind-243.4
+++ b/metadata/md5-cache/sys-auth/elogind-243.4
@@ -12,4 +12,4 @@ RDEPEND=sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/ac
 SLOT=0
 SRC_URI=https://github.com/elogind/elogind/archive/v243.4.tar.gz -> elogind-243.4.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	0b22603e8787cab8d798c23c5e711ca5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d1022a04d99663233c5a70b6d0eb76a5
+_md5_=99466509bc274a6ce392e0f0b7168b1a
diff --git a/metadata/md5-cache/sys-auth/elogind-243.7 b/metadata/md5-cache/sys-auth/elogind-243.7
new file mode 100644
index 000000000000..4196fa4f3e0a
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/elogind-243.7
@@ -0,0 +1,15 @@
+BDEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-util/gperf dev-util/intltool virtual/pkgconfig >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/acl ) pam? ( sys-libs/pam ) selinux? ( sys-libs/libselinux )
+DESCRIPTION=The systemd project's logind, extracted to a standalone package
+EAPI=7
+HOMEPAGE=https://github.com/elogind/elogind
+IUSE=+acl debug doc +pam +policykit selinux kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=CC0-1.0 LGPL-2.1+ public-domain
+PDEPEND=sys-apps/dbus policykit? ( sys-auth/polkit )
+RDEPEND=sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/acl ) pam? ( sys-libs/pam ) selinux? ( sys-libs/libselinux ) !sys-apps/systemd
+SLOT=0
+SRC_URI=https://github.com/elogind/elogind/archive/v243.7.tar.gz -> elogind-243.7.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	0b22603e8787cab8d798c23c5e711ca5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7e4f72cc58de86016c6ce353755ddd9e
diff --git a/metadata/md5-cache/sys-auth/rtkit-0.11-r2 b/metadata/md5-cache/sys-auth/rtkit-0.11-r2
index 604dd09aeb47..df5f3efc32f6 100644
--- a/metadata/md5-cache/sys-auth/rtkit-0.11-r2
+++ b/metadata/md5-cache/sys-auth/rtkit-0.11-r2
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure install prepare pretend setup
 DEPEND=sys-apps/dbus sys-auth/polkit sys-libs/libcap 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=Realtime Policy and Watchdog Daemon
 EAPI=6
-HOMEPAGE=http://0pointer.de/blog/projects/rtkit
+HOMEPAGE=https://0pointer.de/blog/projects/rtkit
 IUSE=kernel_linux
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sh sparc x86
 LICENSE=GPL-3 BSD
 RDEPEND=sys-apps/dbus sys-auth/polkit sys-libs/libcap
 SLOT=0
-SRC_URI=http://0pointer.de/public/rtkit-0.11.tar.xz
+SRC_URI=https://0pointer.de/public/rtkit-0.11.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c0024b62dc06b9e4bd1337ddb91bd539
+_md5_=9ea5cd6f2142a74704b5e18cd5255a8b
diff --git a/metadata/md5-cache/sys-auth/rtkit-0.11-r3 b/metadata/md5-cache/sys-auth/rtkit-0.11-r3
index 78d23f012e15..c0105f8d811a 100644
--- a/metadata/md5-cache/sys-auth/rtkit-0.11-r3
+++ b/metadata/md5-cache/sys-auth/rtkit-0.11-r3
@@ -3,12 +3,12 @@ DEFINED_PHASES=configure install prepare pretend setup
 DEPEND=acct-group/rtkit acct-user/rtkit sys-apps/dbus sys-auth/polkit sys-libs/libcap
 DESCRIPTION=Realtime Policy and Watchdog Daemon
 EAPI=7
-HOMEPAGE=http://0pointer.de/blog/projects/rtkit
+HOMEPAGE=https://0pointer.de/blog/projects/rtkit
 IUSE=kernel_linux
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
 LICENSE=GPL-3 BSD
 RDEPEND=acct-group/rtkit acct-user/rtkit sys-apps/dbus sys-auth/polkit sys-libs/libcap
 SLOT=0
-SRC_URI=http://0pointer.de/public/rtkit-0.11.tar.xz
+SRC_URI=https://0pointer.de/public/rtkit-0.11.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7bb9eedc78f567088bc2b38095b3ab75
+_md5_=f7410a34d7c78adb30f5c80889efef48
diff --git a/metadata/md5-cache/sys-auth/rtkit-0.12 b/metadata/md5-cache/sys-auth/rtkit-0.12
new file mode 100644
index 000000000000..b0b9b1254028
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/rtkit-0.12
@@ -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 prepare pretend setup
+DEPEND=acct-group/rtkit acct-user/rtkit sys-apps/dbus sys-auth/polkit sys-libs/libcap systemd? ( sys-apps/systemd )
+DESCRIPTION=Realtime Policy and Watchdog Daemon
+EAPI=7
+HOMEPAGE=https://0pointer.de/blog/projects/rtkit
+IUSE=systemd kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+LICENSE=GPL-3 BSD
+RDEPEND=acct-group/rtkit acct-user/rtkit sys-apps/dbus sys-auth/polkit sys-libs/libcap systemd? ( sys-apps/systemd )
+SLOT=0
+SRC_URI=https://github.com/heftig/rtkit/releases/download/v0.12/rtkit-0.12.tar.xz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=5be19eea54802fc33097fda8551ce6e4
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 6d90dd517347..9aa28f56b5bd 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/arcconf-3.03.23668 b/metadata/md5-cache/sys-block/arcconf-3.04.23699
similarity index 79%
rename from metadata/md5-cache/sys-block/arcconf-3.03.23668
rename to metadata/md5-cache/sys-block/arcconf-3.04.23699
index d99919147650..f0fc6de52b83 100644
--- a/metadata/md5-cache/sys-block/arcconf-3.03.23668
+++ b/metadata/md5-cache/sys-block/arcconf-3.04.23699
@@ -1,13 +1,13 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install nofetch setup
-DEPEND=app-arch/unzip
 DESCRIPTION=Microsemi Adaptec RAID Controller Command Line Utility
 EAPI=7
 HOMEPAGE=https://www.microsemi.com/
 IUSE=kernel_linux
 KEYWORDS=-* ~amd64
 LICENSE=Microsemi
-RESTRICT=fetch mirror bindist
+RESTRICT=mirror bindist
 SLOT=0
-SRC_URI=https://download.adaptec.com/raid/storage_manager/arcconf_v3_03_23668.zip
+SRC_URI=https://download.adaptec.com/raid/storage_manager/arcconf_v3_04_23699.zip
 _eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a396ab66b449ae2f63956d7a088a856a
+_md5_=1711d64dfcce289b34329515d8ae103d
diff --git a/metadata/md5-cache/sys-block/fio-3.19 b/metadata/md5-cache/sys-block/fio-3.19
new file mode 100644
index 000000000000..34c80f207892
--- /dev/null
+++ b/metadata/md5-cache/sys-block/fio-3.19
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare
+DEPEND=!static? ( aio? ( dev-libs/libaio ) curl? ( net-misc/curl:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) glusterfs? ( sys-cluster/glusterfs ) gtk? ( dev-libs/glib:2 ) numa? ( sys-process/numactl ) rbd? ( sys-cluster/ceph ) rdma? ( sys-fabric/libibverbs sys-fabric/librdmacm ) tcmalloc? ( dev-util/google-perftools:= ) zlib? ( sys-libs/zlib ) ) gtk? ( x11-libs/gtk+:2 ) static? ( aio? ( dev-libs/libaio[static-libs(+)] ) curl? ( net-misc/curl:=[static-libs(+)] !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) glusterfs? ( sys-cluster/glusterfs[static-libs(+)] ) gtk? ( dev-libs/glib:2[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) rbd? ( sys-cluster/ceph[static-libs(+)] ) rdma? ( sys-fabric/libibverbs[static-libs(+)] sys-fabric/librdmacm[static-libs(+)] ) tcmalloc? ( dev-util/google-perftools:=[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) )
+DESCRIPTION=Jens Axboe's Flexible IO tester
+EAPI=7
+HOMEPAGE=https://brick.kernel.dk/snaps/
+IUSE=aio curl glusterfs gnuplot gtk libressl numa python rbd rdma static tcmalloc zlib python_targets_python2_7 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!static? ( aio? ( dev-libs/libaio ) curl? ( net-misc/curl:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) glusterfs? ( sys-cluster/glusterfs ) gtk? ( dev-libs/glib:2 ) numa? ( sys-process/numactl ) rbd? ( sys-cluster/ceph ) rdma? ( sys-fabric/libibverbs sys-fabric/librdmacm ) tcmalloc? ( dev-util/google-perftools:= ) zlib? ( sys-libs/zlib ) ) gtk? ( x11-libs/gtk+:2 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] || ( ( dev-lang/python:3.6 dev-python/pandas[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pandas[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) gnuplot? ( sci-visualization/gnuplot )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_6 ) ) libressl? ( curl ) gnuplot? ( python )
+SLOT=0
+SRC_URI=https://brick.kernel.dk/snaps/fio-3.19.tar.bz2
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4dfa39908a2b26ac08e45ca546f7c9b6	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=1b5e413438e6ed2217562fa857f6e63c
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 051a211a667a..52750526004c 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/crossdev-20191222 b/metadata/md5-cache/sys-devel/crossdev-20200131
similarity index 52%
rename from metadata/md5-cache/sys-devel/crossdev-20191222
rename to metadata/md5-cache/sys-devel/crossdev-20200131
index 830dbceea264..975e84257d99 100644
--- a/metadata/md5-cache/sys-devel/crossdev-20191222
+++ b/metadata/md5-cache/sys-devel/crossdev-20200131
@@ -3,9 +3,9 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Gentoo Cross-toolchain generator
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Crossdev
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions
 SLOT=0
-SRC_URI=mirror://gentoo/crossdev-20191222.tar.xz https://dev.gentoo.org/~slyfox/distfiles/crossdev-20191222.tar.xz
-_md5_=e6e91ba41f7261904de76965d73b6cda
+SRC_URI=mirror://gentoo/crossdev-20200131.tar.xz https://dev.gentoo.org/~slyfox/distfiles/crossdev-20200131.tar.xz
+_md5_=37376261d73f63854c12ea1b74f6bedb
diff --git a/metadata/md5-cache/sys-devel/gcc-9.3.0 b/metadata/md5-cache/sys-devel/gcc-9.3.0
new file mode 100644
index 000000000000..45a668ef1228
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-9.3.0
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=7
+HOMEPAGE=https://gcc.gnu.org/
+IUSE=test vanilla +nls altivec debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite +vtv jit +pie +ssp +pch systemtap d lto
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
+RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+RESTRICT=!test? ( test )
+SLOT=9.3.0
+SRC_URI=mirror://gnu/gcc/gcc-9.3.0/gcc-9.3.0.tar.xz mirror://gentoo/gcc-9.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.3.0-patches-1.tar.bz2
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	3719195b17f75382c225c2155e81198c	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	6057dce2ab2b82fd53d0826654cda38f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=13d022e9c1c4a5357b0fe86fd0ebfe08
diff --git a/metadata/md5-cache/sys-devel/kgcc64-9.3.0 b/metadata/md5-cache/sys-devel/kgcc64-9.3.0
new file mode 100644
index 000000000000..5b34b7a94ce5
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/kgcc64-9.3.0
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0=
+DESCRIPTION=The GNU Compiler Collection
+EAPI=7
+HOMEPAGE=https://gcc.gnu.org/
+IUSE=test vanilla +nls
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
+RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0=
+RESTRICT=!test? ( test )
+SLOT=9.3.0
+SRC_URI=mirror://gnu/gcc/gcc-9.3.0/gcc-9.3.0.tar.xz mirror://gentoo/gcc-9.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.3.0-patches-1.tar.bz2
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	3719195b17f75382c225c2155e81198c	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	6057dce2ab2b82fd53d0826654cda38f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=13d022e9c1c4a5357b0fe86fd0ebfe08
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 62715fcbc0f8..514befe5b774 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/cryptsetup-2.3.1 b/metadata/md5-cache/sys-fs/cryptsetup-2.3.1
new file mode 100644
index 000000000000..0adfc611f1cb
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/cryptsetup-2.3.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare pretend setup test
+DEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) static? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) )
+DESCRIPTION=Tool to setup encrypted devices with dm-crypt
+EAPI=7
+HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
+IUSE=gcrypt kernel nettle +openssl +argon2 libressl luks1_default nls pwquality reencrypt static static-libs +udev urandom kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev )
+REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) libressl? ( openssl ) static? ( !gcrypt )
+SLOT=0/12
+SRC_URI=https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.1.tar.xz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=e1c57ac819bf36720dc1999d47fe7e00
diff --git a/metadata/md5-cache/sys-fs/zfs-9999 b/metadata/md5-cache/sys-fs/zfs-9999
index ae528009aba3..a554ccf16461 100644
--- a/metadata/md5-cache/sys-fs/zfs-9999
+++ b/metadata/md5-cache/sys-fs/zfs-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	741ee6361e3e62791ae1f32ec416afc4	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4dde9df512b1d6f2f2507da5bda1f622	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4dfa39908a2b26ac08e45ca546f7c9b6	python-utils-r1	3ab704558125f1813be1cc37ed9e2667	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=d58d39a6465028bcf4569f975cd732f3
+_md5_=afc3c3d0b500729211dec15c6298d6e9
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 1d728dee0527..00d188ab54a9 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-4.19.109 b/metadata/md5-cache/sys-kernel/gentoo-kernel-4.19.109
new file mode 100644
index 000000000000..5c11e60d2361
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-4.19.109
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc virtual/libelf
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=savedconfig +initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel:4.19.109 !sys-kernel/vanilla-kernel-bin:4.19.109 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=4.19.109
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.19.94.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-108.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-108.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux-lts&id=bf97de6a2e405659aaad4c251b7f0bb48d5ed3c9 -> linux-4.19.92-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux-lts/config?id=1f0345e2983d2edd55b401cb5a87fdf365a4192c -> linux-4.19.85-arch1.i686.config )
+_eclasses_=kernel-build	62503a0a2c84409f29e0ffebd9756232	kernel-install	8d71ac2b8604c81762590203a3959633	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=99500d2c26da8d9f4d302adcab6e1bf3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.25 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.25
new file mode 100644
index 000000000000..c176f993dcd7
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.25
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc virtual/libelf
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=savedconfig +initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel:5.4.25 !sys-kernel/vanilla-kernel-bin:5.4.25 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.4.25
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-25.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-25.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux-lts&id=c060a2f4e686e06679d9cf9bbab5fdf423e5a402 -> linux-5.4.24.arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux-lts/config?id=3f4ba0851a9e9a3809fdec4091335182b0f1885a -> linux-5.4.24.arch1.i686.config )
+_eclasses_=kernel-build	62503a0a2c84409f29e0ffebd9756232	kernel-install	8d71ac2b8604c81762590203a3959633	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=da2837bd1c0bc3553d208002f2e115e8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.5.9 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.5.9
new file mode 100644
index 000000000000..b24405b48a42
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.5.9
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc virtual/libelf
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=savedconfig +initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel:5.5.9 !sys-kernel/vanilla-kernel-bin:5.5.9 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.5.9
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.5.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.5-11.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.5-11.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=e4d4ca36741d228042185e2a9047cd88fb5b4169 -> linux-5.5.5-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=7d53d8a42f68648bce5b002aaf8c2b14e6298275 -> linux-5.5.6-arch1.i686.config )
+_eclasses_=kernel-build	62503a0a2c84409f29e0ffebd9756232	kernel-install	8d71ac2b8604c81762590203a3959633	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=013992d373a59e6e703fbec9a7e97e63
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-4.19.109 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-4.19.109
new file mode 100644
index 000000000000..63588ea6543e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-4.19.109
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=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:4.19.109 !sys-kernel/vanilla-kernel:4.19.109 !sys-kernel/vanilla-kernel-bin:4.19.109 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=4.19.109
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-4.19.109-1.xpak -> gentoo-kernel-4.19.109-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-4.19.109-1.xpak -> gentoo-kernel-4.19.109-1.x86.xpak )
+_eclasses_=kernel-install	8d71ac2b8604c81762590203a3959633	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.25 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.25
new file mode 100644
index 000000000000..53bf71e63b15
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.25
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=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.25 !sys-kernel/vanilla-kernel:5.4.25 !sys-kernel/vanilla-kernel-bin:5.4.25 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.4.25
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.25-1.xpak -> gentoo-kernel-5.4.25-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.25-1.xpak -> gentoo-kernel-5.4.25-1.x86.xpak )
+_eclasses_=kernel-install	8d71ac2b8604c81762590203a3959633	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.5.9 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.5.9
new file mode 100644
index 000000000000..753c9b53bfd4
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.5.9
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=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.5.9 !sys-kernel/vanilla-kernel:5.5.9 !sys-kernel/vanilla-kernel-bin:5.5.9 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.5.9
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.5.9-1.xpak -> gentoo-kernel-5.5.9-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.5.9-1.xpak -> gentoo-kernel-5.5.9-1.x86.xpak )
+_eclasses_=kernel-install	8d71ac2b8604c81762590203a3959633	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.25 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.25
new file mode 100644
index 000000000000..7c3825313809
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.25
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.4.25
+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-25.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-25.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-25.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-25.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-25.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-25.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-25.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-25.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-25.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	161e65a1e185c10599fd2c5b258be436	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=3ed6aafc15ef628f25fd0e9c29005e4a
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-4.19.109 b/metadata/md5-cache/sys-kernel/vanilla-kernel-4.19.109
new file mode 100644
index 000000000000..c8c2d433e15f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-4.19.109
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc virtual/libelf
+DEFINED_PHASES=compile 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=savedconfig +initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel-bin:4.19.109 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=4.19.109
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.19.109.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux-lts&id=bf97de6a2e405659aaad4c251b7f0bb48d5ed3c9 -> linux-4.19.92-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux-lts/config?id=1f0345e2983d2edd55b401cb5a87fdf365a4192c -> linux-4.19.85-arch1.i686.config )
+_eclasses_=kernel-build	62503a0a2c84409f29e0ffebd9756232	kernel-install	8d71ac2b8604c81762590203a3959633	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=3d0f5c5631be95f8cc07bdf8c431f3ac
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.25 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.25
new file mode 100644
index 000000000000..73c123d6fb97
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.25
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc virtual/libelf
+DEFINED_PHASES=compile 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=savedconfig +initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.25 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.4.25
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.25.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux-lts&id=c060a2f4e686e06679d9cf9bbab5fdf423e5a402 -> linux-5.4.24.arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux-lts/config?id=3f4ba0851a9e9a3809fdec4091335182b0f1885a -> linux-5.4.24.arch1.i686.config )
+_eclasses_=kernel-build	62503a0a2c84409f29e0ffebd9756232	kernel-install	8d71ac2b8604c81762590203a3959633	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=4e7adf84f8d4d92d9af96c20ebe476cd
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.5.9 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.5.9
new file mode 100644
index 000000000000..28eaa83b164c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.5.9
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc virtual/libelf
+DEFINED_PHASES=compile 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=savedconfig +initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.5.9 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.5.9
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.5.9.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=e4d4ca36741d228042185e2a9047cd88fb5b4169 -> linux-5.5.5-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=7d53d8a42f68648bce5b002aaf8c2b14e6298275 -> linux-5.5.6-arch1.i686.config )
+_eclasses_=kernel-build	62503a0a2c84409f29e0ffebd9756232	kernel-install	8d71ac2b8604c81762590203a3959633	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=1aa7b7b3ed7b69300c4d8df4a23705ac
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.24 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.25
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.4.24
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.4.25
index 21543a853452..cca04c087b95 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.24
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.25
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
-SLOT=5.4.24
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.24.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
+SLOT=5.4.25
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.25.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	161e65a1e185c10599fd2c5b258be436	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=af62ceca6b46feac79b140ba555f8fb5
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index cde4ce9c1fee..1cb1b8d75da7 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/rust-1.41.0 b/metadata/md5-cache/virtual/rust-1.41.0
deleted file mode 100644
index f89cd1ce2f79..000000000000
--- a/metadata/md5-cache/virtual/rust-1.41.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Rust language compiler
-EAPI=7
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
-RDEPEND=|| ( =dev-lang/rust-1.41.0*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] =dev-lang/rust-bin-1.41.0* )
-SLOT=0
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	dfda7934df092a96e439c05b4aeac519	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5f2517c1f7dd6a4bec802eeca5b72033
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 714758109a73..93ef4ac75d87 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/opera-66.0.3515.103 b/metadata/md5-cache/www-client/opera-66.0.3515.103
deleted file mode 100644
index facd628d1bfc..000000000000
--- a/metadata/md5-cache/www-client/opera-66.0.3515.103
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera/desktop/66.0.3515.103/linux/opera-stable_66.0.3515.103_amd64.deb https://download2.operacdn.com/pub/opera/desktop/66.0.3515.103/linux/opera-stable_66.0.3515.103_amd64.deb https://download3.operacdn.com/pub/opera/desktop/66.0.3515.103/linux/opera-stable_66.0.3515.103_amd64.deb https://download4.operacdn.com/pub/opera/desktop/66.0.3515.103/linux/opera-stable_66.0.3515.103_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ff8ec1a271aeb694a68971441b78148
diff --git a/metadata/md5-cache/www-client/opera-66.0.3515.72 b/metadata/md5-cache/www-client/opera-66.0.3515.72
deleted file mode 100644
index ed1bf21eb85c..000000000000
--- a/metadata/md5-cache/www-client/opera-66.0.3515.72
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera/desktop/66.0.3515.72/linux/opera-stable_66.0.3515.72_amd64.deb https://download2.operacdn.com/pub/opera/desktop/66.0.3515.72/linux/opera-stable_66.0.3515.72_amd64.deb https://download3.operacdn.com/pub/opera/desktop/66.0.3515.72/linux/opera-stable_66.0.3515.72_amd64.deb https://download4.operacdn.com/pub/opera/desktop/66.0.3515.72/linux/opera-stable_66.0.3515.72_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b2a52b350308a5a07770f6f59ee5b674
diff --git a/metadata/md5-cache/www-client/opera-67.0.3575.53 b/metadata/md5-cache/www-client/opera-67.0.3575.79
similarity index 78%
rename from metadata/md5-cache/www-client/opera-67.0.3575.53
rename to metadata/md5-cache/www-client/opera-67.0.3575.79
index 47bd63712f4a..428e425bd11e 100644
--- a/metadata/md5-cache/www-client/opera-67.0.3575.53
+++ b/metadata/md5-cache/www-client/opera-67.0.3575.79
@@ -3,10 +3,10 @@ DESCRIPTION=A fast and secure web browser
 EAPI=7
 HOMEPAGE=https://www.opera.com/
 IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=OPERA-2014
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
 SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera/desktop/67.0.3575.53/linux/opera-stable_67.0.3575.53_amd64.deb https://download2.operacdn.com/pub/opera/desktop/67.0.3575.53/linux/opera-stable_67.0.3575.53_amd64.deb https://download3.operacdn.com/pub/opera/desktop/67.0.3575.53/linux/opera-stable_67.0.3575.53_amd64.deb https://download4.operacdn.com/pub/opera/desktop/67.0.3575.53/linux/opera-stable_67.0.3575.53_amd64.deb
+SRC_URI=https://download1.operacdn.com/pub/opera/desktop/67.0.3575.79/linux/opera-stable_67.0.3575.79_amd64.deb https://download2.operacdn.com/pub/opera/desktop/67.0.3575.79/linux/opera-stable_67.0.3575.79_amd64.deb https://download3.operacdn.com/pub/opera/desktop/67.0.3575.79/linux/opera-stable_67.0.3575.79_amd64.deb https://download4.operacdn.com/pub/opera/desktop/67.0.3575.79/linux/opera-stable_67.0.3575.79_amd64.deb
 _eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ff8ec1a271aeb694a68971441b78148
+_md5_=b2a52b350308a5a07770f6f59ee5b674
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-2.12.1838.3_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-2.12.1838.3_p1
deleted file mode 100644
index 53c5382f1c61..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-2.12.1838.3_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DEPEND=virtual/libiconv
-DESCRIPTION=A browser for our friends
-EAPI=7
-HOMEPAGE=https://vivaldi.com/
-IUSE=kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~x86
-LICENSE=Vivaldi
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.12.1838.3-1_amd64.deb -> vivaldi-snapshot-2.12.1838.3_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.12.1838.3-1_arm64.deb -> vivaldi-snapshot-2.12.1838.3_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.12.1838.3-1_armhf.deb -> vivaldi-snapshot-2.12.1838.3_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.12.1838.3-1_i386.deb -> vivaldi-snapshot-2.12.1838.3_p1-i386.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ef3b4bd883acc7a7dbc0824c73ebbbf
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-2.12.1843.5_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-2.12.1849.7_p1
similarity index 81%
rename from metadata/md5-cache/www-client/vivaldi-snapshot-2.12.1843.5_p1
rename to metadata/md5-cache/www-client/vivaldi-snapshot-2.12.1849.7_p1
index 7c79eb3e1b70..912d8ae6b67d 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-2.12.1843.5_p1
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-2.12.1849.7_p1
@@ -9,6 +9,6 @@ LICENSE=Vivaldi
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.12.1843.5-1_amd64.deb -> vivaldi-snapshot-2.12.1843.5_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.12.1843.5-1_arm64.deb -> vivaldi-snapshot-2.12.1843.5_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.12.1843.5-1_armhf.deb -> vivaldi-snapshot-2.12.1843.5_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.12.1843.5-1_i386.deb -> vivaldi-snapshot-2.12.1843.5_p1-i386.deb )
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.12.1849.7-1_amd64.deb -> vivaldi-snapshot-2.12.1849.7_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.12.1849.7-1_arm64.deb -> vivaldi-snapshot-2.12.1849.7_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.12.1849.7-1_armhf.deb -> vivaldi-snapshot-2.12.1849.7_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.12.1849.7-1_i386.deb -> vivaldi-snapshot-2.12.1849.7_p1-i386.deb )
 _eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8ef3b4bd883acc7a7dbc0824c73ebbbf
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 8940a0e28e8d..25f12dae5d54 100644
Binary files a/metadata/md5-cache/www-plugins/Manifest.gz and b/metadata/md5-cache/www-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/www-plugins/adobe-flash-32.0.0.330 b/metadata/md5-cache/www-plugins/adobe-flash-32.0.0.344
similarity index 90%
rename from metadata/md5-cache/www-plugins/adobe-flash-32.0.0.330
rename to metadata/md5-cache/www-plugins/adobe-flash-32.0.0.344
index 11b140878c50..3398b84ef3e6 100644
--- a/metadata/md5-cache/www-plugins/adobe-flash-32.0.0.330
+++ b/metadata/md5-cache/www-plugins/adobe-flash-32.0.0.344
@@ -10,6 +10,6 @@ RDEPEND=!www-plugins/chrome-binary-plugins[flash(-)] nsplugin? ( dev-libs/atk[ab
 REQUIRED_USE=|| ( nsplugin ppapi )
 RESTRICT=bindist mirror strip
 SLOT=22
-SRC_URI=nsplugin? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.330/flash_player_npapi_linux.i386.tar.gz -> adobe-flash-32.0.0.330-npapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.330/flash_player_npapi_linux.x86_64.tar.gz -> adobe-flash-32.0.0.330-npapi.x86_64.tar.gz ) ) ppapi? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.330/flash_player_ppapi_linux.i386.tar.gz -> adobe-flash-32.0.0.330-ppapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.330/flash_player_ppapi_linux.x86_64.tar.gz -> adobe-flash-32.0.0.330-ppapi.x86_64.tar.gz ) )
+SRC_URI=nsplugin? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.344/flash_player_npapi_linux.i386.tar.gz -> adobe-flash-32.0.0.344-npapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.344/flash_player_npapi_linux.x86_64.tar.gz -> adobe-flash-32.0.0.344-npapi.x86_64.tar.gz ) ) ppapi? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.344/flash_player_ppapi_linux.i386.tar.gz -> adobe-flash-32.0.0.344-ppapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.344/flash_player_ppapi_linux.x86_64.tar.gz -> adobe-flash-32.0.0.344-ppapi.x86_64.tar.gz ) )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	mozextension	f47f008a138943f9e40e37c1fca10b24	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b9c9837c1f6d7c3ba8d05edf0467e6e7
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 5a8a01467959..5a5455ad3968 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/fltk-1.3.3-r3 b/metadata/md5-cache/x11-libs/fltk-1.3.3-r3
deleted file mode 100644
index 29c35c4a45fe..000000000000
--- a/metadata/md5-cache/x11-libs/fltk-1.3.3-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=media-libs/libpng-1.2:0 sys-libs/zlib virtual/jpeg:0 x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt cairo? ( x11-libs/cairo[X] ) games? ( !sys-block/blocks ) opengl? ( virtual/glu virtual/opengl ) xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto 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
-DESCRIPTION=C++ user interface toolkit for X and OpenGL
-EAPI=5
-HOMEPAGE=https://www.fltk.org/
-IUSE=cairo debug doc examples games +opengl static-libs +threads +xft +xinerama
-KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=FLTK LGPL-2
-RDEPEND=>=media-libs/libpng-1.2:0 sys-libs/zlib virtual/jpeg:0 x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt cairo? ( x11-libs/cairo[X] ) games? ( !sys-block/blocks ) opengl? ( virtual/glu virtual/opengl ) xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama )
-SLOT=1
-SRC_URI=https://www.fltk.org/pub/fltk/1.3.3/fltk-1.3.3-source.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	3719195b17f75382c225c2155e81198c	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=563ef032887e75e5b4629c504e410b2c
diff --git a/metadata/md5-cache/x11-libs/fltk-1.3.4 b/metadata/md5-cache/x11-libs/fltk-1.3.4
deleted file mode 100644
index 0e1280237a2c..000000000000
--- a/metadata/md5-cache/x11-libs/fltk-1.3.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=media-libs/libpng-1.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libICE[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libSM[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,X] ) games? ( !sys-block/blocks ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xft? ( x11-libs/libXft[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig x11-base/xorg-proto 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
-DESCRIPTION=C++ user interface toolkit for X and OpenGL
-EAPI=6
-HOMEPAGE=https://www.fltk.org/
-IUSE=cairo debug doc examples games +opengl static-libs +threads +xft +xinerama abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=FLTK LGPL-2
-RDEPEND=>=media-libs/libpng-1.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libICE[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libSM[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,X] ) games? ( !sys-block/blocks ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xft? ( x11-libs/libXft[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=1
-SRC_URI=https://www.fltk.org/pub/fltk/1.3.4/fltk-1.3.4-source.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	3719195b17f75382c225c2155e81198c	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dbb11d04ba5f2f3e3c51c41c9aac40a8
diff --git a/metadata/md5-cache/x11-libs/fltk-1.3.5-r4 b/metadata/md5-cache/x11-libs/fltk-1.3.5-r4
index 1776412d35ec..90f11d6368fb 100644
--- a/metadata/md5-cache/x11-libs/fltk-1.3.5-r4
+++ b/metadata/md5-cache/x11-libs/fltk-1.3.5-r4
@@ -5,10 +5,10 @@ DESCRIPTION=C++ user interface toolkit for X and OpenGL
 EAPI=7
 HOMEPAGE=https://www.fltk.org/
 IUSE=cairo debug doc examples games +opengl static-libs +threads +xft +xinerama abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=FLTK LGPL-2
 RDEPEND=>=media-libs/libpng-1.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libICE[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libSM[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,X] ) games? ( !sys-block/blocks ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xft? ( x11-libs/libXft[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=1
 SRC_URI=https://www.fltk.org/pub/fltk/1.3.5/fltk-1.3.5-source.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e48e62d4ece353278aa25e6bb210f97a
+_md5_=3978d36ea44d3f5c890ae203cdecc22f
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 5cf39c762ecd..7f14783e2d9a 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/projecteur-0.6-r1 b/metadata/md5-cache/x11-misc/projecteur-0.7
similarity index 92%
rename from metadata/md5-cache/x11-misc/projecteur-0.6-r1
rename to metadata/md5-cache/x11-misc/projecteur-0.7
index d0ad40dc5294..67647edbcbe5 100644
--- a/metadata/md5-cache/x11-misc/projecteur-0.6-r1
+++ b/metadata/md5-cache/x11-misc/projecteur-0.7
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/udev x11-libs/libX11
 SLOT=0
-SRC_URI=https://github.com/jahnf/Projecteur/archive/v0.6.tar.gz -> projecteur-0.6.tar.gz
+SRC_URI=https://github.com/jahnf/Projecteur/archive/v0.7.tar.gz -> projecteur-0.7.tar.gz
 _eclasses_=cmake	88799418ef3db9d88b6232a483143608	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	3719195b17f75382c225c2155e81198c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9b8a02d9f9035971a2d355223b6079ed
diff --git a/metadata/news/2020-02-19-openssh-8.2-service-breakage/2020-02-19-openssh-8.2-service-breakage.en.txt b/metadata/news/2020-02-19-openssh-8.2-service-breakage/2020-02-19-openssh-8.2-service-breakage.en.txt
deleted file mode 100644
index 40a309deafbc..000000000000
--- a/metadata/news/2020-02-19-openssh-8.2-service-breakage/2020-02-19-openssh-8.2-service-breakage.en.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Title: OpenSSH 8.2_p1 running sshd breakage
-Author: Patrick McLean <chutzpah@gentoo.org>
-Posted: 2020-02-20
-Revision: 1
-News-Item-Format: 2.0
-Display-If-Installed: <net-misc/openssh-8.2
-
-If sshd is running, and a system is upgraded from
-<net-misc/openssh-8.2_p1 to >=net-misc/openssh-8.2_p1, any new ssh
-connection will fail until sshd is restarted.
-
-Before restarting sshd, it is *strongly* recommended that you test your
-configuration with the following command (as root):
-    sshd -t
-
-If your system is booted with openrc, use this command (as root) 
-to restart sshd:
-    rc-service sshd --nodeps restart
-
-If your system is booted with systemd, use this command (as root)
-to restart sshd:
-    systemctl restart sshd
-
-WARNING: On systemd booted machines with PAM disabled, this command
-         will terminate all currently open ssh connections. It is 
-         *strongly* recommended that you validate your configuration
-         before restarting sshd.
-
-If you are using systemd socket activation for sshd, then no action is
-required.
diff --git a/metadata/news/2020-03-09-opencl-abi_x86_32-phaseout/2020-03-09-opencl-abi_x86_32-phaseout.en.txt b/metadata/news/2020-03-09-opencl-abi_x86_32-phaseout/2020-03-09-opencl-abi_x86_32-phaseout.en.txt
deleted file mode 100644
index fe50d82818a2..000000000000
--- a/metadata/news/2020-03-09-opencl-abi_x86_32-phaseout/2020-03-09-opencl-abi_x86_32-phaseout.en.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Title: Removing ABI_X86_32 support from virtual/opencl
-Author: Marek Szuba <marecki@gentoo.org>
-Posted: 2020-03-09
-Revision: 2
-News-Item-Format: 2.0
-Display-If-Installed: virtual/opencl
-
-From April 2020 onwards virtual/opencl will no longer provide support
-for the 32-bit ABI on either multilib amd64 or native x86 systems. The
-reason for this is that most modern OpenCL providers currently available
-from Gentoo only support the 64-bit ABI anyway. Therefore, we intend
-to initially mask:
- - virtual/opencl in x86 profiles,
- - USE=abi_x86_32 for virtual/opencl in all profiles, and
- - USE=opencl in x86 profiles.
-and follow up with removal of multilib support and x86 keywords from
-virtual/opencl.
-
-Note that this change will only affect the virtual package, i.e. OpenCL
-providers which do support ABI_X86_32 will continue to advertise this
-capability. Users of such providers who wish to retain 32-bit OpenCL
-support are advised to add virtual/opencl to package.provided; see
-portage(5) for details.
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index 3ac241b00654..d9d1a60c8d10 100644
Binary files a/metadata/news/Manifest.files.gz and b/metadata/news/Manifest.files.gz differ
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 9096b3b0e8a8..87544fa14bc2 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 12 Mar 2020 16:38:54 +0000
+Fri, 13 Mar 2020 18:08:50 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index 433dd83cf8cd..a35a8357ed5f 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-e1559c7a4a87b266b306c9b67fc431ca75619e9e 1583748765 2020-03-09T10:12:45+00:00
+bb6ecae5a95bc13b2ec01a5bf3188d87df9a0c2c 1581078273 2020-02-07T12:24:33+00:00
diff --git a/metadata/timestamp b/metadata/timestamp
index b42d434e987d..55c237546f17 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu 12 Mar 2020 04:38:54 PM UTC
+Fri 13 Mar 2020 06:08:50 PM UTC
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 0d26c6673a6d..c106acca9c34 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 12 Mar 2020 17:00:01 +0000
+Fri, 13 Mar 2020 18:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index fef50ac9006d..c51af86fcffb 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-2405291e43b9b18b1f0e89898d9d94707cdcc769 1584030421 2020-03-12T16:27:01+00:00
+e631721bce64fe41cd7e964c2eab4c72b440dd82 1584122563 2020-03-13T18:02:43+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index e671184b689a..423365223aca 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1584030901 Thu 12 Mar 2020 04:35:01 PM UTC
+1584122701 Fri 13 Mar 2020 06:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 9096b3b0e8a8..87544fa14bc2 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 12 Mar 2020 16:38:54 +0000
+Fri, 13 Mar 2020 18:08:50 +0000
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 3ea8d5665647..d5f52f69c34c 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/pidgin/pidgin-2.13.0-r6.ebuild b/net-im/pidgin/pidgin-2.13.0-r7.ebuild
similarity index 99%
rename from net-im/pidgin/pidgin-2.13.0-r6.ebuild
rename to net-im/pidgin/pidgin-2.13.0-r7.ebuild
index aee1ccb0a4bf..0ce122757963 100644
--- a/net-im/pidgin/pidgin-2.13.0-r6.ebuild
+++ b/net-im/pidgin/pidgin-2.13.0-r7.ebuild
@@ -72,7 +72,7 @@ RDEPEND="
 	tcl? ( dev-lang/tcl:0= )
 	tk? ( dev-lang/tk:0= )
 	sasl? ( dev-libs/cyrus-sasl:2 )
-	networkmanager? ( net-misc/networkmanager )
+	networkmanager? ( <net-misc/networkmanager-1.19 )
 	idn? ( net-dns/libidn:= )
 	!<x11-plugins/pidgin-facebookchat-1.69-r1"
 	# Mono support crashes pidgin
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index f74b2156bab6..e5996c9aaf68 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/quiche/Manifest b/net-libs/quiche/Manifest
index 0a8c6952357b..185e6edd9c14 100644
--- a/net-libs/quiche/Manifest
+++ b/net-libs/quiche/Manifest
@@ -5,6 +5,7 @@ DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-0.1.6.crate 11439 BLAKE2B e0eb7a3176bb5ac27b8de466c5fcdfedb9ad32f4d2b52c0385550902d59d01c716a53179708bdeb250a91690edeb70ab81d91090ff0fd89a731dd365621aa496 SHA512 ac7dd73b7c6b8b54c4fc98c3e75210eb59d46ab3447fca533763bfebfa87dba5e947829e3ba56a8eb3403f6d317065b7d674da883741e619f3866b12267801fe
 DIST autocfg-0.1.7.crate 12158 BLAKE2B 4120306f0f7c1cc0cf8d1d994c080cbf42e4b107cb51af910504c8c8d264289654dad23a0c6b9eb28d888157e5a68ef2460c3d38537ae9d5e9bf73b66ffc3015 SHA512 667ca520f2b46140d2f3519b43e5155426a6e7a2130879860eb10b974f84465600077f53abed4c0e6bf2612471f01786bfb3531ea8773d0f50f29d48e05f7925
+DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
 DIST backtrace-0.3.37.crate 67955 BLAKE2B af9deeda806a9c47084df102ed6f5e6d57a81db9ac410678684c7026069be43bc4efd15bbf4b042d5aea9d85d619168484396d1dfc2ed83a69eeb29d750b6158 SHA512 d32ef8fa11cffeee298f7468f8f9b6d3492cdd805679fa72600115df7dd7e0ae65378ed7aa767a75a90743e278018cfb9631842e7eb633869d77485405dc520b
 DIST backtrace-0.3.38.crate 68133 BLAKE2B 75794901cf8d322cb642672eaab9403b00f802a917f04505d8a4df1466d340f92f1824cd0cd501d5f6017ff98cf17e4ad61ce32fce07b061fbcdaecce5ac0c55 SHA512 a962b8ffd435691bf229f6db6cc86a0e9fabec1dea589824a85f11ee77e2c36458cdebd68acc0624d45195df27a9fb6dace0afb98a9fddc0291bae93928345fe
 DIST backtrace-sys-0.1.31.crate 518877 BLAKE2B 397f3c4053eeabd7216c4373e6457637e22ee124d8a864c2587a78ebd8d619745dece654357cb9cd970ee20d7c41d53c84ecb3ed92beefaacbcfddfaca804ce5 SHA512 6aa8c7a2694f4e953a0e9bbd07dc8b7e218719de5aef2adaecfae81beb919deffde6f184675dc6b6c1a330bb81dc9611c256f7f63caef5e301101dbe3bbaafe0
@@ -12,30 +13,41 @@ DIST bitflags-1.1.0.crate 16322 BLAKE2B 01931976111840ca69b58e77e2c18b26ebabe4ef
 DIST bitflags-1.2.0.crate 16814 BLAKE2B 5b7aee7388b01cebf96651e979025e9bcac85f7324982055d7d805361f91da2b9489a07f00350133c8a58eaf70c5397e3561c15b3f2544aa8202bfdb852c145b SHA512 bd9e3797fb9b91e815308a5286439e7eedb285666c937184493cfce45ff1d4c10f505f29be3a6317add313a7fdc72a006682c1b3e1cc9fa05166f6c4ecaffcaa
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST boringssl-f18bd55240b229a65df48e7905da98fff18cbf59.tar.gz 17909647 BLAKE2B c14a9559eab74c400c412fbf62cc3642eff3811e7d93b57bcb286fbe15689ab799c524d2f843e027581fda04919c8fd52defd073da2acd3326eade166423eec6 SHA512 83cd2fb9cec52f97e046c5773741359f4bcea9dad38c346123348187af725011a5ade06a0e3c28609660b00ad1003d3e395b03af6cdeced8a850cd9bebc27e59
+DIST bstr-0.2.12.crate 344435 BLAKE2B b55a55be4875d9aefcff0091be82d80a19c1c92d5d6e17b751dd41bebd37f6a5f72d884fa8a70e829905baf3526ce4d854b162d10d894573dd2801ed030460e9 SHA512 2d14ac85274814bb29439acf67c3aaf84ac32ad361dd6d2cbca58bf571c968f594eeb1443a632b625296929b84047652fc60ec39983c110737ba1950d88bce89
 DIST bstr-0.2.8.crate 337654 BLAKE2B 50c5a639ec2912bd20be83a8b017e60c7b5f75f6cbe93839f8f46a4815537e47261593d17380a38aae45445d611c9fb28135e0424184958edfcc1c06e941e4aa SHA512 9e8786b68c03f059e4182046e7650b6f90431927c26c49fcdd4af3cb464092108fb2f64fdc2da1fe1d1121705ac8a21c68485b0517f3dd32040aab754f88944d
 DIST bumpalo-2.6.0.crate 124915 BLAKE2B 567e4060019477006f3ca468cb0e087d90626e37d2cb13cecd6938162f78504c8ea9dfb6c571adf573d631c4a60055e5784ee27f2cbf22c769428899d774f107 SHA512 0a2f9c9dfd9ecfdb159228b03dc573d790d0aca777f43452e8e1d638f180dc855b2239779e321fd0b225cf976ac81817d4bb5fc85ac1e45377c863607bef9966
 DIST bumpalo-3.1.2.crate 118677 BLAKE2B 1d956397aa3ef73dc300e15179c270f0e9e5b8b3a8d4dac00bd775236ed024dba6738d6e526bcff9f04edc61d5ec28225bfc2e6383fbf82764bc7de75aa643bd SHA512 c7ca828139a621a0f3404455748486fd7b0dd4e51c1e8584f302ac682f87ebcc46a13ec4edbcbf67568b7d620ab31317835a9dfbeefedc66b729deeef31c1235
+DIST bumpalo-3.2.0.crate 118891 BLAKE2B 9ba8c0366c5d6f0503d780d07b86a4b469e3da186aaf684c3d6b399b081103e3e58fec5d2f74e1e997821460fd8eb9d898037b7cf8dae79793caf14ef2373609 SHA512 705c2ea7cfdf04d7eb9b8810e2fa4ec925ca664a3a5a488cd3405a87f2f7a1840c7ced575827464149a8a538dda515e75a22859403038637d33348ee0dc883ff
 DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
+DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
 DIST cast-0.2.2.crate 10318 BLAKE2B da2f8327bc3c2d884bcfaad9d4b2a79e009d060501be98cfe344598da66306940134c28f96eac39578ac98cfc26fd754b68707fa17adab233b371a79eda8a54e SHA512 7b0e860a3c6c809799a9fc733bb0303cff819bc2b884cf77e1517aa9824c819c259edda7793be2fa5fa6573de4f07c0ff95f90a03d0d38c5905260e291ff9786
 DIST cast-0.2.3.crate 11446 BLAKE2B 70003625a66e1f505d81cb324992f38388762686def5f6edd8023d55425273b9aad36a2d1c7f429799565c02a0c9d6db1a869137aec9c8d1e2fe12b228e4c8c4 SHA512 2afdba50989aaefd64b2cd1274dcf8812f69e7b2d8ed783a261fe9d3805bd7800e8e0b30beccc64f640df1a869c012d35c7cdac5ef976829a53dc82e73048ae0
 DIST cc-1.0.45.crate 49112 BLAKE2B f24cd4aba8f84be490ee89f95c666e35156a9dfd745ba4b28a61130ec0c2ff2b8e7ebbb7363cbebe8e9fadcfcd8c1f7f72bbbcf834b146395840c5569e66bfcf SHA512 cd521fa11c0390cb7c71300ef77c5e27f10739345ff9c2d81c693191d602e8b54717237d1cfc325a39220f721df356e771c7a96885f77f43626d4e24d317434e
 DIST cc-1.0.49.crate 49933 BLAKE2B 205a8622f1a85a1fb6816206378a63122d48ee69083932611064e41b22003715a0b3779a2052d015e39028f56599b82e0f56cec0bc77f04458c89c8b6bf83f5b SHA512 f78eaa1b81b8f84bb487889f27564f25630b6a83e89ff74dbd620bfc5080f85d74f6a6f4fc6b09e3a4918dc6998ac2087195850040d5ddcc1a1904976ab001ed
+DIST cc-1.0.50.crate 49792 BLAKE2B 25ec14fd42536c381babcf697cf96fe8be61417a61ba5875a2461bb40bf3ffd9c9d03e1d9df83e2dabfc9472de3db97b08fdffb710e89b868a5e115d0463a9cd SHA512 34a721d9352f8b59cffb8cc0b9c520b972b65d6c23e83d9c6f6e88d6a6845c53ec89350a4aacd0444a5d6b03b867b97aedaf418b483afead209a7ae6d3885f5d
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST cmake-0.1.42.crate 14266 BLAKE2B eab3de3a5a482f58dcf72809f63109605d71e1376e4ae2695345abad556eab86fc946c080602671b748fc79e6757478b5b4398a9985128d6189d5fa13ba8a89d SHA512 eb91ecb665924e433369bac77060e44950cefe73eb250463b0e0346e58b6545114e39f995f24c8dea2bb663db2b177cb9f1a8646b286906b3060effd6691e4f7
 DIST criterion-0.3.0.crate 87281 BLAKE2B 9c246cc4cb4a9007add5d73058ecbac64f8f9093d2272f21b311be2704ef129bbffe24717de10c4b061e0787febca2aab60b141b2bf94e81d3a45a7eb99a0f14 SHA512 d1110f0699493281013980dbeeccb93553e4147e138bde7ab4a6bffcd522385fb74e8f3f15c2bac32661c56fc720ba808e6483223ca4cae05b2a1da7307de620
+DIST criterion-0.3.1.crate 95450 BLAKE2B d63477b414176eb3b49857b6a6e3f1e30d72e95856756051974bb99289082315bde362dd39254a766480e167707a147b621ae84a887243ece6f865ba784a9210 SHA512 c6beae7350029632206cd201faf3e9aa16fae39e96b9256b702cb4c09b013be88280b2e8b87ec2790c386be8ef6f9e9179482655f3af3ec9e34f8b402fe8bec9
 DIST criterion-plot-0.4.0.crate 17204 BLAKE2B dbde14b2a7e3bcfc41886aade72c88f31835b0739dcc0d745233c4b936693cba3638ac5f60a47355f37f9caab2f6addd86c8ef1881c21899dfd43491b24dbeab SHA512 06e46dd31ebdd83621bab4b108892b366566ca6819db4a7832cb24fe5bb2155ce086ec97f282a6fb5aa1e1103de2c2d8a42a69b71af20cd62f49e51994c21864
+DIST criterion-plot-0.4.1.crate 17185 BLAKE2B 106f956a32ab2a0f274882e2cf5707c9763e16ca9e98d2bda2ac92520a9dbff46ff4748f4b14417ccbc288b48fc527ffb9810c3cbcd50c1744975ed2e998c148 SHA512 910ee12c373b2003be314a495d162eeec2b6c5d54fa80f3cd31f5b5ef4a5c1c32181ff0744dccd522ca2e5e501a88cf4c56b231f8eb9b2f2732707eb82f98c39
 DIST crossbeam-deque-0.7.1.crate 19407 BLAKE2B e2fa467b88ef0d6c7f6656bd87ade1306665bb5b56b1e494ed3a7bc59050ebf847de4c57c5dcc5d63688b60edd3645300cf4b3a2020280dcf0e47f434a9f3221 SHA512 6ea3f138aecb4e84b4f9754fa6abc164b5b558987b15bd34562b70cf93ffd9015d017f62098e578236ad8bc1db652b9bfa624edffd5a99f10c3618c3927d3fe2
 DIST crossbeam-deque-0.7.2.crate 19557 BLAKE2B d0be481c85d0a9e22b6b85ad109aecfa227ee2c7748774805d3f487f39540c5620dbef6c89a35459afdbab2df9ba28a48a741fc4f9dd79fb9325dd4523a7bf37 SHA512 1ac3112c3904751ff3540e14740b04b23f8e64b5dc1097deeffd4e7c39af76626bc4b7d1f402cd44f7ab4ab33b275048f5c2d48f941a6bc555b0d98a53d64551
+DIST crossbeam-deque-0.7.3.crate 19888 BLAKE2B f83e6915624ed8d01e56ad28e0a40e84732d820fd07f0f0fa4aac9578aed0f4a980bdcd64d29811be2b5055f28135403faf091b902dd4c800d6d736452ab03d0 SHA512 7c6a42643b2eda7ffbe2d485de4d3723c6a37beaf77e81329e39c9300a80492ef46650fe5a6b18101d3f6b4ed031ddb06174624f5449998ec3a7808e979df131
 DIST crossbeam-epoch-0.7.2.crate 38134 BLAKE2B 1a71b24f507e95c9552a3d5906bdfa77add4723144e1f5275dad65a5de7cd82305eb2c4ad0d99b3f08a06ce050dbcfefff08790a4a65744f4d578c7106abc671 SHA512 672817b282692fa8dfd0e366853d72a2c14c43d54b8059a7b4761315bff20c342629ec1e64ca0e80e1e401cbd625b259d182546779291899334f1d9db56f1fc8
 DIST crossbeam-epoch-0.8.0.crate 38711 BLAKE2B 97fea09cab0da60998f640b7cd13cf4f3c07081f0ca569418c0565d8e87f2c6f1da036c3acb318dd12ec56ba2109f74600cd2ae6b4362afeed39b1076b02fca8 SHA512 e7eca59128d5ae6fefdbd34e912e10b08783436858636c0905d65f651a3af8cb6a2b6d872f4136e31d242d05019391d31ba1be424e8ed5c951f15dfd46162892
+DIST crossbeam-epoch-0.8.2.crate 39283 BLAKE2B eaad3cff833fb3672c93f6f0f4ca7073c709f9ea489c034da5fb2dab2da0676d493300c66bc746c8372369815aac3eec2ab9cb875dd9464cb59ae25c4ef4c6c9 SHA512 7406e92a768dee07c8d13b0fefd658e9eebfd3e89c782c4690740353c0de920013c345d6c112a78a2014396cc837ce4fdbf845dfcfacfd7a57172f483bb9b8e4
 DIST crossbeam-queue-0.1.2.crate 14104 BLAKE2B b084846e3adaefb33991770d53130b361f2dfa76ac9f4793618643afff09c4ebeae1545c33c59211d09427bf8d13d13d3ed0965211568884b0b2042e5542327d SHA512 f799ec04a78ee86051bc6a0b99dc95766c83d2ae8672015d1fa95e53aa0f93232f3816b7b2d38bfbcc577516f45af009a5aac04be21f521550347fe87ca0b444
 DIST crossbeam-queue-0.2.1.crate 14543 BLAKE2B 0decf8fc19f33912d129eb73ac981142e9788fa546ac75ef449b298ff55cb20871cc00ff075814ee3c20924ce890fdf455c607313b9fd07252b576777bfc1713 SHA512 9a6cf2cda3a76f3efe30290413bf3cd539406039d29f42e06326822fcd32aed3dbdfcfddccdc5871b824951653836a8943e0d771c261fcf7878a8526927b5ca7
 DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
 DIST crossbeam-utils-0.7.0.crate 34202 BLAKE2B 7a080ce1cbb33f28788738ab9c0a68ad9f535075633de1bcf9267f52759c679bd4d013bfab8e316294dabedbdf8c3b4b902b082a9993600db7bf6c98126fd1db SHA512 260d4f2e209172128da1470be16fee4ada3f6675649c681c0e311ef7da273cd6f04671cd06483e906948f4c0b505c403622456e9fe68d77e0c8b56ff4bb35c3c
+DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
 DIST csv-1.1.1.crate 890406 BLAKE2B 51759338676d882ea1ec0f953ad6b67b2c29f0a5fe77c0bd316f3f3c92f41b6c325f49e631c35498db8bd292fe118e1c44cf016fbf73f9f16a79e2528b0e8811 SHA512 de89d7243b24b0b85c4b6520f2ada446e32561d58e9bb116d76bbd0465a647825e8dd0125f3d693ade5b9f5f41ad2c65016d958c9c3112cbadec92c26947e9c6
 DIST csv-1.1.2.crate 890778 BLAKE2B ac04af5edff7054c557f50c5fca153286fe6f9045cf12733bebbd377a7dea22e8a916eebfd72e17e0b8a4ce1446488572bcceffd28259635796e587c73cdcde5 SHA512 51c3309b3e4ea6b9c20881fd871dd26fbabc579dd06d714e979357a6073622781434a9f89b9cafc04f8528c9a058c3464516329f7db54b8b0f1c469b50e4cbb4
+DIST csv-1.1.3.crate 890849 BLAKE2B 4d5fcc75f693a7e5f224866c626f3e65c6af66c8f0c13bf7d3d5fddb31a5078c47b195c3e1068ebdb81a5cdfbd716db649b5f2f3e3ffbb4471bbd0176c3c7b5e SHA512 2e5319b50cdb96f85c129743c0ecfc23638713113641608b817e47ac34c6f9767079b98405808a387a8a870d52c44e858aea98b91126e5d996d4d3efecbab713
+DIST csv-core-0.1.10.crate 25668 BLAKE2B 8e9a56c26e75f4c4c9e90a21cc30c60cc3fff17515ac93bc858e8ec45e130df2ecabafa7c513b2d2815269fbbd98c418269dfb1bf1425d2fd32fe46823cee6c8 SHA512 2a269d050fbe5d9e0f5dcda2de1e84bfeb69538dde86040ad1ec7307a214eed813a1482acb5029a51f18126d384d5238355e021964e47811db971a0821bcc328
 DIST csv-core-0.1.6.crate 25593 BLAKE2B 9784db836f17e350f2500e90d0d9d73d20274cb8b0c11613db0d1094eebeced4230c11df1c4c6fd15af59b444fb081c7b1103481b765a936ec582a9ca980e394 SHA512 91f46405b7b8e214d918ba1bd00e866bd05a7296b8220d2041817d53feec05b62d12fa19142ebab1cc7e05518f1353f6560b2811877c5e3d3dd94f7f4d50a9b8
 DIST docopt-1.1.0.crate 39021 BLAKE2B 54a0543879a68cafd91eb61f836426ed5c8b9e02e1fff6dbb9747c44bdf03a45237087e6f094687ccfac4b82aef07c4f8e35acaf994c4afec57f227bd891ccbe SHA512 f5dd97b4dbc9109811a83dba45bb09018f394adf3f5389cc62f7d42749c90dc337b7f5efdee569150a70194f5bda777a22107123ec7341a38c4f9923bb6f9f81
 DIST either-1.5.2.crate 12124 BLAKE2B 514fca1a11697b952d83b2058bfa21b9dac963921d35e055ddd5b132d8035a652b5c76d356a5c221f8eabb8e420ed727a84bf8077a9d4d4534faabee45f468be SHA512 88b4ad9854281d6748177b8e18a1cb1a9ac8948d2de8ebadbad94e72bf8b825361b142d890b6264106069af48328bb9844afd248f64b5469d2d2cb81d0ce5187
@@ -49,6 +61,7 @@ DIST getrandom-0.1.12.crate 23809 BLAKE2B 9669147c455bd03bd15f304eb7019b218cbc48
 DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
 DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
 DIST hermit-abi-0.1.6.crate 6907 BLAKE2B a2c11ec832ea0110421f6be2fa0a5591e5908a74c68c5079f034908c216d6776ef0f4363b809699e58dafd98deb9ff19ee8b06b704d3159448d1b4376fc2537e SHA512 a557402a7529387832ba4014ee1a626d849eb64f873f69eaf53506362340c8f24c7456a8a04653f4ead9043768d06042aeca2aa8d95898dee37d367674854741
+DIST hermit-abi-0.1.8.crate 7581 BLAKE2B 90fef564dd39973c5ff8ee3d4a9b129f1ca00800ca459c644ee08df1542c5adbc06881a7a59d37fe6e03a72a2df21917e38544759a2833dd8f8c065261cc1512 SHA512 25f7806834ea007174001284200201895f4536d5a447dea6c165b43c30b30871f78da5f3ef0d79579e3195951e6fd7ee5e21ec80811c515fd096f2e7b3bf7b9b
 DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
 DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
 DIST iovec-0.1.2.crate 8565 BLAKE2B c1ff225d7e8cb8b7efc2be01763740c4f0c1188a5f1f27c5fd3fc34104b2280bee59915d71812756bfd36832fb807374d531792936ed8a7228d52ab98d622a50 SHA512 3e523bcb8b9891be66398f44c97933d246b7a7fbfc4f315bfda6cdb22ca2786ccc82139ee1b646b4c24f6f50f57fba38f9b1fb7c75e859722e9e9c789b458223
@@ -56,16 +69,21 @@ DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2
 DIST itertools-0.8.0.crate 78917 BLAKE2B 4b519303380c421b5ec9af7b5c97575a39899ed77b0ff462d5c5db65a70f9c1f56959254aa7d20db3fc4f8af033340a96fbcebb189f4d92a2e09f887c736a898 SHA512 ce1dd1f52f6792a6f5303e15f74063d50c11b75312cb807eeddaae7811686347c390426956cbe87b827b970b14b6e4d57fb4ac0f288632766218ff8661feb610
 DIST itertools-0.8.2.crate 89203 BLAKE2B bcf8c00da5033f36cc205708324fd8eff083d46313ee84f567e4f333d8ac1ebe44474d89835a312a5357a48659e2f51d34d2194d548256118943999a3da8ebaf SHA512 325d87a80c0b217469762ae958c46925d284b37ddd987c3ab977c864f426dc6e4515701864f12fafbe49289b45b1910906f0e7d884ba8aea217cac521c3d1ff3
 DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
+DIST itoa-0.4.5.crate 11194 BLAKE2B d8f0e2aaf62152c187e0987ab4b0cf842ac13255262a9ccbf8484d730ea5397572791c023d2363d0562c18c8efd2418680583e99a1f5d14450b3f0184dce69ca SHA512 79ff8774524130a4729d5e708a4a4a837b3e5052384a12c22db4ae3e208dc4391ee185365f685137a8ba55ea7dc3499f8cddddb2fd98b84177ab292c264034d3
 DIST js-sys-0.3.27.crate 59423 BLAKE2B 19256c0ce8b33a134048d2ef68a2f87a183201ce44f95ddef57405cd5f0fb1e9c82af2b8e97d10f5284017dd8a3eb935e9f04e5bf9cb2e09dc62d4d93fcb24e6 SHA512 1bff1b24ab99243e5d789ad9f729b3157241b159b5520529a3a8bd152c60c4df416afe9ac0c054933406f69cf48f49da4c51d7c90e05e915c1e19af47735835c
 DIST js-sys-0.3.28.crate 60457 BLAKE2B 9dc982e95c8342597b94afd7ed2f0b41468634c43301f66b5c19be045dc8bce4b7cb4ee0cf46784ab76de8d3501ed40c58426fff8a7f2930600e8a8ddaa828ad SHA512 15036d58b01e4f616079d9155c2e8da387900a9f11dcda767415e85a65955f1106ff20b586f47e607acd2b915067f93fac320140aad789ca90c0792296914199
 DIST js-sys-0.3.35.crate 62149 BLAKE2B e0cdc501cbeef53d12b7ed25a976e4c0f7fa5d20b8741203994242c7e19a7db3ccce97e02c22dc537192dcf8926e16749e93703a8308d38193346ac50a004176 SHA512 d1181b01070d809a4f48be307e0ab8b30f383ade1f2ad19b7a95dda083008af98b01022f5c857d518ee1cbe28b70c67aaf32aa56e76c9f66d0186d49b7de581a
+DIST js-sys-0.3.36.crate 66941 BLAKE2B 37681d56a799833d4a897086594c9a2b394ef1c9d0f0a2a95f944a9b7855445a37deb86c6348d7e054a3a15325de21370629e927656cc58efbb333ea022d5ddf SHA512 811960047bbeac89ab654de2a7da237f2feffe287fc5c0a40484af1c52f73666d05d67a497827f2a55d5e244c2a3fd6ad8be0754330dd046e02ce51993697388
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.62.crate 433193 BLAKE2B cb6c3f6def6c33f0723ec3dcea2ec4b96f2a7a2e0bbe5ba0ed6a6cb69a43e64016bd05569c6d8e4701592a9d69f7b8a92213a25b5889f833f03bf2f7de9cf184 SHA512 93c178429a099606d4d61576d74204e87c042c4591b8472eb56eb3ddee883b135e28be09ff48e2718c4cdadbfc641e3a313665fe493d64b1820a7e6018f79d1e
 DIST libc-0.2.66.crate 457815 BLAKE2B 5da379ea738b75189e106d4be821c999394043303b8bb6a9caecdb1b53e449f11a58edc4589193611b76e7baf00e155ba1077bcca4d0cfae30826e946a0075f0 SHA512 5bf5645a7cbe626108cd71e1d189286ed161fcd3ea12cd34f4e392be4cf93bf78feb6128b1101bedc41a71091398f26771f3efd3880f779ee0be00f706914975
+DIST libc-0.2.67.crate 458605 BLAKE2B a4c57d6f9917b10e6e7747f40d769f16b9ed599f4643b7e55f7f61ee9a8a447f6a0d50932bbf8d87e29af328da4ad467f88b81eca281d30719ad3133edc94478 SHA512 da1c5a8d996f7f82ff45fdf0872cc2fe731a64f8ed4996291b7a7acc866b61433515240ae0069dd4d6c19db33a94541238195d82dd9fd711c4010a0cb0c0b41e
 DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
+DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
 DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
+DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
 DIST memoffset-0.5.1.crate 5958 BLAKE2B 2ac071da35c45d498889d38805223b46a0ec81b3fcd95da85ffc0f4512ca45f1eaa9fcffa8931e92fd11d16806a887d62d8bf15d2f3f759cf9c27695595d0881 SHA512 8bd14c74a65464061acc5594eb108e630e8dd7a9dedccfab0606c255bd43e7b30241ba0bea11bfa80f9afd8fdbf0879ad7d998628f938a558716ec10da31008e
 DIST memoffset-0.5.3.crate 6107 BLAKE2B edafda6ce36dc8bad6bb1f2d824d6c6726b24effaaf8b6e1e612bb95c506d9f0aede29fbc7c5cd71b27b624ec4f4295b0f09842e6b66257093df8db076b7b974 SHA512 a647140f4218bae56c48119a21c96edefb214a10329bdb91f16382e2b85854dffae33c6c3d55bbad3dd7c82424f0a10e5d97a9010ccfe84b7339bc5f16c4786c
 DIST mio-0.6.19.crate 128192 BLAKE2B 26c821eef0aa49c80e4919d80a795971655b9726c24ce0a5b0716d89c0e254bfdf3a7d4e591ab70474dd9bdb92a48be9d74ff4d7beb3ae158accedcf780525cc SHA512 a6eeb93a34a4a4d486a821763cf660d6c5d3dcb08a7f1cd32a04d918d5196cd50cc29b30c5a97eeca68ab1cda50bf36a50c2c787e08ae3d2a2b9134350acd097
@@ -75,21 +93,28 @@ DIST net2-0.2.33.crate 20936 BLAKE2B ddbc96e7cc4877b8a66d019e7e65a260379cce19c87
 DIST nodrop-0.1.13.crate 7508 BLAKE2B 6918c8ea7f2b84d1a30e8159ac6cf9d061270bf8cf60fb2ee7c96f9d8a5566f1922a3222f80c769fceedd65637d6ee76a4d45b533d5b02aa0decb8114f6cb11a SHA512 2648c0aec970c99f001dbd8169939731610ccff6433acba8c71c669bea5078613b2a785d3ac5ce5a839fcec714b5bc55f2cc83522ab4cc09560c846f4cf8023e
 DIST nom-4.2.3.crate 115343 BLAKE2B 03c0d1cf97a0d34adab29d6e21add3da7d8eb78ee6b7987ed11b136db7fc6afeca6a8eb91e00aadc1f6047eb7bff55bc288faa8c481e6a4677e0c43512a68f72 SHA512 663567dcc6310ecd6446bab1eb700f4ebe834a3b25bc2a0054edf14bcf205a95128de5f5dfaab04adb95e1a2241d487d59c0e23c957934a0d656e4c51932bd54
 DIST num-traits-0.2.10.crate 41810 BLAKE2B b1968facdefb08c2ceae9ca6c3818f03e781e8524488fea26f1a992d3c40af38376d3e732d2dd75c6f666a38d15dce20d9590c432558d65e8fc585e33ea12d3e SHA512 5f945c8310a9b3e78d59a070639dcc1831a80ba682860bade38e738beb36b0496d268d50cde6623d3d20b8f5e68f6ada53d0f21554dab1c18fc225d397ef3761
+DIST num-traits-0.2.11.crate 42000 BLAKE2B 78584a3e8011391b47c7ce45c5a63da5fee88aebc2ee7ae8d788e22b1d6cf46e31e70b7bf6ae094d35ed8dd5ea4f91472e6050c526acff3f181ee383fee139a1 SHA512 12d73656db34456a30de7538daa1efb6e6f61353a0e274aca388bf184732402d8eb8ca19282fbf51975e0541b5c8d764a0148abe346061dc81922d5eb12592e9
 DIST num-traits-0.2.8.crate 39965 BLAKE2B 58b2c432e8523efd95724e01ed80d61b2c4a798fc451e1c7257a392f78617d0ecbab9b1c1d799dde8593cc69f1dbf30d2e966330766992ebd43d8626926f12ee SHA512 a3019e45744245837b2f146ab4213746c93a1ad701958dd418272af89451b843f9b643eac673c1397f6079da7709c7e9ff46e0e829a4cf6092772c9d77bbc534
 DIST num_cpus-1.10.1.crate 11151 BLAKE2B c1328d409d552c2323999a76ed5bed3382752c50091f68feae9b4cc56d28919a51672794122ba23d51a26e6241fe94d36a0a6c843e460ef9c36b734fe474fcc5 SHA512 f1f7408dc1cfe7c718928d8e3e219e3001ce4207467a0a129546f2729ba43a7bf334cd5d328a7f8f8b1c276382c8a0f9d7abf60a3ae2c32f4adafa96c6ea62cd
 DIST num_cpus-1.11.1.crate 11798 BLAKE2B e395b63d0c7050e06d4e70dd9581c0c005a673a1534b49fd4a257c3a210d3f48a32fb467aa4f05c69e1324ba0c1e117f3d0802df2cb54080d27ebf9d31d2117f SHA512 c3a943f5ff82eccee6f2e8af73e12fc83a82590030381cfdfa52c79b2f53012012b246fe8fa682606b7ddc011892d72d5579bc17ed072498170b51060c7e7f5b
+DIST num_cpus-1.12.0.crate 11867 BLAKE2B 49ba476ebd14f2894dcd3e017921a865ceafe62ebf990a27874d264588f5e45fc8d6c3a3e82717e661434daca8b134faafeaf55f44e6ac447b81f162a9cbc695 SHA512 502cb7c7abdaaa42e849847313e6e12b34d9d619b58dccf7f3e80458b5b7778657f352828481daa21d482c247cfbf6d167f9ada8bbf0c3186b82d30a93a6e381
+DIST oorandom-11.1.0.crate 9762 BLAKE2B 0589af12d0ad99009655272035738a6a5f57abb47eda2f2dc3be443474cb67cf4808207f95aee0be5417714f1c72c13fca82fdde778565574d670271ee9528d1 SHA512 faf840b52a315125d5f6c80f6101fcbff6ac29217d362915ebbae4f7337c18ecd46b89da96bf67147e84d0f805edb626be0da448af12b0bf537fb0f0a3a25c0c
 DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
+DIST plotters-0.2.12.crate 3194754 BLAKE2B 21035d561321bc66b47cd3a1d3374f4e11d49cae62cc363a3bac98938328aebd527592270ac4014f558751bcdcf7e4994da5647baf98437200a93849bc9e549f SHA512 f9d8be381ffbb853b9a3bfdb0cf5b29c23fbab9b376ab2cc9a734fb7d573a1ef1ae3a32c5b4f080f534e52505fba1d6051475d62811da01205323420f2045dff
 DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
 DIST proc-macro2-1.0.3.crate 34868 BLAKE2B f97fa38afb8abca38d814673e0cc7d17e3bf623984afa7fc2601636508d8b32160fff4079d2e266e2d2e4519d0d8942e88cbabcde54a869dde0a7f0961d2afaa SHA512 ff4e32e42d206191741880e362e39e33149fec4f94cb38e2693e956e4c0dd680dba4712f436fddbc092a7ebef23b7cd4693345fb93d5b9713a516960c2bfd82e
 DIST proc-macro2-1.0.4.crate 35217 BLAKE2B 5d807f6dcc4ba372d76ca3227b2ed6c6710ebf78c3c4e6ad8bf6020717a262861d9b4017c27e338addba240ff568fbf4510b0c6cbc06bf66a4f38db746e63f91 SHA512 e81800f46b8f0805d10a614848603dbee19ad24339c67986496597fcfd501c528ec4eec081e166b38283b3e7d64a0c2bd972280407ad30e388610b2b81594f80
 DIST proc-macro2-1.0.7.crate 35588 BLAKE2B 8d9b4c1f73c0959a77ac4b5839cf8b1a12259ef83c17fafd773a81518cf3750b43bb05df83719f2966afd5a71982b4a681d76692b93941127a52459990d3a281 SHA512 282514c6d052896130c83f632962a54f6310bea35b5418b41bdb540e51fad73d91bdb1c5e9f83dbd265c1f3d0fc67cd119db5483b5697e34b1598735ea9246b3
+DIST proc-macro2-1.0.9.crate 35576 BLAKE2B 16c687cfd21bc3b97113f32293c1e06ca5811df6c8f279e1c5661a501c230b430f1e8bc983a2ba30d097acd01df8701a5a90ed02a93feff83a1f6f33ffa1e8d6 SHA512 005d1d31ec62a25fcf3cb0e62063d5fb53a3b15fce8fa597ab09cac5ac404a7eb441ae44c2d3acc295e24e814a413d0664a3d142155495674c4713f489ec79dc
 DIST quiche-0.1.0.crate 4017747 BLAKE2B 2a78c68d418f70262bfd2916a44ccb2bebf76c4ace8b97b8898d3e04232dd3f48924b510c84080e4cd85642783c058e3514dad9f2ba0cc827cd24ecd2d47bc11 SHA512 9890d30017ce4363f1f7d0bb095c4050f9a5b57991ad740b6b484ba8086b2920b0e7a65760b9fcaabe37843f3cdd06e15ba7c0747dcec558823b4a6edfbfcf68
 DIST quiche-0.1.0_alpha4_p20190912.tar.gz 168349 BLAKE2B 7da7ca968c43ca065492a541e126909d3e884989d0f51775d7e78b1af1b2b7feeb7c913aa3adc99a6ad31bd3c043b79718a51b32fa9a38934b2bd5a2cb950c4d SHA512 7d2ca442efd83d6fc67fca3b3fd974400f76a1fd5b44b241079d386d9c94c8a0ef14f3f5ec17695dac04c42a8d441807bfbc2aa5fe155c7d80e1df01f1197dc8
 DIST quiche-0.2.0.crate 3588074 BLAKE2B e229a2e9b5030d348c847c5dee1add8376e9fecd15bc44551fdafdebfa52d815bfcc6f8289c5da31fb0fbe9fe3005be79734f3a8bf0017a72c296fea2bc3f43c SHA512 fc8220f50f4bb9bb44e7881737084cf07168a0e71a98574d6be9d030cee3f11d7814b882d7832a74b22a3db9abca28bf8a9f1469550917ed39a6e90366295ae4
+DIST quiche-0.3.0.crate 3521895 BLAKE2B 6c98bb0752b0aaa1284930ffcd30bc9378e58f75c2a43b566f75ddfcf17c5a42f749f3e02c3f879491e83d36100e9f73a7c27348f4d1e61897a71958b3afb081 SHA512 a10c54a54f4de4990c29121c6d14400a0385e884be79648a116a9a80d4abf8bf16145e5804a52bb5c556b437f0ac3b4a715af41c5fc1469139c52d46968f4681
 DIST quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b
 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.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
+DIST quote-1.0.3.crate 22939 BLAKE2B c50e47b647fe1ac1930544d20b2b78ad98e6398a32c98460701d93f93fa1437c6d12c632386ab9eb733cbe64cad57e02dd201686885d0a951cb013fc10a95a9c SHA512 b4867554b86d119251db67f9d0949bf8c3cd7c64f006c76531398ebb7478cb93805b9bcafe159d921ba1a32e92773853b56685cff0e1ebdc6aadaefd3b932ef3
 DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
 DIST rand_os-0.2.2.crate 7975 BLAKE2B 281cc20f771956b5572f2eeeaee25e474be50abc58032f2381dc2512f02efdedf1cce6f9432d66f4d477cebfa78a1fda68ef054caf5861214533c8a8f1bac289 SHA512 7b7b9af819af1e53d941155c3042ecdbb33dfb58de8d0db05ac82eb12faf8986305d1c8b50c595612484c8ce754de20ffab60093ab92d32a8e4d09a622664b1e
 DIST rand_xoshiro-0.3.1.crate 15444 BLAKE2B 8e7ca59d27bf68ef8be1ff0d3b86cc9751c7506f4d2ab124de7832ae718d3f3f56c317a2106117d84071fd5c4603060d71e60e384d1f9a6551351c90c922af49 SHA512 3616554a4e2f781a62039420e24291511313be9965dc17a9b889dc6c92ae74a4ca9b4d7a24872781cb615dc321b4a31faac7359110ba279d28d718141c777175
@@ -98,15 +123,22 @@ DIST rayon-1.3.0.crate 143294 BLAKE2B c52c0ca7f3424eb6c251f91a4a8f556ff40120889b
 DIST rayon-core-1.6.0.crate 62221 BLAKE2B a7cca9fa19d0af21752458b58e22268dae9d8078d338714e30eec59e6b53dfbb717af9a919795828a165b42c8545414aa969875d216021632b7435304b8d72ad SHA512 78f231633fb2382fd38a89b967f5a2f38e611293a19db342039e63fd0c7cffd33a78d18b8f0788089b157373ebf20eae0c88365be9668f48abc3a390130be36c
 DIST rayon-core-1.7.0.crate 58306 BLAKE2B ffcff7e465267a5c360fd92089787281fd1dc07af05cc49b62dd2030267fccb31ea7590509d2af8b7e7a87df9f23167358e91044bb61062bdfaef790d2a4684d SHA512 7bacda8330518c137b433ac1f7f65f64aaf7939d7fdae1c8263bdaefbdf6734003054a1fc7acf73d4e323f27e9f152f273ffb7388abbf6cca0fa2357f1362e2e
 DIST regex-1.3.1.crate 234662 BLAKE2B 41643af1321748db717b37bd4985916afae3a84e19f628ce5d5c194de42620e6b02221083c7e4b35bea5a6749c265575b2c0318dd58ea26b8bcf8d01768e1a27 SHA512 6530767ca2896db30599e5b3e2bf46a785d9c95bda3e530e82c659e5a98345effe5424738fec7545fa5edad12729a396938a9c1dd3a680c0405dab6000fc19f7
+DIST regex-1.3.5.crate 235308 BLAKE2B 66548c392ff921815d3be3cc196c6b1ca1ddb3f1dc178935f8159335ea9b85ab7264bfca468a3c63c242c522095fc6faeb7da19b0968a40b30ad55b6536f8201 SHA512 c37c28141a9ed35250f830d1d4b84dc527cb880d6093f1e95b348aab7ecd2d2e949fe7cc23bafde217a4f704eb828bef1651854ef4ab9593e7b4ac006d2a5ef7
 DIST regex-automata-0.1.8.crate 92234 BLAKE2B eb26c91f5c2ed5b08ff68d316a55a6a23e8b8392d74fd9de5850df38c39304aa3ccb1dca1271ea906602798b132ec49be0623c20f4f2cdb41ce699967dd8815a SHA512 41ad4ad05b0147e663f63e4bdab8281d3dc15f76663bb9eb3d9f6a230350b71e7f3f42bd18e6628a7cd971655a6b13aea2308d7f124bccca24d01ea9ed15d61a
+DIST regex-automata-0.1.9.crate 114560 BLAKE2B 2bbaeaaa896479c817b7bac2f51108f8f74fda72178068c3b5e599b466899692fba8ff3ce8cd30f1f978a944a0df98f466f3d4bd340bf595d6f7048ba6f648a8 SHA512 53323733dc2f8c47ec33b5b3aefacac3a0042cff80c59c3a05ee02b581671dd9a6ebf6b0b5eeddf9cd249662731cabf5a684553daeff440bf8d1d4d296afbeb0
 DIST regex-syntax-0.6.12.crate 289531 BLAKE2B c1736b335844d8695e2795a869b538300a9bcfc92ca41e4e9840fc90c133553da4f2929b0f39fdbc7488551a8477b2adb20b83e728a3d847171579e20c925acf SHA512 671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec
+DIST regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f
+DIST ring-0.16.11.crate 5334322 BLAKE2B 36b0b0905515c73071c074f78db00533481bf2753b357b4a7143bab2341a85d62e22a2fadc9f48e28cac13e3c2a1b09054782e178020cbe75878ef640c327a51 SHA512 12f9738f64b42fddc0815233a115a72a3b4347dec1cc6b995b7c93a8d8fe583902b45ed2a11e047abcedb2271b465b981cd2cf5296f489fbcbe72e31821d5bfa
 DIST ring-0.16.9.crate 5319964 BLAKE2B b1f3807beecc2aefce36ae605c94cf056483ea47f5250b6125dca4445be450be32b3c4afcd4575108fecc2ed61b900ee311d25b50d2499cc24b6eb62ce29020b SHA512 461458276e868764f886016f2ddd3270c97028114003f3509bca59387c23e21b258ebec9f1720e14be4db0e8b722ac0d411e2920929de7d1d08935378c035fd3
 DIST rustc-demangle-0.1.16.crate 19137 BLAKE2B 04226ff97786b81c90130b48cf6542ea448661af9ea7afed179e71d04abf52cfd3c53fab26d4d35bdf2c1d5a735882da7703527aa48ba7b77f337599c2324150 SHA512 36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063
 DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
 DIST ryu-1.0.0.crate 40170 BLAKE2B 5938a70fe991ac71974a38172acff9e559ec457aa12775ac53305742696a7ccf8f4619734b1d7b0e2db01b548ef2945aaebca605c186dd0b599f47dfb3fbf536 SHA512 b5dd360611fdf76ff13d377c1c79ce09a4fab90a8b7fc917a4424b8246c8a0da7d3ec515b8c69b695d936b1207072d173b9f40fd5cb218f1eab947862112caf0
 DIST ryu-1.0.2.crate 42001 BLAKE2B c25f0454bfac40de3150b8c263c6d2842e64f86f441a69ab5e5722a2383a9a07c7539837f6e50996619eb0c4a5da212556a4dd21a761a250785fe0a9c4e18a3c SHA512 c681e037f1eea488bad7fb5ecc79af52377bd4b9eeed95eb213201219d7f100702000f81947aff8f18641235fb62c138a30eb20c1f93ae518a4d9960a598bb64
+DIST ryu-1.0.3.crate 41983 BLAKE2B 32f2b9e8b7aacee3fb86acf405efc86b44c564b4da4310567a0e1b22d09fa51e5ed8278f6b2c38c220ba235de39c596b15db8958aa413ff822c0876ebed56515 SHA512 53ee61ef116594829849b417feb02d415305783b08d3e45656a467aaf272899e4ed46ac0415cefdf3102f61faa666f21f3237244b2711ad10b528a3773aa8414
 DIST same-file-1.0.5.crate 9861 BLAKE2B 3f65c5cfa1ba526157f838ce10695c56dc9241b044890629a3bd7f589f3049b04944d70ce10f371f6844343222954fbed5674c04eb6a7b934a3a6761fc897825 SHA512 33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc
+DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST scopeguard-1.0.0.crate 11304 BLAKE2B 5871f050bbed81b50b05407926d66ef8ecedf21bf9617ee85a425b1f2694c14ec35014fda39dfbedae061d15dc2d7efb39b10f10b5697e854154358eef1e389e SHA512 4f2ca06ee2d9c46e42ab4c72596bc7c99fb7ed8db8e09bdceec010de51aae21497151c01fa72ec55f3bdf81ce964ba682ec64ee96586c5c315a5daa8bcee0b37
+DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 DIST serde-1.0.100.crate 73104 BLAKE2B d3557c4f170b31ca64ebd07bba8ee24eaf8e1ffbf192c97d5681dd2b18940c559c31b6fa9ab2e4d24d7b1ce9ec21c0953d37a1a5ee845b0d75d6bd1e870309a7 SHA512 bce506b4d30c9743f69a8c599eeb5bfde8e4951f1700901ce03eb9cd198e3725bcd625121f494f8d12e98200520899917794b5943b355acf8993f00d1ede4282
@@ -117,15 +149,18 @@ DIST serde_derive-1.0.101.crate 49736 BLAKE2B 247c6284e362d9a31eee6c92b257fd7073
 DIST serde_derive-1.0.104.crate 49658 BLAKE2B d4a9ecb4a8df87776a83d645778dc050803b16fd5c9889f28e231238223d424dd25b101412e89741fb47be624d1773acf97f6e38809c81110b696701975168df SHA512 303c3d126ca56b0a7126a87e9e1be8bd60bdb212ed21b5e1aee015313fd769f1d260869c41b0335bd467fd4e3fc6bb26f428c7c4b35e9a55c009797cfa745d1e
 DIST serde_json-1.0.40.crate 69695 BLAKE2B ad156577b557ffffac9a7f75e6e0f6f6b86c82e33db1e674fd00dffd6f9c33a13f838f062a4bb39ab9dfac63199717f96bbbd53e107ce8231aa88665fd7a2eda SHA512 d09bc95c963f510686106d9885f3420b9eabba8bf32626597dafd43ffbe91ea72ee4a3fedfca922794a727214d73929970acced8eccaa23616cde33dfde9f842
 DIST serde_json-1.0.44.crate 70325 BLAKE2B c8f5836e3448bbf5fd666b30e747b90f84eb7dbaaf078026456082b5403bbcc1931c70528abbf0e605872271861c1e7dabfe1f42d5a13c2b02f5abb28b342e61 SHA512 ce1c68bfd2ceaa8b7f45cd34cfbc71dcfe3905b06fa47032403c54aa9eed0e618cd526938eb78dbc201e9480dbd64b4bfb405f2119478229f5cea12056dcf5e4
+DIST serde_json-1.0.48.crate 72113 BLAKE2B bc522d0924044b41548b5c0ca63ed3e1fe70b7632b9e04ca6b01a63245deeae0e7154b0d913b3edfeaecfc816c1edfebfb666734c2a5371b416aaab9c1880f3c SHA512 544dd844330a26fbdaeb5246825f143cf06110065089c8be3dc44f8437f797ac083d7dcc5181656ed3d78428fcddc44e6802544ae304466eebdcd625a5a5fef9
 DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661
 DIST smallvec-0.6.10.crate 22064 BLAKE2B 41a7ccd12c9b7e1dfaf43a9cee22c60d160b35a08024554cf8d68b59498a6e3fcd0e8146815bb61a6e1727b209ec85813127ab8520f8ef47716913a6ce6cd952 SHA512 802b96283ac27ffa71ba17e8676c23f721cc1bd3b61df6f78a1c8ca9150d07e6d5db55651ba070f9202460019f59636871c1160e31038c6bf7ee21cdba8c5be4
 DIST smallvec-1.1.0.crate 23593 BLAKE2B f49a79a1c9c312559cb48acaa1ec2d414348c55f05ffc3c2e26da5e5c4ca260101a7f4857cc2d554b7d79391f2ce296df3f889bb1aa9aeb9b97c9be41845f8ab SHA512 78e1ce9b80f59254eec3d9b9788bcb7c4c63992dee0ba0da577c2862884e0c6b6fe7517f79cf3128527d7ec5d2d339de6fb79ce1fcdd4341dd2457d7dec7ea94
+DIST smallvec-1.2.0.crate 23658 BLAKE2B 7e662c79fb35e6965b409a63128da6ae6d8183992ab12f09ca7b97f15b2c7c29b1844c35cf4ff72d02d934481bebe5b2353a9c70d17d9f44a11bdcd496f2c201 SHA512 ad89826c1e999c63feb6d481e7ca3110831a08491ff8fc66825e92ad003a06b40033b365ba628c4707df06a3ac2c0d3b71e327c1caa4dc86f48150515031e52f
 DIST sourcefile-0.1.4.crate 3632 BLAKE2B 95a19fa0cd7f9f1a2085ca0f3eca4c083afc8923e29f3aa6b053209594df2ee9259d8d228d216acb6062f08ce1eb195dacf3ecc6c2b109893a61c1edd31be38e SHA512 f60c1c7e1c9acb5fad6d3c8343b4e3fde3569bb0c8da522968fc92b704f3eb1d5164fc17c482ea4fc4b78f33260ed3f51975ebf1f487e719d266cbd26c55f057
 DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
 DIST strsim-0.9.2.crate 9707 BLAKE2B e6f99a4292bdc2c83027b7686eb46b0524b8404949269f7fcd5d1af4c86d28422f3192d09512e8f20447b6361cc936b5cdd62a45d0ec513161677c87e37c23bf SHA512 2054444ea844a25f573219a4993986b69ff8c5dc0dfd2dd06fff638d596c8c5b5a1bedafc2bef3a1b9c146dd47a0769bbe039c54fd8e2a5d9894f29ab9f32838
 DIST strsim-0.9.3.crate 10266 BLAKE2B d850a2d5199cdc2deae94c02a1934933e22b943750871c624256f3722e78878cf15750abdef6cb27a5acbbe95ed0acfc33f960305d08f942f2a4b066e93e2684 SHA512 8d7468be0f19819a454720d2fc9a139cb9afde9984f73d334b9b77085b58008d6d8ed0786f88ef91b4967c503fa1fac0ddf2fdba01391629f7bcf1ef2fe36b51
 DIST syn-0.15.44.crate 184212 BLAKE2B b735040d69d10b30c94de2e8f776d25ff5ec427e79a7371345a9bb694d50c4f3ab848ed30166c683aa88f5f73f7361dda2a74880d21882975485fabe5bf65d33 SHA512 c6c9b5887425e1e5fab905e477fcea41bba191693c471cf26922a9dfdd59ed957155a399406cc3723933a869565e7295183dabedfc34e3e2a20874ba94c7ead7
 DIST syn-1.0.13.crate 195242 BLAKE2B c6889e24927ac5ebc1248be2d1dd1512b888e67ecad686dc67d29ff517aac2035cd4a8bf6dc87db54532eed72608f3a06ace41989bc7f47789c20041841a99e8 SHA512 234b470f432c1981f13e63e37334e200cd872d288f0ca10fb849281a5fe13c077eb9d41e75933a296f8c3d4e71ca8cce8724ef8c3d98bd9972146fab3d010663
+DIST syn-1.0.16.crate 198097 BLAKE2B cd09744c44726d755d4c3518dbda6bbd36f9bf0525fb2e4a04bae745b7dbef3a9d5eebca57c210af0da1a99cceb0ffc5540b3a1c148f87ffbcb5fdbfa57f586c SHA512 5960ce6d6d32eab252b480ba7a8603d45212e0823b5c96f4147f79173674391ddca82a17d95a8ba39e58d8849ee9c50168301e4e48f97517696e3d826e58915e
 DIST syn-1.0.5.crate 190286 BLAKE2B 7d5c813bb4cebbc104978181532a050b0a7f79963a539d69a253ebdb15a83c275a5d5b04dfbb66a426afec2c90a450ed7be595619a2b5a31b0725d904f5adb92 SHA512 4cc18966040b1f86916876aa5ad8029a126f7ab8db55408b3f4bc343dd82dc357899dd4a7afc514c65fd269245f8850f8f2834b08bc2ee6cf6774282f75feadc
 DIST synstructure-0.10.2.crate 17988 BLAKE2B 62bdc896819ba1f0820286dda3596e265dc7ebeda83595d89ad6baf584046242f774141b25ee4cd9b120bd7c392973a99d307abbe956b50eddbd05e9b7b7ce72 SHA512 48da0daf778cd18547e51a080f1e86149534527f20026601b21423c9f89cf6adb7a121b01dd9bb0b680403eb728a92e75242e5ae31a725ea5b1f19c5f47f0458
 DIST termcolor-1.0.5.crate 14526 BLAKE2B c799a73787fdc764ce634731c5cb7232a4696a88797aedad8d2bce72d9d193b099ed80240a03259dccffc5ac2df8b4acc8b60f916dce6ddf63913e2cf0eaec84 SHA512 d729ef6da68be8e2ce19ef02336193d8baea97a28cc8789806587da829471222a0c7669b4485ef81b1d52e85096d787dcfd4f064c894904602b595aa024fcdca
@@ -135,6 +170,7 @@ DIST tinytemplate-1.0.2.crate 24614 BLAKE2B 503faf7917be09f1b061f23375cfc4f0d819
 DIST tinytemplate-1.0.3.crate 24781 BLAKE2B a965579d9551968f5134e2892595abb01950346fe083a32234fe7184d86b1003ed1a71800a1ddfb2eedd2f3a56baafd05eac5a34a4adcdb1477f5cf510027fe2 SHA512 bb3941d197e3d3f98709d2dfee977a35040eb50217fb017487aebec6d75e53d08cc281ead712bffa2ac606a8bdcb9e5e064993c2bf6e0fe66b1bd3d401ab5817
 DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
 DIST unicode-normalization-0.1.11.crate 91048 BLAKE2B 2dd12260a77d9ec10af73bc46178cd49144a8c5206fbd7240c6bd933eb9cb854efedb947b63af165cec51e1677671ddcf2924bb55c4b759dfd2d0939db09f290 SHA512 bee8fd546d4d1ad1179b31790fb5a087daece8a0435d8ba85def9c1d1827a8ce1ca643924863f01515e8fa6f78a47041e1bcda644a33427c65a50c4eb47d5d81
+DIST unicode-normalization-0.1.12.crate 91057 BLAKE2B d5b8354990e1911e093d63d9b3b3adeacb38142ac68637fbfe59c0822f34c743e348cae9f535421c12cc6a56db2112dd5ec75f96c173b1f34a68db66c8ad8dd7 SHA512 0e095a59ff965499a5d2c79bfd4826b793103bebb4d2666c09e675110a50f79d985eb29565e4c40bd8fddc30237f874324d8a24786ead697ee0698ef8f79a1b6
 DIST unicode-normalization-0.1.8.crate 71158 BLAKE2B c548a2bc537abc6d86bffb0828a366ff82b143dcb0ee01e2c21b3b7134fd5f818f3775db391d358f4ebcb906ff256e3d2228ab042066a3de9a6747be05b8effa SHA512 4e3245689d6162a21cedb42e07b179e3aad03728a37b005c2e6bff644a6efd06b6bd26a20a255861a01441a9d15c4318575db3016248b96a03436212aa414547
 DIST unicode-segmentation-1.3.0.crate 90567 BLAKE2B 2bfce62b981b6b8d41be760f0663c3301f974fa9c975e7859c6cac6778cecafa2ee5dbe2e4368959b4fc2f0dee3d93cdab236dde593665b76740d07009051cb2 SHA512 6f32a36c8c69e80b3aacfcf68cde088a34b88587e20de6e49a14b24941caa51a0031623941ef05e6d36e5c99f50472c9bb26d670b5396749bae8373ae4bc7d4c
 DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
@@ -146,35 +182,44 @@ DIST untrusted-0.7.0.crate 7937 BLAKE2B b8b39b052e12135e93b4dd3f5566fff144f05583
 DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04
 DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
 DIST walkdir-2.2.9.crate 22423 BLAKE2B 7c5f1aa4a2078d4821a1fffc57751950295c99706b48198c70556461aa42b2535d93fd95804a6c5003ea906848accee510fe5bc6148c4155e6de074ba324da2a SHA512 43b8f629a43195c8cd8ad6821b431dd3648a19e6abb83f78deaa3300e7dafa32b31b3c89a228499585e3da4520ca26d82dabf938c1204c8011e5516b3b82da7b
+DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
 DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
 DIST wasm-bindgen-0.2.50.crate 144511 BLAKE2B 7778d05717281b6c295260f6ec47898e0c565bb107d0c1f6f64f5de9e9208eecfa49cfd6c83eb3cd6eb6c698f5af74fe59ba3a86ec4f6d02439a55dcacfb4022 SHA512 d2c4ddc0d88864539b0f25511770edba61f54cd13a1f1a08c298dbb9433356a2617b24e3f0a1bd2e37eb418976c97ff11780df9ff809f566524462d965c35b53
 DIST wasm-bindgen-0.2.51.crate 147669 BLAKE2B c1221297c38e061da254cd2225d7788dee79c99c9303af3c25f867dd23693c6428ce1bc0c2a16f3843bebbd3f08df1ea43653a49cf069d9db8a50523eb19bbcb SHA512 d2f336335f61192da98750607b660a03d2e76c1808996a5a549b14205e76624f04f167bedb7fb0ccf371e49f1047688e5cb2289a92001d3b55caad3a8b6855d9
 DIST wasm-bindgen-0.2.58.crate 150537 BLAKE2B e958babff0b29d1c0b931abbbba924b2a2720704120e828c053fd0e06267c8d7a09dc45bd712978c6224ba479f3f61b83a74d2c3d5160913b9ec02becdddcc57 SHA512 c0fe39ec0f496babedf9e2754f3a71bf8da38cac469933ae708b4925ea660bf064c352ae67a0cb15a05328edc59ebe5cbeeb0f3035a6d7a674ebc0d271560667
+DIST wasm-bindgen-0.2.59.crate 152264 BLAKE2B aa52bdfc70c1098aac8506f8a071942a86da99e8ad489f9d0dabc297cf473bc4de215261c96c72d3f2f2a63bd0eb14c34b672a50265a8f54be44a01edf4a3d02 SHA512 f1fa396e6b1c67750f13f63618207b1b24e04d9b186f52a0fde2df4735a799507f23c577528c83fce37a294651d307882b7f4cbced0dfdfd98475968a95926c6
 DIST wasm-bindgen-backend-0.2.50.crate 21115 BLAKE2B 79f9322281636c6bec83c8c6aea5f4ceef360cc0b42ed28de667eb0b18f9b0772dd8f455df84933f43b5be0312cc03c02ebe8f11dc652a7aac3fccaa1d2e4cc7 SHA512 6e53da0259b5c3e167129ae67f8a45497973028af2f48d67964605f8924754a1c6ec6045fe0e3d30ab05902ea2962845a1944d3ed13ee4fc0fcdb6892dd35885
 DIST wasm-bindgen-backend-0.2.51.crate 21373 BLAKE2B 8641aea89deb10550b94a5e83e7b1d6309d3179c05b82f29536061f781dde9ac97449f892da06ddeac480426d9c18c1f4c322baff54dc1165a9f2ed8379a3ec1 SHA512 d0740d003e8dbb62494e6a12e41a7b10e0809877501d8a5f59979c797d08fe7ab57b172bc20ed9d2113ae57a2b1868ce923b68cc2413e1771fd8a4844eb58c06
 DIST wasm-bindgen-backend-0.2.58.crate 21479 BLAKE2B 101d311e32330a2d2d0cca325a9f544fb555bdb1d2b354f02cd16e6b3ec76e0a7056e189b1bde769e22e07a57b05174c6746cee9896141656fa095501518842f SHA512 b58388b94f0389bfa1a28fd975e3f239d05b57fa89aed7bf802ed4cf1065c016a925100eef3fd650d53a581990b9165f6431866ac64798bb11dce44897130417
+DIST wasm-bindgen-backend-0.2.59.crate 23306 BLAKE2B f963f5f7ef437da8c47493b0120ab1a2b1f6e14886e7f126ce2d125c010237437d782f988b6228b1191b3bad0cdf7c53255f5bd81ba23a059dbfe8d6288981a4 SHA512 466861080881dc16023e7c620d0b327a9587177cc608e3ab9652dc1857e8371a55720fb54c611498f70a42cfda8009879b5422b4dc385012c0fbceec96b25ad8
 DIST wasm-bindgen-macro-0.2.50.crate 10849 BLAKE2B b59e71d7f7ce427a60d0c48a5921b4c00f0b97472a8e3c79f9f2a0a3801c02131d0f6b6a249100eeef0e0d6d8fe616511422e70256cd74ccc9edbbe666b36097 SHA512 1d1c273f520c997c6c1b6d86c08ac99c4e25e04da12a25a6efb87e1b8a887618b8435129d6774a7ec2accded5c87c3561285dd8063d28efe19f60052e6d167c6
 DIST wasm-bindgen-macro-0.2.51.crate 11421 BLAKE2B 8bbb0a21d101fdf04db7d0ef31be58a24189c8e5a37593b272213ac4275117aed0caee7736a98f6263634186123ace9c5fb84593fd15fcdf21a4eb6f5293f3c9 SHA512 672a772952773566687ad167bbaa580463d7695d3e040a416263974a4941475b02554e334de5bbeed1f6d3951b1f647728f83055f8bb744a4782f58f8fbb22df
 DIST wasm-bindgen-macro-0.2.58.crate 11599 BLAKE2B 7ec50395addfbfdd40bc09820c73b56ea00bb22dbe835cd5572c0f44b86c862482a3fed5d85b285cdb4075f6a18010055f14baf068dcd52784799b33b8bfda82 SHA512 abc8731d6a6143adca93d7b0c24f3417191f9ceced08a1e2a7df3f8ec86ccf491bba84e94ffe5fdefc0897fe9b33a05355335f5771cda076ab9294d847d81e76
+DIST wasm-bindgen-macro-0.2.59.crate 11562 BLAKE2B b941e0e60eecf4dc043b956e2a0cc137a51a5d10693d2c0e0d7006b3a9cbf73c5145eb2a208e98a8a93bb49e43f9fe5a0614cebe86d6bb40a5bdcdab7155745d SHA512 ecc311c5fd134848e6b43431ead23a0e1616a1735a39f98d5ce91ad425bc4b8dd1ed8890f2ca534362ab1cce6c35d9b3274fc4007c96497d3277ee2a47afa55c
 DIST wasm-bindgen-macro-support-0.2.50.crate 16461 BLAKE2B ae44dd17804d4c554b676d11136868958eed5b6d3dfe58a80fb113c7546e511d20b7cb8a92d53b0b3ff3fff02313d407f8d4e5089b558f0b936332c0a7a82436 SHA512 f855ad370334fc64ccba2d3d00ecff0dec2319ce644b337f60300d4f76c9d8323e2676dda52fdee3ef58e1d9f16ee378beccacb6b02cbda16c2d40f82526df91
 DIST wasm-bindgen-macro-support-0.2.51.crate 16476 BLAKE2B d726d89f063e01c2caeea38ff44d0f7584ebd92a37e139dd5720430a4be54774faec9a4edfecfbc2771adb4b1bbea37c11380c9d9a264663007ef204eb8abc67 SHA512 a53252f8276494a8d706c401e5a5a4b785749da91f7f171f1242268316de926f518e7e3d8c4f36f139e21e2ee3150a6e07ad416125d6f738aa5633f2337036df
 DIST wasm-bindgen-macro-support-0.2.58.crate 16510 BLAKE2B e75fce5858219d70278e5b78ff68e6611226926f8d8ed56a1fbbe0cb73909cdcbbca65b748e1cdb6f3efc0394390628c1fddf09356a22d773851093003cc3054 SHA512 fc8d2606fbd9507bb681a39be26cc01ba1776995a5230f54c3f8052107c9ca177c4680a1f4e8d326bece0285d7d39e04c4291875e5e903f7c45fc721cc3ea9b1
+DIST wasm-bindgen-macro-support-0.2.59.crate 16875 BLAKE2B a3b92c007ec37c774219fe720f6f52b21a0f26cc7dfbc63a274d44dfb3f2424b587f240924417c18f1235e590da798284cc3927f3f747d43f5dd48be1d2a453a SHA512 65b4cddeabe6b9031b1b513d1df95b3308db89b066686bb9427b2cf826101e5dca318db9d4736674ad672eb306b1306d0061b736725b6e52a8f34ea9b09ba89a
 DIST wasm-bindgen-shared-0.2.50.crate 6727 BLAKE2B 9bd99d6f9441c748d1891c532bf42d60838919d3d100eae20b0be2cffc99bdd774a4172e106e121dbccb87130faa2c33e0c4598e43a6252647e63c1c490195ce SHA512 c1d327b1dcdb0abaf76f7121adff7e618691cc8efac5be3fe97e4375446003d9e0c41288288eb1b432e2bd49d1776be11b9cc4f675d42f78606456b711d4e877
 DIST wasm-bindgen-shared-0.2.51.crate 6721 BLAKE2B 651005f120d4d647c3a3db19bcc726ef0669577d2c072f6fe0cde64a7a94933ed51c7b9a5e4f87f41bfa6cc9b2d68e989345c71e4ce2ccbbb1869f0a1f179309 SHA512 29c36bcb531715457f1e2d4b017f505fbc81a685fa80c8137b3558f2448780357e93ca222c67214f32e248585888a58df3f3895b59246dbc59f47a7ddf7632e3
 DIST wasm-bindgen-shared-0.2.58.crate 6740 BLAKE2B f90364bb447cdc7409ea663f8df7d8b8d45df80d1acf1cce0ec0d3e9a1c3def8f93eb3537a69525d18941f71de04aa3e4824c15e34b396ec4462a46d8eff528a SHA512 970b60d8ed46cc86cef2b5954899e4bc4113e86f6d927e920b77194d078726213fe0d92e2f06e5ef6ca85b4379b002b43b798f7050573d68130e0099654b3f48
+DIST wasm-bindgen-shared-0.2.59.crate 6745 BLAKE2B a314206a48c0784d49080f0451a3ae64af6a5fadc1563f8a9d7b7fde805535c54961466df7759a236c2aa369c055ea990473fb6d7b13c018ba5d3069f1852dac SHA512 969e5c59b80bd83900affb82c5659bd1807014482a811828928fc34441e8d0c20b27aa838f401af75d488a70e8d272ef5429ad69c76a177c247a3083c698a3ae
 DIST wasm-bindgen-webidl-0.2.50.crate 24182 BLAKE2B 276641836fc21b2a7513534867799527e56e158ed9f8678f0c8a370cb38fc2dc5eb023fc9aa04db5afae0e7c3f49e5031ab4650daac35dd543594ebc834e24f7 SHA512 a1af0dd9c31cdb8fc52ed55b6f27f1423218c5fa427d8b295b3989122fc3b01650f1c9174bc77f5b6883ad6e05ce6e90af0e1e40aeb236772cf782c63c2d6c20
 DIST wasm-bindgen-webidl-0.2.51.crate 24203 BLAKE2B 7b8f5cf4cc74f357e8c1193262f667551708fea51fed9b8fd38c3bce2ca0608c9af86f998d2a8716024a645c90c83b31dabb214f515783f332991da47710ae95 SHA512 b9dade093a8ed835aaa1be2ef5b989176887c57dccc4cc90cf9e608b54da489bb66bfa9fdaf4c9edc2df1ab2c71fb2018bdddcc502c52250d3d5a36ef354b554
 DIST wasm-bindgen-webidl-0.2.58.crate 23864 BLAKE2B 1d7ecae7c1dea10aaaf830676b502a0ec9fd607a87ab3f3863eddbdeb245d695c08edcf2c954519b753b5dac05593140c10b058a8e08a6a7e3113877cdf55d0c SHA512 3344b82063f4dbcbfe9b0777b9e071ca072b716c87142e7fc2ca043f0ce973477b4609fabb415ab43261bbb19bbe5ab7df3301c92cd9d159dc0ae6b85fb20a15
+DIST wasm-bindgen-webidl-0.2.59.crate 35711 BLAKE2B a95e203ccb1df906ced64b3052662c77103017f67dfd0364335e19dabab2718ef0683809a7f67af267abaa99187c301752f89f3186ae4a4a1259b3766065289a SHA512 975b71a144a11ee005451aafef72d6410bfa9663702cc788f5604a773c88d0c2fe36e4ff53ec7bc882935662590f3b2503f7530cdb1e014d729463341c3ff56e
 DIST web-sys-0.3.27.crate 204250 BLAKE2B 73a067c079b3b3c5cf858adf185016f8be9cf02559c18b62b2f24628366df769e5e71010277718dee6a479191d38bc2f97dc42128b1327434dbc9f6c78d869c6 SHA512 906a16b5642a515dbaf996b4b4b42b4fc93ec1c614651fed476fd62ba3296f8e4d111a5f1f86bc0d3d565174e6a9da3a8f9b0a3b2dff827501b03bc734653b26
 DIST web-sys-0.3.28.crate 204077 BLAKE2B b8e7eb716e0eb6b20d2cd994cfe708964923be61c1d71ed303ff3b7a8210dfcb58858f608d28249f33bc6fb03f97ab497143e40fb2665523907b78dd122a1a50 SHA512 c26acca4493e3521feaeb081aea53a1c9be248bc547f42dbac7ef98a108e765e150678c37888de92cb06d97f1102ac96a5faebbf32621f9bd2bb74f668faadc4
 DIST web-sys-0.3.35.crate 204293 BLAKE2B 0f07e1da5ec23b286a1b7ac830050a0f0b48ecdffefb871f105647ccbefe8696d7c1e27498231b7d810ec9a9b73ad851eaad9ce9ed1fe87ecfc78b52b3e89388 SHA512 d9ba1d162030c07d3abb91f42c29f06162ad22952f7d55bff5b3f051de4be594eb1bd910b65d2e527c0faffaab2f731bff9e9f9573eb298e0392e918f7029195
+DIST web-sys-0.3.36.crate 615528 BLAKE2B 45dc9ae3227f04a9cba4c9c1cdc8d50f273e83ba83356d1fcd50f695559fbf36cb9c00a0ac5efc89d439c8ab213361cb6460798bd80f3864e45377c57262069d SHA512 203995e587c7ac9042587a79899834be4409dd1dc73fdb3a76545e206f0516093833d975db9fd2349d63e4262f50f6b22b3ef1e22cd556ebd377da73240e4761
 DIST weedle-0.10.0.crate 34686 BLAKE2B 9592932b38543c700717dbc1ea2852acc4fc73cc9c6550e4abdec6d230c7e4a2e01663643222a5fe025767d83d0a802be74a9798fcb57083dd795b513a64ade2 SHA512 c7e5ca778af68d69284cc93556a67884adbc437aae32f85ef305bb9489a5181dd3b77ded68657c1d3a088386586ead4830707a8e6bc0c912c953e1a74ded49ad
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8e22c7519fedaa5dd65cdc0c51134606c2a7ff0a6cbd7f24e75aaf3109959decaf2a5171fe01fbfc7ad7453fbc4 SHA512 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a
+DIST winapi-util-0.1.3.crate 9913 BLAKE2B d310b3fbe45bf4a25971c4396f945119efbe8f5bd497f03ae04eaee7643d9d022af69c4d511ed6e89fd10bc56d4448b8b3a624491a67a87dcab4f156c31ab104 SHA512 55ed7996a8f63e2218e74e778e47450863b19170bf1f5375a36b094c5e34bb41b19f093157e40190e105a40cd1cd9bf90e95966fc3a7de71f6b74e272723a1b8
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wincolor-1.0.2.crate 4821 BLAKE2B 14fec69f86d72f6664f7ada8dfa34cbb603f5ebd0de098db69c0bd0d193f49b4bb2ebdec40a962a44e9111f656f62d9d67135ae94147ada48440dd8cd7e615ee SHA512 b902c8985b3e341cd4728fa597528740bb3d95bdd3cdc4fd70867a41ab4d95cb64c4f20efa9a9a911c1905ac9e0adb4fadd13c126ae6a808caaafa23f47d7f10
 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
diff --git a/net-libs/quiche/quiche-0.3.0.ebuild b/net-libs/quiche/quiche-0.3.0.ebuild
new file mode 100644
index 000000000000..174406e41944
--- /dev/null
+++ b/net-libs/quiche/quiche-0.3.0.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+anyhow-1.0.26
+aho-corasick-0.7.6
+arrayvec-0.4.11
+atty-0.2.14
+autocfg-1.0.0
+backtrace-0.3.37
+backtrace-sys-0.1.31
+bitflags-1.2.1
+bstr-0.2.12
+bumpalo-3.2.0
+byteorder-1.3.4
+cast-0.2.3
+cc-1.0.50
+cfg-if-0.1.10
+clap-2.33.0
+cmake-0.1.42
+criterion-0.3.1
+criterion-plot-0.4.1
+crossbeam-deque-0.7.3
+crossbeam-epoch-0.8.2
+crossbeam-queue-0.2.1
+crossbeam-utils-0.7.2
+csv-1.1.3
+csv-core-0.1.10
+either-1.5.3
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+hermit-abi-0.1.8
+idna-0.1.5
+iovec-0.1.4
+itertools-0.8.2
+itoa-0.4.5
+js-sys-0.3.36
+kernel32-sys-0.2.2
+lazy_static-1.4.0
+libc-0.2.67
+log-0.4.8
+matches-0.1.8
+maybe-uninit-2.0.0
+memchr-2.3.3
+memoffset-0.5.3
+mio-0.6.21
+miow-0.2.1
+net2-0.2.33
+num-traits-0.2.11
+num_cpus-1.12.0
+oorandom-11.1.0
+percent-encoding-1.0.1
+plotters-0.2.12
+proc-macro2-1.0.9
+quote-1.0.3
+rayon-1.3.0
+rayon-core-1.7.0
+regex-1.3.5
+regex-automata-0.1.9
+regex-syntax-0.6.17
+ring-0.16.11
+rustc_version-0.2.3
+ryu-1.0.3
+same-file-1.0.6
+scopeguard-1.1.0
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.104
+serde_derive-1.0.104
+serde_json-1.0.48
+slab-0.4.2
+smallvec-1.2.0
+spin-0.5.2
+syn-1.0.16
+textwrap-0.11.0
+tinytemplate-1.0.3
+unicode-bidi-0.3.4
+unicode-normalization-0.1.12
+unicode-width-0.1.7
+unicode-xid-0.1.0
+unicode-xid-0.2.0
+untrusted-0.7.0
+url-1.7.2
+walkdir-2.3.1
+wasm-bindgen-0.2.59
+wasm-bindgen-backend-0.2.59
+wasm-bindgen-macro-0.2.59
+wasm-bindgen-macro-support-0.2.59
+wasm-bindgen-shared-0.2.59
+wasm-bindgen-webidl-0.2.59
+web-sys-0.3.36
+winapi-0.2.8
+winapi-0.3.8
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.3
+winapi-x86_64-pc-windows-gnu-0.4.0
+ws2_32-sys-0.2.1
+"
+
+inherit cargo cmake-utils flag-o-matic multilib-minimal rust-toolchain
+
+DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3"
+HOMEPAGE="https://github.com/cloudflare/quiche"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/cloudflare/${PN}.git"
+	inherit git-r3
+else
+	CRATES+=" ${P//_/-}"
+	SRC_URI="$(cargo_crate_uris ${CRATES})"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S="${WORKDIR}/${P//_/-}"
+fi
+
+LICENSE="|| ( Apache-2.0 Boost-1.0 )
+	|| ( Apache-2.0 MIT )
+	|| ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT )
+	BSD-2
+	BSD
+	ISC
+	MIT
+	|| ( Unlicense MIT )
+	openssl"
+SLOT="0/0"
+IUSE=""
+DOCS=( CODEOWNERS  COPYING README.md )
+
+BDEPEND="
+	>=virtual/rust-1.39.0[${MULTILIB_USEDEP}]
+	dev-util/cmake
+	dev-lang/go
+	dev-lang/perl
+"
+DEPEND=""
+RDEPEND=""
+
+CMAKE_USE_DIR="${S}/deps/boringssl"
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+		tar -xf "${DISTDIR}/${P//_/-}.crate" -C "${WORKDIR}" || die
+	fi
+}
+
+src_prepare() {
+	default
+	cmake-utils_src_prepare
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	append-flags "-fPIC"
+	local mycmakeargs=(
+		-DOPENSSL_NO_ASM=ON
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_compile bssl
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features pkg-config-meta --target="$(rust_abi)"
+}
+
+multilib_src_test() {
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test  --target="$(rust_abi)"
+}
+
+multilib_src_install() {
+	sed -i -e "s:libdir=.\+:libdir=${EPREFIX}/usr/$(get_libdir):" -e "s:includedir=.\+:includedir=${EPREFIX}/usr/include:" target/release/quiche.pc || die
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins target/release/quiche.pc
+	doheader -r include/*
+	dolib.so "target/$(rust_abi)/release/libquiche.so"
+}
diff --git a/net-libs/quiche/quiche-9999.ebuild b/net-libs/quiche/quiche-9999.ebuild
index 6b2fceb3dbb3..174406e41944 100644
--- a/net-libs/quiche/quiche-9999.ebuild
+++ b/net-libs/quiche/quiche-9999.ebuild
@@ -8,117 +8,95 @@ anyhow-1.0.26
 aho-corasick-0.7.6
 arrayvec-0.4.11
 atty-0.2.14
-autocfg-0.1.7
+autocfg-1.0.0
 backtrace-0.3.37
 backtrace-sys-0.1.31
 bitflags-1.2.1
-bstr-0.2.8
-bumpalo-3.1.2
-byteorder-1.3.2
+bstr-0.2.12
+bumpalo-3.2.0
+byteorder-1.3.4
 cast-0.2.3
-cc-1.0.49
+cc-1.0.50
 cfg-if-0.1.10
 clap-2.33.0
 cmake-0.1.42
-crossbeam-deque-0.7.2
-crossbeam-epoch-0.8.0
+criterion-0.3.1
+criterion-plot-0.4.1
+crossbeam-deque-0.7.3
+crossbeam-epoch-0.8.2
 crossbeam-queue-0.2.1
-crossbeam-utils-0.7.0
-csv-1.1.2
-csv-core-0.1.6
-docopt-1.1.0
+crossbeam-utils-0.7.2
+csv-1.1.3
+csv-core-0.1.10
 either-1.5.3
-env_logger-0.6.2
-failure-0.1.5
-failure_derive-0.1.5
 fuchsia-zircon-0.3.3
 fuchsia-zircon-sys-0.3.3
-getrandom-0.1.14
-heck-0.3.1
-hermit-abi-0.1.6
-humantime-1.3.0
+hermit-abi-0.1.8
 idna-0.1.5
 iovec-0.1.4
 itertools-0.8.2
-itoa-0.4.4
-js-sys-0.3.35
+itoa-0.4.5
+js-sys-0.3.36
 kernel32-sys-0.2.2
 lazy_static-1.4.0
-libc-0.2.66
+libc-0.2.67
 log-0.4.8
 matches-0.1.8
-memchr-2.2.1
+maybe-uninit-2.0.0
+memchr-2.3.3
 memoffset-0.5.3
 mio-0.6.21
 miow-0.2.1
 net2-0.2.33
-nodrop-0.1.13
-nom-4.2.3
-num-traits-0.2.10
-num_cpus-1.11.1
+num-traits-0.2.11
+num_cpus-1.12.0
+oorandom-11.1.0
 percent-encoding-1.0.1
-proc-macro2-0.4.30
-proc-macro2-1.0.7
-quick-error-1.2.3
-quote-0.6.13
-quote-1.0.2
-rand_core-0.5.1
-rand_os-0.2.2
-rand_xoshiro-0.3.1
+plotters-0.2.12
+proc-macro2-1.0.9
+quote-1.0.3
 rayon-1.3.0
 rayon-core-1.7.0
-regex-1.3.1
-regex-automata-0.1.8
-regex-syntax-0.6.12
-ring-0.16.9
-rustc-demangle-0.1.16
+regex-1.3.5
+regex-automata-0.1.9
+regex-syntax-0.6.17
+ring-0.16.11
 rustc_version-0.2.3
-ryu-1.0.2
-same-file-1.0.5
-scopeguard-1.0.0
+ryu-1.0.3
+same-file-1.0.6
+scopeguard-1.1.0
 semver-0.9.0
 semver-parser-0.7.0
 serde-1.0.104
 serde_derive-1.0.104
-serde_json-1.0.44
+serde_json-1.0.48
 slab-0.4.2
-smallvec-1.1.0
-sourcefile-0.1.4
+smallvec-1.2.0
 spin-0.5.2
-strsim-0.9.3
-syn-0.15.44
-syn-1.0.13
-synstructure-0.10.2
-termcolor-1.0.5
+syn-1.0.16
 textwrap-0.11.0
-thread_local-0.3.6
 tinytemplate-1.0.3
 unicode-bidi-0.3.4
-unicode-normalization-0.1.11
-unicode-segmentation-1.6.0
+unicode-normalization-0.1.12
 unicode-width-0.1.7
 unicode-xid-0.1.0
 unicode-xid-0.2.0
 untrusted-0.7.0
 url-1.7.2
-version_check-0.1.5
-walkdir-2.2.9
-wasi-0.9.0+wasi-snapshot-preview1
-wasm-bindgen-0.2.58
-wasm-bindgen-backend-0.2.58
-wasm-bindgen-macro-0.2.58
-wasm-bindgen-macro-support-0.2.58
-wasm-bindgen-shared-0.2.58
-wasm-bindgen-webidl-0.2.58
-web-sys-0.3.35
-weedle-0.10.0
+walkdir-2.3.1
+wasm-bindgen-0.2.59
+wasm-bindgen-backend-0.2.59
+wasm-bindgen-macro-0.2.59
+wasm-bindgen-macro-support-0.2.59
+wasm-bindgen-shared-0.2.59
+wasm-bindgen-webidl-0.2.59
+web-sys-0.3.36
 winapi-0.2.8
 winapi-0.3.8
 winapi-build-0.1.1
 winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.2
+winapi-util-0.1.3
 winapi-x86_64-pc-windows-gnu-0.4.0
-wincolor-1.0.2
 ws2_32-sys-0.2.1
 "
 
@@ -133,7 +111,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	CRATES+=" ${P//_/-}"
 	SRC_URI="$(cargo_crate_uris ${CRATES})"
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	S="${WORKDIR}/${P//_/-}"
 fi
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
index 47f5da095e91..430f780b0e2c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha ~arm arm64 ~ppc ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~arm ~ppc ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild
index aaa55b7f7664..48c9e084906f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm64 ~ia64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm64 ~ia64 ~ppc64 ~sparc x86"
 
 IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 5f6f32d61353..56a15fce6db8 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/curl/curl-7.69.0.ebuild b/net-misc/curl/curl-7.69.0.ebuild
index 31ffb33b4b5b..d2544cba1b3f 100644
--- a/net-misc/curl/curl-7.69.0.ebuild
+++ b/net-misc/curl/curl-7.69.0.ebuild
@@ -48,7 +48,7 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
 		net-libs/nghttp3[${MULTILIB_USEDEP}]
 		net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
 	)
-	quiche? ( net-libs/quiche[${MULTILIB_USEDEP}] )
+	quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
 	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
 	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
diff --git a/net-misc/memcached/memcached-1.5.22.ebuild b/net-misc/memcached/memcached-1.5.22.ebuild
index c89e46b00bea..e5bb4f023b65 100644
--- a/net-misc/memcached/memcached-1.5.22.ebuild
+++ b/net-misc/memcached/memcached-1.5.22.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 4dede9e99296..b07f9fbf00aa 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1,2 +1,3 @@
 DIST NetworkManager-1.18.4.tar.xz 4875196 BLAKE2B 9c58d6d7317562332dfa9639f8e236a0a7f6b58e7dad5af83916b1c6178899a6bcf12bc289fb401d84fd6420306364b4c4c0a25eda2a08eef812acde1862a18a SHA512 9fd22775a400ee8d20c75ebddfee842bfbd8780966444dd537e371a65918f41640e921d2c441853afe8f72d693e9b4c1415435136a07004666a6af4799fd3350
+DIST NetworkManager-1.22.10.tar.bz2 6292347 BLAKE2B b6cb06a0630685714cdd3c8b8e1d788a6e979c2d7f232259e682fdc9e1f5569259731fdbbea65b6e8321561ecb8354b6f7a0b10843eb17cbe6f5937af8d9d898 SHA512 61b6214188a3cd281d0d5a5b8bfc402f8a19d8beaa6a3a2bd85983991cc66d62b2c3785d7ca652373903d53331610cd63a45d94bdb355196d939c48f42be29c1
 DIST NetworkManager-1.22.8.tar.bz2 6291982 BLAKE2B f02ca4006c7ccedc30f2a54cc15f9e0e44fb0fd00114ea1f634a1c72b422083d6bcd0b4ac23404da4eb2d278d97708776e925bb37a13394e97563053e3330e3d SHA512 af598bcb192a2f48703cd7a995823b3f9c53c3f658e29a0cc939f4436d38417ae57f44dc7da75581a9caff32bc572b57bae7ad4a56930178ae0f0003e0a44973
diff --git a/net-misc/networkmanager/networkmanager-1.22.10.ebuild b/net-misc/networkmanager/networkmanager-1.22.10.ebuild
new file mode 100644
index 000000000000..dc42b9360620
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.22.10.ebuild
@@ -0,0 +1,333 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit meson linux-info python-any-r1 systemd udev vala
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+SRC_URI="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/archive/${PV}/NetworkManager-${PV}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="audit bluetooth +concheck connection-sharing consolekit +dhclient dhcpcd "
+IUSE+="debug doc elogind examples +gnutls introspection iwd json kernel_linux "
+IUSE+="libpsl lto modemmanager nss ofono ovs +policykit ppp resolvconf selinux "
+IUSE+="syslog systemd teamd test +tools vala wext +wifi"
+
+REQUIRED_USE="
+	doc? ( introspection )
+	iwd? ( wifi )
+	vala? ( introspection )
+	^^ ( gnutls nss )
+	?? ( consolekit elogind systemd )
+	?? ( dhclient dhcpcd )
+	?? ( syslog systemd )
+"
+
+DEPEND="
+	dev-libs/dbus-glib
+	dev-libs/glib:2
+	net-libs/libndp
+	sys-apps/dbus
+	sys-kernel/linux-headers
+	virtual/libudev
+	audit? ( sys-process/audit )
+	bluetooth? ( net-wireless/bluez )
+	concheck? ( net-misc/curl )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		net-firewall/iptables
+	)
+	consolekit? ( sys-auth/consolekit )
+	dhclient? ( net-misc/dhcp[client] )
+	dhcpcd? ( net-misc/dhcpcd )
+	doc? ( dev-util/gtk-doc )
+	elogind? ( sys-auth/elogind )
+	gnutls? (
+		dev-libs/libgcrypt:0=
+		net-libs/gnutls
+	)
+	introspection? ( dev-libs/gobject-introspection:= )
+	json? ( dev-libs/jansson )
+	libpsl? ( net-libs/libpsl )
+	modemmanager? (
+		net-misc/mobile-broadband-provider-info
+		net-misc/modemmanager
+	)
+	nss? ( dev-libs/nss )
+	ofono? ( net-misc/ofono )
+	ovs? ( dev-libs/jansson )
+	policykit? ( sys-auth/polkit )
+	ppp? ( net-dialup/ppp[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( sys-apps/systemd:= )
+	teamd? (
+		dev-libs/jansson
+		net-misc/libteam
+	)
+	tools? (
+		dev-libs/newt
+		sys-libs/ncurses
+		sys-libs/readline:0=
+	)
+"
+RDEPEND="${DEPEND}
+	acct-group/plugdev
+	|| (
+		net-analyzer/arping
+		net-misc/iputils[arping(+)]
+	)
+	wifi? (
+		iwd? ( net-wireless/iwd )
+		!iwd? ( net-wireless/wpa_supplicant[dbus] )
+	)
+"
+BDEPEND="dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-libs/libxslt
+		dev-lang/perl
+	)
+	vala? ( $(vala_depend) )
+"
+
+S="${WORKDIR}"/NetworkManager-${PV}
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.20.6-dont_call_helpers_with_full_paths.patch"
+)
+
+python_check_deps() {
+	if use introspection; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+
+	if use test; then
+		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile "
+		eerror "your kernel or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend ${?}
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, "
+			ewarn "NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+	fi
+}
+
+pkg_setup() {
+	CONFIG_CHECK="~BPF"
+
+	if use connection-sharing; then
+		if kernel_is lt 5 1; then
+			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		else
+			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
+		fi
+	fi
+
+	linux-info_pkg_setup
+
+	# if use introspection || use test; then
+	if use introspection; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-D systemdsystemunitdir=$(systemd_get_systemunitdir)
+		-D system_ca_path=/etc/ssl/certs
+		-D udev_dir=$(get_udevdir)
+		-D dbus_conf_dir=/usr/share/dbus-1/system.d
+		-D kernel_firmware_dir=/lib/firmware
+		-D iptables=/sbin/iptables
+		#-D dnsmasq=
+		#-D dnssec_trigger=
+
+		-D dist_version=${PVR}
+		$(meson_use policykit polkit)
+		-D modify_system=true
+		$(meson_use policykit polkit_agent)
+		$(meson_use policykit config_auth_polkit_default)
+		$(meson_use selinux)
+		$(meson_use systemd systemd_journal)
+		-D hostname_persist=gentoo
+		-D libaudit=$(usex audit yes no)
+
+		$(meson_use wext)
+		$(meson_use wifi)
+		$(meson_use iwd)
+		$(meson_use ppp)
+		#-D pppd='path to pppd binary'
+		#-D pppd_plugin_dir='path to the pppd plugins directory'
+		$(meson_use modemmanager modem_manager)
+		$(meson_use ofono)
+		$(meson_use concheck)
+		$(meson_use teamd teamdctl)
+		$(meson_use ovs)
+		$(meson_use tools nmcli)
+		$(meson_use tools nmtui)
+		$(meson_use tools nm_cloud_setup)
+		$(meson_use bluetooth bluez5_dun)
+		-D ebpf=true
+
+		-D config_plugins_default=keyfile
+		-D ifcfg_rh=false
+		-D ifupdown=false
+
+		$(meson_feature resolvconf)
+		-D netconfig=disable
+		-D config_dns_rc_manager_default=symlink
+
+		$(meson_feature dhclient)
+		-D dhcpcanon=disable
+		$(meson_feature dhcpcd)
+
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+		$(meson_use doc docs)
+		# $(meson_use debug more_asserts)
+		-D more_asserts=0
+		$(meson_use debug more_logging)
+		-D valgrind=no
+		-D valgrind_suppressions=
+		$(meson_use debug ld_gc)
+		$(meson_use libpsl)
+		$(meson_use json json_validation)
+		-D qt=false
+
+		$(meson_use lto b_lto)
+	)
+
+	if use consolekit; then
+		emesonargs+=( -D session_tracking_consolekit=true )
+		emesonargs+=( -D session_tracking=no )
+		emesonargs+=( -D suspend_resume=consolekit )
+	elif use systemd; then
+		emesonargs+=( -D session_tracking_consolekit=false )
+		emesonargs+=( -D session_tracking=systemd )
+		emesonargs+=( -D suspend_resume=systemd )
+	elif use elogind; then
+		emesonargs+=( -D session_tracking_consolekit=false )
+		emesonargs+=( -D session_tracking=elogind )
+		emesonargs+=( -D suspend_resume=elogind )
+	else
+		emesonargs+=( -D session_tracking_consolekit=false )
+		emesonargs+=( -D session_tracking=none )
+		emesonargs+=( -D suspend_resume=auto )
+	fi
+
+	if use syslog; then
+		emesonargs+=( -D config_logging_backend_default=syslog )
+	elif use systemd; then
+		emesonargs+=( -D config_logging_backend_default=journal )
+	else
+		emesonargs+=( -D config_logging_backend_default=default )
+	fi
+
+	if use dhclient; then
+		emesonargs+=( -D config_dhcp_default=dhclient )
+	elif use dhcpcd; then
+		emesonargs+=( -D config_dhcp_default=dhcpcd )
+	else
+		emesonargs+=( -D config_dhcp_default=internal )
+	fi
+
+	if use nss; then
+		emesonargs+=( -D crypto=nss )
+	else
+		emesonargs+=( -D crypto=gnutls )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* || die
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+
+	if use iwd; then
+		insinto /usr/lib/NetworkManager/conf.d/
+		newins - iwd.conf <<- _EOF_
+			[device]
+			wifi.backend=iwd
+		_EOF_
+	fi
+
+	if use examples; then
+		dodoc -r "${S}"/examples/
+
+		insinto /usr/lib/NetworkManager/conf.d
+		doins "${S}"/examples/nm-conf.d/{30-anon,31-mac-addr-change}.conf
+
+		# Temporary workaround
+		cp "${ED}"/usr/share/doc/NetworkManager/examples/server.conf \
+			"${ED}"/usr/share/doc/${PF}/examples/ ||
+			die "Failed to copy server.conf example."
+	fi
+
+	# Temporary workaround,
+	# The file will be installed regargless of 'examples' USE.
+	rm "${ED}"/usr/share/doc/NetworkManager/examples/server.conf || die
+	rm -r "${ED}"/usr/share/doc/NetworkManager || die
+
+	# Empty dirs
+	rm -r "${ED}/var" || die
+}
+
+pkg_postinst() {
+	systemd_reenable NetworkManager.service
+}
diff --git a/net-misc/ntpsec/files/ntpd-r1.service b/net-misc/ntpsec/files/ntpd-r1.service
index 5da473805aa0..8bc16f9f634a 100644
--- a/net-misc/ntpsec/files/ntpd-r1.service
+++ b/net-misc/ntpsec/files/ntpd-r1.service
@@ -4,10 +4,9 @@ After=network.target nss-lookup.target
 Conflicts=systemd-timesyncd.service
 
 [Service]
-Type=forking
+Type=simple
 PrivateTmp=true
-EnvironmentFile=-/etc/conf.d/ntp
-ExecStart=/usr/sbin/ntpd ${NTPD_OPTS}
+ExecStart=/usr/sbin/ntpd --configfile=/etc/ntp.conf --panicgate --user=ntp:ntp --nofork
 # Specifying -g on the command line allows ntpd to make large adjustments to
 # the clock on boot.  However, if Restart=yes is set, a malicious (or broken)
 # server could send the incorrect time, trip the panic threshold, and when
diff --git a/net-misc/ntpsec/files/ntpsec-1.1.8-fix-missing-scmp_sys-on-aarch64.patch b/net-misc/ntpsec/files/ntpsec-1.1.8-fix-missing-scmp_sys-on-aarch64.patch
new file mode 100644
index 000000000000..ee75d103d2e6
--- /dev/null
+++ b/net-misc/ntpsec/files/ntpsec-1.1.8-fix-missing-scmp_sys-on-aarch64.patch
@@ -0,0 +1,16 @@
+diff --git a/ntpd/ntp_sandbox.c b/ntpd/ntp_sandbox.c
+index 4e5ceaa36c1a7b452445023e201ddb6211625c52..78ac7aea263ed3d3394b2d32e79a6836f0387434 100644
+--- a/ntpd/ntp_sandbox.c
++++ b/ntpd/ntp_sandbox.c
+@@ -428,6 +428,11 @@ int scmp_sc[] = {
+ 	/* gentoo 64-bit and 32-bit, Intel and Arm use mmap */
+ 	SCMP_SYS(mmap),
+ #endif
++#if defined(__aarch64__)
++	SCMP_SYS(faccessat),
++	SCMP_SYS(newfstatat),
++	SCMP_SYS(renameat),
++#endif
+ #if defined(__i386__) || defined(__arm__) || defined(__powerpc__)
+ 	SCMP_SYS(_newselect),
+ 	SCMP_SYS(_llseek),
diff --git a/net-misc/ntpsec/ntpsec-1.1.8.ebuild b/net-misc/ntpsec/ntpsec-1.1.8.ebuild
index 128e2a23826c..d0003067a4f7 100644
--- a/net-misc/ntpsec/ntpsec-1.1.8.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.8.ebuild
@@ -62,7 +62,8 @@ DEPEND="${CDEPEND}
 
 WAF_BINARY="${S}/waf"
 
-PATCHES=( "${FILESDIR}/${P}-externalize-sys_maxclock-fix-for-bug-708522.patch" )
+PATCHES=( "${FILESDIR}/${P}-externalize-sys_maxclock-fix-for-bug-708522.patch"
+	"${FILESDIR}/${P}-fix-missing-scmp_sys-on-aarch64.patch" )
 
 src_prepare() {
 	default
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 54bcdf34dfe5..dba3a1b6ef20 100644
Binary files a/net-print/Manifest.gz and b/net-print/Manifest.gz differ
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index fef246c0ccc0..90796714a198 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,3 +1,3 @@
 DIST hplip-3.18.12-patches-1.tar.xz 12032 BLAKE2B 33e6e4e1e0e5b4f998459073cf0742b7c56929b23e6c1cc3ba9df4eafb8007273a5a2e7f27af0d2d4a3a97ebb9cfe462b74dcddd7149088980893b2c66113b7c SHA512 3b0e2b4f7d8da257c6fcf12f2e049276d059426f2d1c626324982ce862efa2323cbb191a373c53fea7880e3b6e44ec62e584091676556d97e6a456edea4c44cf
 DIST hplip-3.19.12.tar.gz 25676247 BLAKE2B 1373aa70a2307071c28a22b0ae85e242c3e6bec614ef7490c1ecc0e5e745b81b6c2097948fbd062b5e72e10714cdc8d6f9145aacafc0fedeafde375909cb2cb6 SHA512 5552cd717ae082ee55cdb77d79e8d035d8ecb7cf23c79d659fda43468d8ed414a33c4d869eab4ab83dee836f0d1cceb74c3c4a249e26f904a5ab2350e08a5677
-DIST hplip-3.20.2.tar.gz 25713273 BLAKE2B b96fc035fd166e5d7eb9af900c08c338bd9c5030c3c6c1bb14e0f193a5414ee26e09318235418d560b37ed827f816676868b58b8806e5894d1842beec0ec31de SHA512 013abeb1453a2b1045618543d2795d0653ac12b1804b99043b3ca04a8f7bc48289be1a0b3d7740064df1286eacfb5b1f504b64b280c169c7d263b7d5e7a213a0
+DIST hplip-3.20.2.tar.gz 25675649 BLAKE2B 8e98768736fe4ec667852fccebf2bb178047eedb1d92b995d3107ea4c8ba618caa24204c48069b06333a2797dabdf14e1d7d066f5aca77e2c88a85c7080223e6 SHA512 9343eca569c8367e8207708a76351c0f97472500d07f26b62867b4001d504f24b2d2ecfe431e8019623477e7e5d55623d5d91848b4aba71c3e88c8302ed51b4c
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index c3eb02f9c7e9..2dd55ceadf31 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6.ebuild b/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6-r1.ebuild
similarity index 93%
rename from net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6.ebuild
rename to net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6-r1.ebuild
index 94074c6b078a..a9f1c000252b 100644
--- a/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6.ebuild
+++ b/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6-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
@@ -23,7 +23,7 @@ RDEPEND="
 	>=net-vpn/openfortivpn-1.2.0
 	gtk? (
 		>=app-crypt/libsecret-0.18
-		>=gnome-extra/nm-applet-1.2.0
+		>=gnome-extra/nm-applet-1.2.0[gtk]
 		>=x11-libs/gtk+-3.4:3
 	)
 "
diff --git a/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.8.ebuild b/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.8-r1.ebuild
similarity index 91%
rename from net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.8.ebuild
rename to net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.8-r1.ebuild
index 0aadb4db8bb0..5c9130e5118c 100644
--- a/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.8.ebuild
+++ b/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.8-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
@@ -23,7 +23,7 @@ RDEPEND="
 	>=net-vpn/openfortivpn-1.2.0
 	gtk? (
 		>=app-crypt/libsecret-0.18
-		>=gnome-extra/nm-applet-1.2.0
+		>=gnome-extra/nm-applet-1.2.0[gtk]
 		>=x11-libs/gtk+-3.4:3
 	)
 "
diff --git a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.10.ebuild b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.10-r1.ebuild
similarity index 94%
rename from net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.10.ebuild
rename to net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.10-r1.ebuild
index 06c1fd8288e4..a8ed070e24c8 100644
--- a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.10.ebuild
+++ b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.10-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
@@ -21,7 +21,7 @@ RDEPEND="
 	>=net-vpn/openvpn-2.1
 	gtk? (
 		>=app-crypt/libsecret-0.18
-		>=gnome-extra/nm-applet-1.7.0
+		>=gnome-extra/nm-applet-1.7.0[gtk]
 		>=x11-libs/gtk+-3.4:3
 	)
 "
diff --git a/net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.8.ebuild b/net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.8-r1.ebuild
similarity index 94%
rename from net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.8.ebuild
rename to net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.8-r1.ebuild
index a20000d7800e..0a3a2b4956e6 100644
--- a/net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.8.ebuild
+++ b/net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ RDEPEND="
 	net-dialup/pptpclient
 	gtk? (
 		>=app-crypt/libsecret-0.18
-		>=gnome-extra/nm-applet-1.2.0
+		>=gnome-extra/nm-applet-1.2.0[gtk]
 		>=x11-libs/gtk+-3.4:3
 	)
 "
diff --git a/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5.ebuild b/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5-r1.ebuild
similarity index 96%
rename from net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5.ebuild
rename to net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5-r1.ebuild
index 9b4aaeb44e99..40b060fd4cd9 100644
--- a/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5.ebuild
+++ b/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5-r1.ebuild
@@ -21,6 +21,7 @@ RDEPEND="
 	net-misc/networkmanager
 	net-vpn/strongswan[networkmanager]
 	x11-libs/gtk+:3
+	glib? ( gnome-extra/nm-applet[gtk] )
 "
 
 DEPEND="
diff --git a/net-vpn/networkmanager-vpnc/networkmanager-vpnc-1.2.6.ebuild b/net-vpn/networkmanager-vpnc/networkmanager-vpnc-1.2.6-r1.ebuild
similarity index 93%
rename from net-vpn/networkmanager-vpnc/networkmanager-vpnc-1.2.6.ebuild
rename to net-vpn/networkmanager-vpnc/networkmanager-vpnc-1.2.6-r1.ebuild
index 564a0091b8d8..e5455535518c 100644
--- a/net-vpn/networkmanager-vpnc/networkmanager-vpnc-1.2.6.ebuild
+++ b/net-vpn/networkmanager-vpnc/networkmanager-vpnc-1.2.6-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
@@ -22,7 +22,7 @@ RDEPEND="
 	>=net-vpn/vpnc-0.5.3_p550
 	gtk? (
 		>=app-crypt/libsecret-0.18
-		>=gnome-extra/nm-applet-1.2.0
+		>=gnome-extra/nm-applet-1.2.0[gtk]
 		>=x11-libs/gtk+-3.4:3
 	)
 "
diff --git a/net-vpn/networkmanager-wireguard/networkmanager-wireguard-0_pre20191128-r2.ebuild b/net-vpn/networkmanager-wireguard/networkmanager-wireguard-0_pre20191128-r3.ebuild
similarity index 97%
rename from net-vpn/networkmanager-wireguard/networkmanager-wireguard-0_pre20191128-r2.ebuild
rename to net-vpn/networkmanager-wireguard/networkmanager-wireguard-0_pre20191128-r3.ebuild
index 0786a2a6e888..5df9750c6f2e 100644
--- a/net-vpn/networkmanager-wireguard/networkmanager-wireguard-0_pre20191128-r2.ebuild
+++ b/net-vpn/networkmanager-wireguard/networkmanager-wireguard-0_pre20191128-r3.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	glib? ( dev-libs/glib )
 	gtk? (
 		app-crypt/libsecret
-		gnome-extra/nm-applet
+		gnome-extra/nm-applet[gtk]
 		x11-libs/gtk+:3
 	)
 "
diff --git a/net-vpn/networkmanager-wireguard/networkmanager-wireguard-9999.ebuild b/net-vpn/networkmanager-wireguard/networkmanager-wireguard-9999.ebuild
index e2fe0d2911b8..5c5e32f83ad8 100644
--- a/net-vpn/networkmanager-wireguard/networkmanager-wireguard-9999.ebuild
+++ b/net-vpn/networkmanager-wireguard/networkmanager-wireguard-9999.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	glib? ( dev-libs/glib )
 	gtk? (
 		app-crypt/libsecret
-		gnome-extra/nm-applet
+		gnome-extra/nm-applet[gtk]
 		x11-libs/gtk+:3
 	)
 "
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 44ae4ad7a880..0fac6fd768ad 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 9ec3e67b55f2..e003b016b007 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,4 +1,4 @@
 DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e1158357c602fa807d712870543a7fade25077f449c07c023ad1d2150870352aa754484846d8c2a0d9f027113bb57c1fc SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416
 DIST kismet-2019-09-R1.tar.xz 3034832 BLAKE2B 9f7818549e5260dc081ac39ea8323c70f2e4d0b959bc42dacc253c9d72bf72c2547f7c6d65d84ee7d0ca4a41068f5973028e48f6f9f3c5a7cd50c35246570814 SHA512 eeaf069718206f2b6d292c41792217afc9c72c10ffa014c8c670de64195bd28d44f33364dba7d338610f17a5af2be3c125ccd1297cce362159a4968c9ddabb88
 DIST kismet-2019-12-R2.tar.xz 3127064 BLAKE2B b7ffac6a6a4d7d7893d3564f9471080e055798c325b102f98fa0e86db37bcbab33422afae9c2694b747ae0c369259b62c218a77c673d0e0c05969a56e42311c2 SHA512 b1e3de74a6d314150d849ac3d95c8b99324bba14522dc4f00244d1c09acb690cce40d35dbe33845ffb1060a69cd38f036d59a0283ed9b1a70b022e3d57cde5a0
-DIST kismet-2020-03-R1.tar.xz 3137312 BLAKE2B c20137677f598c0856e21e3c34b52b1edea1262cc0049638f31554a78780d37860200dae85ac65e35cda8425be6798fe98ac3de08e8dcbff33ea0b7b9fdb945f SHA512 a237d31ef953729571232693cc51029add808002dfcb350e6dbb0a5360f85b3c608e4d49273d4b377e91ba83feff198527a13930f1976b2182eee7e5185471a2
+DIST kismet-2020.03.1_p20200311.tar.gz 4237239 BLAKE2B 6daa8174086a30e46f9a70abf124e571372772bf21166c9896e76f557412e230b0eedfd08d10514d80ba0b3a7e38bf05b14e3048cb2fcac0a084a8b3bb844ce7 SHA512 913e46b560438f9f44ba05d9d900a9dfab7f7fa85d6b356e38cb1eb8f902a83473a59165304d36c6d0ab737c0195caa0561047f74e642005efa1374356275f48
diff --git a/net-wireless/kismet/kismet-2020.03.1.ebuild b/net-wireless/kismet/kismet-2020.03.1_p20200311.ebuild
similarity index 92%
rename from net-wireless/kismet/kismet-2020.03.1.ebuild
rename to net-wireless/kismet/kismet-2020.03.1_p20200311.ebuild
index 73b8a86810b3..b1b373dfe0cd 100644
--- a/net-wireless/kismet/kismet-2020.03.1.ebuild
+++ b/net-wireless/kismet/kismet-2020.03.1_p20200311.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_6 )
 
-inherit autotools eutils multilib user python-single-r1
+inherit autotools eutils multilib user python-single-r1 udev
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git"
@@ -18,12 +18,12 @@ else
 	S=${WORKDIR}/${MY_P/BETA/beta}
 
 	#normally we want an official release
-	SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
+	#SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
 
 	#but sometimes we want a git commit
-	#COMMIT="6d6d486831c0f7ac712ffb8a3ff122c5063c3b2a"
-	#SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	#S="${WORKDIR}/${PN}-${COMMIT}"
+	COMMIT="9ca7e469cf115469f392db7436816151867e1654"
+	SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
 
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 fi
@@ -33,7 +33,7 @@ HOMEPAGE="https://www.kismetwireless.net"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-IUSE="libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth"
+IUSE="libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth udev"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 CDEPEND="
@@ -113,6 +113,7 @@ src_install() {
 	emake DESTDIR="${D}" commoninstall
 	python_optimize
 	emake DESTDIR="${D}" forceconfigs
+	use udev && udev_dorules packaging/udev/*.rules
 
 	insinto /usr/share/${PN}
 	doins Makefile.inc
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 73b8a86810b3..e7ca54723d1e 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_6 )
 
-inherit autotools eutils multilib user python-single-r1
+inherit autotools eutils multilib user python-single-r1 udev
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git"
@@ -21,7 +21,7 @@ else
 	SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
 
 	#but sometimes we want a git commit
-	#COMMIT="6d6d486831c0f7ac712ffb8a3ff122c5063c3b2a"
+	#COMMIT="9ca7e469cf115469f392db7436816151867e1654"
 	#SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	#S="${WORKDIR}/${PN}-${COMMIT}"
 
@@ -33,7 +33,7 @@ HOMEPAGE="https://www.kismetwireless.net"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-IUSE="libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth"
+IUSE="libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth udev"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 CDEPEND="
@@ -113,6 +113,7 @@ src_install() {
 	emake DESTDIR="${D}" commoninstall
 	python_optimize
 	emake DESTDIR="${D}" forceconfigs
+	use udev && udev_dorules packaging/udev/*.rules
 
 	insinto /usr/share/${PN}
 	doins Makefile.inc
diff --git a/net-wireless/nanovna-saver/Manifest b/net-wireless/nanovna-saver/Manifest
index c7bbec5906af..00fa016e2db8 100644
--- a/net-wireless/nanovna-saver/Manifest
+++ b/net-wireless/nanovna-saver/Manifest
@@ -1 +1 @@
-DIST nanovna-saver-0.1.5.tar.gz 96346 BLAKE2B e3ae93df4c732f27dc7781068b6fba3abda81b84b1663953ddf5cbc043e45c273ccc1f25c81f0c02180ebfad8e0cd0d65411fc75f2c7124cfeed8b7ff0b71aff SHA512 cb230f17f45bff77bb60700e5a32d8fd577cfa2603a3bde03dbdebd20bc0c5c2acc1546560a08d0cb3c1abce5e7e6aef067e3805d5ec09e70aefb9e1a1f3a164
+DIST nanovna-saver-0.2.2.tar.gz 178819 BLAKE2B 97949c0b77f6fa122f4f1d446fe10b9d2aee8be37d6d1d47fcfe95db978e70886b110932c820bc248491cc68014c5ee5f76bea33a7b3e971ca8f9fbaaa323217 SHA512 fe1d23103472bccf804b4b0c0df6cc8ec2a782cf442214358c1bd1895c185f472701656bd9ffacf3bbf0b24ee964f8c58a103570cd8c80adbd0126a7113ccb5c
diff --git a/net-wireless/nanovna-saver/nanovna-saver-0.1.5.ebuild b/net-wireless/nanovna-saver/nanovna-saver-0.2.2.ebuild
similarity index 86%
rename from net-wireless/nanovna-saver/nanovna-saver-0.1.5.ebuild
rename to net-wireless/nanovna-saver/nanovna-saver-0.2.2.ebuild
index eeb9302e2479..b0585e449aea 100644
--- a/net-wireless/nanovna-saver/nanovna-saver-0.1.5.ebuild
+++ b/net-wireless/nanovna-saver/nanovna-saver-0.2.2.ebuild
@@ -26,3 +26,8 @@ RDEPEND="${DEPEND}
 	dev-python/PyQt5[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]"
 BDEPEND=""
+
+src_prepare(){
+	sed -i "s#find_packages()#find_packages(exclude=['test'])#" setup.py
+	distutils-r1_src_prepare
+}
diff --git a/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild b/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
index eeb9302e2479..b0585e449aea 100644
--- a/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
+++ b/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
@@ -26,3 +26,8 @@ RDEPEND="${DEPEND}
 	dev-python/PyQt5[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]"
 BDEPEND=""
+
+src_prepare(){
+	sed -i "s#find_packages()#find_packages(exclude=['test'])#" setup.py
+	distutils-r1_src_prepare
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 31758221e4a9..f975aaf940ed 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/package.mask b/profiles/package.mask
index a508f3065e05..9cf2b2b9b669 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Matthew Thode <prometheanfire@gentoo.org> (2020-03-13)
+# masked for removal in 14 days. Bug #712310
+dev-python/cliff-tablib
+
 # Ulrich Müller <ulm@gentoo.org> (2020-03-11)
 # No license. HOMEPAGE is gone.
 # Masked for removal in 14 days. Bug #450454.
@@ -176,7 +180,6 @@ dev-python/mmh3
 dev-python/mockldap
 dev-python/multipledispatch
 dev-python/netmiko
-dev-python/nltk
 dev-python/nosehtmloutput
 dev-python/odo
 dev-python/passwordmeter
@@ -251,7 +254,6 @@ dev-python/tpg
 dev-python/translationstring
 dev-python/trollius
 dev-python/twitter
-dev-python/twython
 dev-python/uhashring
 dev-python/uncompyle6
 dev-python/venusian
diff --git a/profiles/updates/1Q-2020 b/profiles/updates/1Q-2020
index 320d898c2072..b1f7fe244b9a 100644
--- a/profiles/updates/1Q-2020
+++ b/profiles/updates/1Q-2020
@@ -7,3 +7,4 @@ move dev-python/pyzor mail-filter/pyzor
 move dev-python/python-sqlparse dev-python/sqlparse
 move dev-python/ghp-import dev-vcs/ghp-import
 move app-doc/ghp-import dev-vcs/ghp-import
+move dev-python/git-python dev-python/GitPython
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index b0bfec566464..8538c07a0750 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -547,7 +547,6 @@ app-emulation/libvirt:openvz - Support management of OpenVZ virtualisation (open
 app-emulation/libvirt:parted - Allow using real disk partitions as pool for disk image storage, using sys-block/parted to create, resize and delete them.
 app-emulation/libvirt:pcap - Support auto learning IP addreses for routing
 app-emulation/libvirt:phyp - Support IBM HMC / IVM hypervisor via PHYP protocol
-app-emulation/libvirt:pm-utils - Add runtime support for sys-power/pm-utils
 app-emulation/libvirt:qemu - Support management of QEMU virtualisation (app-emulation/qemu)
 app-emulation/libvirt:rbd - Enable rados block device support via sys-cluster/ceph
 app-emulation/libvirt:vepa - Virtual Ethernet Port Aggregator (VEPA) / 802.1Qbg support. Relies on macvtap support.
@@ -2563,6 +2562,7 @@ dev-python/networkx:pandas - Provides a DataFrame, which is a tabular data struc
 dev-python/networkx:scipy - Enables scipy backend
 dev-python/networkx:yaml - Provides YAML format reading and writing
 dev-python/nltk:numpy - Use numpy for the saved word tokenizer
+dev-python/nltk-data:extra - Install the complete set of data files. Otherwise, only files required by tests are installed.
 dev-python/nose:coverage - Pull in dev-python/coverage needed for nose-xcover plugin.
 dev-python/numexpr:mkl - Enable support for Intel Vector Math Library, part of sci-libs/mkl.
 dev-python/pandas:full-support - Pull all packages to give pandas full support
@@ -3807,7 +3807,6 @@ mail-client/mutt:smtp - Enable support for direct SMTP delivery
 mail-client/mutt:tokyocabinet - Enable dev-db/tokyocabinet database backend for header caching
 mail-client/neomutt:berkdb - Enable BDB (Berkley DB) backend for header caching
 mail-client/neomutt:gdbm - Enable GDBM (GNU dbm) backend for header caching
-mail-client/neomutt:gpg - Enable support for app-crypt/gpgme
 mail-client/neomutt:gpgme - Build gpgme backend to support S/MIME, PGP/MIME and traditional/inline PGP
 mail-client/neomutt:kyotocabinet - Enable Kyoto Cabinet database backend for header caching
 mail-client/neomutt:lmdb - Enable LMDB (Lightning Memory-Mapped Database) backend for header caching
@@ -3815,7 +3814,6 @@ mail-client/neomutt:notmuch - Enable support for net-mail/notmuch
 mail-client/neomutt:pgp-classic - Build classic_pgp backend to support PGP/MIME and traditional/inline PGP
 mail-client/neomutt:pgp_classic - Build classic_pgp backend to support PGP/MIME and traditional/inline PGP
 mail-client/neomutt:qdbm - Enable QDBM (Quicker Database Manager) database backend for header caching
-mail-client/neomutt:smime - Enable support for smime
 mail-client/neomutt:smime-classic - Build classic_smime backend to support S/MIME
 mail-client/neomutt:smime_classic - Build classic_smime backend to support S/MIME
 mail-client/neomutt:tokyocabinet - Enable Tokyo Cabinet database backend for header caching
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index b174aa0f5417..41a086931133 100644
Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.6.0-disable_update_check.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.6.0-disable_update_check.patch
new file mode 100644
index 000000000000..6adeef664a52
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel-1.6.0-disable_update_check.patch
@@ -0,0 +1,132 @@
+From e24573dc7fce7c48da6b960a722b567f24e1318e Mon Sep 17 00:00:00 2001
+From: "Andreas K. Huettel" <dilfridge@gentoo.org>
+Date: Thu, 12 Mar 2020 19:48:16 +0100
+Subject: [PATCH] Gentoo: Disable update check
+
+---
+ gui/babeldata.h    |  2 +-
+ gui/mainwindow.cc  | 16 ----------------
+ gui/mainwinui.ui   |  6 ------
+ gui/preferences.cc |  2 --
+ gui/preferences.ui |  7 -------
+ 5 files changed, 1 insertion(+), 32 deletions(-)
+
+diff --git a/gui/babeldata.h b/gui/babeldata.h
+index a8586f30..4d73a4e4 100644
+--- a/gui/babeldata.h
++++ b/gui/babeldata.h
+@@ -64,7 +64,7 @@ public:
+     upgradeErrors_(0),
+     upgradeOffers_(0),
+     runCount_(0),
+-    startupVersionCheck_(true),
++    startupVersionCheck_(false),
+     reportStatistics_(false),
+     allowBetaUpgrades_(false),
+     ignoreVersionMismatch_(false),
+diff --git a/gui/mainwindow.cc b/gui/mainwindow.cc
+index adbac733..b0a8483a 100644
+--- a/gui/mainwindow.cc
++++ b/gui/mainwindow.cc
+@@ -174,7 +174,6 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent)
+   connect(ui_.actionAbout, SIGNAL(triggered()), this, SLOT(aboutActionX()));
+   connect(ui_.actionVisit_Website, SIGNAL(triggered()), this, SLOT(visitWebsiteActionX()));
+   connect(ui_.actionMake_a_Donation, SIGNAL(triggered()), this, SLOT(donateActionX()));
+-  connect(ui_.actionUpgradeCheck, SIGNAL(triggered()), this, SLOT(upgradeCheckActionX()));
+   connect(ui_.actionPreferences, SIGNAL(triggered()), this, SLOT(preferencesActionX()));
+ 
+   connect(ui_.inputFormatCombo,  SIGNAL(currentIndexChanged(int)),
+@@ -233,17 +232,6 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent)
+   restoreSettings();
+ 
+   upgrade = new UpgradeCheck(parent, formatList_, babelData_);
+-  if (babelData_.startupVersionCheck_) {
+-    upgrade->checkForUpgrade(babelVersion_, babelData_.upgradeCheckTime_,
+-                             allowBetaUpgrades());
+-  }
+-
+-  if (!babelData_.ignoreVersionMismatch_ && babelVersion_ != VERSION) {
+-    VersionMismatch vm(nullptr, babelVersion_, QString(VERSION));
+-
+-    vm.exec();
+-    babelData_.ignoreVersionMismatch_ = vm.neverAgain();
+-  }
+ }
+ 
+ //------------------------------------------------------------------------
+@@ -1067,10 +1055,6 @@ void MainWindow::applyActionX()
+ //------------------------------------------------------------------------
+ void MainWindow::closeActionX()
+ {
+-  QDateTime wt= upgrade->getUpgradeWarningTime();
+-  if (wt.isValid()) {
+-    babelData_.upgradeCheckTime_ = wt;
+-  }
+   babelData_.runCount_++;
+ 
+   QDateTime now = QDateTime::currentDateTime();
+diff --git a/gui/mainwinui.ui b/gui/mainwinui.ui
+index f5765e10..4533f234 100644
+--- a/gui/mainwinui.ui
++++ b/gui/mainwinui.ui
+@@ -691,7 +691,6 @@
+     <addaction name="actionHelp"/>
+     <addaction name="separator"/>
+     <addaction name="actionAbout"/>
+-    <addaction name="actionUpgradeCheck"/>
+     <addaction name="separator"/>
+     <addaction name="actionVisit_Website"/>
+     <addaction name="actionMake_a_Donation"/>
+@@ -720,11 +719,6 @@
+     <string>Preferences...</string>
+    </property>
+   </action>
+-  <action name="actionUpgradeCheck">
+-   <property name="text">
+-    <string>Check for Upgrade</string>
+-   </property>
+-  </action>
+   <action name="actionVisit_Website">
+    <property name="text">
+     <string>Visit Website...</string>
+diff --git a/gui/preferences.cc b/gui/preferences.cc
+index f648324b..ea398f7c 100644
+--- a/gui/preferences.cc
++++ b/gui/preferences.cc
+@@ -41,7 +41,6 @@ Preferences::Preferences(QWidget* parent, QList<Format>& formatList,
+ {
+   ui_.setupUi(this);
+ 
+-  ui_.startupCheck->setChecked(babelData_.startupVersionCheck_);
+   ui_.reportStatisticsCheck->setChecked(babelData_.reportStatistics_);
+   ui_.ignoreVersionMismatchCheck->setChecked(babelData_.ignoreVersionMismatch_);
+   // Because of an unfortunate bug in 1.4.0, we turn this off in 1.4.1.
+@@ -85,7 +84,6 @@ void Preferences::acceptClicked()
+     formatList_[i].setHidden(item->checkState() == Qt::Unchecked);
+   }
+ 
+-  babelData_.startupVersionCheck_ = ui_.startupCheck->isChecked();
+   babelData_.reportStatistics_ = ui_.reportStatisticsCheck->isChecked();
+   babelData_.ignoreVersionMismatch_ = ui_.ignoreVersionMismatchCheck->isChecked();
+   accept();
+diff --git a/gui/preferences.ui b/gui/preferences.ui
+index 3bea6c2c..48f5deb3 100644
+--- a/gui/preferences.ui
++++ b/gui/preferences.ui
+@@ -39,13 +39,6 @@
+         </rect>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_4">
+-        <item>
+-         <widget class="QCheckBox" name="startupCheck">
+-          <property name="text">
+-           <string>Check for newer version on start.</string>
+-          </property>
+-         </widget>
+-        </item>
+         <item>
+          <widget class="QCheckBox" name="reportStatisticsCheck">
+           <property name="text">
+-- 
+2.24.1
+
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-9999-use_system_shapelib.patch b/sci-geosciences/gpsbabel/files/gpsbabel-9999-use_system_shapelib.patch
new file mode 100644
index 000000000000..8df45d839cdc
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel-9999-use_system_shapelib.patch
@@ -0,0 +1,133 @@
+From b69718b85b4ea9025f0f91d1e5de8b051a3c102d Mon Sep 17 00:00:00 2001
+From: "Andreas K. Huettel" <dilfridge@gentoo.org>
+Date: Thu, 12 Mar 2020 20:10:59 +0100
+Subject: [PATCH] Gentoo: Use system shapelib
+
+---
+ Makefile.in | 23 ++++++++++-------------
+ shape.cc    |  2 +-
+ shape.h     |  3 +--
+ 3 files changed, 12 insertions(+), 16 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index f04c6408..5365cf56 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -105,7 +105,7 @@ JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \
+ # Extra modules in Jeeps that we don't use
+ # 	jeeps/gpsfmt.o jeeps/gpsinput.o jeeps/gpsproj.o
+ 
+-SHAPE=shapelib/shpopen.o shapelib/dbfopen.o shapelib/safileio.o
++SHAPE=-lshp
+ 
+ ZLIB=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o \
+ 	zlib/inflate.o zlib/infback.o zlib/inftrees.o zlib/trees.o \
+@@ -121,7 +121,7 @@ LIBOBJS = route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \
+     src/core/textstream.o \
+ 	  src/core/usasciicodec.o \
+ 	  src/core/xmlstreamwriter.o \
+-	  $(GARMIN) $(JEEPS) $(SHAPE) @ZLIB@ $(FMTS) $(FILTERS)
++	  $(GARMIN) $(JEEPS) @ZLIB@ $(FMTS) $(FILTERS)
+ OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@
+ 
+ DEPFILES = $(OBJS:.o=.d)
+@@ -154,10 +154,10 @@ toolinfo
+ all: gpsbabel$(EXEEXT)
+ 
+ gpsbabel$(EXEEXT): configure Makefile $(OBJS) @USB_DEPS@ @GPSBABEL_DEBUG@
+-	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
+ 
+ gpsbabel-debug: $(OBJS) @USB_DEPS@
+-	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
+ 
+ Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \
+ 	  gbversion.h.in gui/setup.iss.in
+@@ -511,7 +511,7 @@ filter_vecs.o: filter_vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
+   position.h radius.h reverse_route.h smplrout.h sort.h stackfilter.h \
+   swapdata.h trackfilter.h transform.h validate.h gbversion.h vecs.h \
+   format.h ggv_bin.h gpx.h src/core/file.h src/core/xmlstreamwriter.h \
+-  src/core/xmltag.h shape.h shapelib/shapefil.h yahoo.h xmlgeneric.h \
++  src/core/xmltag.h shape.h yahoo.h xmlgeneric.h \
+   legacyformat.h mynav.h xcsv.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \
+   jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \
+   jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \
+@@ -535,7 +535,7 @@ garmin.o: garmin.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
+   jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \
+   jeeps/gpsrqst.h garmin_tables.h grtcirc.h jeeps/gpsserial.h vecs.h \
+   ggv_bin.h gpx.h src/core/file.h src/core/xmlstreamwriter.h \
+-  src/core/xmltag.h shape.h shapelib/shapefil.h yahoo.h xmlgeneric.h \
++  src/core/xmltag.h shape.h yahoo.h xmlgeneric.h \
+   legacyformat.h mynav.h xcsv.h src/core/textstream.h
+ garmin_device_xml.o: garmin_device_xml.cc defs.h config.h zlib/zlib.h \
+   zlib/zconf.h formspec.h inifile.h gbfile.h session.h \
+@@ -817,7 +817,7 @@ magproto.o: magproto.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
+   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
+   src/core/optional.h explorist_ini.h format.h gbser.h magellan.h vecs.h \
+   ggv_bin.h gpx.h src/core/file.h src/core/xmlstreamwriter.h \
+-  src/core/xmltag.h shape.h shapelib/shapefil.h yahoo.h xmlgeneric.h \
++  src/core/xmltag.h shape.h yahoo.h xmlgeneric.h \
+   legacyformat.h mynav.h xcsv.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \
+   jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \
+   jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \
+@@ -831,7 +831,7 @@ main.o: main.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
+   stackfilter.h swapdata.h trackfilter.h transform.h validate.h format.h \
+   src/core/file.h src/core/usasciicodec.h vecs.h ggv_bin.h gpx.h \
+   src/core/xmlstreamwriter.h src/core/xmltag.h shape.h \
+-  shapelib/shapefil.h yahoo.h xmlgeneric.h legacyformat.h mynav.h xcsv.h \
++  yahoo.h xmlgeneric.h legacyformat.h mynav.h xcsv.h \
+   garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \
+   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
+   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
+@@ -954,10 +954,7 @@ session.o: session.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
+   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h
+ shape.o: shape.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
+   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
+-  shape.h format.h shapelib/shapefil.h
+-shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h
+-shapelib/safileio.o: shapelib/safileio.c shapelib/shapefil.h
+-shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h
++  shape.h format.h
+ skyforce.o: skyforce.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
+   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
+   src/core/optional.h
+@@ -1048,7 +1045,7 @@ vecs.o: vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
+   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
+   vecs.h format.h ggv_bin.h gpx.h src/core/file.h \
+   src/core/xmlstreamwriter.h src/core/xmltag.h shape.h \
+-  shapelib/shapefil.h yahoo.h xmlgeneric.h legacyformat.h mynav.h xcsv.h \
++  yahoo.h xmlgeneric.h legacyformat.h mynav.h xcsv.h \
+   garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \
+   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
+   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
+diff --git a/shape.cc b/shape.cc
+index 933eb95a..f2ec5365 100644
+--- a/shape.cc
++++ b/shape.cc
+@@ -32,7 +32,7 @@
+ 
+ #include "defs.h"
+ #include "shape.h"
+-#include "shapelib/shapefil.h"
++#include <libshp/shapefil.h>
+ 
+ 
+ #if SHAPELIB_ENABLED
+diff --git a/shape.h b/shape.h
+index 75ec82c2..3bf1072f 100644
+--- a/shape.h
++++ b/shape.h
+@@ -27,8 +27,7 @@
+ 
+ #include "defs.h"               // for arglist_t, ARGTYPE_STRING, Waypoint, route_head, CET_CHARSET_ASCII, FF_CAP_RW_ALL, ff_cap, ff_type, ff_type_file
+ #include "format.h"             // for Format
+-#include "shapelib/shapefil.h"  // for DBFHandle, SHPAPI_CALL, SHPHandle
+-
++#include <libshp/shapefil.h>
+ 
+ #if SHAPELIB_ENABLED
+ class ShapeFormat : public Format
+-- 
+2.24.1
+
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-9999-xmldoc.patch b/sci-geosciences/gpsbabel/files/gpsbabel-9999-xmldoc.patch
new file mode 100644
index 000000000000..32728e04df28
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel-9999-xmldoc.patch
@@ -0,0 +1,27 @@
+From 7930deeee0c6f00a092b73c9d098873c2344ffdf Mon Sep 17 00:00:00 2001
+From: "Andreas K. Huettel" <dilfridge@gentoo.org>
+Date: Thu, 12 Mar 2020 21:25:04 +0100
+Subject: [PATCH] Gentoo: Use xml stylesheet from distdir instead of net access
+
+---
+ Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 091db602..0093e581 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -282,8 +282,8 @@ gpsbabel.html: FORCE # gpsbabel
+ 	  --stringparam html.cleanup "1" \
+ 	  --stringparam make.clean.html "1" \
+ 	  --stringparam html.valid.html "1" \
+-	  --stringparam html.stylesheet \
+-	  "https://www.gpsbabel.org/style3.css" \
++	  --nonet \
++	  --stringparam html.stylesheet "gpsbabel.org-style3.css" \
+ 	  http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
+ 	xmldoc/readme.xml
+ 
+-- 
+2.24.1
+
diff --git a/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
new file mode 100644
index 000000000000..e7b3f8abc911
--- /dev/null
+++ b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils qmake-utils
+
+MY_PV=${PV//./_}
+
+DESCRIPTION="GPS waypoints, tracks and routes converter"
+HOMEPAGE="https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel"
+LICENSE="GPL-2"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gpsbabel/gpsbabel.git"
+	SRC_URI="doc? ( https://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )"
+else
+	SRC_URI="
+		https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${MY_PV}.tar.gz
+		doc? ( https://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )
+	"
+	KEYWORDS="~amd64 ~ppc ~x86"
+	S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}"
+fi
+
+SLOT="0"
+IUSE="doc +gui"
+
+RDEPEND="
+	dev-libs/expat
+	dev-qt/qtcore:5
+	sci-libs/shapelib:=
+	sys-libs/zlib[minizip]
+	virtual/libusb:0
+	gui? (
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwebchannel:5
+		dev-qt/qtwebengine:5[widgets]
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+"
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	gui? ( dev-qt/linguist-tools:5 )
+"
+
+DOCS=( AUTHORS README.{contrib,igc,mapconverter,md,xmapwpt} )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.4-disable_statistic_uploading.patch
+	"${FILESDIR}"/${PN}-1.6.0-disable_update_check.patch
+	"${FILESDIR}"/${PN}-1.5.4-disable_version_check.patch
+	"${FILESDIR}"/${PN}-9999-use_system_shapelib.patch
+	"${FILESDIR}"/${PN}-9999-xmldoc.patch
+)
+
+RESTRICT="test" # bug 421699
+
+src_prepare() {
+	default
+
+	# remove bundled libs and cleanup
+	rm -r shapelib || die
+
+	use doc && cp "${DISTDIR}/gpsbabel.org-style3.css" "${S}"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with doc doc "${S}"/doc/manual) \
+		LRELEASE=$(qt5_get_bindir)/lrelease \
+		LUPDATE=$(qt5_get_bindir)/lupdate \
+		QMAKE=$(qt5_get_bindir)/qmake \
+		--with-zlib=system
+
+	if use gui; then
+		pushd "${S}/gui" > /dev/null || die
+		$(qt5_get_bindir)/lrelease *.ts || die
+		eqmake5
+		popd > /dev/null
+	fi
+}
+
+src_compile() {
+	default
+	if use gui; then
+		pushd "${S}/gui" > /dev/null || die
+		emake
+		popd > /dev/null
+	fi
+
+	if use doc; then
+		perl xmldoc/makedoc || die
+		emake gpsbabel.html
+	fi
+}
+
+src_install() {
+	use doc && HTML_DOCS=( "${S}"/${PN}.html "${S}"/${PN}.org-style3.css )
+
+	default
+
+	if use gui; then
+		dobin gui/objects/gpsbabelfe
+		insinto /usr/share/${PN}/translations/
+		doins gui/gpsbabel*_*.qm
+		newicon gui/images/appicon.png ${PN}.png
+		make_desktop_entry gpsbabelfe ${PN} ${PN} "Science;Geoscience"
+	fi
+}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 909ad50dc3c6..152ca606edf1 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/genius/Manifest b/sci-mathematics/genius/Manifest
index 25416bdf6754..d38b488a2248 100644
--- a/sci-mathematics/genius/Manifest
+++ b/sci-mathematics/genius/Manifest
@@ -1,2 +1,3 @@
 DIST genius-1.0.23.tar.xz 2910332 BLAKE2B 8c9822737dfd0b445092c6b96376249093f3cfece4f0b98cb1bf62e9066336875fc014798b301686a9ffcaf5e37c1f324771c5b9e86c1578455874964427cca6 SHA512 8c64235d22734a7653468d39500ebbaa38b0ba7c25e292b4e96ddf825082584bf8c70e7ddc463b685ea01d51d3e08233b4e0cf8816a9a0e3357badb90d8e43c7
+DIST genius-1.0.25.tar.xz 2935920 BLAKE2B 9e5a58e15a1e53a64b10c662f1dea91ec80987d1be3ec208aaff76f59d1f9f5b2f9b2b1a2d6bede9c2cae5258038b2995b3bce6600471d088653b1392a1a8eb1 SHA512 ecd01acceb4cea3cb9796edaebc983ed7c0ee618737d98755882a845ddc07e1307851ef9fba75714bc33868556f03c004e03c3b9c42425293cb59a86b8af17a9
 DIST genius-reference.pdf 1024944 BLAKE2B e0058fbd266a4ed4bf29306520ac64b7ff9a970fa79b5132f5556b61a97dd985fe916c888d0d5a678528ef231a9c66310dc2affe01491c7848451b3d54f58274 SHA512 04af3870104d2320b1d4b345d74d713a0dfcdf8a228002506508f437659b3ef6037ead0b1f6b37cc335692150750b58c4007fdaaddd9540233474ccd10dac285
diff --git a/sci-mathematics/genius/files/genius-1.0.25-vte-conf-fixes.patch b/sci-mathematics/genius/files/genius-1.0.25-vte-conf-fixes.patch
new file mode 100644
index 000000000000..54d3a65c7ff3
--- /dev/null
+++ b/sci-mathematics/genius/files/genius-1.0.25-vte-conf-fixes.patch
@@ -0,0 +1,173 @@
+From 3b0ffaf91894a70d5d3eefcf587a258cdc818a8f Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Fri, 13 Mar 2020 00:37:32 +0200
+Subject: [PATCH] Clean up vte configure.ac handling
+
+---
+ configure.ac    | 113 +-----------------------------------------------
+ src/Makefile.am |   2 -
+ 2 files changed, 2 insertions(+), 113 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6c70c5c9..9d8e76a8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,9 +19,9 @@ PKG_PROG_PKG_CONFIG
+ 
+ dnl ================= Requirements ================================================
+ 
++VTE_REQUIRED=0.50.0
+ GTK_REQUIRED=3.21.4
+ GLIB_REQUIRED=2.41.1
+-PANGO_REQUIRED=1.22.0
+ GTKSOURCEVIEW4_REQUIRED=3.99.7
+ GIO_REQUIRED=2.16.0
+ 
+@@ -123,7 +123,7 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
+ AC_SUBST(GLIB_CFLAGS)
+ AC_SUBST(GLIB_LIBS)
+ 
+-GENIUS_MODULES="amtk-5 gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GIO_REQUIRED"
++GENIUS_MODULES="amtk-5 gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GIO_REQUIRED vte-2.91 >= $VTE_REQUIRED"
+ 
+ if test "x$use_gnome" = "xyes" ; then
+   echo " 
+@@ -260,115 +260,6 @@ AC_ARG_ENABLE(update-mimedb,
+ AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
+ 
+ 
+-####
+-# VTE STUFF, this is all temporary pending a port to gtk 3.0 in the star trek future
+-# FIXME: OK this happened, so things ought to be properly "whacked" (removed)
+-
+-AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
+-AC_DEFINE_UNQUOTED(VTE_DEFAULT_EMULATION,"xterm",[The default terminal type to be emulated.])
+-VTE_DEFAULT_EMULATION="xterm"
+-AC_SUBST(VTE_DEFAULT_EMULATION)
+-
+-# Check for headers.
+-AC_CHECK_HEADERS(sys/select.h sys/syslimits.h sys/termios.h sys/un.h sys/wait.h stropts.h termios.h wchar.h)
+-AC_HEADER_TIOCGWINSZ
+-
+-# Check for PTY handling functions.
+-AC_CHECK_FUNCS([cfmakeraw fork setsid setpgid getpgid getpt grantpt unlockpt ptsname ptsname_r tcgetattr tcsetattr])
+-
+-# Pull in the right libraries for various functions which might not be
+-# bundled into an exploded libc.
+-AC_CHECK_FUNC(socket,[have_socket=1],AC_CHECK_LIB(socket,socket,[have_socket=1; LIBS="$LIBS -lsocket"]))
+-AC_CHECK_FUNC(socketpair,[have_socketpair=1],AC_CHECK_LIB(socket,socketpair,[have_socketpair=1; LIBS="$LIBS -lsocket"]))
+-AC_CHECK_FUNC(recvmsg,[have_recvmsg=1],AC_CHECK_LIB(socket,recvmsg,[have_recvmsg=1; LIBS="$LIBS -lsocket -lnsl"]))
+-if test x$have_socket = x1 ; then
+-	AC_DEFINE(HAVE_SOCKET,1,[Define if you have the socket function.])
+-fi
+-if test x$have_socketpair = x1 ; then
+-	AC_DEFINE(HAVE_SOCKETPAIR,1,[Define if you have the socketpair function.])
+-fi
+-if test x$have_recvmsg = x1 ; then
+-	AC_DEFINE(HAVE_RECVMSG,1,[Define if you have the recvmsg function.])
+-fi
+-AC_CHECK_FUNC(floor,,AC_CHECK_LIB(m,floor,LIBS=["$LIBS -lm"]))
+-AC_CHECK_FUNCS([ceil floor])
+-
+-# Look for tgetent
+-
+-AC_CHECK_FUNC([tgetent],[vte_cv_termcap_lib=libc],
+-  [AC_CHECK_LIB([ncurses],[tgetent],[vte_cv_termcap_lib=libncurses],
+-    [AC_CHECK_LIB([tinfo],[tgetent],[vte_cv_termcap_lib=libtinfo],
+-      [AC_CHECK_LIB([curses],[tgetent],[vte_cv_termcap_lib=libcurses],
+-        [AC_CHECK_LIB([termcap],[tgetent],[vte_cv_termcap_lib=libtermcap],
+-          [vte_cv_termcap_lib=])])])])])
+-
+-case "$vte_cv_termcap_lib" in
+-  libc)       # FIXME: which headers to include here?
+-              ;;
+-  libncurses) # We need ncurses.h and term.h, or ncurses/curses.h and ncurses/term.h
+-              AC_CHECK_HEADERS([ncurses.h term.h],[],
+-                [AC_CHECK_HEADERS([ncurses/curses.h ncurses/term.h],[],
+-                  [AC_MSG_ERROR([ncurses headers not found])])])
+-              LIBS="-lncurses $LIBS"
+-              ;;
+-  libtinfo)   # Need ncurses/curses.h and ncurses/term.h
+-              AC_CHECK_HEADERS([ncurses.h term.h],[],
+-                [AC_CHECK_HEADERS([ncurses/curses.h ncurses/term.h],[],
+-                  [AC_MSG_ERROR([ncurses headers not found])])])
+-              LIBS="-ltinfo $LIBS"
+-              ;;
+-  libcurses)  # Need curses.h and term.h
+-              AC_CHECK_HEADERS([curses.h term.h],[],
+-                [AC_MSG_ERROR([curses headers not found])],
+-                [[#ifdef HAVE_CURSES_H
+-                  #include <curses.h>
+-                  #endif]])
+-              LIBS="-lcurses $LIBS"
+-              ;;
+-  libtermcap) # Need termcap.h
+-              AC_CHECK_HEADERS([termcap.h],[],
+-                [AC_MSG_ERROR([termcap headers not found])])
+-              LIBS="-ltermcap $LIBS"
+-              ;;
+-  *)          AC_MSG_ERROR([tgetent not found in any library]) ;;
+-esac
+-
+-# Search for the required modules.
+-
+-# We have a direct dependency on X11 on gdk-x11, see bug #613525
+-AC_MSG_CHECKING([for GDK target])
+-GDK_TARGET="$($PKG_CONFIG --variable target gdk-3.0)"
+-AC_MSG_RESULT([$GDK_TARGET])
+-case "$GDK_TARGET" in
+-  x11) PLATFORM_PKGS="x11 cairo-xlib" ;;
+-  *) PLATFORM_PKGS="" ;;
+-esac
+-
+-VTE_PKGS="vte-2.91"
+-PKG_CHECK_MODULES([VTE],[$VTE_PKGS])
+-AC_SUBST([VTE_PKGS])
+-
+-wcs_funcs_includes="
+-#ifdef HAVE_STRING_H
+-# if !STDC_HEADERS && HAVE_MEMORY_H
+-#  include <memory.h>
+-# endif
+-# include <string.h>
+-#else
+-# ifdef HAVE_STRINGS_H
+-#  include <strings.h>
+-# endif
+-#endif
+-#ifdef HAVE_WCHAR_H
+-# include <wchar.h>
+-#endif
+-"
+-
+-AC_CHECK_TYPES(wint_t, AC_DEFINE(HAVE_WINT_T, , [Defined when the wint_t type is supported]), ,$wcs_funcs_includes)
+-
+-
+-########
+-
+ AC_OUTPUT([
+ genius.spec
+ Makefile
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 8408becd..f58eb689 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -22,7 +22,6 @@ AM_CPPFLAGS = \
+ 	-I$(top_builddir)/ve					\
+ 	-I$(top_builddir)/gtkextra				\
+ 	$(WARN_CFLAGS)						\
+-	$(VTE_CFLAGS)						\
+ 	$(BINRELOC_CFLAGS)					\
+ 	$(GMP_INCLUDEDIR)					\
+ 	$(GENIUS_CFLAGS)					\
+@@ -102,7 +101,6 @@ gnome_genius_LDADD = \
+ 	@LEXLIB@				\
+ 	$(INTLLIBS)				\
+ 	$(GENIUS_LIBS)				\
+-	$(VTE_LIBS)				\
+ 	$(GENIUS_NOGUI_LIBS)			\
+ 	$(GSV_LIBS)				\
+ 	@READLINE_LIB@				\
+-- 
+2.20.1
+
diff --git a/sci-mathematics/genius/genius-1.0.25.ebuild b/sci-mathematics/genius/genius-1.0.25.ebuild
new file mode 100644
index 000000000000..8d7c54134e0c
--- /dev/null
+++ b/sci-mathematics/genius/genius-1.0.25.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="Genius Mathematics Tool and the GEL Language"
+HOMEPAGE="https://www.jirka.org/genius.html"
+SRC_URI="${SRC_URI}
+	doc? ( https://www.jirka.org/${PN}-reference.pdf )"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +gui"
+
+RDEPEND="
+	>=dev-libs/glib-2.41.1:2
+	dev-libs/gmp:0=
+	dev-libs/mpfr:0=
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	gui? (
+		>=x11-libs/gtk+-3.21.4:3
+		>=x11-libs/gtksourceview-3.99.7:4
+		gui-libs/amtk:5
+		>=x11-libs/vte-0.50.0:2.91 )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-update-icon-cache
+	dev-util/intltool
+	sys-devel/autoconf-archive
+	sys-devel/flex
+	virtual/yacc
+" # eautoreconf needs sys-devel/autoconf-archive
+# dev-util/gtk-update-icon-cache because configure checks for it for some reason and never calls it with DESTDIR set..
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.24-no_scrollkeeper.patch"
+	"${FILESDIR}/${P}-vte-conf-fixes.patch"
+)
+
+src_configure() {
+	# Unrecognized --disable-scrollkeeper warning comes from gnome2.eclass adding it based on grep, but upstream has them commented out in .ac with "#" instead of "dnl"
+	gnome2_src_configure \
+		$(use_enable gui gnome) \
+		--enable-nls \
+		--disable-extra-gcc-optimization \
+		--disable-static
+}
+
+src_install() {
+	use doc && DOCS+=" ${DISTDIR}/${PN}-reference.pdf"
+	gnome2_src_install
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index c17d0d3ac162..b12f9ef1df2e 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index 4c592e48ed0e..8a0297073e69 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,2 +1,2 @@
 DIST cpuid-20180519.src.tar.gz 84784 BLAKE2B 87098145a378081d296f0473f9106e7c5b6654c2bd63d385dc27e293079adf3a527801fa644000ede53228e087e9e9afdf807a3c8d9cc8eb93826f01a5a89e9a SHA512 565738c41777669e750a2ef2e122ed0568de5ac8cc2584fa5047ba66d42eb5c3324b283bda25605e055d85402a4e2d109bc6d033ccd34243caab728465792669
-DIST cpuid-20200203.src.tar.gz 113144 BLAKE2B fea8a51559e77bac779cda096e694992090d5b6e4f6efbee3b67f66727267028da062c317ca045155b668292c5f3f6c2d027a59f74d27f138c8ebb529f8df820 SHA512 ae80275fba522688161d08b58d4df6437bad66853a7fce9591b5ca10ecd649ce712616f46d6c9f47a36ff3a1f09c65a10dc70fb409bc58c5e30ae413cfd92aa0
+DIST cpuid-20200211.src.tar.gz 114939 BLAKE2B c03d703fe6cdf131886e83e31ccafdb80e435e5183d033886d1d737905667fc359d0117951d76d9c6475a7138173cba7d94f5580d5e3d4a8c0c1ec571d5fec51 SHA512 5a5bf3a57f6af3f88b234c9f2cedbb9f8b7e1fd87923da140de01ee4212bac78513cbc006471f3aacc563fb2893c66bc236e2bb27f606e22c07bd9acf612c8e4
diff --git a/sys-apps/cpuid/cpuid-20200203.ebuild b/sys-apps/cpuid/cpuid-20200211.ebuild
similarity index 90%
rename from sys-apps/cpuid/cpuid-20200203.ebuild
rename to sys-apps/cpuid/cpuid-20200211.ebuild
index 60a214f3c409..c48d21a156d2 100644
--- a/sys-apps/cpuid/cpuid-20200203.ebuild
+++ b/sys-apps/cpuid/cpuid-20200211.ebuild
@@ -18,7 +18,7 @@ DEPEND="app-arch/gzip"
 
 DOCS=( "ChangeLog" "FUTURE" )
 
-PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
+PATCHES=( "${FILESDIR}/${PN}-20200203-makefile.patch" )
 
 src_prepare() {
 	default
diff --git a/sys-apps/edid-decode/Manifest b/sys-apps/edid-decode/Manifest
index faf4bcb829dc..9f796d975078 100644
--- a/sys-apps/edid-decode/Manifest
+++ b/sys-apps/edid-decode/Manifest
@@ -1,2 +1,2 @@
 DIST edid-decode-0_pre20191209.tar.gz 57651 BLAKE2B 2a8717547939b7ff25482edc00a158c1cb3ff162b6e450549a274a10b10678fabf20529c9e97a455f6d4bfaf6dcb1db54c38cea3908761432bcd4d15e58271d1 SHA512 8d4c6a15538da1720f0e6c8fc4f9f3f64e6ade0e217a6860016167eb14f752e60bbfe69979f25189979fbc6405b417e8f1a9bf9f2a75a299b4914ce1827b680f
-DIST edid-decode-0_pre20200203.tar.gz 80075 BLAKE2B 8450f7e702dba03a16bd8febe7bd97263d946538ad3bf9bc3d22b76729341b784f02b49d7e2f0e0c86c1d38e79635494e7e3f99d0c56c530a4bbef09408c7e72 SHA512 aad6a0bdb94531e2147c009950be6214c654e0a8dcb381c5154626cb0681b7273163b5422100ffb440b8c4d207affb854bfed33b797d0de6d112d7254a45003e
+DIST edid-decode-0_pre20200310.tar.gz 87818 BLAKE2B e346d19285b6a7d15a863830d0e8d53df51f88e1914a7cb130cced06f30ebb42d83dd71fe054b8f98842ca98973aeb65fb76375014c9dcecde946e6805a02b82 SHA512 7ab26216ccf42065fba022fb5415601dbc338e8c70ff039d25c2a6066e5bd9f171893b4ba52fba248d295b9ac72bce5bd0f0397ea6721799d8a7357eb6b41a6f
diff --git a/sys-apps/edid-decode/edid-decode-0_pre20200203.ebuild b/sys-apps/edid-decode/edid-decode-0_pre20200310.ebuild
similarity index 92%
rename from sys-apps/edid-decode/edid-decode-0_pre20200203.ebuild
rename to sys-apps/edid-decode/edid-decode-0_pre20200310.ebuild
index dcd5ec78591e..1b5705aa4e70 100644
--- a/sys-apps/edid-decode/edid-decode-0_pre20200203.ebuild
+++ b/sys-apps/edid-decode/edid-decode-0_pre20200310.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit toolchain-funcs
 
-EGIT_COMMIT="c29b9433af16d4b31453b000e39bb1ce64aac065"
+EGIT_COMMIT="24f1eb8acb4bf9365a66326a0b5d01eff23ba32e"
 MY_P="${PN}-${EGIT_COMMIT}"
 
 DESCRIPTION="Decode EDID data in a human-readable format"
diff --git a/sys-apps/elivepatch-client/elivepatch-client-0.1.ebuild b/sys-apps/elivepatch-client/elivepatch-client-0.1.ebuild
index b8302c17b2c9..342b201d82a7 100644
--- a/sys-apps/elivepatch-client/elivepatch-client-0.1.ebuild
+++ b/sys-apps/elivepatch-client/elivepatch-client-0.1.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	app-admin/sudo
-	dev-python/git-python[${PYTHON_USEDEP}]
+	dev-python/GitPython[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/sys-apps/elivepatch-client/elivepatch-client-9999.ebuild b/sys-apps/elivepatch-client/elivepatch-client-9999.ebuild
index ef9800d25dac..70cc99090d40 100644
--- a/sys-apps/elivepatch-client/elivepatch-client-9999.ebuild
+++ b/sys-apps/elivepatch-client/elivepatch-client-9999.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
 
 RDEPEND="
 	app-admin/sudo
-	dev-python/git-python[${PYTHON_USEDEP}]
+	dev-python/GitPython[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/sys-apps/ipmicfg/Manifest b/sys-apps/ipmicfg/Manifest
index 481fbaa6b213..d38b1b46aafe 100644
--- a/sys-apps/ipmicfg/Manifest
+++ b/sys-apps/ipmicfg/Manifest
@@ -1 +1 @@
-DIST IPMICFG_1.30.0_build.190710.zip 1886457 BLAKE2B 5a303ccedda2ffab8d599e68feb1e23faeba0cca7d2fdb224c29440a11a12114cdf536e3f9e5544c1f929fdf8aab0846db51ff2935b20b70b7c3cf7a0fa82bfc SHA512 bad76fd5bc07a9bafecbc02c9a0fc26310b4894c6c365f3c53f1a900244b634317bf59f43d8fa230af866ce6e7f537c7f902b38bb1d4ff5a8546de4fe94043f4
+DIST IPMICFG_1.31.0_build.200205.zip 1972548 BLAKE2B e6d16907bad2c85618087f770621bf8335bbe38eb5b1a2466ee5b998ab13613aa96dd44e395a05e5b183597d4e5d5f775685bc810cd7d904f57eccecc8474ba1 SHA512 c46414b3504fe357f3b7df0f0c5f8cd4ada5ffa0541a1e49f282a187b8257d6c278cda099cce034eb9a25ad47bfd531255ec88ef6e2495a80f281888374441eb
diff --git a/sys-apps/ipmicfg/ipmicfg-1.30.0.190710.ebuild b/sys-apps/ipmicfg/ipmicfg-1.31.0.200205.ebuild
similarity index 58%
rename from sys-apps/ipmicfg/ipmicfg-1.30.0.190710.ebuild
rename to sys-apps/ipmicfg/ipmicfg-1.31.0.200205.ebuild
index c8ffc2689fba..6c3e2af0a83a 100644
--- a/sys-apps/ipmicfg/ipmicfg-1.30.0.190710.ebuild
+++ b/sys-apps/ipmicfg/ipmicfg-1.31.0.200205.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
@@ -15,16 +15,13 @@ KEYWORDS="-* ~amd64 ~x86"
 LICENSE="supermicro"
 SLOT="0"
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 RESTRICT="bindist fetch mirror"
 
 S="${WORKDIR}/${MY_PN}_${MY_PV}_build.${MY_DATE}"
 
-QA_PREBUILT="
-	opt/ipmicfg/IPMICFG-Linux.x86
-	opt/ipmicfg/IPMICFG-Linux.x86_64
-"
+QA_PREBUILT="usr/bin/ipmicfg"
 
 pkg_nofetch() {
 	elog "Please download ${A} from"
@@ -33,21 +30,7 @@ pkg_nofetch() {
 }
 
 src_install() {
-	# Choose ARCH
-	local my_arch_binary="$(usex amd64 'x86_64' 'x86')"
-	local my_arch_folder="$(usex amd64 '64bit' '32bit')"
-
-	# Install files
-	insinto /opt/ipmicfg
-	doins Linux/"${my_arch_folder}"/*.dat
-
-	# Install binary
-	exeinto /opt/ipmicfg
-	doexe Linux/"${my_arch_folder}"/IPMICFG-Linux."${my_arch_binary}"
-
-	# Install symlink
-	dodir /opt/bin
-	dosym ../ipmicfg/IPMICFG-Linux."${my_arch_binary}" /opt/bin/ipmicfg
+	newbin Linux/$(usex amd64 '64bit' '32bit')/IPMICFG-Linux.x86$(usex amd64 '_64' '') ipmicfg
 
 	# Install docs
 	local DOCS=(
diff --git a/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild b/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
index 29f95d7ca59f..11ae583d9307 100644
--- a/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
+++ b/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index a34105b46b31..744197c25e88 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index c56e12bdaad2..4f851a933261 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -1,2 +1,3 @@
 DIST elogind-241.4.tar.gz 1400769 BLAKE2B f1ddf87a6a4e3d06c184ae004d99acbfc1a753d0e5c6d18ff4c10a51b350cee0c14f833aba6f2a2a0f4891ad323868b9a94a3acb8b9eec2e30405b9fa4a09425 SHA512 e1685ac81028eab4a4cf63c7b962ae85f07bc0e39b2562934f863bfdf39417445c432fab5454e7c64b337ab62d95fb69abbe1139464a059a86fb485ed0534ad8
 DIST elogind-243.4.tar.gz 1335747 BLAKE2B 37c4eb1c476f97948aed44901fbd61ee1b1b8215d3167b368be00c542c64cdcb8b1e8e2725515820df4542d800079810e95f59469e3c6f5229932e55de4a3c1f SHA512 9751a3d0ed65dd73d9363097ee1752d437d5636db2a4137395596e0c81e04d4715f314568d1d7c6f367f1ecbda011086cb165bd4dc207302626b16e693cd0a02
+DIST elogind-243.7.tar.gz 1338186 BLAKE2B f3efc2af50f56c2cda18d721c18f4d88ca608fb35b2c7e2ebb35c3f3f743124dcf17efcc9db47810a13093397b1c1bc82cb42e017b3db493af5d2bb70bcf0eff SHA512 fd17c5016d083d63805f9ed0326ee32597870f6c48c9c246712cb09a77db775036b0fd0f4258b6557e189a1eceb4b50f4ae2e9e7881f4d9759b87a0b49ce3472
diff --git a/sys-auth/elogind/elogind-243.4.ebuild b/sys-auth/elogind/elogind-243.4.ebuild
index 1817a25b51c0..0a185cec6129 100644
--- a/sys-auth/elogind/elogind-243.4.ebuild
+++ b/sys-auth/elogind/elogind-243.4.ebuild
@@ -50,6 +50,7 @@ DOCS=( README.md src/libelogind/sd-bus/GVARIANT-SERIALIZATION )
 PATCHES=(
 	"${FILESDIR}/${P}-nodocs.patch"
 	"${FILESDIR}/${PN}-241.4-broken-test.patch" # bug 699116
+	"${FILESDIR}/${P}-selinux-missing-headers.patch" # bug 711432
 )
 
 pkg_setup() {
diff --git a/sys-auth/elogind/elogind-243.7.ebuild b/sys-auth/elogind/elogind-243.7.ebuild
new file mode 100644
index 000000000000..ec495cedb70c
--- /dev/null
+++ b/sys-auth/elogind/elogind-243.7.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_BRANCH="v241-stable"
+	EGIT_REPO_URI="https://github.com/elogind/elogind.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+inherit linux-info meson pam udev xdg-utils
+
+DESCRIPTION="The systemd project's logind, extracted to a standalone package"
+HOMEPAGE="https://github.com/elogind/elogind"
+
+LICENSE="CC0-1.0 LGPL-2.1+ public-domain"
+SLOT="0"
+IUSE="+acl debug doc +pam +policykit selinux"
+
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-util/gperf
+	dev-util/intltool
+	virtual/pkgconfig
+"
+DEPEND="
+	sys-apps/util-linux
+	sys-libs/libcap
+	virtual/libudev:=
+	acl? ( sys-apps/acl )
+	pam? ( sys-libs/pam )
+	selinux? ( sys-libs/libselinux )
+"
+RDEPEND="${DEPEND}
+	!sys-apps/systemd
+"
+PDEPEND="
+	sys-apps/dbus
+	policykit? ( sys-auth/polkit )
+"
+
+DOCS=( README.md src/libelogind/sd-bus/GVARIANT-SERIALIZATION )
+
+PATCHES=(
+	"${FILESDIR}/${P}-nodocs.patch"
+	"${FILESDIR}/${PN}-241.4-broken-test.patch" # bug 699116
+)
+
+pkg_setup() {
+	local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD"
+
+	use kernel_linux && linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	xdg_environment_reset
+}
+
+src_configure() {
+	local rccgroupmode="$(grep rc_cgroup_mode ${EPREFIX}/etc/rc.conf | cut -d '"' -f 2)"
+	local cgroupmode="legacy"
+
+	if [[ "xhybrid" = "x${rccgroupmode}" ]] ; then
+		cgroupmode="hybrid"
+	elif [[ "xunified" = "x${rccgroupmode}" ]] ; then
+		cgroupmode="unified"
+	fi
+
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+		-Dpamlibdir=$(getpam_mod_dir)
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)"/rules.d
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		-Drootlibdir="${EPREFIX}"/$(get_libdir)
+		-Drootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind
+		-Drootprefix="${EPREFIX}/"
+		-Dbashcompletiondir="${EPREFIX}/usr/share/bash-completion/completions"
+		-Dman=auto
+		-Dsmack=true
+		-Dcgroup-controller=openrc
+		-Ddefault-hierarchy=${cgroupmode}
+		-Ddefault-kill-user-processes=false
+		-Dacl=$(usex acl true false)
+		--buildtype $(usex debug debug release)
+		-Dhtml=$(usex doc auto false)
+		-Dpam=$(usex pam true false)
+		-Dselinux=$(usex selinux true false)
+		-Dutmp=$(usex elibc_musl false true)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	DOCS+=( src/libelogind/sd-bus/GVARIANT-SERIALIZATION )
+
+	meson_src_install
+
+	newinitd "${FILESDIR}"/${PN}.init ${PN}
+
+	sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die
+	newconfd ${PN}.conf ${PN}
+}
+
+pkg_postinst() {
+	if [[ "$(rc-config list boot | grep elogind)" != "" ]]; then
+		elog "elogind is currently started from boot runlevel."
+	elif [[ "$(rc-config list default | grep elogind)" != "" ]]; then
+		ewarn "elogind is currently started from default runlevel."
+		ewarn "Please remove elogind from the default runlevel and"
+		ewarn "add it to the boot runlevel by:"
+		ewarn "# rc-update del elogind default"
+		ewarn "# rc-update add elogind boot"
+	else
+		elog "elogind is currently not started from any runlevel."
+		elog "You may add it to the boot runlevel by:"
+		elog "# rc-update add elogind boot"
+		elog
+		elog "Alternatively, you can leave elogind out of any"
+		elog "runlevel. It will then be started automatically"
+		if use pam; then
+			elog "when the first service calls it via dbus, or"
+			elog "the first user logs into the system."
+		else
+			elog "when the first service calls it via dbus."
+		fi
+	fi
+}
diff --git a/sys-auth/elogind/files/elogind-243.4-selinux-missing-headers.patch b/sys-auth/elogind/files/elogind-243.4-selinux-missing-headers.patch
new file mode 100644
index 000000000000..7cc46fd05ebd
--- /dev/null
+++ b/sys-auth/elogind/files/elogind-243.4-selinux-missing-headers.patch
@@ -0,0 +1,36 @@
+From 1cd3fe4083eb8784fa2a125e4af0edb80e6928b5 Mon Sep 17 00:00:00 2001
+From: Sven Eden <sven.eden@prydeworx.com>
+Date: Thu, 12 Mar 2020 20:31:00 +0100
+Subject: [PATCH] basic/selinux-util.c : Uncomment missing includes (#157)
+
+Compiling on Debian unstable failed using gcc 9.2.1 and libc6 2.29.
+Uncommenting the two commented includes in basic/selinux-util.c
+fixes the compilation issues.
+
+Bug: #157
+Closes: #157
+Signed-off-by: Sven Eden <sven.eden@prydeworx.com>
+---
+ src/basic/selinux-util.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c
+index 40a85feec..3be9f2c0d 100644
+--- a/src/basic/selinux-util.c
++++ b/src/basic/selinux-util.c
+@@ -1,13 +1,13 @@
+ /* SPDX-License-Identifier: LGPL-2.1+ */
+ 
+ #include <errno.h>
+-//#include <fcntl.h>
++#include <fcntl.h>
+ #include <malloc.h>
+ #include <stddef.h>
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>
+-//#include <sys/types.h>
++#include <sys/types.h>
+ #include <sys/un.h>
+ #include <syslog.h>
+ 
diff --git a/sys-auth/elogind/files/elogind-243.7-nodocs.patch b/sys-auth/elogind/files/elogind-243.7-nodocs.patch
new file mode 100644
index 000000000000..0ec0aa37308a
--- /dev/null
+++ b/sys-auth/elogind/files/elogind-243.7-nodocs.patch
@@ -0,0 +1,29 @@
+We don't want the build system to install to docdir for us.
+
+--- a/meson.build	2020-03-12 20:33:40.000000000 +0100
++++ b/meson.build	2020-03-12 22:46:08.020716935 +0100
+@@ -3352,15 +3352,11 @@
+ # install_data('modprobe.d/systemd.conf',
+ #              install_dir : modprobedir)
+ #endif // 0
+-install_data('LICENSE.GPL2',
+-             'LICENSE.LGPL2.1',
+ #if 0 /// elogind has upgraded to markdown, and the NEWS file is useless
+ #              'NEWS',
+ #              'README',
+ #else // 0
+-             'README.md',
+ #endif // 0
+-             'docs/CODING_STYLE.md',
+ #if 0 /// irrelevant for elogind
+ #              'docs/DISTRO_PORTING.md',
+ #              'docs/ENVIRONMENT.md',
+@@ -3369,8 +3365,6 @@
+ #              'docs/TRANSLATORS.md',
+ #              'docs/UIDS-GIDS.md',
+ #endif // 0
+-             'src/libelogind/sd-bus/GVARIANT-SERIALIZATION',
+-             install_dir : docdir)
+ 
+ #if 0 /// UNNEEDED by elogind
+ # meson.add_install_script('sh', '-c', mkdir_p.format(systemdstatedir))
diff --git a/sys-auth/rtkit/Manifest b/sys-auth/rtkit/Manifest
index 93133abc2da0..c99b05393585 100644
--- a/sys-auth/rtkit/Manifest
+++ b/sys-auth/rtkit/Manifest
@@ -1 +1,2 @@
 DIST rtkit-0.11.tar.xz 126748 BLAKE2B e989f1fb9e33c2e06d7eedbe0aab45982d458b6a80aa8ba9b05ae94ed048ef1351d30f8800859a08d8bb0a53891e7b63f6bda6308b4521da10a61182ca3921f9 SHA512 4641af965dc64c0f498ae469fbee1ceb337204fa7d778fbbb41f2b5c5e88947e633c7e9ad037274fdd778c3c097a4a1dbb0b2add287d74eccbcd2d357cb2da22
+DIST rtkit-0.12.tar.xz 127504 BLAKE2B c2132098b98f24c1f1662df08c9940772cdad9a326c0c4b9180aac2e0878b0c71e5917ab2535628aab12ff29546faef1c68f455625c77bc2bac25864dddfa4b6 SHA512 cee48058367b5b8a705203865538d0ab4bda9d2f1d06d155360922cb095b5d6a5b0311fdda6c45d9f33227324394ca5fd3b5a399fc71e11ea4c609eab18a7b04
diff --git a/sys-auth/rtkit/files/rtkit-0.12_libsystemd_optional.patch b/sys-auth/rtkit/files/rtkit-0.12_libsystemd_optional.patch
new file mode 100644
index 000000000000..9d61f4e5685c
--- /dev/null
+++ b/sys-auth/rtkit/files/rtkit-0.12_libsystemd_optional.patch
@@ -0,0 +1,63 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -116,7 +116,15 @@
+ AC_SEARCH_LIBS([cap_init], [cap])
+ 
+ PKG_CHECK_MODULES(DBUS, dbus-1)
+-PKG_CHECK_MODULES(LIBSYSTEMD, libsystemd)
++
++AC_ARG_ENABLE(systemd-integration,
++	      AS_HELP_STRING([--enable-systemd-integration], [use the sd-daemon API to communicate with systemd]),
++	      [enable_libsystemd=$enableval],
++	      [enable_libsystemd=yes])
++if test "x${enable_libsystemd}" != "xno"; then
++	PKG_CHECK_MODULES(LIBSYSTEMD, libsystemd)
++	AC_DEFINE([HAVE_LIBSYSTEMD], [1], [Define to 1 if you have libsystemd and its header files])
++fi
+ 
+ AC_ARG_WITH([systemdsystemunitdir],
+         AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
+@@ -142,5 +150,6 @@
+     localstatedir:          ${localstatedir}
+     Compiler:               ${CC}
+     CFLAGS:                 ${CFLAGS}
++    systemd integration:    ${enable_libsystemd}
+     systemd unit directory: ${systemdsystemunitdir}
+ "
+--- a/rtkit-daemon.c
++++ b/rtkit-daemon.c
+@@ -50,7 +50,10 @@
+ #include <dirent.h>
+ #include <syslog.h>
+ #include <grp.h>
++
++#ifdef HAVE_LIBSYSTEMD
+ #include <systemd/sd-daemon.h>
++#endif
+ 
+ #include "rtkit.h"
+ 
+@@ -1432,11 +1435,13 @@
+                 n_total_processes,
+                 n_users);
+ 
++#ifdef HAVE_LIBSYSTEMD
+         sd_notifyf(0,
+                    "STATUS=Supervising %u threads of %u processes of %u users.",
+                    n_total_threads,
+                    n_total_processes,
+                    n_users);
++#endif
+ 
+ finish:
+         if (r) {
+@@ -2304,7 +2309,9 @@
+ 
+         syslog(LOG_DEBUG, "Running.\n");
+ 
++#ifdef HAVE_LIBSYSTEMD
+         sd_notify(0, "STATUS=Running.");
++#endif
+ 
+         dbus_connection_set_exit_on_disconnect(bus, FALSE);
+ 
diff --git a/sys-auth/rtkit/files/rtkit-0.12_noexecstack.patch b/sys-auth/rtkit/files/rtkit-0.12_noexecstack.patch
new file mode 100644
index 000000000000..f156422f8f62
--- /dev/null
+++ b/sys-auth/rtkit/files/rtkit-0.12_noexecstack.patch
@@ -0,0 +1,10 @@
+--- a/xml-introspection.S
++++ b/xml-introspection.S
+@@ -1,3 +1,7 @@
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
++
+ .section .rodata
+ .global introspect_xml
+ .type introspect_xml, @object
diff --git a/sys-auth/rtkit/rtkit-0.11-r2.ebuild b/sys-auth/rtkit/rtkit-0.11-r2.ebuild
index f4db25801e9f..01562410aef7 100644
--- a/sys-auth/rtkit/rtkit-0.11-r2.ebuild
+++ b/sys-auth/rtkit/rtkit-0.11-r2.ebuild
@@ -5,8 +5,8 @@ EAPI=6
 inherit eutils systemd user autotools linux-info
 
 DESCRIPTION="Realtime Policy and Watchdog Daemon"
-HOMEPAGE="http://0pointer.de/blog/projects/rtkit"
-SRC_URI="http://0pointer.de/public/${P}.tar.xz"
+HOMEPAGE="https://0pointer.de/blog/projects/rtkit"
+SRC_URI="https://0pointer.de/public/${P}.tar.xz"
 
 LICENSE="GPL-3 BSD"
 SLOT="0"
diff --git a/sys-auth/rtkit/rtkit-0.11-r3.ebuild b/sys-auth/rtkit/rtkit-0.11-r3.ebuild
index 72a36d770d01..d11ce72f4f07 100644
--- a/sys-auth/rtkit/rtkit-0.11-r3.ebuild
+++ b/sys-auth/rtkit/rtkit-0.11-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
@@ -6,8 +6,8 @@ EAPI=7
 inherit eutils systemd autotools linux-info
 
 DESCRIPTION="Realtime Policy and Watchdog Daemon"
-HOMEPAGE="http://0pointer.de/blog/projects/rtkit"
-SRC_URI="http://0pointer.de/public/${P}.tar.xz"
+HOMEPAGE="https://0pointer.de/blog/projects/rtkit"
+SRC_URI="https://0pointer.de/public/${P}.tar.xz"
 
 LICENSE="GPL-3 BSD"
 SLOT="0"
diff --git a/sys-auth/rtkit/rtkit-0.12.ebuild b/sys-auth/rtkit/rtkit-0.12.ebuild
new file mode 100644
index 000000000000..125517d132b3
--- /dev/null
+++ b/sys-auth/rtkit/rtkit-0.12.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info
+
+DESCRIPTION="Realtime Policy and Watchdog Daemon"
+HOMEPAGE="https://0pointer.de/blog/projects/rtkit"
+SRC_URI="https://github.com/heftig/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="systemd"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="acct-group/rtkit
+	acct-user/rtkit
+	sys-apps/dbus
+	sys-auth/polkit
+	sys-libs/libcap
+	systemd? ( sys-apps/systemd )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.12_libsystemd_optional.patch
+	"${FILESDIR}"/${PN}-0.12_noexecstack.patch
+)
+
+pkg_pretend() {
+	if use kernel_linux; then
+		CONFIG_CHECK="~!RT_GROUP_SCHED"
+		ERROR_RT_GROUP_SCHED="CONFIG_RT_GROUP_SCHED is enabled. rtkit-daemon (or any other "
+		ERROR_RT_GROUP_SCHED+="real-time task) will not work unless run as root. Please consider "
+		ERROR_RT_GROUP_SCHED+="unsetting this option."
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable systemd systemd-integration)
+}
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 8ace2758c764..d6b578e5de4b 100644
Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ
diff --git a/sys-block/arcconf/Manifest b/sys-block/arcconf/Manifest
index ff511720725d..1e470efa5c47 100644
--- a/sys-block/arcconf/Manifest
+++ b/sys-block/arcconf/Manifest
@@ -1,3 +1,3 @@
 DIST arcconf_v2_01_22270.zip 47168976 BLAKE2B 95693a1408e5a4d0d638bbf265f2e1e64247dfec2b1078b56860c5fcd4b13ffa5967bfb9967abfd4b79c788aaeb20759b3a9070a84b083c1653e4868a96ac4cf SHA512 0f91a697c44ea0c0561bec9e432e7d4eba8eb8a2b0255a9867bdb183f81e745aee1dcc2b0017847803dbb27f55cad3e985f4bcd3a202c52f5b557fb724e94d9e
 DIST arcconf_v3_01_23531.zip 76188493 BLAKE2B bb939262e89a76fe28cca60ce647df53bd66625d8273cf80ad0b9daa31de8ac33d181a5ad864e52ce5b599d9631a503d2e4a132ec3369b67f0e12887a4bccc0c SHA512 93ab1b5f3f35ad403ac52456ffb16b5b57c4851dbaa3d4922194b29b72957944a0a3e02346362f62b3f6ba5f73394a3720a1f5a371b34e9a03f31bd793348822
-DIST arcconf_v3_03_23668.zip 83570233 BLAKE2B 938c7c7dcc3cd6d4a0cb85b3240be5b61397b57c9bd3fdc2fd2541d5cae543f1a31613e1fa0281c1ab3be3f37e794ce16820b0e0d63a8e6671599352a79eb80f SHA512 5b1f173784f4d08a929fb71371baf4340e23c1cb9eb7ba9728a44e32a23ca268ec3f984f44e13b6ce235ee07e49a5befb1eebc67fc6f23736425ce79501a373c
+DIST arcconf_v3_04_23699.zip 89105029 BLAKE2B 338923a508cb3b55d93128383b02a1bc650436689c29af6c2658c13af6789cacf89354ca2f5d79d84cc485e2559b26929269f591cf99412427f88ba5ca872303 SHA512 d87ca4edae53505fbfd1042df4ae38a9d8ff51cbaaecfe2de45d136d9a8f3a7713b0104e126f281b02a61fb91f9188aa7846a31ab51757cd0ff5cb91348fae80
diff --git a/sys-block/arcconf/arcconf-3.03.23668.ebuild b/sys-block/arcconf/arcconf-3.04.23699.ebuild
similarity index 94%
rename from sys-block/arcconf/arcconf-3.03.23668.ebuild
rename to sys-block/arcconf/arcconf-3.04.23699.ebuild
index 1595e76bab6f..fc4aaa9b7431 100644
--- a/sys-block/arcconf/arcconf-3.03.23668.ebuild
+++ b/sys-block/arcconf/arcconf-3.04.23699.ebuild
@@ -15,9 +15,9 @@ LICENSE="Microsemi"
 SLOT="0"
 KEYWORDS="-* ~amd64"
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
-RESTRICT="fetch mirror bindist"
+RESTRICT="mirror bindist"
 
 S="${WORKDIR}/linux_x64"
 
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index ce2256488b88..bcd89e742203 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -2,5 +2,6 @@ DIST fio-2.15.tar.bz2 545809 BLAKE2B 163530097a6ff08016c977a328bc499d052c423890c
 DIST fio-2.16.tar.bz2 558662 BLAKE2B cbc6e6000bd497fc92779c34688c0862f3adccd7c399ca5d4e4ce9ee9c40faddfec9b3fcca2fad2cd91ca00eee95c4a108273496c9e63db8017695ecf42d294d SHA512 f71c8ab8423e82ceae160bae8c17ac1222c1b2dde2ccb1b2aedb2288e0eb60485f8e9f3908640d4f6cebf166a148f4ad64026c035381c5db5141bf3059349d75
 DIST fio-3.16.tar.bz2 881436 BLAKE2B fee99930d0245474eb67ceee2d1a6ec2f1a0eb4da6d52cf8616d7eda64699a8c2727715284134fd4931e91efad69b064f66a80a78f70ea03e66d4eab4e601120 SHA512 2d651b20cbc6c7babf3adc082dbe78e1f7de920764653cf5ffd99df7516cf6190ffefe2152d2739326d3102949d9bad7db978ff88866cfa54020f9ec3b0a2a23
 DIST fio-3.17.tar.bz2 888795 BLAKE2B 10277efb1234708aff336fc3c0723d0b9b5c903dce3a999ea2b8749b5034c778be4828549b9e0d9fc36a4f9429ca86ac0011f0c110e1a44ed3ad33b6e4a30a68 SHA512 27dba4c3e8f544c0fd40a5f42660f64f42e114e7b56199bc70f540b1a09b9dec9291e3fbae0fab9691189fa4a1f40edbcf4f9b53c313fd9c1a8ba0fdbb7f524e
+DIST fio-3.19.tar.bz2 902391 BLAKE2B 84993717248add335a77c6fc03fa730f628806e1e001078d48a91bc5ac9703e42c6cc5c720cfe76a83d1daf4af2245bfd78fd6a871611de1c19562ca70a9cc89 SHA512 0004dbaf5a8ce4f2b13114a3bfb65c388bb6d01e9a82791208ff7e7eb54cd6741e60cc8cb0a19f6319301ee2040c03862725943972ea767e6cc65fce4a2b3ecb
 DIST fio-3.2.tar.bz2 613565 BLAKE2B e721d698338dd8d2c6215780a2d9a10c643a5912d3c27b3e759b4c14585ae1afe4edab5bdc54df8cf19c6f3727f8f4b19ce9da3298a5f0ef3753a5d8f423f4ef SHA512 97ea5ed6587d1e7382a67ab7ad933b6e332ba84cb648d17dcebad3c95c9eb6b1c04a4537e3470f890607f2921da77fcd4e49079b8b78f2d15e9c199dab850d1e
 DIST fio-3.7.tar.bz2 629354 BLAKE2B 99a1c88481c7a693e31b1a0bc23bc80e85df92385f9d5a7de8d6479be8bc425326a20d794eb4809f822adfcd06e07c66ebed321faa9dbae7a2c1d3c766a6467d SHA512 b1f5cb35fe1c06e030c570959ab9a96d936f9eaa2f7f30d5a34f34fd93fae057da07c4084a06143cd5188ad6b2cc06b564484f8867e050cfeddc0ee3fb0fe266
diff --git a/sys-block/fio/fio-3.19.ebuild b/sys-block/fio/fio-3.19.ebuild
new file mode 100644
index 000000000000..bc57b7b265c8
--- /dev/null
+++ b/sys-block/fio/fio-3.19.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python2_7 python3_6 )
+
+inherit python-r1 toolchain-funcs
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Jens Axboe's Flexible IO tester"
+HOMEPAGE="https://brick.kernel.dk/snaps/"
+SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="aio curl glusterfs gnuplot gtk libressl numa python rbd rdma static tcmalloc zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	libressl? ( curl )
+	gnuplot? ( python )"
+
+BDEPEND="virtual/pkgconfig"
+
+# GTK+:2 does not offer static libaries.
+LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
+	curl? (
+		net-misc/curl:=[static-libs(+)]
+		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+	)
+	glusterfs? ( sys-cluster/glusterfs[static-libs(+)] )
+	gtk? ( dev-libs/glib:2[static-libs(+)] )
+	numa? ( sys-process/numactl[static-libs(+)] )
+	rbd? ( sys-cluster/ceph[static-libs(+)] )
+	rdma? (
+		sys-fabric/libibverbs[static-libs(+)]
+		sys-fabric/librdmacm[static-libs(+)]
+	)
+	tcmalloc? ( dev-util/google-perftools:=[static-libs(+)] )
+	zlib? ( sys-libs/zlib[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	gtk? ( x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+RDEPEND+="
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/pandas[${PYTHON_USEDEP}]')
+	)
+	gnuplot? ( sci-visualization/gnuplot )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/fio-2.2.13-libmtd.patch
+)
+
+python_check_deps() {
+	has_version "dev-python/pandas[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+
+	sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
+
+	# Many checks don't have configure flags.
+	sed -i \
+		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
+		-e '/if compile_prog "" "-lz" "zlib" *; *then/  '"s::if $(usex zlib true false) ; then:" \
+		-e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
+		configure || die
+}
+
+src_configure() {
+	chmod g-w "${T}"
+	# not a real configure script
+	# TODO: pmem
+	set -- \
+	./configure \
+		--disable-optimizations \
+		--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
+		--cc="$(tc-getCC)" \
+		--disable-pmem \
+		$(usex curl '' '--disable-http') \
+		$(usex glusterfs '' '--disable-gfapi') \
+		$(usex gtk '--enable-gfio' '') \
+		$(usex numa '' '--disable-numa') \
+		$(usex rbd '' '--disable-rbd') \
+		$(usex rdma '' '--disable-rdma') \
+		$(usex static '--build-static' '') \
+		$(usex tcmalloc '' '--disable-tcmalloc')
+	echo "$@"
+	"$@" || die 'configure failed'
+}
+
+src_compile() {
+	emake V=1 OPTFLAGS=
+}
+
+src_install() {
+	emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
+
+	local python2_7_files=(
+		"${ED}"/usr/bin/fiologparser_hist.py
+		"${ED}"/usr/bin/fiologparser.py
+	)
+	local python_files=(
+		"${python2_7_files[@]}"
+		"${ED}"/usr/bin/fio_jsonplus_clat2csv
+	)
+	if use python ; then
+		sed -i 's:python2.7:python:g' "${python2_7_files[@]}" || die
+		python_replicate_script "${python2_7_files[@]}"
+	else
+		rm "${python_files[@]}" || die
+	fi
+
+	local gnuplot_python2_7_files=(
+		"${ED}"/usr/bin/fio2gnuplot
+	)
+	local gnuplot_files=(
+		"${gnuplot_python2_7_files[@]}"
+		"${ED}"/usr/bin/fio_generate_plots
+		"${ED}"/usr/share/man/man1/fio_generate_plots.1
+		"${ED}"/usr/share/man/man1/fio2gnuplot.1
+		"${ED}"/usr/share/fio/*.gpm
+	)
+	if use gnuplot ; then
+		sed -i 's:python2.7:python:g' "${gnuplot_python2_7_files[@]}" || die
+		python_replicate_script "${gnuplot_python2_7_files[@]}"
+	else
+		rm "${gnuplot_files[@]}" || die
+		rmdir "${ED}"/usr/share/fio/ || die
+	fi
+
+	# This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
+	rm "${ED}"/usr/bin/genfio || die
+
+	dodoc README REPORTING-BUGS HOWTO
+	docinto examples
+	dodoc examples/*
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 61be71e028ac..6125282ee920 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 5f295ac037ed..0b1928fb6d1f 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,2 +1,2 @@
-DIST crossdev-20191222.tar.xz 27320 BLAKE2B 375e0ccb7bfd5c5c365b9c874a7dbf75207843b68dbe6d4cf9da07b36efb7b3bb1e6c84f85268fea6c71d6afc1e284f9bd1dcfeca5536d0947f8d3a3f5344ca9 SHA512 ad32f2231663f312b2b35bdea81c9ddac584d13f9affd496f36cbed072a97e6f80deb3436dcbea184621a4bd86bb25d52fb0434208226a3d743f0f664cd91fd0
 DIST crossdev-20200125.tar.xz 27380 BLAKE2B 4871b3ba1130c8d2e4df263aea155f95352417e65dabe64968cf9cc2628f9a1ae32a7e569cdea73a04d32d05396b0a83720bbd712a5f5b703606692e6b61516b SHA512 a4db1d09179b23f032af59c4857c3ab58d7944633b0c612a1f8aa0ecc38201f960cc1da761f34288568bb7f3434fe4da5094b4d4445be047da8838a096f6c606
+DIST crossdev-20200131.tar.xz 28200 BLAKE2B b1b8e283d150968339e259c48b3f066f5233af2578b04e060d5e69c002af6ffd65214c559353a8ebcf3238c2b60d0ddfa29131e26c707647717088df55f77282 SHA512 e1d18a7d69cdc0240d30e77b1634bd6b5806e1576227e4ffa394805aa217c050ced75436e9a004a35bc9bc47b96ea2f3d8e19ef530a106736f7cc0d995bee4a5
diff --git a/sys-devel/crossdev/crossdev-20191222.ebuild b/sys-devel/crossdev/crossdev-20200131.ebuild
similarity index 87%
rename from sys-devel/crossdev/crossdev-20191222.ebuild
rename to sys-devel/crossdev/crossdev-20200131.ebuild
index 8f6b8bd48667..e37579ff62fd 100644
--- a/sys-devel/crossdev/crossdev-20191222.ebuild
+++ b/sys-devel/crossdev/crossdev-20200131.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index a00f2b8aaf72..69b8a444b9e5 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -61,4 +61,6 @@ DIST gcc-9.2.0-patches-3.tar.bz2 15452 BLAKE2B 8ebd8beef1a7d3b0e0e544a0967599e9a
 DIST gcc-9.2.0-patches-4.tar.bz2 21655 BLAKE2B 2acf6d83ec934a65e77d2079a024b42622e1234f0516f12839f7d03c2f3e1bb275037b020e35ba847d6809d5577ba966619c78345b75355df0a754d02ccf9819 SHA512 114e01a7b08ecb1feab24ef3cfc72c8953748f1526722b80c18602025eef132e2b4c05db59c7a23eb2e7f42ed48eb02d92bcd73b1ca932374d6bedaf89cc66d0
 DIST gcc-9.2.0-patches-6.tar.bz2 23171 BLAKE2B 00295f471a276764daf003c0eb6351d6d4e7e247df2519b4fc6bf360d72ba10af1230ca0175cbd96ab4beaf0123b5061c7c2f7f5c0b95b7f416a735ad9ff454d SHA512 8a8a070a66a24f31ec2d3d1cf170db2d030a1667485064646d360c3154330f01e7b44595642040c07d033922f1654c4b18bbabfe269210b3d1aeb24fe248b613
 DIST gcc-9.2.0.tar.xz 70607648 BLAKE2B 41a5e148f9a6857d6599679964c203533f76f330ad527fbe7c5e746d78f6f6f6d6d0f330a67cb1e794e155be8d1cd6e986bcc8a116d620dca410b78f0bcdd453 SHA512 a12dff52af876aee0fd89a8d09cdc455f35ec46845e154023202392adc164848faf8ee881b59b681b696e27c69fd143a214014db4214db62f9891a1c8365c040
+DIST gcc-9.3.0-patches-1.tar.bz2 12659 BLAKE2B 03937d13f58fbcb84bbe3111c7dad7c53767501c443f7e21ac078d37d067fe0e7022589e94a9cfb38d164fd4c1cecfce57f28165e0577fa6e06b189abf348459 SHA512 08b2c9a20b17e06c6721c7193d40e085308b561376a4c35a5ec6ff19ee4f414fead25febbd4d95c8d09586893af83d818d8d5f23bfb16794bffe4439d0b0d8be
+DIST gcc-9.3.0.tar.xz 70533868 BLAKE2B 21efb1432aefad5ed9b9b395e88ef2adfda3a8ea6e3e808cd151da6e66df9fed1bafdc8b8ff055d4b2272ac786d8b7ddc4293bb6b51c55c40a261a0eda0e7cb4 SHA512 4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de
 DIST gdc-0.24-src.tar.bz2 1012099 BLAKE2B 2c85058aad09af328719a702f69d655b9aa9655f2a83bb46bd21367cd442ed72c9b471ddaa764753f782dcb2f22fe51b052a965ed08290e0d9415b543481d144 SHA512 9aec7e4b102e602dfb61cd09ea4b4a96af637ceb3d726235261d09ebd35dbd416abcbfe0e46918e48474bd241fe9bb29abc145a65aa834669295aaee4fca0686
diff --git a/sys-devel/gcc/gcc-9.3.0.ebuild b/sys-devel/gcc/gcc-9.3.0.ebuild
new file mode 100644
index 000000000000..ecdde41c0bcb
--- /dev/null
+++ b/sys-devel/gcc/gcc-9.3.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PATCH_VER="1"
+
+inherit toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.13 )
+	>=${CATEGORY}/binutils-2.20"
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
+fi
diff --git a/sys-devel/kgcc64/Manifest b/sys-devel/kgcc64/Manifest
index 38af90bd203c..c7298e7a695c 100644
--- a/sys-devel/kgcc64/Manifest
+++ b/sys-devel/kgcc64/Manifest
@@ -42,3 +42,5 @@ DIST gcc-9.1.0-patches-1.1.tar.bz2 13931 BLAKE2B 55e863514f41f1af11b1f6f618604ed
 DIST gcc-9.1.0.tar.xz 70546856 BLAKE2B 0f7e5575aebc24113d12a56eb3dbf4bcdba3c656a76513c44dbbcded9ee71629727f24949bf2e1424682a9e5eda7c51eed93317e6f80013f5a837aaf25b82805 SHA512 b6134df027e734cee5395afd739fcfa4ea319a6017d662e54e89df927dea19d3fff7a6e35d676685383034e3db01c9d0b653f63574c274eeb15a2cb0bc7a1f28
 DIST gcc-9.2.0-patches-1.tar.bz2 12836 BLAKE2B c29516d2877229129cc69ebb781198918f0e59e2a4631f3b2933b5a6db61d50ef0d2e78ee9acaaf1c50c597aad3203d81e49d4e0674f7ac74bdedc401238940b SHA512 0382ed0d483955079bd20fc15066b8f45772651bcba83dbed2c35e51f7259cfd28b825243c6a49a0bf51d9ab1eacec3cf55c47a00d2873d6122d32b9fc05d87c
 DIST gcc-9.2.0.tar.xz 70607648 BLAKE2B 41a5e148f9a6857d6599679964c203533f76f330ad527fbe7c5e746d78f6f6f6d6d0f330a67cb1e794e155be8d1cd6e986bcc8a116d620dca410b78f0bcdd453 SHA512 a12dff52af876aee0fd89a8d09cdc455f35ec46845e154023202392adc164848faf8ee881b59b681b696e27c69fd143a214014db4214db62f9891a1c8365c040
+DIST gcc-9.3.0-patches-1.tar.bz2 12659 BLAKE2B 03937d13f58fbcb84bbe3111c7dad7c53767501c443f7e21ac078d37d067fe0e7022589e94a9cfb38d164fd4c1cecfce57f28165e0577fa6e06b189abf348459 SHA512 08b2c9a20b17e06c6721c7193d40e085308b561376a4c35a5ec6ff19ee4f414fead25febbd4d95c8d09586893af83d818d8d5f23bfb16794bffe4439d0b0d8be
+DIST gcc-9.3.0.tar.xz 70533868 BLAKE2B 21efb1432aefad5ed9b9b395e88ef2adfda3a8ea6e3e808cd151da6e66df9fed1bafdc8b8ff055d4b2272ac786d8b7ddc4293bb6b51c55c40a261a0eda0e7cb4 SHA512 4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de
diff --git a/sys-devel/kgcc64/files/gcc-configure-texinfo.patch b/sys-devel/kgcc64/files/gcc-configure-texinfo.patch
index ddc098ddbd58..99e90998a469 100644
--- a/sys-devel/kgcc64/files/gcc-configure-texinfo.patch
+++ b/sys-devel/kgcc64/files/gcc-configure-texinfo.patch
@@ -4,8 +4,8 @@ that it violates the cheesy version grep.
 
 http://bugs.gentoo.org/198182
 
---- configure
-+++ configure
+--- a/configure
++++ b/configure
 @@ -3573,6 +3573,6 @@
        :
      else
diff --git a/sys-devel/kgcc64/kgcc64-9.3.0.ebuild b/sys-devel/kgcc64/kgcc64-9.3.0.ebuild
new file mode 100644
index 000000000000..ecdde41c0bcb
--- /dev/null
+++ b/sys-devel/kgcc64/kgcc64-9.3.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PATCH_VER="1"
+
+inherit toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.13 )
+	>=${CATEGORY}/binutils-2.20"
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
+fi
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 564dfc7daa1b..9653bed4a4c7 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 2b4a6a70359a..cae99ab9f399 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -2,3 +2,4 @@ DIST cryptsetup-1.7.5.tar.xz 1232696 BLAKE2B 1bd62b186564e0b902480d66f623074f8d2
 DIST cryptsetup-2.2.1.tar.xz 10803072 BLAKE2B 00ee2eff11e3054a40a4d9036c1786422288ff4c61ff497cb7039721dde80ca337cab067faa4f70721de3aded465f612e9328a6b533ff7c9b67d1069fe435bed SHA512 e4b45b24ad63cc4c22cb816f04cf4af71431e15134a8208af1a24e64ded54c07aba6c43521c063f03429304e0610b6cce849332564d69a46934fb7bae8e99718
 DIST cryptsetup-2.2.2.tar.xz 10808684 BLAKE2B d8d864d9ec2a5d646706d3ba003a21aa83d2373ca7afed5663c5167172116ea9342704483559f49c06979cbe0f6ac5670f4e9baae88ab908423b793043ba4a68 SHA512 d04123a622438ecbee28145cbdc71886b6f13db87df1c67522bff6e6e3cba817e895e2d085bdb08c78f9cafba557b1203177811a0c316ccd9b7c19939f3fc851
 DIST cryptsetup-2.3.0.tar.xz 11035660 BLAKE2B 0fff903cdb07d91183bbd35afb660aad42d31188a80d0ef6294c40082b39fdcde25da4fe1bf679ebe308133fc63051876ce813a2ef3a557f63b574d6f6f49d8c SHA512 d4af8edb7a50603028c6c6999ae7a1851d2232ee11d4a501270afb424f0a7dc82893a6a5d30d3a3188634aa80ec1a79f22a91b539910df10d07f8d9ae532cb08
+DIST cryptsetup-2.3.1.tar.xz 11041592 BLAKE2B acf3bb17503575b5d7edb58d0ab13989a2bc70ec96583dfc057b8258fd98a39a088411a9e0175d51d816b9164e5ec193710f1ada92427b1e6c6a53c5b8a6b9ea SHA512 e6ee77d72eda0b990db894d794a686f22043161b17b5f5c8cd54a64c5751f884a241c76b03bbccd52f74440c609036d50ed8503584bc3a0a011e4854a60dd4bf
diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.1.ebuild
new file mode 100644
index 000000000000..cf95b7a30b03
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info libtool
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
+SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/12" # libcryptsetup.so version
+[[ ${PV} != *_rc* ]] && \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
+# we don't support nss since it doesn't allow cryptsetup to be built statically
+# and it's missing ripemd160 support so it can't provide full backward compatibility
+IUSE="${CRYPTO_BACKENDS} +argon2 libressl luks1_default nls pwquality reencrypt static static-libs +udev urandom"
+REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
+	libressl? ( openssl )
+	static? ( !gcrypt )" #496612
+
+LIB_DEPEND="
+	dev-libs/json-c:=[static-libs(+)]
+	dev-libs/libgpg-error[static-libs(+)]
+	dev-libs/popt[static-libs(+)]
+	>=sys-apps/util-linux-2.31-r1[static-libs(+)]
+	argon2? ( app-crypt/argon2:=[static-libs(+)] )
+	gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
+	openssl? (
+		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+	)
+	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
+	sys-fs/lvm2[static-libs(+)]
+	udev? ( virtual/libudev[static-libs(-)] )"
+# We have to always depend on ${LIB_DEPEND} rather than put behind
+# !static? () because we provide a shared library which links against
+# these other packages. #414665
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+	${LIB_DEPEND//\[static-libs\([+-]\)\]}"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
+
+pkg_pretend() {
+	if ! use luks1_default ; then
+		ewarn "WARNING! WARNING! WARNING!"
+		ewarn "You have chosen LUKS2 as your default format."
+		ewarn "This can break LUKS1 backwards compatibility."
+		ewarn "Enable \"luks1_default\" USE flag if you need backwards compatibility."
+	fi
+}
+
+pkg_setup() {
+	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
+	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
+	local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n"
+	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
+	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
+	check_extra_config
+}
+
+src_prepare() {
+	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	if use kernel ; then
+		ewarn "Note that kernel backend is very slow for this type of operation"
+		ewarn "and is provided mainly for embedded systems wanting to avoid"
+		ewarn "userspace crypto libraries."
+	fi
+
+	local myeconfargs=(
+		--disable-internal-argon2
+		--enable-shared
+		--sbindir=/sbin
+		# for later use
+		--with-default-luks-format=LUKS$(usex luks1_default 1 2)
+		--with-tmpfilesdir="${EPREFIX}/usr/lib/tmpfiles.d"
+		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
+		$(use_enable argon2 libargon2)
+		$(use_enable nls)
+		$(use_enable pwquality)
+		$(use_enable reencrypt cryptsetup-reencrypt)
+		$(use_enable static static-cryptsetup)
+		$(use_enable static-libs static)
+		$(use_enable udev)
+		$(use_enable !urandom dev-random)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if [[ ! -e /dev/mapper/control ]] ; then
+		ewarn "No /dev/mapper/control found -- skipping tests"
+		return 0
+	fi
+
+	local p
+	for p in /dev/mapper /dev/loop* ; do
+		addwrite ${p}
+	done
+
+	default
+}
+
+src_install() {
+	default
+
+	if use static ; then
+		mv "${ED}"/sbin/cryptsetup{.static,} || die
+		mv "${ED}"/sbin/veritysetup{.static,} || die
+		if use reencrypt ; then
+			mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die
+		fi
+	fi
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	dodoc docs/v*ReleaseNotes
+
+	newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
+	newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
+}
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index f40bd0bca2a7..cb8a4427800d 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -110,7 +110,7 @@ src_prepare() {
 
 	# prevent errors showing up on zfs-mount stop, #647688
 	# openrc will unmount all filesystems anyway.
-	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" etc/init.d/zfs.in || die
+	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" etc/default/zfs.in || die
 }
 
 src_configure() {
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 15823101edff..55042add81fb 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 bdf332387dd7..0080f9853dee 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -2,13 +2,19 @@ DIST gentoo-kernel-4.19.107-1.amd64.xpak 61334447 BLAKE2B cf58cd409c20d0990a24ae
 DIST gentoo-kernel-4.19.107-1.x86.xpak 53605880 BLAKE2B 9b3e4eea0a904c94958a7c5e64ea274892b4b744a4efd0636477fb86bd2fdc06c88eef380ecf4b4175dd67fe6528380083728a58867da550e974accc47e7a0be SHA512 31dd5fe2af75605422230f145795ba1d3e6004b9f8487e65192cc6144e0ec8c786b7b8a6eab8e14ea63d194650805204d0d000ec72e91ad4b77817589fd602a2
 DIST gentoo-kernel-4.19.108-1.amd64.xpak 61335185 BLAKE2B aca10f98a1cae44d796113cd8452ef3362e8694fbd50a505addb553c44719f9ab58838e633bec1d35403b0940c726fa7dccc296926461c0728b28a41f951ea69 SHA512 2f7bc58bbcc72022a3997a82d9581fa813404ead028837947311e31c0392f3301011a845b5a84bb8d0a799af68b21a225c47c09b2cba0c485a6c510440abf6be
 DIST gentoo-kernel-4.19.108-1.x86.xpak 53603785 BLAKE2B f73ca2f45e549ab71af0c59667cb7668a8fdc3110676a29d25ac7736e1c304ac687eb149e5d926bf155c9305db9ecd35139c16fec172789f6623056c91c6d3a8 SHA512 3ee73beb268b542c38e883546bf6ecb41ef5f0aea647cda1a32ead116309afa2e0361c4e717cabdea64b09b703ab15120e6ea3d966084900047c183ad92ebe46
+DIST gentoo-kernel-4.19.109-1.amd64.xpak 61346541 BLAKE2B 0ef60b1d38fe49e75434162c468c6788d066611a7c24b0c59d85e721a485d310d6d90bd5392bb0fdea97a4e310574efbce92cb0a92b2aa0a91f94c06f67dee8a SHA512 732a789306ad347075d2098504c1eca7ac067f259df3acd3ebb600668add5077e2772a46a5debd4cdf435714685a4434b53a307dc8bef5fafa546112d5e8247e
+DIST gentoo-kernel-4.19.109-1.x86.xpak 53609386 BLAKE2B 1f77ceae91ae4d5fb4e6a06d4644dce190288e4761c46be65c5540c8e1ca53c796eea529119f2b2ef188cfef0d833361e131409ff8e78520677a5a729fc0b677 SHA512 6c12e2dc973f3790758bbaeb5eec87f43f6f8499780970da12b9b8f69665b11d3047d4448e8c75e9f971645a1facc726452fcfbaa4e97979f80efea4386c12c5
 DIST gentoo-kernel-5.4.23-1.amd64.xpak 64901352 BLAKE2B e8e610dafd50d6ec41067107ca6a738c5080e76bc7f64cd59b7b8e33a7a65ff8c4f02363574ecc9c09192b409b73b4698e559a7f98d1a003bac1c14dbd8774e5 SHA512 61aeafaf4f1b6e1b0e5aedf120758520fafae75d78b70babce6b874661508ab85ad2f7a1ce6aa1252e3d3a73c782cc03a6a56a6d74a538fb1306b86c52f6c904
 DIST gentoo-kernel-5.4.23-1.x86.xpak 56515809 BLAKE2B 4a96d2cc7d97b8246736b026ffa7f49cecf97818df342576965bd724602921d5ee4dda87167b40f9263e776f8c1d073a3d215bed35897af124c27f92357ea9ea SHA512 673b8e8dd1a4be89f49e6173fbbbc0ee334bb040cb75f49a850fcf1f666b93b2ac66ca73d5b9221c65c7cc520fed4c37e56ed434c9b0a8cf59535d260930a264
 DIST gentoo-kernel-5.4.24-1.amd64.xpak 64896666 BLAKE2B eb639ca7776e1b2094620e71baac2c53be76c4cd12783f4d07a845b4c07ae894bc2de75b4fb77c9b14ece3a2cae53be2d969a7cc6ee541a26c39f04a57d49a06 SHA512 4648bd9fd369d222cb36bb2247cb618995d679ff5405ed26383a72473d6fea726f0369d3406727196f50bdefadc64e7acf80b283d0f365877a389a3d3e8ba697
 DIST gentoo-kernel-5.4.24-1.x86.xpak 56510472 BLAKE2B 68c715db0815024e31c9a460b30a5bce3df32eba50a4f5f8a20107a7ea5ee2ec75b4179e38e5f1128a6be824bcff41c2e646240836f9ea5f8881b9bdfc752657 SHA512 8b7a2af3d63aac259dd1c40c7a2cd39deeac179508796f93ac5208c2f396f5f3bcb269cea395f5c4687898e8606d9053c793e05624abdba7548b4fa5c2013cb0
+DIST gentoo-kernel-5.4.25-1.amd64.xpak 64946299 BLAKE2B 93620ae7dd7f730f9d722d13cbee79d948b4c6684f0f1b3083b60c51c98245ff823c601f0767f665f5cd5834f05aed7fa8e7b01578e0cf787283a8e5b1242bed SHA512 2371484f0329dcb06fd825821ebcb6c0726a83858d1e2650f100479061911de73832d584d340b500026dc64c10afca1e3a82547b9f926b591c5eead6391f9d2c
+DIST gentoo-kernel-5.4.25-1.x86.xpak 56522225 BLAKE2B 6c7f74d33eb0357f3bfa31a9d829e90c7406a8dba730d833517b14e938f2d20d6193a557236b4fc1b12697a07259389cdd81c52da638c899fcd7ba43361896ca SHA512 e4f082ce42d0a5a5d0ba323d4235880561057fdd52b3802c3a1da8a4de41ca8def1f383209a0ee3ac013cbc71ad60154aa5220356251c8da42911dfc0428920e
 DIST gentoo-kernel-5.5.7-1.amd64.xpak 65766080 BLAKE2B 05732adba34cadc43b602a929469de656c57a2ae74ebd2d5d1c40312887f8889ac2768d53dbd58eb1b49dadd1f4a15bb6efcaf425294aa206b05952c1752a831 SHA512 bbeaa28894c7629085686f77d3a211a304c59bbcc66974dc476c74128312b6ecd094fcb399cc8f56fa1ba3f14aed2c174bd408799acf540cab39bb8eade22c01
 DIST gentoo-kernel-5.5.7-1.x86.xpak 57160779 BLAKE2B 6323263bea0671d0d6939404b934d756f5f4c71912e128bdc2c5521b9f84d561af5a56853ebd8b24d53d3cb0a3e13c4df993a6f802f6f2ddbc07dd0a46763d31 SHA512 7bca175b60ab30ce4558db614b33bd694566322a5d7b4ed9efea82ad2cd37e3f45b45a922ed927739c20e74dc0753eb153bcc7439595dbdfd61ac1aace831d9a
 DIST gentoo-kernel-5.5.8-1.amd64.xpak 65789134 BLAKE2B bf55be87d32899d885a04fe7106989b3aa3f4b97b0bee5d32a9cb8c699a00a9e75c4b2db48c67a2d0d558d0f549cf9aff12658b73fe723fda2fdd902f373e696 SHA512 3d1017d8dabf8cf9faad16f21165dd27c8d68cef88722d4b7aa57d4ffb0ba9f4d9cd11a0455ad948bc7b7331ccdd216ee68fce4fd733c993806e33b33fd85a5f
 DIST gentoo-kernel-5.5.8-1.x86.xpak 57175448 BLAKE2B 1685c8d61a709af22fa95432e6801e64c9a18157a302840f347035c60e6792c2056f66037a9a7126b02f7db7975a5ddd868b130eb1ca1e5fb5758d5943ca860d SHA512 07c2599dd7719699b8fdcabb31e78ac8978dadfff5a2ed2eeca7a0dae70b613e02187d7d8e67eb851a0ae4eed7c98191cb9c28ed2a86db5ac659ca62d20107b9
+DIST gentoo-kernel-5.5.9-1.amd64.xpak 65795584 BLAKE2B 401431b1808a9270ede96cee2d49ff39fc6aa641fa89c2e7c1e860922a1fe0a8d9c8b4d94f5ebc26480c7924381cc0b9032b0becea7af2733ad751fd8930c848 SHA512 7365893595e41eef793db42e3568855f1ae9fd0ab4cd12a0177543768d26c6240186732aeaec8a73b8cf447377af3476b8dd4e1fcd604ff74dc340d3888756d2
+DIST gentoo-kernel-5.5.9-1.x86.xpak 57175911 BLAKE2B ea127f1bcc0ad2cda627f9f8c45b5a0ff6fa70bc7c4aa49c2c054d4dcb3f34884becf464536d0714b8486af4b18b10cc0357057bfeba5575be6deef21e0e737d SHA512 9bd97fea93dcb0bb1010b66fcc761227f5e6bca91ee204f56a6fcc53027addc8f57f331397ccdd985ec25138a94e972de4bf096c282fd69a7c368630a4dc17b7
 DIST tinycorelinux-10.1-amd64.qcow2 16842752 BLAKE2B e013e76503c335739a9623c0901ca791937a0e6b177854535cadec1e2c2cd2df588283ed3128cf652595f32264fbfe5b3bd3a8c97665fd4da344e308535be366 SHA512 c3aeb20ff8769da9211694b7f701907cc7ae7582cdfad2c2fdc008d97ebcbd9dc08245b4e8f8450e1cb304bd705345a11fe79f901a47979fee91443841d55641
 DIST tinycorelinux-10.1-x86.qcow2 14876672 BLAKE2B 3c760eb7438b13261e52ecfaa33a53649ced95f1ab40aae52134b8cdc31a16d7aa0d6a6dd716e268ed148e9d77a10b7c700b141b61d70c82d271ffe88e8e2a3c SHA512 9964538dc42f232a11949f74b61d46422ea5da3bdc253a217119bd0b8a750c40fd2da0b07157067be9ac0226472614f210a1248114df0d331df390979867a895
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-4.19.109.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-4.19.109.ebuild
new file mode 100644
index 000000000000..68ca59b57351
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-4.19.109.ebuild
@@ -0,0 +1,46 @@
+# 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='*'
+
+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.25.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.25.ebuild
new file mode 100644
index 000000000000..68ca59b57351
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.25.ebuild
@@ -0,0 +1,46 @@
+# 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='*'
+
+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.5.9.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.5.9.ebuild
new file mode 100644
index 000000000000..68ca59b57351
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.5.9.ebuild
@@ -0,0 +1,46 @@
+# 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='*'
+
+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 5aa855685725..52ae1834c01f 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -2,12 +2,18 @@ DIST genpatches-4.19-106.base.tar.xz 3207860 BLAKE2B 4a5c29c2e1e825630b4bccba0dc
 DIST genpatches-4.19-106.extras.tar.xz 17492 BLAKE2B d84b9ed61c0d3e3fd032ac5bda3e2898e09c652166305a4a2a949938713d2b7e04405d16ed22d9fc7171d8850dc27a886956b2f3f99b6c7519c0b74e3089f032 SHA512 422d7cf4a79ecc5bdb48e01a77207cf77162a1cda33dd629cf806d149193ddfa0254e93f7dacebb39cf0f42a3fd17a131cc3e14b6340b5a90f20b449c99ece54
 DIST genpatches-4.19-107.base.tar.xz 3227648 BLAKE2B 0a40b4a65cef13ba6840a3ff5380bc286cbb4fad8bdd1d714385435e0403afd8b128be2253cb9e08756b01bebd319782b5821cb879310fe45d5f034a6234b7da SHA512 d2dd2859104c38014357ebc4fd94b81cee27fb13ce6ece76e8ba82d4726d0ce35cac96c8af7eb7a55f559fc4ac305779ebfdca30b194d4e791a5120fb9a78456
 DIST genpatches-4.19-107.extras.tar.xz 17488 BLAKE2B 55a484a8927241b721ebcdc0d48f92895982f27e7e05c68f9e04638019355fd296ad514fa767c72b27aaa3fcae0339f436080776fa53081d489e51e889a2e1ff SHA512 42126be688244fda9fb87e1d83785933fb6a96d92e02460f3fd34704e45b5f73ba2921e599f5a51729939f3cacc0d29ca5a9dbedb5d929551169b02ab765617e
+DIST genpatches-4.19-108.base.tar.xz 3245572 BLAKE2B ac917443056a08dc9cbd47fe57d4b15a9b8916bbab59462ba0c96be4f9240f2d2beb0496bec6deeecc924862f49e65d77369bc3b1d59c51d0d70e7d5067e1cb9 SHA512 cbba52bbf0649f346dfee4601ffbc9305d5d34a7cb4cd50df9fee221d4afe970fe3ae9f9dd461b7da3fb2aff5e3efe2f69f4117d2adb55ebdd570f00e1824c61
+DIST genpatches-4.19-108.extras.tar.xz 17488 BLAKE2B 4a5d2cf9c20a3c8ee9178713ad18e68a5c33022e36a299a97b926f0311cca5366dae98831c6a9861ef644a2707953c0b6be7e939bef263ac27e9facfe9896347 SHA512 c6c04bc19debe86fdb8d504b5f06b4f30914d63d54e025ec885fc88bba94de070c51efe6d84004c78f2baf126d696d574fd9a1ebee017fbc2e98f97580dc4e87
 DIST genpatches-5.4-23.base.tar.xz 956024 BLAKE2B 5270c606d07a9c593e8428ebf4636ccec4e6fe07fdda05617451cb1d6523c39fa5c483f9e2006e7944c0f7f835c40d8bffe50606b3266d4a8134779a5d651c3f SHA512 038aeb54cf8854461d61b38598e0191f46fe8b327ec7287c721238f8a41fc8a69a80c4c914ad04569aed6d994321979dcf469c376297ad555ac9095dddae4567
 DIST genpatches-5.4-23.extras.tar.xz 1744 BLAKE2B a744740c74b52b66f8db5f0a71174b15284bd83c0ca9318c2bc3809586aa914f20239a9a122930df587cf861412d7ce33a7efb74128bfd2dd52516abbe0cf20a SHA512 74f429626747883c5b4c6e8cb6bced6a5dc377a758637b7eded70dc9471121aa8496030f4b00ac0cd9bacb693d89366d10fc34d0827286ade8160038bf9aa1f7
 DIST genpatches-5.4-24.base.tar.xz 1012048 BLAKE2B 88f206f9824bdbe818a159832be638bd37ba274cc06fa245c7e48fe67112383ba3254e6e6433a5ebef792b4b61798aba9d748f8bffac0f62aa9c5536cc934b8d SHA512 bfa30fab2737af4d7e8874831cadec224a634832502f7472c4a018ee98ff698e5134101b06f09ab779e03d62920a29691a12a189ff19e055cfb1effce584b8d9
 DIST genpatches-5.4-24.extras.tar.xz 1740 BLAKE2B 959877a73da6fc757631407722e086c41409309060b275139c092aacc9cb1a7b749638322abf019bf194508d06a73eeef00939dc666f94313a680452b1fc91c2 SHA512 d9c85b2e581bcda49cf34ca90dbcb124c56ab515a8df67a55b08f5e8c0495894376267ba78c966dc9697d88ca8e429e2018d9dedd1a1fddaa7107c6fc74f248b
+DIST genpatches-5.4-25.base.tar.xz 1052564 BLAKE2B b41dcbbeefe779bf86209d676bc5155e1a6db0b8e91fc101da87bb66cd51f5ac26d41798fabe7b4e9377c696a729b649e16036bf677bfb468b8300d32617e995 SHA512 f1badde5398ff780bea19c91c294fbd391d142f0912645a2adf4c5ff63b049697d83bd5377069828b43abe5e448abe3649313d16cc6ee07c6eaa90f0c57f0ca5
+DIST genpatches-5.4-25.extras.tar.xz 1744 BLAKE2B 7ca0570133350ec60e8872f9035dfd2d46355a16642755d8f4bdbed7a9622a1a18f0529fb55eff00dd15520396c269c7849210b461f0c8f5ed8c6512071eaeb5 SHA512 1894e699b09a9cf5732b9b9c8aad91c0ab85ef08fbc03afd4d0feb3cabf8dd04b2f6cd47ee8f1d09a07490617d5f16997cfcf037449f1d4f3af84c4f8541de43
 DIST genpatches-5.5-10.base.tar.xz 456696 BLAKE2B d26c970cad7ffc6950f92fdd906a85f4e0e6242c6450b7ac0211a2cab8ade3c03112f3220943babbf26f115d35d3ba3dec18ff00c7a5608efadcaf7d417431e3 SHA512 bbd56eac912dac056d8273a9f3c21710fc614619b1bb6b52c48bf5972518a17ae20ad8601fb294a446415d0ecda57501681a4bbf13fe4a493a48a0d2d324e396
 DIST genpatches-5.5-10.extras.tar.xz 1740 BLAKE2B 43ef46fdd52322a5b1f370690e7e39d8a6b835726b4166b5f35f079446042b60c9f59e159a88ac82ffa384ff7dce619140783a7e202d3374e272e140744a6459 SHA512 57affa6ae287b621407d8c8b8d12dcc7a45bb3d68bbd0418737c95df6ef7bdd76ea8a90caec3322b2e3a75ccb159c42fb132e38cf8c62e21d7abd22e98d309c9
+DIST genpatches-5.5-11.base.tar.xz 504352 BLAKE2B e7e24b605897a5c9aa454c9b8591458b9ff6276574513c58e2c16b99f8f045081ff57a419f5f31c78625d3c807abf1483ec718d3e4d80f8cbc45455d1d5e2d95 SHA512 db442b6df1b841c59c888dad631a7353daa9f500322a2f4b0449ee61833cd89c7f6f1bad1b799009a90de6c17b7bab7592fdcc4d7d2ba26321ec91302343a204
+DIST genpatches-5.5-11.extras.tar.xz 1744 BLAKE2B f84aa0a4059f15a6e8e08f957259ceb519e144905467562abfe5637702e089141c4a6def7c61d91af299d2a850115a01852435d448e04fa8bb6a84644bd57bbd SHA512 e0241b4cb10e6257fbb5d12e41a7ef32eb9a501e9a81c0e638ec619629f9a421ae6022c8cb041789b764948f6b71cf810f49be7d8773b2d8c7c25935de846648
 DIST genpatches-5.5-9.base.tar.xz 399476 BLAKE2B a4582c276854d99a15766b0f9ae28326c3ba89d46e513e7265b839788966057fdfc46912695d74dc560cf22db087d20869dbfd69c59250d0b2e59cf56a506d81 SHA512 cb566c2394bf1c98a32343b5be1bc9ecc1a48587443cac39a2e999b09adedb3319726b1321a6d38ae6e6eb39e106dd1e251ed15f127ffb730f6597949df512de
 DIST genpatches-5.5-9.extras.tar.xz 1744 BLAKE2B c8f761afd767cef3ea6c1d79a3eb6e7dbef2d292dfcecd314189d92c020b3016ae8e3f5cfad3a532f34d9c47f01421ba38e3305b381791dc07375d217f3ac9a0 SHA512 5f48330ef699b9704baabb2c8171c80d445790c7876a92b0c7ea49bc29ee8347d87e441b9a51e2eedd069a78fc7011053e6282e54c216852cc9ba080064169d6
 DIST linux-4.19.85-arch1.i686.config 222183 BLAKE2B 03eac77940db0ee6b4f2a006edc600ef34141bbca849f5be4de9b961301a8fc987da6d0e21344aa5d80c29bb7793d56cf5441abb6c8e4057d94e2601c174c1be SHA512 6bd45c9dfd96b1afb8c1ca1ca72722baee6c91894e454d7af937de02242d3bb9d3b6870f5976aa96245c753c6bc1ac637a6356125b0d4c596aadef643b8c3d8d
@@ -15,6 +21,8 @@ DIST linux-4.19.92-arch1.amd64.config 222487 BLAKE2B a658d80d85525287a1df9053ca2
 DIST linux-4.19.94.tar.xz 103389152 BLAKE2B 291db6f448606a4ba288295b4b1c0b813e736534e4749a152baa1d07fcf52bba2b59e7b4b261594a2deb9ad961afec50a28b4ec126f97033f1c0a36aba9f2961 SHA512 c6017e854ec06054c658042c2e8227d79284ecdadf0a2e1c5da799ca2ac165a266e7d33aa52361d0036ddb3059e3b24f0a68b45ffd84d87394d3f41492f6f9a4
 DIST linux-5.4.18.arch1.amd64.config 241388 BLAKE2B dacc83b154eab51e3c7f57bba6e02a4edfe34fa584c907f514b8afe9cb7ef39aa245caf82a35f648e379883fbbb6426b763879676cd3cecf741bcf342f165a81 SHA512 bf211c4293f7dbd980bfcc47fb337a2db359f1320573f5086a5ec60a0c50b4105723e010212eb6d5b9c2ba3ecb5fa4381f8b67c16596647c030b4f49274120b9
 DIST linux-5.4.18.arch1.i686.config 240651 BLAKE2B 9e00b28951593aefc53cf735bd30589e44c9326f53ff98f7b2a244e171192910f93ab9f20d879ec06ace9b1169a6b3d3d6acf2105736905cca3b9c2db1cc8e68 SHA512 0c9331fd1256e044734d24d4ca58e2677604482aa0ce33f65a5df63dce4d2615ea9686a53a0e603956437d9b9d23e54389459d7ea0bfe66597609dae96952785
+DIST linux-5.4.24.arch1.amd64.config 241418 BLAKE2B b24fbeb04cb63b5f0ec7ea935b21302aec92552f1a8108c204f8529803d5eb23dc6124529ca0f9fc394af051b0d3725698fb5df95d6af25274cb51146e3c052b SHA512 d180f3cea5c9c357d482d8533dec7e641b782f501c15f749a5a5347fe737fab93a43a95e12391fcbe3d93a90d673c91b890cb66d219a8f8247074d222959e9cd
+DIST linux-5.4.24.arch1.i686.config 240684 BLAKE2B 8c29d083cef61f0c61e7256553c00817c5656ff56929dbce60132283a1a43576b18c42823eec7114c9332caad59557b1383a8f9fd16c92ff54f87e587fb2fe06 SHA512 bc293ffd03ee0d8dbe745e80963d3f52977c1cd5875826afa0be6d4615aa33afc6a8a548bd5db5d3bc00a33f7cde566206a959d4f5ea4b4f41ed83492ae4e365
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST linux-5.5.5-arch1.amd64.config 243885 BLAKE2B 088e76a9981a64cd6163667fd09cc02148f15cc53812a429d1f5e22dc893823f57041e581ec957f38504c1fbb5aa0c7886847d1ea4cdc44d5ab245dcc304edc3 SHA512 e6958e1fd35e2a900fa6c81e68e35b42496e245829b8bfd85d9d351dcdf8bbea93d25a0edf74871beababb4ba28cd7a731e589e68e047ac972d973ea8c20d3ac
 DIST linux-5.5.6-arch1.i686.config 243301 BLAKE2B c5fdd9dc2a0baed1ea421faa8f254d6ece47e89b78fc4c25c38369b53acc1f954978f2f86eda23b77d20a35096a596944f9c433db66008278ed2b8140823ce62 SHA512 b2d75bb1826a4dfad10aa5b6fa9cce2684d5de2dabc6da165e192e5a33cbd6eeaff4d7f236e074f4c099830e01e767bd6bc14a70d644057dce59288ae9704877
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-4.19.109.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-4.19.109.ebuild
new file mode 100644
index 000000000000..3b0d137453f9
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-4.19.109.ebuild
@@ -0,0 +1,76 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-4.19.94
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} - 1))
+# https://git.archlinux.org/svntogit/packages.git/log/trunk/config?h=packages/linux-lts
+AMD64_CONFIG_VER=4.19.92-arch1
+AMD64_CONFIG_HASH=bf97de6a2e405659aaad4c251b7f0bb48d5ed3c9
+# https://git.archlinux32.org/packages/log/core/linux-lts/config
+I686_CONFIG_VER=4.19.85-arch1
+I686_CONFIG_HASH=1f0345e2983d2edd55b401cb5a87fdf365a4192c
+
+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://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux-lts&id=${AMD64_CONFIG_HASH}
+			-> linux-${AMD64_CONFIG_VER}.amd64.config
+	)
+	x86? (
+		https://git.archlinux32.org/packages/plain/core/linux-lts/config?id=${I686_CONFIG_HASH}
+			-> linux-${I686_CONFIG_VER}.i686.config
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		# (skip most patch release patches, we just fetch newer sources)
+		"${WORKDIR}"/109[4-9]*.patch
+		"${WORKDIR}"/11*.patch
+		"${WORKDIR}"/[2-9]*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}"/linux-${AMD64_CONFIG_VER}.amd64.config .config || die
+			;;
+		x86)
+			cp "${DISTDIR}"/linux-${I686_CONFIG_VER}.i686.config .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local config_tweaks=(
+		# shove arch under the carpet!
+		-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'
+		# disable compression to allow stripping
+		-e '/CONFIG_MODULE_COMPRESS/d'
+		# disable gcc plugins to unbreak distcc
+		-e '/CONFIG_GCC_PLUGIN_STRUCTLEAK/d'
+	)
+	sed -i "${config_tweaks[@]}" .config || die
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.25.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.25.ebuild
new file mode 100644
index 000000000000..26593f121ff0
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.25.ebuild
@@ -0,0 +1,73 @@
+# 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://git.archlinux.org/svntogit/packages.git/log/trunk/config?h=packages/linux-lts
+AMD64_CONFIG_VER=5.4.24.arch1
+AMD64_CONFIG_HASH=c060a2f4e686e06679d9cf9bbab5fdf423e5a402
+# https://git.archlinux32.org/packages/log/core/linux-lts/config
+I686_CONFIG_VER=5.4.24.arch1
+I686_CONFIG_HASH=3f4ba0851a9e9a3809fdec4091335182b0f1885a
+
+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://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux-lts&id=${AMD64_CONFIG_HASH}
+			-> linux-${AMD64_CONFIG_VER}.amd64.config
+	)
+	x86? (
+		https://git.archlinux32.org/packages/plain/core/linux-lts/config?id=${I686_CONFIG_HASH}
+			-> linux-${I686_CONFIG_VER}.i686.config
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}"/linux-${AMD64_CONFIG_VER}.amd64.config .config || die
+			;;
+		x86)
+			cp "${DISTDIR}"/linux-${I686_CONFIG_VER}.i686.config .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local config_tweaks=(
+		# shove arch under the carpet!
+		-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'
+		# disable compression to allow stripping
+		-e '/CONFIG_MODULE_COMPRESS/d'
+		# disable gcc plugins to unbreak distcc
+		-e '/CONFIG_GCC_PLUGIN_STRUCTLEAK/d'
+	)
+	sed -i "${config_tweaks[@]}" .config || die
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.5.9.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.5.9.ebuild
new file mode 100644
index 000000000000..46f0dc57842a
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.5.9.ebuild
@@ -0,0 +1,73 @@
+# 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##*.} + 2 ))
+# https://git.archlinux.org/svntogit/packages.git/log/trunk/config?h=packages/linux
+AMD64_CONFIG_VER=5.5.5-arch1
+AMD64_CONFIG_HASH=e4d4ca36741d228042185e2a9047cd88fb5b4169
+# https://git.archlinux32.org/packages/log/core/linux/config.i686
+I686_CONFIG_VER=5.5.6-arch1
+I686_CONFIG_HASH=7d53d8a42f68648bce5b002aaf8c2b14e6298275
+
+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://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=${AMD64_CONFIG_HASH}
+			-> linux-${AMD64_CONFIG_VER}.amd64.config
+	)
+	x86? (
+		https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=${I686_CONFIG_HASH}
+			-> linux-${I686_CONFIG_VER}.i686.config
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}"/linux-${AMD64_CONFIG_VER}.amd64.config .config || die
+			;;
+		x86)
+			cp "${DISTDIR}"/linux-${I686_CONFIG_VER}.i686.config .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local config_tweaks=(
+		# shove arch under the carpet!
+		-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'
+		# disable compression to allow stripping
+		-e '/CONFIG_MODULE_COMPRESS/d'
+		# disable gcc plugins to unbreak distcc
+		-e '/CONFIG_GCC_PLUGIN_STRUCTLEAK/d'
+	)
+	sed -i "${config_tweaks[@]}" .config || die
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 1edc73874727..d09ff6728a44 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -109,6 +109,9 @@ DIST genpatches-5.4-23.extras.tar.xz 1744 BLAKE2B a744740c74b52b66f8db5f0a71174b
 DIST genpatches-5.4-24.base.tar.xz 1012048 BLAKE2B 88f206f9824bdbe818a159832be638bd37ba274cc06fa245c7e48fe67112383ba3254e6e6433a5ebef792b4b61798aba9d748f8bffac0f62aa9c5536cc934b8d SHA512 bfa30fab2737af4d7e8874831cadec224a634832502f7472c4a018ee98ff698e5134101b06f09ab779e03d62920a29691a12a189ff19e055cfb1effce584b8d9
 DIST genpatches-5.4-24.experimental.tar.xz 6140 BLAKE2B 93c1963594e725765475fc1cfbd9e84d2904cc0abf22db4af59f030f74c7b3be3f24811e47346b7560818cc59b24761b2d2bc1bb309c20833c86a06f75af52f6 SHA512 81f55a9c37e7905bb30d4980aef2f178fc1c3871358c2d26943c42e7c99c1be6b4e3339f10a0d578ba694350da107d72259daeac1424d49ea6ad5c67d51201ba
 DIST genpatches-5.4-24.extras.tar.xz 1740 BLAKE2B 959877a73da6fc757631407722e086c41409309060b275139c092aacc9cb1a7b749638322abf019bf194508d06a73eeef00939dc666f94313a680452b1fc91c2 SHA512 d9c85b2e581bcda49cf34ca90dbcb124c56ab515a8df67a55b08f5e8c0495894376267ba78c966dc9697d88ca8e429e2018d9dedd1a1fddaa7107c6fc74f248b
+DIST genpatches-5.4-25.base.tar.xz 1052564 BLAKE2B b41dcbbeefe779bf86209d676bc5155e1a6db0b8e91fc101da87bb66cd51f5ac26d41798fabe7b4e9377c696a729b649e16036bf677bfb468b8300d32617e995 SHA512 f1badde5398ff780bea19c91c294fbd391d142f0912645a2adf4c5ff63b049697d83bd5377069828b43abe5e448abe3649313d16cc6ee07c6eaa90f0c57f0ca5
+DIST genpatches-5.4-25.experimental.tar.xz 6140 BLAKE2B 44a3ca437b6d166694853a540aa94c56af93e3965a63ef7098e0431814181735aa171a0473c2babfc3e966898860cad375342407dfd3a5797f90e99a3a9f6e6e SHA512 b879b90f76028ccf5c11b584163f9209f10c3391d17e06a6027c7345013ac22ae29601ef37bd2ccac9ab8aa237e02d3d18af353b74e77f415ec5ce4ce4375a1b
+DIST genpatches-5.4-25.extras.tar.xz 1744 BLAKE2B 7ca0570133350ec60e8872f9035dfd2d46355a16642755d8f4bdbed7a9622a1a18f0529fb55eff00dd15520396c269c7849210b461f0c8f5ed8c6512071eaeb5 SHA512 1894e699b09a9cf5732b9b9c8aad91c0ab85ef08fbc03afd4d0feb3cabf8dd04b2f6cd47ee8f1d09a07490617d5f16997cfcf037449f1d4f3af84c4f8541de43
 DIST genpatches-5.5-1.base.tar.xz 3984 BLAKE2B aed3662231f2863f234ebdc3c615c8c7fa32c3b1301659388facef4354b148bd31a9978917dcced2081f157afa176df5cda2e11fa085e3599f68af65f8edfaec SHA512 bdbe3d72620418ad0245f7e7f4fec7960d302be4842c6a090440f8ffccc5f6a67fdf11e51da5a14b659ec7a003410f1374b70ece128455ffd8eaf13177a427ff
 DIST genpatches-5.5-1.experimental.tar.xz 6168 BLAKE2B 22b8602963c9a601da950a86b242116f4885065087e751d7371d914b2077434ba4dfb54ed03be26bb6951dfef49bc587c39c9b5065df2585b25e6c116bac7261 SHA512 9bbfa35b13e4d994a426fc623fd8fed56b722f4ff9e3d2ff330f8b8dab454e9d5b5da205ea64385377685bd319663fed27612b7c9122b752ce8d4be5bdde3e8c
 DIST genpatches-5.5-1.extras.tar.xz 1744 BLAKE2B 78353a253969918f5c054768df01bf7d0a0887f5686f6b84a78f28a0c1ef49101f278c5140367a4547cce9932ec9e7dcff4b4fd8519bb9e9dd9b7d4764461877 SHA512 84815483c7c30e2258c1d246080c460177b8e3b6c49592a78c2a5d83798b703da845ee3f1f939da1e947dddced42fc83434ca162f8e5135c838877304e3a80cf
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.25.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.25.ebuild
new file mode 100644
index 000000000000..d33624fc553f
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.25.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="25"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index dfb763f04409..f5be4ffdfa5c 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -1,14 +1,19 @@
 DIST linux-4.19.107.tar.xz 103417476 BLAKE2B 4cafa666bb7a5c16bd806c0b0d8bfdf98fd8a09ffc99512a3b354abfe3514fb61802c596a898417e54b52f7c3da4ccac0c52746d4f80c77ceff79f0f9821663f SHA512 92b23cdbe1234bfc606b498bb59e2c493d57693f7897b92c3d1d8b2620394e55dc5c80c1fc40c862778f81f91ed09e2fa4598f196f969977dc44c80ac13dce05
 DIST linux-4.19.108.tar.xz 103408396 BLAKE2B d8130982ef7b1bbcdc6b1e4099b6bf5bd707f722b74b2e8cf8bcd45e510f3e39c8418851c923013a6919c4c45c43c65fae8f39ba92563f4645c1c3a3fcfd2937 SHA512 c39099f314fe22e902f561f0dd17fad021a9b8d4ad3c154709a7680e710980a44bcadf46092da7f1a0a9c6910a9b2a8116cc874f8991e197ff05fafe4312da2d
+DIST linux-4.19.109.tar.xz 103426400 BLAKE2B 0b21b26db8f51d3857eddbdff8267d571bbdafae4b3d0785478769c8c29d049a64297f9b2889fcaa9eb396245cd77a51067d4be6fb6fd8d08c17080e7283bdc8 SHA512 595411940613df10571e8de1d025f8af5596aecad6f4ab5c68c611b9b03a1fba1ef1ac511658fc85e98f6a9aa0569db26dc99e24436912fa53682caebb68de69
 DIST linux-4.19.85-arch1.i686.config 222183 BLAKE2B 03eac77940db0ee6b4f2a006edc600ef34141bbca849f5be4de9b961301a8fc987da6d0e21344aa5d80c29bb7793d56cf5441abb6c8e4057d94e2601c174c1be SHA512 6bd45c9dfd96b1afb8c1ca1ca72722baee6c91894e454d7af937de02242d3bb9d3b6870f5976aa96245c753c6bc1ac637a6356125b0d4c596aadef643b8c3d8d
 DIST linux-4.19.92-arch1.amd64.config 222487 BLAKE2B a658d80d85525287a1df9053ca2ddfe423ab423bcc3b9ea8bd9cda65cc7ffa4b1be782c48c867c13e46070af4016f446860f5cf71351f239da1eff6c45a5aa6a SHA512 a5658c8e8464516dffd6f624344e739784cb315d334b2c5105bd5d16022b6366ad4ec00d3692a7b78e2458514175522bc85e834bf19593feff6363b616860258
 DIST linux-5.4.18.arch1.amd64.config 241388 BLAKE2B dacc83b154eab51e3c7f57bba6e02a4edfe34fa584c907f514b8afe9cb7ef39aa245caf82a35f648e379883fbbb6426b763879676cd3cecf741bcf342f165a81 SHA512 bf211c4293f7dbd980bfcc47fb337a2db359f1320573f5086a5ec60a0c50b4105723e010212eb6d5b9c2ba3ecb5fa4381f8b67c16596647c030b4f49274120b9
 DIST linux-5.4.18.arch1.i686.config 240651 BLAKE2B 9e00b28951593aefc53cf735bd30589e44c9326f53ff98f7b2a244e171192910f93ab9f20d879ec06ace9b1169a6b3d3d6acf2105736905cca3b9c2db1cc8e68 SHA512 0c9331fd1256e044734d24d4ca58e2677604482aa0ce33f65a5df63dce4d2615ea9686a53a0e603956437d9b9d23e54389459d7ea0bfe66597609dae96952785
 DIST linux-5.4.23.tar.xz 109502288 BLAKE2B 84b3f193c490e9e6a5095266a61dd683470c14351dc597b569106b813e96e7ab304468495dbf9997ab42d602eb1a3f80dffe523e36e6d209a9986dbfaf75579d SHA512 392cb5daac01f5d7de958ac5aa5163a4ce9f66312539ebe62742e82307a35462a785450e1265fb4c20134ba25b979ee8566e6a6e5c2e6b305658b9939ee993eb
+DIST linux-5.4.24.arch1.amd64.config 241418 BLAKE2B b24fbeb04cb63b5f0ec7ea935b21302aec92552f1a8108c204f8529803d5eb23dc6124529ca0f9fc394af051b0d3725698fb5df95d6af25274cb51146e3c052b SHA512 d180f3cea5c9c357d482d8533dec7e641b782f501c15f749a5a5347fe737fab93a43a95e12391fcbe3d93a90d673c91b890cb66d219a8f8247074d222959e9cd
+DIST linux-5.4.24.arch1.i686.config 240684 BLAKE2B 8c29d083cef61f0c61e7256553c00817c5656ff56929dbce60132283a1a43576b18c42823eec7114c9332caad59557b1383a8f9fd16c92ff54f87e587fb2fe06 SHA512 bc293ffd03ee0d8dbe745e80963d3f52977c1cd5875826afa0be6d4615aa33afc6a8a548bd5db5d3bc00a33f7cde566206a959d4f5ea4b4f41ed83492ae4e365
 DIST linux-5.4.24.tar.xz 109481252 BLAKE2B 8124547a1be476b61612d22f856627ed0a70e3bb4ff3898a93eaaa6921870baf3bfcf3901a0f85772c995da5c2214d0a3ff440143438a479808e229d2ba9fb5d SHA512 1d30040ee4992156cc0436e1782fee1c1b2fbb50462ac29429be141eac5f6c7e0a124db335fcd42c5d73f03b564a5903c3de73afd867e0c923a9f1cb88273200
+DIST linux-5.4.25.tar.xz 109489936 BLAKE2B 46882393c13f9c2394597bf267ec7361b2d8a161d53bee2d4df2b15f4705f56bd5bb4f14db40098a52bac75544ec11c5ec6446bc7834aafaf135d243d5578e47 SHA512 2d0dfac419ab7d8d53ef95e1d4d9c59d79c573f953f947907903f781c3240cdcdb014eaca8c8641280948b594fd2098edb6994dfc0a4387bc45ae70234faa82d
 DIST linux-5.5.5-arch1.amd64.config 243885 BLAKE2B 088e76a9981a64cd6163667fd09cc02148f15cc53812a429d1f5e22dc893823f57041e581ec957f38504c1fbb5aa0c7886847d1ea4cdc44d5ab245dcc304edc3 SHA512 e6958e1fd35e2a900fa6c81e68e35b42496e245829b8bfd85d9d351dcdf8bbea93d25a0edf74871beababb4ba28cd7a731e589e68e047ac972d973ea8c20d3ac
 DIST linux-5.5.6-arch1.i686.config 243301 BLAKE2B c5fdd9dc2a0baed1ea421faa8f254d6ece47e89b78fc4c25c38369b53acc1f954978f2f86eda23b77d20a35096a596944f9c433db66008278ed2b8140823ce62 SHA512 b2d75bb1826a4dfad10aa5b6fa9cce2684d5de2dabc6da165e192e5a33cbd6eeaff4d7f236e074f4c099830e01e767bd6bc14a70d644057dce59288ae9704877
 DIST linux-5.5.7.tar.xz 110727036 BLAKE2B 25a0c09a2a8b2ff8762dcf29dc326339537a49996b232c1568de036475a3afb62406fcf85c4357a8fa32088fdb7f868c46ff13a6fa3c2c554b8717c7fbe57712 SHA512 a6f4f171ed041a556378dd037de309243272dfa5a51268755d931e75df1358ed970af0a26e3bb4fe64c75f02318a7d0e497e3e9e6a4d10ab9d2d65e958670754
 DIST linux-5.5.8.tar.xz 110741748 BLAKE2B c7f017bff5beeaea947a93a97b8f0e0dc137e5df3e7b342ef4dbb0336072aadb16bf22a2cb777bf82627dd100378b4fde00eecfdd6ac30b41b4fa2ce32abc8f9 SHA512 0aecbfaae033834db85d17349aeb22d62168244eb2a5db627c7bcab8a2800dfae6e21dda29efb29c3d78fae99ef673d22471ea433098a870113e2db67252a093
+DIST linux-5.5.9.tar.xz 110744896 BLAKE2B 0f9c4e49bd6d88be460609013fc2dfb6dc0d5999b3cd2321d9953ed42a97d373c04ecc21d4b28f2873f0086938910deeceadf3334f52920483844057eae4851c SHA512 43ec99c2496567753f8945cbdbf131e706ced98132418b80643c9730dab125ca993defda60e0eb64a8242b76127b7550d8bee89cb7d31ae51293344a25344171
 DIST tinycorelinux-10.1-amd64.qcow2 16842752 BLAKE2B e013e76503c335739a9623c0901ca791937a0e6b177854535cadec1e2c2cd2df588283ed3128cf652595f32264fbfe5b3bd3a8c97665fd4da344e308535be366 SHA512 c3aeb20ff8769da9211694b7f701907cc7ae7582cdfad2c2fdc008d97ebcbd9dc08245b4e8f8450e1cb304bd705345a11fe79f901a47979fee91443841d55641
 DIST tinycorelinux-10.1-x86.qcow2 14876672 BLAKE2B 3c760eb7438b13261e52ecfaa33a53649ced95f1ab40aae52134b8cdc31a16d7aa0d6a6dd716e268ed148e9d77a10b7c700b141b61d70c82d271ffe88e8e2a3c SHA512 9964538dc42f232a11949f74b61d46422ea5da3bdc253a217119bd0b8a750c40fd2da0b07157067be9ac0226472614f210a1248114df0d331df390979867a895
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-4.19.109.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-4.19.109.ebuild
new file mode 100644
index 000000000000..17bfa6ee759e
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-4.19.109.ebuild
@@ -0,0 +1,65 @@
+# 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://git.archlinux.org/svntogit/packages.git/log/trunk/config?h=packages/linux-lts
+AMD64_CONFIG_VER=4.19.92-arch1
+AMD64_CONFIG_HASH=bf97de6a2e405659aaad4c251b7f0bb48d5ed3c9
+# https://git.archlinux32.org/packages/log/core/linux-lts/config
+I686_CONFIG_VER=4.19.85-arch1
+I686_CONFIG_HASH=1f0345e2983d2edd55b401cb5a87fdf365a4192c
+
+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://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux-lts&id=${AMD64_CONFIG_HASH}
+			-> linux-${AMD64_CONFIG_VER}.amd64.config
+	)
+	x86? (
+		https://git.archlinux32.org/packages/plain/core/linux-lts/config?id=${I686_CONFIG_HASH}
+			-> linux-${I686_CONFIG_VER}.i686.config
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}"/linux-${AMD64_CONFIG_VER}.amd64.config .config || die
+			;;
+		x86)
+			cp "${DISTDIR}"/linux-${I686_CONFIG_VER}.i686.config .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local config_tweaks=(
+		# shove arch under the carpet!
+		-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'
+		# disable compression to allow stripping
+		-e '/CONFIG_MODULE_COMPRESS/d'
+		# disable gcc plugins to unbreak distcc
+		-e '/CONFIG_GCC_PLUGIN_STRUCTLEAK/d'
+	)
+	sed -i "${config_tweaks[@]}" .config || die
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.25.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.25.ebuild
new file mode 100644
index 000000000000..1346d4278bf5
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.25.ebuild
@@ -0,0 +1,65 @@
+# 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://git.archlinux.org/svntogit/packages.git/log/trunk/config?h=packages/linux-lts
+AMD64_CONFIG_VER=5.4.24.arch1
+AMD64_CONFIG_HASH=c060a2f4e686e06679d9cf9bbab5fdf423e5a402
+# https://git.archlinux32.org/packages/log/core/linux-lts/config
+I686_CONFIG_VER=5.4.24.arch1
+I686_CONFIG_HASH=3f4ba0851a9e9a3809fdec4091335182b0f1885a
+
+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://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux-lts&id=${AMD64_CONFIG_HASH}
+			-> linux-${AMD64_CONFIG_VER}.amd64.config
+	)
+	x86? (
+		https://git.archlinux32.org/packages/plain/core/linux-lts/config?id=${I686_CONFIG_HASH}
+			-> linux-${I686_CONFIG_VER}.i686.config
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}"/linux-${AMD64_CONFIG_VER}.amd64.config .config || die
+			;;
+		x86)
+			cp "${DISTDIR}"/linux-${I686_CONFIG_VER}.i686.config .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local config_tweaks=(
+		# shove arch under the carpet!
+		-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'
+		# disable compression to allow stripping
+		-e '/CONFIG_MODULE_COMPRESS/d'
+		# disable gcc plugins to unbreak distcc
+		-e '/CONFIG_GCC_PLUGIN_STRUCTLEAK/d'
+	)
+	sed -i "${config_tweaks[@]}" .config || die
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.5.9.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.5.9.ebuild
new file mode 100644
index 000000000000..0fc8e2822599
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.5.9.ebuild
@@ -0,0 +1,65 @@
+# 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://git.archlinux.org/svntogit/packages.git/log/trunk/config?h=packages/linux
+AMD64_CONFIG_VER=5.5.5-arch1
+AMD64_CONFIG_HASH=e4d4ca36741d228042185e2a9047cd88fb5b4169
+# https://git.archlinux32.org/packages/log/core/linux/config.i686
+I686_CONFIG_VER=5.5.6-arch1
+I686_CONFIG_HASH=7d53d8a42f68648bce5b002aaf8c2b14e6298275
+
+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://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=${AMD64_CONFIG_HASH}
+			-> linux-${AMD64_CONFIG_VER}.amd64.config
+	)
+	x86? (
+		https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=${I686_CONFIG_HASH}
+			-> linux-${I686_CONFIG_VER}.i686.config
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}"/linux-${AMD64_CONFIG_VER}.amd64.config .config || die
+			;;
+		x86)
+			cp "${DISTDIR}"/linux-${I686_CONFIG_VER}.i686.config .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local config_tweaks=(
+		# shove arch under the carpet!
+		-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'
+		# disable compression to allow stripping
+		-e '/CONFIG_MODULE_COMPRESS/d'
+		# disable gcc plugins to unbreak distcc
+		-e '/CONFIG_GCC_PLUGIN_STRUCTLEAK/d'
+	)
+	sed -i "${config_tweaks[@]}" .config || die
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 121be84043f9..a5dd69d39271 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -10,5 +10,5 @@ DIST patch-4.14.173.xz 3523396 BLAKE2B 45804f5af5f44201c13b1c99bbe546a81b2d8c34e
 DIST patch-4.19.109.xz 2891684 BLAKE2B 3bec8f0eefb4479f04021a72216cbe6a12ad09c5e0a7fccfde73729d3f56719c075dc33778d4498b3052be388632cdd9d4e98ff4628c3bdc5a4e46cb2b61b359 SHA512 8a5334c2746512f863df1db95cedbc8255d1fff18779bfbbdb2dfbc00f96235af96cf7c62a7aea3fb07046de9c2e2b1a5902f146d14e5a8f5717793c8031550d
 DIST patch-4.4.216.xz 3040032 BLAKE2B cd1a3613b1c965680e38375bf4af2d353bc7818adaedc956c52858867a0228b9ca9d7cccdcf837afc50cf1bdd3317c785759473991e38e37530d5da5537ce244 SHA512 fc56cc99704a59d29320142053ee1228db46ff271e5ea77e45eba2e4a61a0d495345535746981971fcda6363c73add01847fcbbac6e2717f2a7dff3f4b6cdd6c
 DIST patch-4.9.216.xz 3382928 BLAKE2B bf53291ebbfdd4bd871d738926f769247349a25b9894cd2ef25d11542164a6e0698a9000c912c13dd43767085565a0fc8d27a8c923af001bc720bb50a68e4ba6 SHA512 d0385467457908d753e5ff846b89c247edb13456538a088049b2fc2a913226de475a9280993baf63a026708ef3144c9df730634f014272506165fed216075cc1
-DIST patch-5.4.24.xz 968056 BLAKE2B ed74c9e48f8bfac0030580bd7556bda705e366176c402b8ee91a0080aea3caafc8fc1534f6590c36a9b78005a59214b918462c27099b1e70b03c84b992237f5d SHA512 2036ddc1738f8d3fd0356fc2d0bf00646a882cbab7dcfbad6a8e3a4968de02a0613d9b513b45c4fd87210627405534a4af5711e3caa8bc5ebee574dc3235e133
+DIST patch-5.4.25.xz 1005776 BLAKE2B cb9ed154fc9fd88ee50437a9c595a53010f5a1bfc5f5766234e6bbcd5cd9bbbac32509ac4a473446b2d8257a02ebea8dbbf2280b88b969cfd98426ce5ffeefab SHA512 ba887634350a2fde67283241356c5f6fee1fd076b58051aa4df88da8bc60645e40b8b73dba3401415770a80f58d59546fc96b8b816b61da70177a3ef92c1bafa
 DIST patch-5.5.9.xz 491120 BLAKE2B 0bba19e3d579b8f78b4e99de168719fbca40f6ef3977f36d180025ee4bcbf16f0978eac1f8378d9c230ff0faee9730db5a9e4b9b3a2dc25ad59c773784c99b01 SHA512 44f26e7bce86c149fb4ddae20306ae58dead5a4797c268409f12284c695de80bde4a1b8bb1492f51db0f36210543d4a277024481e43acda10c3bb03470bf5270
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.24.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.25.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.4.24.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.4.25.ebuild
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 43cb46b755dc..0534d9f3abff 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/rust/rust-1.41.0.ebuild b/virtual/rust/rust-1.41.0.ebuild
deleted file mode 100644
index 5331d749eed6..000000000000
--- a/virtual/rust/rust-1.41.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-build
-
-DESCRIPTION="Virtual for Rust language compiler"
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-
-BDEPEND=""
-RDEPEND="|| ( =dev-lang/rust-${PV}*[${MULTILIB_USEDEP}] =dev-lang/rust-bin-${PV}* )"
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 77411e6a2597..897b6cce7bb1 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 6c3a81121c19..4875a3ba1ab1 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,3 +1 @@
-DIST opera-stable_66.0.3515.103_amd64.deb 66093116 BLAKE2B 395d16ac517256d3b9d48daaf7673843a0e7cfd8a4578c90237276a482e219c01d59db380b07950577e8a9607340bbd5675fc99cf71202ca675e558926d4f2e3 SHA512 6434a76c625250e66946951a183cdcd8c9fb9756b99294ade3743aa1250b1b1c8fbb7b05d3c95824de98df23d8d913ead5faad6cfe33cad5c43a53a580c1d6c8
-DIST opera-stable_66.0.3515.72_amd64.deb 66037860 BLAKE2B cca65f4ff78a180b4bec4d60686d3d9b33daca9585898f9e086ab3a9861b7919de743397b3fe18a4131e3343ae4c24ee4bd820372204c0d6a5376abd06845569 SHA512 4dd9bb5b5329c1a7fc0298454e674b1932abc622a96bcf8d1099b6d84f1716dadbc0b526eaa298b40c856480d692828677b5d6c20d0403382c869f48bd702572
-DIST opera-stable_67.0.3575.53_amd64.deb 67124892 BLAKE2B 9acd8bcc781e0d8e2f2b08f8a9786739d031e6c34eb3de0f4f5fa7b7528acb4e8aa62b9a845cf0fdbcda39b7329408b8c042bb2546ba5d2012f955b5a7a581a2 SHA512 7bff33f0f6c51471ec4dd9f989555ea974dcfd1a7d53dd79bdc64000251df71cb9012284214651723ad5af8378d787947f4b9e5a59d608563fb8063ee727cb45
+DIST opera-stable_67.0.3575.79_amd64.deb 67131788 BLAKE2B 5183bb4644be8f8868a2c1355a4e7bf77d5669a16416074428dda792611bd5323554fe62131faa219a4f003617e70add8d6b0f2f4b52464b60cac52f0c762363 SHA512 95db2d608b8f8454407559aa9ff97d8918e026008e5c99836f97a9b33c6b4934f7f973cd0cd341ef00bcce41a448e8e96fce57342733aa9f686d616e9f95b0ad
diff --git a/www-client/opera/opera-66.0.3515.103.ebuild b/www-client/opera/opera-66.0.3515.103.ebuild
deleted file mode 100644
index a1d448874c75..000000000000
--- a/www-client/opera/opera-66.0.3515.103.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
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB en-US es-419 es fil fi fr-CA fr hi hr hu id
-	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-
-"
-inherit chromium-2 multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	https://download1.operacdn.com/pub/
-	https://download2.operacdn.com/pub/
-	https://download3.operacdn.com/pub/
-	https://download4.operacdn.com/pub/
-"
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
-"
-done
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	default
-
-	OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-	esac
-
-	rm usr/bin/${PN} || die
-
-	rm usr/share/doc/${PN}-stable/copyright || die
-	mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	pushd "${OPERA_HOME}"/localization > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	rm "${OPERA_HOME}"/${PN}_autoupdate || die
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /"${OPERA_HOME}"/opera_sandbox
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/opera/opera-67.0.3575.53.ebuild b/www-client/opera/opera-67.0.3575.53.ebuild
deleted file mode 100644
index a1d448874c75..000000000000
--- a/www-client/opera/opera-67.0.3575.53.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
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB en-US es-419 es fil fi fr-CA fr hi hr hu id
-	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-
-"
-inherit chromium-2 multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	https://download1.operacdn.com/pub/
-	https://download2.operacdn.com/pub/
-	https://download3.operacdn.com/pub/
-	https://download4.operacdn.com/pub/
-"
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
-"
-done
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	default
-
-	OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-	esac
-
-	rm usr/bin/${PN} || die
-
-	rm usr/share/doc/${PN}-stable/copyright || die
-	mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	pushd "${OPERA_HOME}"/localization > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	rm "${OPERA_HOME}"/${PN}_autoupdate || die
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /"${OPERA_HOME}"/opera_sandbox
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/opera/opera-66.0.3515.72.ebuild b/www-client/opera/opera-67.0.3575.79.ebuild
similarity index 100%
rename from www-client/opera/opera-66.0.3515.72.ebuild
rename to www-client/opera/opera-67.0.3575.79.ebuild
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 2087a6c5d60e..d65e7ea02c53 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,12 +1,8 @@
-DIST vivaldi-snapshot-2.12.1838.3_p1-amd64.deb 67635384 BLAKE2B ea105e0d2ce19244d71bbcc2ee23d3de15fc647c80f8913132b2b9a2d03c478e9b1dd99d9e15b1e3900a6635ee30b1164799a6e34ea9c281387a3ad64f8d1564 SHA512 75ff754a593134e86d5b0931eb154971458e4d4f09b75da0b007e1ae05be477e9c6ea94863503d03e5d762d0826b3f40b211a75dcad61f559016401db05c0c53
-DIST vivaldi-snapshot-2.12.1838.3_p1-arm64.deb 60676180 BLAKE2B e9c0d0b52fcdc66f4a368921c486b80f3ae40865f1bbb134469e245ea82bd5755c02c81fa4cd9e8c1f79533eaf1fa835ea80971da1df05db6d0ca069ff237c06 SHA512 a3886b7ad21d86190d2d24e1cd0a30255d77cef4d9e621dcdc1b487f4d0cb40500659ff8a666e354e1295289237024c790f1b9ec3af5a9499e79e74072609334
-DIST vivaldi-snapshot-2.12.1838.3_p1-armhf.deb 60058172 BLAKE2B 06b7a63daa0cc30d95dacdbb2ac426bf78801aa8cbe4aaf804356f0f9280771f12275651da88e3412bc0d87fdab8ed16e1eeff4dd4894e8fb3f3960e075d0c49 SHA512 dbbbc485fc4f497a7ba1466fab65d091d1b5cb098ac718ca1f3bcdcbc4eea7cfe0bed962802170bef1439bb295997a377906b1010d0cd30f142ce87c61f3091a
-DIST vivaldi-snapshot-2.12.1838.3_p1-i386.deb 66489800 BLAKE2B bf9927dddeded3ac21b238c8bf384bf6fd344fc738e385be189ff66b312ac5b7f8f1f4957ee524a42f4ba7983f717f7e135204b63c9bab3eeaaa041e0a2787ab SHA512 94be102b935ffa2f12416a4ed7ac8a29e5a51028d5cda2a6ca387fd011abacadbe0f21b7250922e05e0f88fb6ba0d12b8126f2d01493dfa93bc39b460e8d0e03
-DIST vivaldi-snapshot-2.12.1843.5_p1-amd64.deb 68982688 BLAKE2B 9bf495533fd1eb983f84467dfd8b1f642d1f5a561e092a3f00c60558335e3d81ade1951e4d1ed47c9b95ace4154b4ecb9ab6a5c1e40b15731f681a545850be14 SHA512 e86d09d5d6b771b5b8d89200414526232335b7064f4a5aecc48c1d00fdbb8986b714c2567acff97fb418678adf3f526c0591978d430c05d4568f2fe31dac1648
-DIST vivaldi-snapshot-2.12.1843.5_p1-arm64.deb 62103744 BLAKE2B aebcc7509ce192dc3845eb000a05ecd0ad6f5aa507aa7442bc4b1460d998174ff36e979c766e7af15a04087cafc5486f409e6329f9d34201a202afbc63b318e8 SHA512 77256324655c1d39e2379f929142fd2c885313980a570b0ff9ec45aa3beba17d01f032380251d673b98b9ef56860e57085824e81a9ab8b81aff361a8bf817fc3
-DIST vivaldi-snapshot-2.12.1843.5_p1-armhf.deb 61397064 BLAKE2B beada5988db61cb211a76bb21b1db77d106745451e6aaec889e6ea60ec8fb8cc9b7835534dbba77c2a9c73ce1246ca7f584dcd05b02dc8593e0a9aa6a6ed6bab SHA512 1b4d17e3fcc6726d4d96330710a91620910255b13997a26105caa4a54b45e6fbcbbb118fdfdc5b93aa6f21f88b7a1bda6175466f5e3ed7e28655a592da358b28
-DIST vivaldi-snapshot-2.12.1843.5_p1-i386.deb 67714672 BLAKE2B cae0267b8162e0d40dcee55a930296290165a1252cc6bf222dd5f26eadc26b2d56e0f9a0d27e0a92063e91ae3c7d61a41d55d3db4e40d80abeb2fc4d1004c1c6 SHA512 b55885f3e47e4709300e2d83a0772d09ab27f65f76d5a58087d9bfb2de6ec9dd452ffcc64425d3fb46bf0360ea971fc250bcb8f482c60f8f1f21227f4aac086f
 DIST vivaldi-snapshot-2.12.1848.4_p1-amd64.deb 69009980 BLAKE2B 006be4ec000b2154099aed5f5012683157f263c19a7611dccc3b550e0c492de8df109376eb7980a93a0776bfec22b2039de016d3f0fed009a57f9e27dcb2e237 SHA512 e1066b1a3e60b8ca540cbdaf4a3e5b382e4daa27b80dcea02f19f16e4d3c85bc85879aa9cccf90cb98856f841a7eb65de52742949b4d0039f913f5dc49ba9953
 DIST vivaldi-snapshot-2.12.1848.4_p1-arm64.deb 62091288 BLAKE2B 50d07892c45386ba13de9f46cbe75c02b9c82b600f57198c267255146ef65c5089778cf4e185e1e023a79153f51d115cdffdae216b99e1a21e57581f4d48ec2c SHA512 26e1057421e7818a44f33ccf2b134e00f12a6602bdbef417965775b1cf92b94dfb60e5e2efc39775dd04bd269791f448ed54d1f746ba7b3e8448041001137523
 DIST vivaldi-snapshot-2.12.1848.4_p1-armhf.deb 61432824 BLAKE2B c8bf4a6013823b6f1714de1730ef851e9d2f2a27bc9d46f76c403e5e266d275072bd3a064db7060100543ce66fa234bc47d481dc1133a772839d318374375d53 SHA512 146b198245c14b17272251e61cd7654b25d31757f669491b44eaaabfb2a80245cbd2945beace4a310db89ae38ac5aa000782e9beea321ba6d6814be2c06ef142
 DIST vivaldi-snapshot-2.12.1848.4_p1-i386.deb 67753028 BLAKE2B 17664be398476d91c3036c4c3865c605c6b06de5cd0ba97c32aec6476a66dbedae9ed461ac37a097041e08424e01cc8ef2130b7cc1209313cca344ee959512d6 SHA512 02d88933b01ca2030a26c8f99127ae67ba2866c6a640d6f02c7585d010f75d108e06466dc40cb67d2e9c63f02e4d36a9d81eb401bc7b246b311bde52318fa02f
+DIST vivaldi-snapshot-2.12.1849.7_p1-amd64.deb 69022216 BLAKE2B 75591766cb0865596c68db65d7d715f14cf75857923a336a3d6bf56962f8bc5ca7d453772d74d584603fcda092ab0682b1e1c637ebecaf736e34812da2724e63 SHA512 49b45e54ed5a601e3122553d507076c4d72df9b0eacf3bda17a97c8d3bd94a82569dbdf44c8a9b98e7a3ad84a480fc0a17e321ad0925ef494063136b6c3b4a59
+DIST vivaldi-snapshot-2.12.1849.7_p1-arm64.deb 62104856 BLAKE2B 67f7d0d72f1b938c6f19049e6c4a571b51d60a2d09879d2939f7483e5028e97bd7e5d28472a7d2c748ca098046e911bf41cb405fc0ce9fe35801c90c0273d598 SHA512 4d6dd1849e7f068fbfa11cabb57b661a43fea41503037c6a7bda094cbdd2678bbee1fe82e8ae21ea7ce9f67d96966df7521ddd10d1a4da091d327915b8a92eb3
+DIST vivaldi-snapshot-2.12.1849.7_p1-armhf.deb 61454136 BLAKE2B 2f3333f335cfc9cefd99c5ab32f3ba125d857e32781f3a77c942b5d0f61cc8a9e29f1975365b1b96feca6f73137bc1c6536d5ebd6fe69ad531ab1a1a38769e54 SHA512 0ce4d26df66ebb7251e03187ee9ae044cd3389e1aa211912501be67a6f6cf1a6135181172315147c81c5e423ab3ffdd75ed3773285764a01b281279e4be49d47
+DIST vivaldi-snapshot-2.12.1849.7_p1-i386.deb 67761108 BLAKE2B f557393a7cd622b456e1e77bc968ed8cd1684b36afbee5e6be18be68190708f888dc22a7cd11fc2b9e5bad9d19bacb2525f40ba29142fa68f8ff2429cd89dcc5 SHA512 38ccccc39a027ae8780eeccbbcfa71640d20f4e8d9936da30f08475e2f0a3c61df80af16f3d5ba9fe5fa659c7c9a5bb68bc45372cf426c8d85b14c93fbcb3951
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.12.1843.5_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.12.1843.5_p1.ebuild
deleted file mode 100644
index db3613b057e7..000000000000
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.12.1843.5_p1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	af am ar be bg bn ca cs da de de-CH el en-GB en-US eo es es-419 es-PE et eu
-	fa fi fil fr fy gd gl gu he hi hr hu hy id io is it ja jbo ka kn ko ku lt
-	lv mk ml mr ms nb nl nn pl pt-BR pt-PT ro ru sc sk sl sq sr sv sw ta te th
-	tr uk vi zh-CN zh-TW
-"
-inherit chromium-2 multilib unpacker toolchain-funcs xdg-utils
-
-VIVALDI_HOME="opt/${PN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
-	arm64? ( ${VIVALDI_BASE_URI}arm64.deb -> ${P}-arm64.deb )
-	arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
-	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
-RESTRICT="bindist mirror"
-
-DEPEND="
-	virtual/libiconv
-"
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/speex
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango[X]
-"
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > "${T}"/${PN}.desktop || die
-	mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	chmod 0755 usr/share/doc/${PF} || die
-
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm \
-		_gpgbuilder \
-		etc/cron.daily/${PN} \
-		|| die
-	rmdir \
-		etc/cron.daily/ \
-		etc/ \
-		|| die
-
-	local c d
-	for d in 16 22 24 32 48 64 128 256; do
-		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
-		cp \
-			${VIVALDI_HOME}/product_logo_${d}.png \
-			usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
-	done
-
-	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_install() {
-	rm -r usr/share/appdata || die
-	mv * "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
-
-	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.12.1838.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.12.1849.7_p1.ebuild
similarity index 100%
rename from www-client/vivaldi-snapshot/vivaldi-snapshot-2.12.1838.3_p1.ebuild
rename to www-client/vivaldi-snapshot/vivaldi-snapshot-2.12.1849.7_p1.ebuild
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index cfbfc8a75b9a..35da4a0e19a3 100644
Binary files a/www-plugins/Manifest.gz and b/www-plugins/Manifest.gz differ
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 38d65923ac3e..9e56ae2ae3b6 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,4 +1,4 @@
-DIST adobe-flash-32.0.0.330-npapi.i386.tar.gz 8542901 BLAKE2B 5b43a56c8de4462b51c3003877be8aa4c8e85af05202211358a9aed7566c6c1a57e369a933260b452c0f076bee398626214f366bad613d6ca14db08ee5a9fbd2 SHA512 6036edf4a8da513657e4b759f6d9ac1c6e5a78e478c76c1eb42edf35f533cfd95b6feeea488814b2461d7e42ddb345269e7192ac243acf7240d8ced6a5728dc0
-DIST adobe-flash-32.0.0.330-npapi.x86_64.tar.gz 9062340 BLAKE2B 981becbbddb599c17516f73f3e353618eaafbd06e58b4d091a1af776ec8687778949785214b4834f2e70b437ba6085361907278e6156c7fb59da92fc5941890b SHA512 f8cddc25999574e0a7c29151b06339827caed2df7a7b61b2b625d5fc2f6f5c3583808178a5606c13b8e187bb2a29c1e40d6db15412e8aebe66abcc84b5f25525
-DIST adobe-flash-32.0.0.330-ppapi.i386.tar.gz 8579454 BLAKE2B 2c71ee721caa6e6a98ececa89cfcc14f474ae1c862da42dc340d764d8f8db4b9c23172795a035cf839c77d1bac7753a466e6d802e01af7952af811bb274b7e26 SHA512 dcce6b054ae42b6215e4aa48c60b49722737f35dcafa9bf7313019122603981d7e9ec8105cd8f96d6844fa0dbecd775fa7b5a3789da0a9bd3f258545098da2ea
-DIST adobe-flash-32.0.0.330-ppapi.x86_64.tar.gz 9492629 BLAKE2B 1edb4e7c8a8b234c7dbd4a403c9af8046b812b1cc088e1645d4feaf37083215c5436495eff1f6dee2713904bd93e0ced6ba419a44acb22ecb24f7353cd2a5e72 SHA512 0fb58106319fdd0e2483fffe38099d88e470409adedb9b0d54fc9b88c98e66e5f05a2dfb958b10c14a1438e55d5380f397f29bb265dbbf313e10e7c2b66bdaad
+DIST adobe-flash-32.0.0.344-npapi.i386.tar.gz 8543568 BLAKE2B f734671e7a3e0d45c896d33d9f5cf7715a3aca42774558075b3cd72f720a446e2a5cc8d8dd3d5d00c63b2dec93654dbefe3e5c6ba865c49c529fc87bb99c9122 SHA512 5b52b4198fea66ca5db40b716a98d452b274ee5252f40ff4c316a7fd50a4177ad1dfd83b1bb5b3dc4ec9290760dcf76dbbd80139f808e2a3adb12a7c38f37613
+DIST adobe-flash-32.0.0.344-npapi.x86_64.tar.gz 9062923 BLAKE2B 0dbe8e2ac099c41c2a135a8d37901752c5571d1c79fe5a5cbdeaa124a654a2fbff4b40e090e8083cb04406e1796f18e9d1a9b7000efeeb2c8f537e403d39d198 SHA512 4cf57daff5ef3435f277f77bcff6c34887a7ebeaf68346ac818797b07ef418fadfe091edea606a2a44fc8d3973377bc04e924ab0028d8b36c012edf2459db27f
+DIST adobe-flash-32.0.0.344-ppapi.i386.tar.gz 8579804 BLAKE2B 7f34e4441877a6155d32ad1d29a3c04600aa150deb8ec1a34c7277d2ee431f09be9f5440f1d55799e9dbc1514249804492b3b2fad6b1db911716650ff86bb876 SHA512 6143aa76823e0377833e6dd0142492819b49dae72691f74924cdab5cea98e2d42d9a74958bce49913568ea2ec44ca0b306e82204254f276e7d3067fa21bd2909
+DIST adobe-flash-32.0.0.344-ppapi.x86_64.tar.gz 9492669 BLAKE2B 04d6c27cc985e999e87a33905ebffec4394391f21b4e458aa293050ddf868a45167c8e7b0cc4be8c2b2a65520c6c2d65edea5bef3489c76cdb240adb520e4202 SHA512 d209c083b01198e41834f840b602dd26ef50f1c8894b872ee41df8f2f667244e3e58296ba46e4ae379130ea266d07635d21f2eff185402c3fcb82d6c13a0226b
diff --git a/www-plugins/adobe-flash/adobe-flash-32.0.0.330.ebuild b/www-plugins/adobe-flash/adobe-flash-32.0.0.344.ebuild
similarity index 100%
rename from www-plugins/adobe-flash/adobe-flash-32.0.0.330.ebuild
rename to www-plugins/adobe-flash/adobe-flash-32.0.0.344.ebuild
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 3cf31cdfa38a..12ab55ad4fd6 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index b00e46dfe502..e624e9ce136e 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -1,3 +1 @@
-DIST fltk-1.3.3-source.tar.gz 4986376 BLAKE2B 866d26cd8d7d1e985010f7601598ec87b44674f55d019239ebc0cbf8d70e04d9d1bce7a7c8463740bcd4c4a8ffcc8ef5e44b3f0cb591358d53d513844605c868 SHA512 277ba27e35c20e2d4fc5296bf418c5ab78c821870476e21d49f723765b99b3a559eed4ecd5215ac26d53a1091ada003e17f1553194cebaa97dd854809dd2885d
-DIST fltk-1.3.4-source.tar.gz 5284217 BLAKE2B 87da82cd04abe81cf095b92b997d4ca0fb7d77fbbb5602848f88ad79e5e41c9bff64b7c948b408b83833fcb658c07b3fe487f55c30357484fab444faca7e990f SHA512 92c236e426ad9b2a2954a6fc401bc9bf4c4c46d47b08f8c9b879da6031ac158ef9b944f28a8bea64d18072d1af8ceaa09c00abebd745fb76dd628636424446c2
 DIST fltk-1.3.5-source.tar.gz 5261324 BLAKE2B df05989d6581b570c689e29e9f31e5fc85fa91dee1296d70b5f5c3b4aab527749850ea78bec3ef5947151b21598c3bb04e52f78b5e6db179e7fd922627862b5e SHA512 db7ea7c5f3489195a48216037b9371a50f1119ae7692d66f71b6711e5ccf78814670581bae015e408dee15c4bba921728309372c1cffc90113cdc092e8540821
diff --git a/x11-libs/fltk/files/FLTKConfig.cmake b/x11-libs/fltk/files/FLTKConfig.cmake
deleted file mode 100644
index 09427aac2aa5..000000000000
--- a/x11-libs/fltk/files/FLTKConfig.cmake
+++ /dev/null
@@ -1,37 +0,0 @@
-#-----------------------------------------------------------------------------
-#
-# FLTKConfig.cmake - FLTK CMake configuration file for external projects.
-#
-# This file is configured by FLTK and used by the UseFLTK.cmake module
-# to load FLTK's settings for an external project.
-
-# The FLTK source tree.
-# SET(FLTK_SOURCE_DIR "@FLTK_SOURCE_DIR@")
-
-# The FLTK include file directories.
-SET(FLUID_COMMAND "/usr/bin/fluid")
-SET(FLTK_EXECUTABLE_DIRS "/usr/bin")
-SET(FLTK_LIBRARY_DIRS "/usr/lib")
-SET(FLTK_LIBRARIES "fltk_images;fltk_gl;fltk_forms;fltk")
-SET(FLTK_INCLUDE_DIRS "/usr/include")
-
-# The C and C++ flags added by FLTK to the cmake-configured flags.
-SET(FLTK_REQUIRED_C_FLAGS "")
-SET(FLTK_REQUIRED_CXX_FLAGS "")
-
-# The FLTK version number
-SET(FLTK_VERSION_MAJOR "1")
-SET(FLTK_VERSION_MINOR "1")
-SET(FLTK_VERSION_PATCH "7")
-
-# Is FLTK using shared libraries?
-SET(FLTK_BUILD_SHARED_LIBS "ON")
-# SET(FLTK_BUILD_SETTINGS_FILE "@FLTK_BUILD_SETTINGS_FILE@")
-
-# The location of the UseFLTK.cmake file.
-SET(FLTK11_USE_FILE "/usr/share/cmake/Modules/FLTKUse.cmake")
-
-# # The ExodusII library dependencies.
-# IF(NOT FLTK_NO_LIBRARY_DEPENDS)
-#   INCLUDE("@FLTK_LIBRARY_DEPENDS_FILE@")
-# ENDIF(NOT FLTK_NO_LIBRARY_DEPENDS)
diff --git a/x11-libs/fltk/files/fltk-1.3.2-conf-tests.patch b/x11-libs/fltk/files/fltk-1.3.2-conf-tests.patch
deleted file mode 100644
index 74022a72ffb9..000000000000
--- a/x11-libs/fltk/files/fltk-1.3.2-conf-tests.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -100,9 +103,6 @@
- 	touch config.h
- 	chmod +x fltk-config
- 
--configure: configure.in
--	autoconf
--
- config.guess config.sub:
- 	-automake --add-missing 2> /dev/null
- 	if [ ! -e config.sub   ]; then echo NOTE: Using frozen copy of config.sub;   cp misc/config.sub   . ; fi
---- a/documentation/Makefile
-+++ b/documentation/Makefile
-@@ -84,11 +84,6 @@
- 	  $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \
- 	fi
- 	echo "Installing man pages in $(DESTDIR)$(mandir) ..."
--	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1
--	$(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
--	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
--	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3
--	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3
- 	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1
- 	$(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1
- 	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1
-@@ -96,10 +91,6 @@
- 	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk.man $(DESTDIR)$(mandir)/man3/fltk.3
- 
- install-linux install-osx:
--	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat6
--	$(INSTALL_MAN) $(SRC_DOCDIR)/blocks.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
--	$(INSTALL_MAN) $(SRC_DOCDIR)/checkers.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
--	$(INSTALL_MAN) $(SRC_DOCDIR)/sudoku.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
- 	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man6
- 	$(INSTALL_MAN) $(SRC_DOCDIR)/blocks.man $(DESTDIR)$(mandir)/man6/blocks.6
- 	$(INSTALL_MAN) $(SRC_DOCDIR)/checkers.man $(DESTDIR)$(mandir)/man6/checkers.6
-@@ -108,17 +99,11 @@
- 
- uninstall:
- 	$(RMDIR) $(DESTDIR)$(docdir)
--	$(RM) $(DESTDIR)$(mandir)/cat1/fluid.$(CAT1EXT)
- 	$(RM) $(DESTDIR)$(mandir)/man1/fluid.1
--	$(RM) $(DESTDIR)$(mandir)/cat1/fltk-config.$(CAT1EXT)
- 	$(RM) $(DESTDIR)$(mandir)/man1/fltk-config.1
--	$(RM) $(DESTDIR)$(mandir)/cat3/fltk.$(CAT3EXT)
- 	$(RM) $(DESTDIR)$(mandir)/man3/fltk.3
- 
- uninstall-linux uninstall-osx:
--	$(RM) $(DESTDIR)$(mandir)/cat6/blocks.$(CAT6EXT)
--	$(RM) $(DESTDIR)$(mandir)/cat6/checkers.$(CAT6EXT)
--	$(RM) $(DESTDIR)$(mandir)/cat6/sudoku.$(CAT6EXT)
- 	$(RM) $(DESTDIR)$(mandir)/man6/blocks.6
- 	$(RM) $(DESTDIR)$(mandir)/man6/checkers.6
- 	$(RM) $(DESTDIR)$(mandir)/man6/sudoku.6
diff --git a/x11-libs/fltk/files/fltk-1.3.2-desktop.patch b/x11-libs/fltk/files/fltk-1.3.2-desktop.patch
deleted file mode 100644
index ef72ba9c3ec2..000000000000
--- a/x11-libs/fltk/files/fltk-1.3.2-desktop.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/fluid/fluid.desktop
-+++ b/fluid/fluid.desktop
-@@ -6,5 +6,5 @@
- Icon=fluid
- Terminal=false
- Type=Application
--MimeType=application/x-fluid
-+MimeType=application/x-fluid;
- Categories=Development;GUIDesigner;
---- a/fluid/x-fluid.desktop
-+++ b/fluid/x-fluid.desktop
-@@ -1,6 +1,6 @@
- [Desktop Entry]
- Type=MimeType
--MimeType=application/x-fluid
-+MimeType=application/x-fluid;
- Icon=fluid.png
- Patterns=*.fl
- Name=FLUID
diff --git a/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch b/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch
deleted file mode 100644
index ed487e7dc24d..000000000000
--- a/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://bugs.gentoo.org/479774
-
---- a/src/Fl_JPEG_Image.cxx
-+++ b/src/Fl_JPEG_Image.cxx
-@@ -155,7 +155,7 @@
-   
-   jpeg_create_decompress(&dinfo);
-   jpeg_stdio_src(&dinfo, fp);
--  jpeg_read_header(&dinfo, 1);
-+  jpeg_read_header(&dinfo, TRUE);
-   
-   dinfo.quantize_colors      = (boolean)FALSE;
-   dinfo.out_color_space      = JCS_RGB;
-@@ -337,7 +337,7 @@
-   
-   jpeg_create_decompress(&dinfo);
-   jpeg_mem_src(&dinfo, data);
--  jpeg_read_header(&dinfo, 1);
-+  jpeg_read_header(&dinfo, TRUE);
-   
-   dinfo.quantize_colors      = (boolean)FALSE;
-   dinfo.out_color_space      = JCS_RGB;
diff --git a/x11-libs/fltk/files/fltk-1.3.3-fl_open_display.patch b/x11-libs/fltk/files/fltk-1.3.3-fl_open_display.patch
deleted file mode 100644
index 562f1157038f..000000000000
--- a/x11-libs/fltk/files/fltk-1.3.3-fl_open_display.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/Fl_x.cxx
-+++ b/src/Fl_x.cxx
-@@ -2211,6 +2211,7 @@
-   static int result = -1;
-
-   if (result == -1) {
-+    fl_open_display();
-     result = 0;
-     unsigned long nitems;
-     unsigned long *words = 0;
diff --git a/x11-libs/fltk/files/fltk-1.3.3-xutf8-visibility.patch b/x11-libs/fltk/files/fltk-1.3.3-xutf8-visibility.patch
deleted file mode 100644
index f30105e18c06..000000000000
--- a/x11-libs/fltk/files/fltk-1.3.3-xutf8-visibility.patch
+++ /dev/null
@@ -1,165 +0,0 @@
---- a/src/xutf8/utf8Input.c
-+++ b/src/xutf8/utf8Input.c
-@@ -18,6 +18,7 @@
- 
- #include <config.h>
- #include "../Xutf8.h"
-+#include "../../FL/Fl_Export.H"
- #include <X11/X.h>
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
-@@ -53,7 +54,7 @@ typedef struct {
- #include "lcUniConv/jisx0212.h"
- #include "lcUniConv/ksc5601.h"
- 
--static int
-+FL_EXPORT static int
- XConvertEucTwToUtf8(char* buffer_return, int len) {
-   /* FIXME */
- #if HAVE_LIBC_ICONV
-@@ -120,7 +121,7 @@ XConvertEucTwToUtf8(char* buffer_return,
-   return l;
- }
- 
--static int
-+FL_EXPORT static int
- XConvertEucKrToUtf8(char* buffer_return, int len) {
-   int i = 0, l = 0;
-   char *buf;
-@@ -160,7 +161,7 @@ XConvertEucKrToUtf8(char* buffer_return,
-   return l;
- }
- 
--static int
-+FL_EXPORT static int
- XConvertBig5ToUtf8(char* buffer_return, int len) {
-   int i = 0, l = 0;
-   char *buf;
-@@ -189,7 +190,7 @@ XConvertBig5ToUtf8(char* buffer_return,
-   return l;
- }
- 
--static int
-+FL_EXPORT static int
- XConvertCp936extToUtf8(char* buffer_return, int len)
- {
-   int i = 0, l = 0;
-@@ -226,7 +227,7 @@ XConvertCp936extToUtf8(char* buffer_retu
-   return l;
- }
- 
--static int
-+FL_EXPORT static int
- XConvertGb2312ToUtf8(char* buffer_return, int len) {
-   int i = 0, l = 0;
-   char *buf;
-@@ -261,7 +262,7 @@ XConvertGb2312ToUtf8(char* buffer_return
-   return l;
- }
- 
--static int
-+FL_EXPORT static int
- XConvertEucCnToUtf8(char* buffer_return, int len) {
-   int i = 0, l = 0;
-   char *buf;
-@@ -300,7 +301,7 @@ XConvertEucCnToUtf8(char* buffer_return,
-   return l;
- }
- 
--static int
-+FL_EXPORT static int
- XConvertEucJpToUtf8(char* buffer_return, int len) {
-   int i = 0, l = 0;
-   char *buf;
-@@ -373,7 +374,7 @@ XConvertEucJpToUtf8(char* buffer_return,
-   return l;
- }
- 
--static int
-+FL_EXPORT static int
- XConvertEucToUtf8(const char*	locale,
- 		  char*		buffer_return, 
- 		  int		len, 
-@@ -408,7 +409,7 @@ XConvertEucToUtf8(const char*	locale,
-   return len;
- }
- 
--int
-+FL_EXPORT int
- XUtf8LookupString(XIC                 ic,
- 		  XKeyPressedEvent*   event,
- 		  char*               buffer_return,
---- a/src/xutf8/utf8Utils.c
-+++ b/src/xutf8/utf8Utils.c
-@@ -21,6 +21,7 @@
- #if !defined(WIN32) && !defined(__APPLE__)
- 
- #include "../Xutf8.h"
-+#include "../../FL/Fl_Export.H"
- 
- /*** NOTE : all functions are LIMITED to 24 bits Unicode values !!! ***/
- 
-@@ -29,7 +30,7 @@
-  * Returns the byte length of the converted UTF-8 char 
-  * Returns -1 if the UTF-8 string is not valid 
-  */
--int
-+FL_EXPORT int
- XConvertUtf8ToUcs(const unsigned char     *buf,
- 		  int                     len,
- 		  unsigned int         	  *ucs) {
-@@ -137,7 +138,7 @@ XConvertUcsToUtf8(unsigned int 	ucs,
-  * returns the byte length of the first UTF-8 char 
-  * (returns -1 if not valid) 
-  */
--int
-+FL_EXPORT int
- XUtf8CharByteLen(const unsigned char     *buf,
- 		 int                     len) {
-   unsigned int ucs;
-@@ -165,7 +166,7 @@ XCountUtf8Char(const unsigned char 	*buf
- /* 
-  * Same as XConvertUtf8ToUcs but no sanity check is done.
-  */
--int
-+FL_EXPORT int
- XFastConvertUtf8ToUcs(const unsigned char     *buf,
- 		      int                     len,
- 		      unsigned int            *ucs) {
---- a/src/xutf8/utf8Wrap.c
-+++ b/src/xutf8/utf8Wrap.c
-@@ -20,6 +20,7 @@
- #if !defined(WIN32) && !defined(__APPLE__)
- 
- #include "../Xutf8.h"
-+#include "../../FL/Fl_Export.H"
- #include <X11/Xlib.h>
- #include <ctype.h>
- #include <stdlib.h>
-@@ -705,7 +706,7 @@ XUtf8_measure_extents(
- /*****************************************************************************/
- /** returns the pixel width of a UTF-8 string				    **/
- /*****************************************************************************/
--int
-+FL_EXPORT int
- XUtf8TextWidth(XUtf8FontStruct 	*font_set,
- 	       const char 	*string,
- 	       int 		num_bytes) {
-@@ -815,7 +816,7 @@ XUtf8TextWidth(XUtf8FontStruct 	*font_se
- /*****************************************************************************/
- /**  get the X font and glyph ID of a UCS char                              **/
- /*****************************************************************************/
--int
-+FL_EXPORT int
- XGetUtf8FontAndGlyph(XUtf8FontStruct  *font_set,
- 		     unsigned int     ucs,
- 		     XFontStruct      **fnt,
-@@ -886,7 +887,7 @@ XGetUtf8FontAndGlyph(XUtf8FontStruct  *f
- /*****************************************************************************/
- /** returns the pixel width of a UCS char				    **/
- /*****************************************************************************/
--int
-+FL_EXPORT int
- XUtf8UcsWidth(XUtf8FontStruct  *font_set,
- 	      unsigned int     ucs) {
- 
diff --git a/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch b/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch
deleted file mode 100644
index 32dcd3016349..000000000000
--- a/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1005,13 +1005,13 @@
- 	AC_ARG_ENABLE(xft, [  --enable-xft            turn on Xft support [[default=yes]]])
- 
- 	xft_found=no
--	if test x$enable_xft != xno; then
--	    AC_PATH_PROG(FTCONFIG, freetype-config)
--
--	    if test "x$FTCONFIG" != x; then
--		CPPFLAGS="`$FTCONFIG --cflags` $CPPFLAGS"
--		CFLAGS="`$FTCONFIG --cflags` $CFLAGS"
--		CXXFLAGS="`$FTCONFIG --cflags` $CXXFLAGS"
-+	AS_IF([test x$enable_xft != xno], [
-+	    PKG_PROG_PKG_CONFIG
-+	    PKG_CHECK_MODULES(FREETYPE, freetype2, [
-+		CPPFLAGS="$FREETYPE_CFLAGS $CPPFLAGS"
-+		CFLAGS="$FREETYPE_CFLAGS $CFLAGS"
-+		CXXFLAGS="$FREETYPE_CFLAGS $CXXFLAGS"
-+	    ],AC_MSG_ERROR([No freetype found]))
- 
- 		AC_CHECK_LIB(fontconfig, FcPatternCreate)
- 		AC_CHECK_HEADER(X11/Xft/Xft.h,
-@@ -1019,8 +1019,7 @@
- 			[AC_DEFINE(USE_XFT)
- 			 LIBS="-lXft $LIBS"
- 			 xft_found=yes] ))
--	    fi
--	fi
-+	])
- 
- 	dnl Issue a warning message if Xft was not found, abort configure
- 	dnl if Xft was requested explicitly (but not found)
diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
deleted file mode 100644
index 6fecfbecb1e3..000000000000
--- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils fdo-mime flag-o-matic ltprune
-
-DESCRIPTION="C++ user interface toolkit for X and OpenGL"
-HOMEPAGE="https://www.fltk.org/"
-SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
-
-SLOT="1"
-LICENSE="FLTK LGPL-2"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama"
-
-RDEPEND="
-	>=media-libs/libpng-1.2:0
-	sys-libs/zlib
-	virtual/jpeg:0
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/libXt
-	cairo? ( x11-libs/cairo[X] )
-	games? ( !sys-block/blocks )
-	opengl? ( virtual/glu virtual/opengl )
-	xft? ( x11-libs/libXft )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-	doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	rm -rf zlib jpeg png || die
-	epatch \
-		"${FILESDIR}"/${PN}-1.3.2-desktop.patch \
-		"${FILESDIR}"/${PN}-1.3.0-share.patch \
-		"${FILESDIR}"/${PN}-1.3.2-conf-tests.patch \
-		"${FILESDIR}"/${PN}-1.3.2-jpeg-9a.patch \
-		"${FILESDIR}"/${PN}-1.3.3-visibility.patch \
-		"${FILESDIR}"/${PN}-1.3.3-fl_open_display.patch \
-		"${FILESDIR}"/${PN}-1.3.3-fltk-config.patch \
-		"${FILESDIR}"/${PN}-1.3.3-xutf8-visibility.patch
-
-	sed -i \
-		-e 's:@HLINKS@::g' FL/Makefile.in || die
-	# some fixes introduced because slotting
-	sed -i \
-		-e '/RANLIB/s:$(libdir)/\(.*LIBNAME)\):$(libdir)/`basename \1`:g' \
-		src/Makefile || die
-	# docs in proper docdir
-	sed -i \
-		-e "/^docdir/s:fltk:${PF}/html:" \
-		-e "/SILENT:/d" \
-		makeinclude.in || die
-	sed -e "s/7/${PV}/" \
-		< "${FILESDIR}"/FLTKConfig.cmake \
-		> CMake/FLTKConfig.cmake || die
-	sed -e 's:-Os::g' -i configure.in || die
-
-	use prefix && append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}"
-
-	# also in Makefile:config.guess config.sub:
-	cp misc/config.{guess,sub} . || die
-
-	eautoconf
-}
-
-src_configure() {
-	FLTK_INCDIR=${EPREFIX}/usr/include/fltk
-	FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk
-
-	econf \
-		$(use_enable cairo) \
-		$(use_enable debug) \
-		$(use_enable opengl gl) \
-		$(use_enable threads) \
-		$(use_enable xft) \
-		$(use_enable xinerama) \
-		--disable-localjpeg \
-		--disable-localpng \
-		--disable-localzlib \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--enable-largefile \
-		--enable-shared \
-		--enable-xdbe \
-		--includedir=${FLTK_INCDIR} \
-		--libdir=${FLTK_LIBDIR}
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake -C documentation html
-	fi
-
-	if use games; then
-		emake -C test blocks checkers sudoku
-	fi
-}
-
-src_test() {
-	emake -C test
-}
-
-src_install() {
-	default
-
-	emake -C fluid \
-			DESTDIR="${D}" install-linux
-
-	if use doc; then
-		emake -C documentation \
-			DESTDIR="${D}" install
-	fi
-
-	local apps="fluid"
-	if use games; then
-		emake -C test \
-			DESTDIR="${D}" install-linux
-		emake -C documentation \
-			DESTDIR="${D}" install-linux
-		apps+=" sudoku blocks checkers"
-	fi
-
-	for app in ${apps}; do
-		dosym /usr/share/icons/hicolor/32x32/apps/${app}.png \
-			/usr/share/pixmaps/${app}.png
-	done
-
-	dodoc CHANGES README CREDITS ANNOUNCEMENT
-
-	if use examples; then
-		docinto examples
-		dodoc -r test/*.{h,cxx,fl} test/demo.menu
-	fi
-
-	insinto /usr/share/cmake/Modules
-	doins CMake/FLTK*.cmake
-
-	echo "LDPATH=${FLTK_LIBDIR}" > 99fltk
-	echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk
-	doenvd 99fltk
-
-	# FIXME: This is bad, but building only shared libraries is hardly supported
-	# FIXME: The executables in test/ are linking statically against libfltk
-	if ! use static-libs; then
-		rm "${ED}"/usr/lib*/fltk/*.a || die
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/x11-libs/fltk/fltk-1.3.4.ebuild b/x11-libs/fltk/fltk-1.3.4.ebuild
deleted file mode 100644
index b8168ff96996..000000000000
--- a/x11-libs/fltk/fltk-1.3.4.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools fdo-mime flag-o-matic ltprune multilib-minimal
-
-DESCRIPTION="C++ user interface toolkit for X and OpenGL"
-HOMEPAGE="https://www.fltk.org/"
-SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
-
-SLOT="1"
-LICENSE="FLTK LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama"
-
-RDEPEND="
-	>=media-libs/libpng-1.2:0=[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/jpeg:0=[${MULTILIB_USEDEP}]
-	x11-libs/libICE[${MULTILIB_USEDEP}]
-	x11-libs/libSM[${MULTILIB_USEDEP}]
-	x11-libs/libXcursor[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes[${MULTILIB_USEDEP}]
-	x11-libs/libXt[${MULTILIB_USEDEP}]
-	cairo? ( x11-libs/cairo[${MULTILIB_USEDEP},X] )
-	games? ( !sys-block/blocks )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	xft? ( x11-libs/libXft[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	doc? ( app-doc/doxygen )
-"
-
-DOCS=(
-	ANNOUNCEMENT
-	CHANGES
-	CREDITS
-	README
-)
-FLTK_GAMES="
-	blocks
-	checkers
-	sudoku
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.0-share.patch
-	"${FILESDIR}"/${PN}-1.3.3-fltk-config.patch
-	"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
-	"${FILESDIR}"/${PN}-1.3.3-visibility.patch
-	"${FILESDIR}"/${PN}-1.3.4-conf-tests.patch
-	"${FILESDIR}"/${PN}-1.3.4-freetype_pkgconfig.patch
-)
-
-src_prepare() {
-	default
-
-	rm -rf zlib jpeg png || die
-
-	sed -i \
-		-e 's:@HLINKS@::g' FL/Makefile.in || die
-	# docs in proper docdir
-	sed -i \
-		-e "/^docdir/s:fltk:${PF}/html:" \
-		-e "/SILENT:/d" \
-		makeinclude.in || die
-	sed -e "s/7/${PV}/" \
-		< "${FILESDIR}"/FLTKConfig.cmake \
-		> CMake/FLTKConfig.cmake || die
-	sed -e 's:-Os::g' -i configure.ac || die
-
-	# also in Makefile:config.guess config.sub:
-	cp misc/config.{guess,sub} . || die
-
-	cp fluid/{,x-}fluid.desktop || die
-
-	eaclocal
-	eautoconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset FLTK_LIBDIRS
-
-	local FLTK_INCDIR=${EPREFIX}/usr/include/fltk
-	local FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk
-	FLTK_LIBDIRS+=${FLTK_LIBDIRS+:}${FLTK_LIBDIR}
-
-	multilib_is_native_abi && use prefix &&
-		append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}"
-
-	econf \
-		$(use_enable cairo) \
-		$(use_enable debug) \
-		$(use_enable opengl gl) \
-		$(use_enable threads) \
-		$(use_enable xft) \
-		$(use_enable xinerama) \
-		--disable-localjpeg \
-		--disable-localpng \
-		--disable-localzlib \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--enable-largefile \
-		--enable-shared \
-		--enable-xcursor \
-		--enable-xdbe \
-		--enable-xfixes \
-		--includedir=${FLTK_INCDIR} \
-		--libdir=${FLTK_LIBDIR}
-}
-
-multilib_src_compile() {
-	# Prevent reconfigure on non-native ABIs.
-	touch -r makeinclude config.{guess,sub} || die
-
-	default
-
-	if multilib_is_native_abi; then
-		emake -C fluid
-		use doc && emake -C documentation html
-		use games && emake -C test ${FLTK_GAMES}
-	fi
-}
-
-multilib_src_test() {
-	emake -C fluid
-	emake -C test
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi; then
-		emake -C fluid DESTDIR="${D}" install-linux install
-
-		use doc && \
-			emake -C documentation DESTDIR="${D}" install
-
-		use games && \
-			emake -C test DESTDIR="${D}" install-linux
-	fi
-}
-
-multilib_src_install_all() {
-	for app in fluid $(usex games "${FLTK_GAMES}" ''); do
-		dosym \
-			/usr/share/icons/hicolor/32x32/apps/${app}.png \
-			/usr/share/pixmaps/${app}.png
-	done
-
-	if use examples; then
-		docinto examples
-		dodoc -r test/*.{h,cxx,fl} test/demo.menu
-	fi
-
-	insinto /usr/share/cmake/Modules
-	doins CMake/FLTK*.cmake
-
-	echo "LDPATH=${FLTK_LIBDIRS}" > 99fltk || die
-	echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk || die
-	doenvd 99fltk
-
-	# FIXME: This is bad, but building only shared libraries is hardly supported
-	# FIXME: The executables in test/ are linking statically against libfltk
-	if ! use static-libs; then
-		rm "${ED}"/usr/lib*/fltk/*.a || die
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/x11-libs/fltk/fltk-1.3.5-r4.ebuild b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
index 524f578813a1..75d54f5bbf10 100644
--- a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
 
 SLOT="1"
 LICENSE="FLTK LGPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama"
 
 RDEPEND="
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 9def6f12a09d..aad7e04a6e93 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/projecteur/Manifest b/x11-misc/projecteur/Manifest
index b9decade370d..9c956caf71aa 100644
--- a/x11-misc/projecteur/Manifest
+++ b/x11-misc/projecteur/Manifest
@@ -1 +1 @@
-DIST projecteur-0.6.tar.gz 286242 BLAKE2B 80385b946fbd8ba8f6f5db4c495f382252a5c644d0626c0e6f0b95c9a1785a3fdba8347115c456517da1c5627238883db7b253a98f3aa4912dc75adc54af1f82 SHA512 d97cd9facb0db0199ae0c569a1e4c881f30901a31966f23a94d093cab5582af1b8199d7b7d2d074d852dc2c22f4ce249b9690e99e8b4d79444d17d22bcabcbc0
+DIST projecteur-0.7.tar.gz 296252 BLAKE2B fb20de48ee5f89e66701fc8d6cad036aed48ed862994b82431a8a14f3ec95dccb863c4c35a5de01c932150b3b311511ef01af093ddbcd23a2413ebb882152bab SHA512 9af54e47883cd3d9368edef173b9c0eb522f947f7d72f759388e2ecdf275524bdf56d3562506a383bba32c0fd2ec5c76c232a7b523e13b79caeb4d6d76bbbac0
diff --git a/x11-misc/projecteur/projecteur-0.6-r1.ebuild b/x11-misc/projecteur/projecteur-0.7.ebuild
similarity index 100%
rename from x11-misc/projecteur/projecteur-0.6-r1.ebuild
rename to x11-misc/projecteur/projecteur-0.7.ebuild